motiejus
/
jgit
1
Fork 0
Code Releases Activity

Add commit id and parent count to exception message 

Bug: 357312
Change-Id: I2f85cf88650594eca7df6aa0e26bea329674f08e
This commit is contained in:
Kevin Sawicki 2011-12-14 13:33:27 -08:00
parent 80c5210409
commit 3c7dceec1a
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
View File

@ -76,7 +76,7 @@ cannotResolveLocalTrackingRefForUpdating=Cannot resolve local tracking ref {0} f
cannotStoreObjects=cannot store objects cannotStoreObjects=cannot store objects
cannotUnloadAModifiedTree=Cannot unload a modified tree. cannotUnloadAModifiedTree=Cannot unload a modified tree.
cannotWorkWithOtherStagesThanZeroRightNow=Cannot work with other stages than zero right now. Won't write corrupt index. cannotWorkWithOtherStagesThanZeroRightNow=Cannot work with other stages than zero right now. Won't write corrupt index.
canOnlyCherryPickCommitsWithOneParent=Can only cherry-pick commits which have exactly one parent canOnlyCherryPickCommitsWithOneParent=Cannot cherry-pick commit ''{0}'' because it has {1} parents, only commits with exactly one parent are supported.
canOnlyRevertCommitsWithOneParent=Can only revert commits which have exactly one parent canOnlyRevertCommitsWithOneParent=Can only revert commits which have exactly one parent
cantFindObjectInReversePackIndexForTheSpecifiedOffset=Can't find object in (reverse) pack index for the specified offset {0} cantFindObjectInReversePackIndexForTheSpecifiedOffset=Can't find object in (reverse) pack index for the specified offset {0}
cantPassMeATree=Can't pass me a tree! cantPassMeATree=Can't pass me a tree!

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

@ -122,10 +122,13 @@ public CherryPickResult call() throws GitAPIException {
RevCommit srcCommit = revWalk.parseCommit(srcObjectId); RevCommit srcCommit = revWalk.parseCommit(srcObjectId);
// get the parent of the commit to cherry-pick // get the parent of the commit to cherry-pick
if (srcCommit.getParentCount() != 1) { if (srcCommit.getParentCount() != 1)
throw new MultipleParentsNotAllowedException( throw new MultipleParentsNotAllowedException(
JGitText.get().canOnlyCherryPickCommitsWithOneParent); MessageFormat.format(
} JGitText.get().canOnlyCherryPickCommitsWithOneParent,
srcCommit.name(),
Integer.valueOf(srcCommit.getParentCount())));
RevCommit srcParent = srcCommit.getParent(0); RevCommit srcParent = srcCommit.getParent(0);
revWalk.parseHeaders(srcParent); revWalk.parseHeaders(srcParent);

5
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
View File

@ -554,7 +554,10 @@ else if (walk.isMergedInto(headCommit, upstream)) {
for (RevCommit commit : commitsToUse) { for (RevCommit commit : commitsToUse) {
if (commit.getParentCount() != 1) if (commit.getParentCount() != 1)
throw new JGitInternalException( throw new JGitInternalException(
JGitText.get().canOnlyCherryPickCommitsWithOneParent); MessageFormat.format(
JGitText.get().canOnlyCherryPickCommitsWithOneParent,
commit.name(),
Integer.valueOf(commit.getParentCount())));
cherryPickList.add(commit); cherryPickList.add(commit);
} }