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