|
|
|
@ -127,14 +127,14 @@ public class RebaseResult {
|
|
|
|
|
static final RebaseResult FAST_FORWARD_RESULT = new RebaseResult( |
|
|
|
|
Status.FAST_FORWARD); |
|
|
|
|
|
|
|
|
|
private final Status mySatus; |
|
|
|
|
private final Status status; |
|
|
|
|
|
|
|
|
|
private final RevCommit currentCommit; |
|
|
|
|
|
|
|
|
|
private Map<String, MergeFailureReason> failingPaths; |
|
|
|
|
|
|
|
|
|
private RebaseResult(Status status) { |
|
|
|
|
this.mySatus = status; |
|
|
|
|
this.status = status; |
|
|
|
|
currentCommit = null; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -145,7 +145,7 @@ public class RebaseResult {
|
|
|
|
|
* current commit |
|
|
|
|
*/ |
|
|
|
|
RebaseResult(RevCommit commit) { |
|
|
|
|
mySatus = Status.STOPPED; |
|
|
|
|
status = Status.STOPPED; |
|
|
|
|
currentCommit = commit; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -156,7 +156,7 @@ public class RebaseResult {
|
|
|
|
|
* list of paths causing this rebase to fail |
|
|
|
|
*/ |
|
|
|
|
RebaseResult(Map<String, MergeFailureReason> failingPaths) { |
|
|
|
|
mySatus = Status.FAILED; |
|
|
|
|
status = Status.FAILED; |
|
|
|
|
currentCommit = null; |
|
|
|
|
this.failingPaths = failingPaths; |
|
|
|
|
} |
|
|
|
@ -165,7 +165,7 @@ public class RebaseResult {
|
|
|
|
|
* @return the overall status |
|
|
|
|
*/ |
|
|
|
|
public Status getStatus() { |
|
|
|
|
return mySatus; |
|
|
|
|
return status; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|