org.eclipse.jgit.api

Class CherryPickCommand

java.lang.Object

org.eclipse.jgit.api.GitCommand<CherryPickResult>

org.eclipse.jgit.api.CherryPickCommand

All Implemented Interfaces:

java.util.concurrent.Callable<CherryPickResult>

public class CherryPickCommand
extends GitCommand<CherryPickResult>

A class used to execute a cherry-pick command. It has setters for all supported options and arguments of this command and a call() method to finally execute the command. Each instance of this class should only be used for one invocation of the command (means: one call to call())

See Also:

Git documentation about cherry-pick

Field Summary

Fields

Modifier and Type	Field and Description
private java.util.List<Ref>	commits
private java.lang.Integer	mainlineParentNumber
private ProgressMonitor	monitor
private boolean	noCommit
private java.lang.String	ourCommitName
private java.lang.String	reflogPrefix
private MergeStrategy	strategy

Fields inherited from class org.eclipse.jgit.api.GitCommand

repo

Constructor Summary

Constructors

Modifier	Constructor and Description
protected	CherryPickCommand(Repository repo) Constructor for CherryPickCommand

Method Summary

Modifier and Type	Method and Description
private java.lang.String	calculateOurName(Ref headRef)
CherryPickResult	call()
private RevCommit	getParentCommit(RevCommit srcCommit, RevWalk revWalk)
CherryPickCommand	include(AnyObjectId commit) Include a commit
CherryPickCommand	include(Ref commit) Include a reference to a commit
CherryPickCommand	include(java.lang.String name, AnyObjectId commit) Include a commit
CherryPickCommand	setMainlineParentNumber(int mainlineParentNumber) Set the (1-based) parent number to diff against
CherryPickCommand	setNoCommit(boolean noCommit) Allows cherry-picking changes without committing them.
CherryPickCommand	setOurCommitName(java.lang.String ourCommitName) Set the name that should be used in the "OURS" place for conflict markers
CherryPickCommand	setProgressMonitor(ProgressMonitor monitor) The progress monitor associated with the cherry-pick operation.
CherryPickCommand	setReflogPrefix(java.lang.String prefix) Set the prefix to use in the reflog.
CherryPickCommand	setStrategy(MergeStrategy strategy) Set the MergeStrategy
java.lang.String	toString()

Methods inherited from class org.eclipse.jgit.api.GitCommand

checkCallable, getRepository, setCallable

Methods inherited from class java.lang.Object

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

Field Detail

reflogPrefix

private java.lang.String reflogPrefix

commits

private java.util.List<Ref> commits

ourCommitName

private java.lang.String ourCommitName

strategy

private MergeStrategy strategy

mainlineParentNumber

private java.lang.Integer mainlineParentNumber

noCommit

private boolean noCommit

monitor

private ProgressMonitor monitor

Constructor Detail

CherryPickCommand

protected CherryPickCommand(Repository repo)

Constructor for CherryPickCommand

Parameters:

repo - the Repository

Method Detail

call

public CherryPickResult call()
                      throws GitAPIException,
                             NoMessageException,
                             UnmergedPathsException,
                             ConcurrentRefUpdateException,
                             WrongRepositoryStateException,
                             NoHeadException

Execute the command

Executes the Cherry-Pick command with all the options and parameters collected by the setter methods (e.g. include(Ref) of this class. Each instance of this class should only be used for one invocation of the command. Don't call this method twice on an instance.

Specified by:

call in interface java.util.concurrent.Callable<CherryPickResult>

Specified by:

call in class GitCommand<CherryPickResult>

Throws:

GitAPIException

NoMessageException

UnmergedPathsException

ConcurrentRefUpdateException

WrongRepositoryStateException

NoHeadException

getParentCommit

private RevCommit getParentCommit(RevCommit srcCommit,
                                  RevWalk revWalk)
                           throws MultipleParentsNotAllowedException,
                                  MissingObjectException,
                                  java.io.IOException

Throws:

MultipleParentsNotAllowedException

MissingObjectException

java.io.IOException

include

public CherryPickCommand include(Ref commit)

Include a reference to a commit

Parameters:

commit - a reference to a commit which is cherry-picked to the current head

Returns:

this

include

public CherryPickCommand include(AnyObjectId commit)

Include a commit

Parameters:

commit - the Id of a commit which is cherry-picked to the current head

Returns:

this

include

public CherryPickCommand include(java.lang.String name,
                                 AnyObjectId commit)

Include a commit

Parameters:

name - a name given to the commit

commit - the Id of a commit which is cherry-picked to the current head

Returns:

this

setOurCommitName

public CherryPickCommand setOurCommitName(java.lang.String ourCommitName)

Set the name that should be used in the "OURS" place for conflict markers

Parameters:

ourCommitName - the name that should be used in the "OURS" place for conflict markers

Returns:

this

setReflogPrefix

public CherryPickCommand setReflogPrefix(java.lang.String prefix)

Set the prefix to use in the reflog.

This is primarily needed for implementing rebase in terms of cherry-picking

Parameters:

prefix - including ":"

Returns:

this

Since:

3.1

setStrategy

public CherryPickCommand setStrategy(MergeStrategy strategy)

Set the MergeStrategy

Parameters:

strategy - The merge strategy to use during this Cherry-pick.

Returns:

this

Since:

3.4

setMainlineParentNumber

public CherryPickCommand setMainlineParentNumber(int mainlineParentNumber)

Set the (1-based) parent number to diff against

Parameters:

mainlineParentNumber - the (1-based) parent number to diff against. This allows cherry-picking of merges.

Returns:

this

Since:

3.4

setNoCommit

public CherryPickCommand setNoCommit(boolean noCommit)

Allows cherry-picking changes without committing them.

NOTE: The behavior of cherry-pick is undefined if you pick multiple commits or if HEAD does not match the index state before cherry-picking.

Parameters:

noCommit - true to cherry-pick without committing, false to commit after each pick (default)

Returns:

this

Since:

3.5

setProgressMonitor

public CherryPickCommand setProgressMonitor(ProgressMonitor monitor)

The progress monitor associated with the cherry-pick operation. By default, this is set to NullProgressMonitor

Parameters:

monitor - a ProgressMonitor

Returns:

this

Since:

4.11

See Also:

NullProgressMonitor

calculateOurName

private java.lang.String calculateOurName(Ref headRef)

toString

public java.lang.String toString()

Overrides:

toString in class java.lang.Object