opendev/gerrit
Code Issues Proposed changes

Merge "Always set VisibleRefFilter on UploadPack"

Browse Source
This commit is contained in:
Edwin Kempin
2016-05-03 10:56:24 +00:00
committed by Gerrit Code Review
parent 5304584a4b b961a7d03d
commit 0d67c8427d
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/InProcessProtocol.java
View File

@@ -259,11 +259,8 @@ class InProcessProtocol extends TestProtocol<Context> {
UploadPack up = new UploadPack(repo); UploadPack up = new UploadPack(repo);
up.setPackConfig(transferConfig.getPackConfig()); up.setPackConfig(transferConfig.getPackConfig());
up.setTimeout(transferConfig.getTimeout()); up.setTimeout(transferConfig.getTimeout());
if (!ctl.allRefsAreVisible()) {
up.setAdvertiseRefsHook(new VisibleRefFilter( up.setAdvertiseRefsHook(new VisibleRefFilter(
tagCache, changeCache, repo, ctl, dbProvider.get(), true)); tagCache, changeCache, repo, ctl, dbProvider.get(), true));
}
List<PreUploadHook> hooks = Lists.newArrayList(preUploadHooks); List<PreUploadHook> hooks = Lists.newArrayList(preUploadHooks);
hooks.add(uploadValidatorsFactory.create( hooks.add(uploadValidatorsFactory.create(
ctl.getProject(), repo, "localhost-test")); ctl.getProject(), repo, "localhost-test"));

2
gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java
View File

@@ -256,10 +256,8 @@ public class GitOverHttpServlet extends GitServlet {
uploadValidatorsFactory.create(pc.getProject(), repo, request.getRemoteHost()); uploadValidatorsFactory.create(pc.getProject(), repo, request.getRemoteHost());
up.setPreUploadHook(PreUploadHookChain.newChain( up.setPreUploadHook(PreUploadHookChain.newChain(
Lists.newArrayList(up.getPreUploadHook(), uploadValidators))); Lists.newArrayList(up.getPreUploadHook(), uploadValidators)));
if (!pc.allRefsAreVisible()) {
up.setAdvertiseRefsHook(new VisibleRefFilter(tagCache, changeCache, up.setAdvertiseRefsHook(new VisibleRefFilter(tagCache, changeCache,
repo, pc, db.get(), true)); repo, pc, db.get(), true));
}
next.doFilter(request, response); next.doFilter(request, response);
} }

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

@@ -477,9 +477,11 @@ public class ReceiveCommits {
}); });
if (!projectControl.allRefsAreVisible()) { if (!projectControl.allRefsAreVisible()) {
rp.setCheckReferencedObjectsAreReachable(receiveConfig.checkReferencedObjectsAreReachable); rp.setCheckReferencedObjectsAreReachable(
rp.setAdvertiseRefsHook(new VisibleRefFilter(tagCache, changeCache, repo, projectControl, db, false)); receiveConfig.checkReferencedObjectsAreReachable);
} }
rp.setAdvertiseRefsHook(new VisibleRefFilter(tagCache, changeCache, repo,
projectControl, db, false));
List<AdvertiseRefsHook> advHooks = new ArrayList<>(3); List<AdvertiseRefsHook> advHooks = new ArrayList<>(3);
advHooks.add(new AdvertiseRefsHook() { advHooks.add(new AdvertiseRefsHook() {
@Override @Override

2
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java
View File

@@ -68,10 +68,8 @@ final class Upload extends AbstractGitCommand {
} }
final UploadPack up = new UploadPack(repo); final UploadPack up = new UploadPack(repo);
if (!projectControl.allRefsAreVisible()) {
up.setAdvertiseRefsHook(new VisibleRefFilter(tagCache, changeCache, repo, up.setAdvertiseRefsHook(new VisibleRefFilter(tagCache, changeCache, repo,
projectControl, db, true)); projectControl, db, true));
}
up.setPackConfig(config.getPackConfig()); up.setPackConfig(config.getPackConfig());
up.setTimeout(config.getTimeout()); up.setTimeout(config.getTimeout());
up.setPostUploadHook(uploadMetrics); up.setPostUploadHook(uploadMetrics);