Uses of Class
org.eclipse.jgit.internal.diffmergetool.ToolException
-
Packages that use ToolException Package Description org.eclipse.jgit.internal.diffmergetool -
-
Uses of ToolException in org.eclipse.jgit.internal.diffmergetool
Methods in org.eclipse.jgit.internal.diffmergetool that throw ToolException Modifier and Type Method Description boolean
CommandExecutor. checkExecutable(String path, File workingDir, Map<String,String> env)
Optional<FS.ExecutionResult>
DiffTools. compare(FileElement localFile, FileElement remoteFile, Optional<String> toolName, BooleanTriState prompt, boolean gui, BooleanTriState trustExitCode, PromptContinueHandler promptHandler, InformNoToolHandler noToolHandler)
Compare two versions of a file.FS.ExecutionResult
DiffTools. compare(FileElement localFile, FileElement remoteFile, ExternalDiffTool tool, boolean trustExitCode)
Compare two versions of a file.Optional<String>
DiffTools. getExternalToolFromAttributes(String path)
ProvidesOptional
with the name of an external diff tool if specified in git configuration for a path.static Optional<String>
ExternalToolUtils. getExternalToolFromAttributes(Repository repository, String path, String toolKey)
ProvidesOptional
with the name of an external tool if specified in git configuration for a path.Optional<String>
MergeTools. getExternalToolFromAttributes(String path)
ProvidesOptional
with the name of an external merge tool if specified in git configuration for a path.Optional<FS.ExecutionResult>
MergeTools. merge(FileElement localFile, FileElement remoteFile, FileElement mergedFile, FileElement baseFile, File tempDir, Optional<String> toolName, BooleanTriState prompt, boolean gui, PromptContinueHandler promptHandler, InformNoToolHandler noToolHandler)
Merge two versions of a file with optional base file.FS.ExecutionResult
MergeTools. merge(FileElement localFile, FileElement remoteFile, FileElement mergedFile, FileElement baseFile, File tempDir, ExternalMergeTool tool)
Merge two versions of a file with optional base file.FS.ExecutionResult
CommandExecutor. run(String command, File workingDir, Map<String,String> env)
-