Top Inners Fields Constructors Methods
org.eclipse.jgit.pgm

pack-priv Class MergeTool

extends TextBuiltin
Class Inheritance
Annotations
@Command
name:mergetool
common:true
usage:usage_MergeTool
Static Imports
org.eclipse.jgit.treewalk.TreeWalk.OperationType.CHECKOUT_OP

Nested and Inner Type Summary

Modifier and TypeClass and Description
pack-priv static enum
MergeTool.MergeResult

Field Summary

Modifier and TypeField and Description
protected List<String>
filterPaths

private boolean
gui

private BufferedReader
inputReader

private MergeTools
mergeTools

private BooleanTriState
prompt

private boolean
toolHelp

private Optional<String>
toolName

Inherited from org.eclipse.jgit.pgm.TextBuiltin:
argWalkdberrserrwgitdirinsoutsoutw

Constructor Summary

AccessConstructor and Description
pack-priv
MergeTool()

Method Summary

Modifier and TypeMethod and Description
private void
addFile(String fileName)

private int
getDeletedMergeDecision()

private Map<String, IndexDiff.StageState>
getFiles()

private boolean
hasUserAccepted(String message)

private void
informUserNoTool(List<String> tools)

protected void
init(Repository
the opened repository that the command should work on.
repository, String
value of the --git-dir command line option, if repository is null.
gitDir)

Overrides org.eclipse.jgit.pgm.TextBuiltin.init.

Initialize the command to work with a repository.

private boolean
isContinueUnresolvedPaths()

private boolean
isMergeSuccessful()

private void
merge(Map<String, IndexDiff.StageState> files)

private MergeTool.MergeResult
mergeDeleted(String mergedFilePath, boolean deletedByUs)

private MergeTool.MergeResult
mergeModified(String mergedFilePath, boolean showPrompt)

pack-priv void
noGui(boolean on)

pack-priv void
noPrompt(boolean on)

private boolean
promptForLaunch(String toolNamePrompt)

private void
rmFile(String fileName)

protected void
run()

Implements abstract org.eclipse.jgit.pgm.TextBuiltin.run.

Perform the actions of this command.

pack-priv void
setGui(boolean on)

pack-priv void
setPrompt(boolean on)

pack-priv void
setToolName(String name)

private void
showToolHelp()

Inherited from org.eclipse.jgit.pgm.TextBuiltin:
abbreviateRefcontainsHelpdiediediedieexecutegetErrorWritergetOutputWritergetRepositorygetResourceBundleinitRawparseArgumentsprintUsageprintUsageAndExitprintUsageAndExitrequiresRepositoryresolvesetCommandName

Field Detail

filterPathsback to summary
protected List<String> filterPaths
Annotations
@Argument
required:false
index:0
metaVar:metaVar_paths
@Option
name:--
metaVar:metaVar_paths
handler:RestOfArgumentsHandler
guiback to summary
private boolean gui
inputReaderback to summary
private BufferedReader inputReader
mergeToolsback to summary
private MergeTools mergeTools
promptback to summary
private BooleanTriState prompt
toolHelpback to summary
private boolean toolHelp
Annotations
@Option
name:--tool-help
usage:usage_toolHelp
toolNameback to summary
private Optional<String> toolName

Constructor Detail

MergeToolback to summary
pack-priv MergeTool()

Method Detail

addFileback to summary
private void addFile(String fileName) throws Exception
getDeletedMergeDecisionback to summary
private int getDeletedMergeDecision() throws IOException
getFilesback to summary
private Map<String, IndexDiff.StageState> getFiles() throws RevisionSyntaxException, NoWorkTreeException, GitAPIException
hasUserAcceptedback to summary
private boolean hasUserAccepted(String message) throws IOException
informUserNoToolback to summary
private void informUserNoTool(List<String> tools)
initback to summary
protected void init(Repository repository, String gitDir)

Overrides org.eclipse.jgit.pgm.TextBuiltin.init.

Doc from org.eclipse.jgit.pgm.TextBuiltin.init.

Initialize the command to work with a repository.

Parameters
repository:Repository

the opened repository that the command should work on.

gitDir:String

value of the --git-dir command line option, if repository is null.

Annotations
@Override
isContinueUnresolvedPathsback to summary
private boolean isContinueUnresolvedPaths() throws IOException
isMergeSuccessfulback to summary
private boolean isMergeSuccessful() throws IOException
mergeback to summary
private void merge(Map<String, IndexDiff.StageState> files) throws Exception
mergeDeletedback to summary
private MergeTool.MergeResult mergeDeleted(String mergedFilePath, boolean deletedByUs) throws Exception
mergeModifiedback to summary
private MergeTool.MergeResult mergeModified(String mergedFilePath, boolean showPrompt) throws Exception
noGuiback to summary
pack-priv void noGui(boolean on)
Annotations
@Option
name:--no-gui
usage:usage_noGui
noPromptback to summary
pack-priv void noPrompt(boolean on)
Annotations
@Option
name:--no-prompt
aliases:-y
usage:usage_noPrompt
promptForLaunchback to summary
private boolean promptForLaunch(String toolNamePrompt)
rmFileback to summary
private void rmFile(String fileName) throws Exception
runback to summary
protected void run()

Implements abstract org.eclipse.jgit.pgm.TextBuiltin.run.

Doc from org.eclipse.jgit.pgm.TextBuiltin.run.

Perform the actions of this command.

This method should only be invoked by execute(String[]).

Annotations
@Override
setGuiback to summary
pack-priv void setGui(boolean on)
Annotations
@Option
name:--gui
aliases:-g
usage:usage_MergeGuiTool
setPromptback to summary
pack-priv void setPrompt(boolean on)
Annotations
@Option
name:--prompt
usage:usage_prompt
setToolNameback to summary
pack-priv void setToolName(String name)
Annotations
@Option
name:--tool
aliases:-t
metaVar:metaVar_tool
usage:usage_ToolForMerge
showToolHelpback to summary
private void showToolHelp() throws IOException
org.eclipse.jgit.pgm back to summary

pack-priv final Enum MergeTool.MergeResult

extends Enum<MergeTool.MergeResult>
Class Inheritance

Field Summary

Modifier and TypeField and Description
public static final MergeTool.MergeResult
ABORTED

public static final MergeTool.MergeResult
FAILED

public static final MergeTool.MergeResult
SUCCESSFUL

Constructor Summary

AccessConstructor and Description
private
MergeResult()

Method Summary

Modifier and TypeMethod and Description
public static MergeTool.MergeResult
valueOf(String name)

public static MergeTool.MergeResult[]
values()

Inherited from java.lang.Enum:
clonecompareTodescribeConstableequalsfinalizegetDeclaringClasshashCodenameordinaltoStringvalueOf

Field Detail

ABORTEDback to summary
public static final MergeTool.MergeResult ABORTED
FAILEDback to summary
public static final MergeTool.MergeResult FAILED
SUCCESSFULback to summary
public static final MergeTool.MergeResult SUCCESSFUL

Constructor Detail

MergeResultback to summary
private MergeResult()

Method Detail

valueOfback to summary
public static MergeTool.MergeResult valueOf(String name)
valuesback to summary
public static MergeTool.MergeResult[] values()