Package org.eclipse.jgit.api
Class CherryPickResult
- java.lang.Object
-
- org.eclipse.jgit.api.CherryPickResult
-
public class CherryPickResult extends Object
Encapsulates the result of aCherryPickCommand
.
-
-
Nested Class Summary
Nested Classes Modifier and Type Class Description static class
CherryPickResult.CherryPickStatus
The cherry-pick status
-
Field Summary
Fields Modifier and Type Field Description static CherryPickResult
CONFLICT
ACherryPickResult
with statusCherryPickResult.CherryPickStatus.CONFLICTING
-
Constructor Summary
Constructors Constructor Description CherryPickResult(Map<String,ResolveMerger.MergeFailureReason> failingPaths)
Constructor for CherryPickResultCherryPickResult(RevCommit newHead, List<Ref> cherryPickedRefs)
Constructor for CherryPickResult
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description List<Ref>
getCherryPickedRefs()
Get the cherry-pickedRef
sMap<String,ResolveMerger.MergeFailureReason>
getFailingPaths()
Get the list of paths causing this cherry-pick to failRevCommit
getNewHead()
Get the new head after this cherry-pickCherryPickResult.CherryPickStatus
getStatus()
Get status
-
-
-
Field Detail
-
CONFLICT
public static final CherryPickResult CONFLICT
ACherryPickResult
with statusCherryPickResult.CherryPickStatus.CONFLICTING
-
-
Constructor Detail
-
CherryPickResult
public CherryPickResult(RevCommit newHead, List<Ref> cherryPickedRefs)
Constructor for CherryPickResult- Parameters:
newHead
- commit the head points at after this cherry-pickcherryPickedRefs
- list of successfully cherry-pickedRef
's
-
CherryPickResult
public CherryPickResult(Map<String,ResolveMerger.MergeFailureReason> failingPaths)
Constructor for CherryPickResult- Parameters:
failingPaths
- list of paths causing this cherry-pick to fail (seeResolveMerger.getFailingPaths()
for details)
-
-
Method Detail
-
getStatus
public CherryPickResult.CherryPickStatus getStatus()
Get status- Returns:
- the status this cherry-pick resulted in
-
getNewHead
public RevCommit getNewHead()
Get the new head after this cherry-pick- Returns:
- the commit the head points at after this cherry-pick,
null
ifgetStatus()
is notCherryPickResult.CherryPickStatus.OK
-
getCherryPickedRefs
public List<Ref> getCherryPickedRefs()
Get the cherry-pickedRef
s- Returns:
- the list of successfully cherry-picked
Ref
's,null
ifgetStatus()
is notCherryPickResult.CherryPickStatus.OK
-
getFailingPaths
public Map<String,ResolveMerger.MergeFailureReason> getFailingPaths()
Get the list of paths causing this cherry-pick to fail- Returns:
- the list of paths causing this cherry-pick to fail (see
ResolveMerger.getFailingPaths()
for details),null
ifgetStatus()
is notCherryPickResult.CherryPickStatus.FAILED
-
-