summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorPhilipp Thun2011-03-28 10:01:44 (EDT)
committer Philipp Thun2011-03-28 10:01:44 (EDT)
commit761b9285f07bf209ea3b282fe9079cbbf097fd79 (patch)
tree6d6663f38c2a075e918149084be05bd4b5880ce1
parent23967441fc5b72996f5f29e197d52e763a14cb32 (diff)
downloadjgit-761b9285f07bf209ea3b282fe9079cbbf097fd79.zip
jgit-761b9285f07bf209ea3b282fe9079cbbf097fd79.tar.gz
jgit-761b9285f07bf209ea3b282fe9079cbbf097fd79.tar.bz2
Do not categorize merge failures as 'abnormal'refs/changes/48/2948/1
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>
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickResult.java6
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java12
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java6
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java18
5 files changed, 22 insertions, 22 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java
index eea661c..1ececd2 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java
@@ -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
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickResult.java
index 8019e95..45b3dd7 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickResult.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickResult.java
@@ -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}
*/
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
index 9d84c18..1ec8685 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
@@ -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;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java
index f750f8c..412ba5f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java
@@ -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>
*/
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
index a4c795c..cf96910 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -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;
}