opendev/gerrit
Code Issues Proposed changes

Let users know which change prevents submit in case of MISSING_DEPENDENCY

Browse Source 
If a change cannot be submitted because it depends on a commit that
cannot be merged the user got the following message:

  Depends on change that was not submitted. Commit <commit> depends on
  commit <other-commit> which cannot be merged.

To find the change to which <other-commit> belongs the user must do a
change query. Do this for the user and return the change ID too.

Now we return:

  Depends on change that was not submitted. Commit <commit> depends on
  commit <other-commit> of change <other-change> which cannot be merged.

Returning the commit SHA1 of <other-commit> is still useful since the
commit that prevents submit may be an outdated patch set and this can be
found easier if the commit SHA1 is known.

Change-Id: I1368af204702a06d01ee6f812a5da5ac419b89d7
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2018-10-04 10:34:05 +02:00
parent 01838a813e
commit 93703efaf4
8 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/server/git/MergeUtil.java
View File

@@ -216,7 +216,7 @@ public class MergeUtil {
List<CodeReviewCommit> result = new ArrayList<>();
try {
result.addAll(mergeSorter.sort(toSort));
} catch (IOException e) {
} catch (IOException | OrmException e) {
throw new IntegrationException("Branch head sorting failed", e);
}
result.sort(CodeReviewCommit.ORDER);
@@ -566,7 +566,7 @@ public class MergeUtil {
throws IntegrationException {
try {
return !mergeSorter.sort(Collections.singleton(toMerge)).contains(toMerge);
} catch (IOException e) {
} catch (IOException | OrmException e) {
throw new IntegrationException("Branch head sorting failed", e);
}
}