git - 如何从命令行使用 PyCharm 作为 GIT diff 工具？

Question

关于PyCharm Help Website我看到您可以使用 PyCharm 作为命令行中的差异工具来比较两个文件。棒极了!然而，有没有办法更进一步并将其用作 git diff 工具。

所以我只需键入 pycharm diff file_name.py 并获取 GIT 差异，就像您在 PyCharm 上设置 GIT 集成并按 CTRL + D 查看差异。

Answer 1

是的，你可以。

首先您需要启用命令行启动器:

To enable invoking PyCharm operations from the command line, follow these steps

• On macOS or UNIX:

  1. Make sure PyCharm is running.
  2. On the main menu, choose Tools | Create Command-line Launcher. The dialog box Create Launcher Script opens, with the suggested path and name of the launcher script. You can accept default, or specify your own path. Make notice of it, as you'll need it later.
  3. Outside of PyCharm, add the path and name of the launcher script to your path.

• On Windows:

  1. Specify the location of the PyCharm executable in the Path system environment variable. In this case, you will be able to invoke the PyCharm executable and other PyCharm commands from any directory.

https://www.jetbrains.com/help/pycharm/running-pycharm-as-a-diff-or-merge-command-line-tool.html

然后将以下行添加到您的~/.gitconfig:

[diff]
        tool = pycharm
[difftool "pycharm"]
        cmd = /usr/local/bin/charm diff "$LOCAL" "$REMOTE" && echo "Press enter to continue..." && read
[merge]
        tool = pycharm
[mergetool "pycharm"]
        cmd = /usr/local/bin/charm merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
        keepBackup = false

(对于 Windows 用户，这些细节可能略有不同)