motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Do not categorize merge failures as 'abnormal'"

This commit is contained in:
Christian Halstrick 2011-03-29 04:23:56 -04:00 committed by Code Review
parent 475672866a 761b9285f0
commit c8b698abb9
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java
View File

@ -147,7 +147,7 @@ public CherryPickResult call() throws GitAPIException {
.setAuthor(srcCommit.getAuthorIdent()).call();
cherryPickedRefs.add(src);
} else {
if (merger.failedAbnormally())
if (merger.failed())
return new CherryPickResult(merger.getFailingPaths());
// merge conflicts

6
org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickResult.java
View File

@ -103,7 +103,7 @@ public CherryPickResult(RevCommit newHead, List<Ref> cherryPickedRefs) {
/**
* @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 List<Ref> getCherryPickedRefs() {
}
/**
* @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}
*/

12
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeResult.java
View File

@ -187,8 +187,8 @@ public MergeResult(ObjectId newHead, ObjectId base,
* 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 Map<String, int[][]> getConflicts() {
}
/**
* 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;

6
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseResult.java
View File

@ -109,9 +109,9 @@ public enum Status {
/**
* 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 RevCommit getCurrentCommit() {
}
/**
* @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>
*/

18
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
View File

@ -90,8 +90,8 @@
*/
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 Map<String, MergeResult<? extends Sequence>> getMergeResults() {
}
/**
* @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;
}