diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2016-09-21 07:15:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-21 07:15:39 +0000 |
| commit | bfb01f2008bfcaf9be575159bc45f9520a0da11b (patch) | |
| tree | 5f28817442080c105e3f602840776949fa05f1ed | |
| parent | 1a1b471a1ca713eb64d1f94909ca192043ea7822 (diff) | |
| parent | 3433f6eec8e633c086f26e28779343f5460977ac (diff) | |
Merge "Exclude draft changes from ReindexAfterUpdate" into stable-2.13
2 files changed, 9 insertions, 1 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ReindexAfterUpdate.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ReindexAfterUpdate.java index e446f9ac2a..942ce8896f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ReindexAfterUpdate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ReindexAfterUpdate.java @@ -127,7 +127,7 @@ public class ReindexAfterUpdate implements GitReferenceUpdatedListener { if (ref.equals(RefNames.REFS_CONFIG)) { return asChanges(queryProvider.get().byProjectOpen(project)); } - return asChanges(queryProvider.get().byBranchOpen( + return asChanges(queryProvider.get().byBranchNew( new Branch.NameKey(project, ref))); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java index 27a7ec78f9..6aa3335253 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java @@ -152,6 +152,14 @@ public class InternalChangeQuery extends InternalQuery<ChangeData> { open())); } + public List<ChangeData> byBranchNew(Branch.NameKey branch) + throws OrmException { + return query(and( + ref(branch), + project(branch.getParentKey()), + status(Change.Status.NEW))); + } + public Iterable<ChangeData> byCommitsOnBranchNotMerged(Repository repo, ReviewDb db, Branch.NameKey branch, List<String> hashes) throws OrmException, IOException { |