opendev/gerrit
Code Issues Proposed changes

Improve message for unsatisfiable dependencies

Browse Source 
If a change cannot be merged due to unsatisfiable dependencies a
comment is added to the change that lists the missing commits and says
that a rebase is necessary.

For each missing commit the comment says "Depends on patch set X
of ..., however the current patch set is Y."

If multiple commits are missing it may be that for some commits the
dependency is not outdated (X == Y). In this case the message is
confusing.

Skip ", however the current patch set is Y." if Y == X.

Change-Id: Idf0f36a0575e7c672e690bc17acfadd8dc373f80
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2013-02-28 09:41:07 +01:00
parent 941229c37f
commit 1b428f404f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
View File

@@ -836,8 +836,10 @@ public class MergeOp {
m.append(missingCommit.patchsetId.get());
m.append(" of ");
m.append(missingCommit.change.getKey().abbreviate());
m.append(", however the current patch set is ");
m.append(missingCommit.change.currentPatchSetId().get());
if (missingCommit.patchsetId.get() != missingCommit.change.currentPatchSetId().get()) {
m.append(", however the current patch set is ");
m.append(missingCommit.change.currentPatchSetId().get());
}
m.append(".\n");
} else {