Module org.eclipse.jgit

Package org.eclipse.jgit.internal.diffmergetool

Class PreDefinedMergeTool

java.lang.Object

org.eclipse.jgit.internal.diffmergetool.UserDefinedDiffTool

org.eclipse.jgit.internal.diffmergetool.UserDefinedMergeTool

org.eclipse.jgit.internal.diffmergetool.PreDefinedMergeTool

All Implemented Interfaces:

ExternalDiffTool, ExternalMergeTool

public class PreDefinedMergeTool
extends UserDefinedMergeTool

The pre-defined merge tool.

Constructor Summary

Constructors

Constructor	Description
PreDefinedMergeTool(String name, String path, String parametersWithBase, String parametersWithoutBase, BooleanTriState trustExitCode)	Creates the pre-defined merge tool
PreDefinedMergeTool(CommandLineMergeTool tool)	Creates the pre-defined merge tool

Method Summary

Modifier and Type	Method	Description
String	getCommand()	The command of the diff tool.
String	getCommand(boolean withBase)	Get command
void	setTrustExitCode(BooleanTriState trustExitCode)	Set "trust exit code" flag

Methods inherited from class org.eclipse.jgit.internal.diffmergetool.UserDefinedMergeTool

getTrustExitCode

Methods inherited from class org.eclipse.jgit.internal.diffmergetool.UserDefinedDiffTool

getName, getPath, isAvailable, setAvailable, setPath

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Methods inherited from interface org.eclipse.jgit.internal.diffmergetool.ExternalDiffTool

getName, getPath, isAvailable

Constructor Details

PreDefinedMergeTool

public PreDefinedMergeTool(String name,
 String path,
 String parametersWithBase,
 String parametersWithoutBase,
 BooleanTriState trustExitCode)

Creates the pre-defined merge tool

Parameters:

name - the name

path - the path

parametersWithBase - the tool parameters that are used together with path as command and "base is present" ($BASE)

parametersWithoutBase - the tool parameters that are used together with path as command and "base is present" ($BASE)

trustExitCode - the "trust exit code" option

PreDefinedMergeTool

public PreDefinedMergeTool(CommandLineMergeTool tool)

Creates the pre-defined merge tool

Parameters:

tool - the command line merge tool

Method Details

setTrustExitCode

public void setTrustExitCode(BooleanTriState trustExitCode)

Description copied from class: UserDefinedMergeTool

Set "trust exit code" flag

Overrides:

setTrustExitCode in class UserDefinedMergeTool

Parameters:

trustExitCode - the "trust exit code" option

getCommand

public String getCommand()

Description copied from class: UserDefinedDiffTool

The command of the diff tool.

A pre-defined external diff tool can be overridden using the tools name in a configuration file. The overwritten tool is then a user defined tool and the command of the diff tool is specified with difftool.<tool>.cmd. This command must work without prepending the value of UserDefinedDiffTool.getPath() and can sometimes include tool parameters.

Specified by:

getCommand in interface ExternalDiffTool

Overrides:

getCommand in class UserDefinedDiffTool

Returns:

the tool command (with base present)

See Also:

• https://git-scm.com/docs/git-difftool

getCommand

public String getCommand(boolean withBase)

Description copied from class: UserDefinedMergeTool

Get command

Specified by:

getCommand in interface ExternalMergeTool

Overrides:

getCommand in class UserDefinedMergeTool

Parameters:

withBase - get command with base present (true) or without base present (false)

Returns:

the tool command