Class DiffTools
java.lang.Object
org.eclipse.jgit.internal.diffmergetool.DiffTools
Manages diff tools.
-
Field Summary
FieldsModifier and TypeFieldDescriptionprivate final DiffToolConfigprivate Map<String,ExternalDiffTool> private Map<String,ExternalDiffTool> -
Constructor Summary
ConstructorsConstructorDescriptionDiffTools(Repository repo) Creates the external diff-tools manager for given repository. -
Method Summary
Modifier and TypeMethodDescriptionintcompare(String newPath, String oldPath, String newId, String oldId, String toolName, BooleanTriState prompt, BooleanTriState gui, BooleanTriState trustExitCode) Compare two versions of a file.booleanprivate voidprivate void
-
Field Details
-
config
-
predefinedTools
-
userDefinedTools
-
-
Constructor Details
-
DiffTools
Creates the external diff-tools manager for given repository.- Parameters:
repo- the repository
-
-
Method Details
-
compare
public int compare(String newPath, String oldPath, String newId, String oldId, String toolName, BooleanTriState prompt, BooleanTriState gui, BooleanTriState trustExitCode) Compare two versions of a file.- Parameters:
newPath- the new file patholdPath- the old file pathnewId- the new object IDoldId- the old object IDtoolName- the selected tool name (can be null)prompt- the prompt optiongui- the GUI optiontrustExitCode- the "trust exit code" option- Returns:
- the return code from executed tool
-
getToolNames
- Returns:
- the tool names
-
getUserDefinedTools
- Returns:
- the user defined tools
-
getAvailableTools
- Returns:
- the available predefined tools
-
getNotAvailableTools
- Returns:
- the NOT available predefined tools
-
getDefaultToolName
- Parameters:
gui- use the diff.guitool setting ?- Returns:
- the default tool name
-
isInteractive
public boolean isInteractive()- Returns:
- is interactive (config prompt enabled) ?
-
setupPredefinedTools
private void setupPredefinedTools() -
setupUserDefinedTools
private void setupUserDefinedTools()
-