public class CherryPickResult extends Object
CherryPickCommand.| Modifier and Type | Class and Description |
|---|---|
static class |
CherryPickResult.CherryPickStatus
The cherry-pick status
|
| Modifier and Type | Field and Description |
|---|---|
static CherryPickResult |
CONFLICT
A
CherryPickResult with status
CherryPickResult.CherryPickStatus.CONFLICTING |
| Constructor and Description |
|---|
CherryPickResult(Map<String,ResolveMerger.MergeFailureReason> failingPaths) |
CherryPickResult(RevCommit newHead,
List<Ref> cherryPickedRefs) |
| Modifier and Type | Method and Description |
|---|---|
List<Ref> |
getCherryPickedRefs() |
Map<String,ResolveMerger.MergeFailureReason> |
getFailingPaths() |
RevCommit |
getNewHead() |
CherryPickResult.CherryPickStatus |
getStatus() |
public static final CherryPickResult CONFLICT
CherryPickResult with status
CherryPickResult.CherryPickStatus.CONFLICTINGpublic CherryPickResult(RevCommit newHead, List<Ref> cherryPickedRefs)
newHead - commit the head points at after this cherry-pickcherryPickedRefs - list of successfully cherry-picked Ref'spublic CherryPickResult(Map<String,ResolveMerger.MergeFailureReason> failingPaths)
failingPaths - list of paths causing this cherry-pick to fail (see
ResolveMerger.getFailingPaths() for details)public CherryPickResult.CherryPickStatus getStatus()
public RevCommit getNewHead()
null if getStatus() is not
CherryPickResult.CherryPickStatus.OKpublic List<Ref> getCherryPickedRefs()
Ref's,
null if getStatus() is not
CherryPickResult.CherryPickStatus.OKpublic Map<String,ResolveMerger.MergeFailureReason> getFailingPaths()
ResolveMerger.getFailingPaths() for details),
null if getStatus() is not
CherryPickResult.CherryPickStatus.FAILEDCopyright © 2014. All rights reserved.