opendev/gerrit
Code Issues Proposed changes

VisibleRefFilter: Extract Change.Id from refs, not PatchSet.Id

Browse Source 
Change-Id: I6ce2ebb86d95eaa2c47c5e3431a8eaac45b4169c
This commit is contained in:
Dave Borowitz
2014-08-01 13:04:24 -07:00
parent ab5396890a
commit 5742f019bb
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.server.git;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.reviewdb.server.ReviewDb;
@@ -82,13 +81,13 @@ public class VisibleRefFilter extends AbstractAdvertiseRefsHook {
final List<Ref> deferredTags = new ArrayList<>();
for (Ref ref : refs.values()) {
PatchSet.Id psId;
Change.Id changeId;
if (ref.getName().startsWith(RefNames.REFS_CACHE_AUTOMERGE)) {
continue;
} else if ((psId = PatchSet.Id.fromRef(ref.getName())) != null) {
// Reference to a patch set is visible if the change is visible.
} else if ((changeId = Change.Id.fromRef(ref.getName())) != null) {
// Reference related to a change is visible if the change is visible.
//
if (showChanges && visibleChanges.contains(psId.getParentKey())) {
if (showChanges && visibleChanges.contains(changeId)) {
result.put(ref.getName(), ref);
}