diff options
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 eea661cb31..1ececd23f0 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 8019e95a1f..45b3dd7b21 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 9d84c18443..1ec8685f7e 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 f750f8cb2c..412ba5f5a3 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 a4c795cc55..cf969107d8 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; } |