This change contains a simple renaming. Instead of using the expression 'abnormal failure', we just treat this kind of situation as 'failure'. This is specific enough as conflicts are already handled separately. Change-Id: I535acdc7d022543ed0f5ac6151b09a6985f4ef38 Signed-off-by: Philipp Thun <philipp.thun@sap.com>tags/v0.12.1
@@ -147,7 +147,7 @@ public class CherryPickCommand extends GitCommand<CherryPickResult> { | |||
.setAuthor(srcCommit.getAuthorIdent()).call(); | |||
cherryPickedRefs.add(src); | |||
} else { | |||
if (merger.failedAbnormally()) | |||
if (merger.failed()) | |||
return new CherryPickResult(merger.getFailingPaths()); | |||
// merge conflicts |
@@ -103,7 +103,7 @@ public class CherryPickResult { | |||
/** | |||
* @param failingPaths | |||
* list of paths causing this cherry-pick to fail abnormally (see | |||
* list of paths causing this cherry-pick to fail (see | |||
* {@link ResolveMerger#getFailingPaths()} for details) | |||
*/ | |||
public CherryPickResult(Map<String, MergeFailureReason> failingPaths) { | |||
@@ -153,8 +153,8 @@ public class CherryPickResult { | |||
} | |||
/** | |||
* @return the list of paths causing this cherry-pick to fail abnormally | |||
* (see {@link ResolveMerger#getFailingPaths()} for details), | |||
* @return the list of paths causing this cherry-pick to fail (see | |||
* {@link ResolveMerger#getFailingPaths()} for details), | |||
* <code>null</code> if {@link #getStatus} is not | |||
* {@link CherryPickStatus#FAILED} | |||
*/ |
@@ -187,8 +187,8 @@ public class MergeResult { | |||
* merge results as returned by | |||
* {@link ResolveMerger#getMergeResults()} | |||
* @param failingPaths | |||
* list of paths causing this merge to fail abnormally as | |||
* returned by {@link ResolveMerger#getFailingPaths()} | |||
* list of paths causing this merge to fail as returned by | |||
* {@link ResolveMerger#getFailingPaths()} | |||
* @param description | |||
* a user friendly description of the merge result | |||
*/ | |||
@@ -356,11 +356,11 @@ public class MergeResult { | |||
} | |||
/** | |||
* Returns a list of paths causing this merge to fail abnormally as returned | |||
* by {@link ResolveMerger#getFailingPaths()} | |||
* Returns a list of paths causing this merge to fail as returned by | |||
* {@link ResolveMerger#getFailingPaths()} | |||
* | |||
* @return the list of paths causing this merge to fail abnormally or | |||
* <code>null</code> if no abnormal failure occurred | |||
* @return the list of paths causing this merge to fail or <code>null</code> | |||
* if no failure occurred | |||
*/ | |||
public Map<String, MergeFailureReason> getFailingPaths() { | |||
return failingPaths; |
@@ -109,9 +109,9 @@ public class RebaseResult { | |||
/** | |||
* Create <code>RebaseResult</code> with status {@link Status#FAILED} | |||
* | |||
* | |||
* @param failingPaths | |||
* list of paths causing this rebase to fail abnormally | |||
* list of paths causing this rebase to fail | |||
*/ | |||
RebaseResult(Map<String, MergeFailureReason> failingPaths) { | |||
mySatus = Status.FAILED; | |||
@@ -135,7 +135,7 @@ public class RebaseResult { | |||
} | |||
/** | |||
* @return the list of paths causing this rebase to fail abnormally (see | |||
* @return the list of paths causing this rebase to fail (see | |||
* {@link ResolveMerger#getFailingPaths()} for details) if status is | |||
* {@link Status#FAILED}, otherwise <code>null</code> | |||
*/ |
@@ -90,8 +90,8 @@ import org.eclipse.jgit.util.FileUtils; | |||
*/ | |||
public class ResolveMerger extends ThreeWayMerger { | |||
/** | |||
* If the merge fails abnormally (means: not because of unresolved | |||
* conflicts) this enum is used to explain why it failed | |||
* If the merge fails (means: not stopped because of unresolved conflicts) | |||
* this enum is used to explain why it failed | |||
*/ | |||
public enum MergeFailureReason { | |||
/** the merge failed because of a dirty index */ | |||
@@ -629,22 +629,22 @@ public class ResolveMerger extends ThreeWayMerger { | |||
} | |||
/** | |||
* @return lists paths causing this merge to fail abnormally (not because of | |||
* a conflict). <code>null</code> is returned if this merge didn't | |||
* fail abnormally. | |||
* @return lists paths causing this merge to fail (not stopped because of a | |||
* conflict). <code>null</code> is returned if this merge didn't | |||
* fail. | |||
*/ | |||
public Map<String, MergeFailureReason> getFailingPaths() { | |||
return (failingPaths.size() == 0) ? null : failingPaths; | |||
} | |||
/** | |||
* Returns whether this merge failed abnormally (i.e. not because of a | |||
* Returns whether this merge failed (i.e. not stopped because of a | |||
* conflict) | |||
* | |||
* @return <code>true</code> if an abnormal failure occurred, | |||
* <code>false</code> otherwise | |||
* @return <code>true</code> if a failure occurred, <code>false</code> | |||
* otherwise | |||
*/ | |||
public boolean failedAbnormally() { | |||
public boolean failed() { | |||
return failingPaths.size() > 0; | |||
} | |||