diff options
| author | Andre Bossert <andre.bossert@siemens.com> | 2020-01-19 20:56:28 +0100 |
|---|---|---|
| committer | Andrey Loskutov <loskutov@gmx.de> | 2022-06-01 14:23:48 +0200 |
| commit | 973e955ead1a9bf41efb3168baf5b68527e78023 (patch) | |
| tree | 70e6b916308e20da790ac41759e1b9bd3c28b324 /org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java | |
| parent | bb30be6b3335c67ee59d3705d5e04e2dbb688128 (diff) | |
| download | jgit-973e955ead1a9bf41efb3168baf5b68527e78023.tar.gz jgit-973e955ead1a9bf41efb3168baf5b68527e78023.zip | |
Add availability check of pre-defined tools
see: https://git-scm.com/docs/git-difftool
see: https://git-scm.com/docs/git-mergetool
* now all available tools are printed with "--tool-help"
* if no diff.tool or merge.tool is defined the first available
pre-defined tool is used
TODO:
- add mergetools to difftools --> extra change or merge to this
- return the exit-code of the tool to jgit / java runtime
Bug: 356832
Change-Id: I20fb04e71ced981f5625020f461bbac24e6cec70
Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java index f2d7e828cb..e01b892a53 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/diffmergetool/ExternalDiffTool.java @@ -30,4 +30,10 @@ public interface ExternalDiffTool { */ String getCommand(); + /** + * @return availability of the tool: true if tool can be executed and false + * if not + */ + boolean isAvailable(); + } |