opendev
/
gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15 

* stable-2.14:
  WebLinks: Don't show file weblinks for magic files

Change-Id: I508336632905e30d3fcb14c4962bf53938bd70c7
This commit is contained in:
David Pursehouse 2017-10-03 09:03:42 +01:00
parent 4ed16b23fd 44f895fbd4
commit fd1437e713
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
View File

@ -31,9 +31,11 @@ import com.google.gerrit.extensions.webui.PatchSetWebLink;
import com.google.gerrit.extensions.webui.ProjectWebLink;
import com.google.gerrit.extensions.webui.TagWebLink;
import com.google.gerrit.extensions.webui.WebLink;
import com.google.gerrit.reviewdb.client.Patch;
import com.google.gerrit.reviewdb.client.Project;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.util.Collections;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -118,7 +120,9 @@ public class WebLinks {
* @return Links for files.
*/
public List<WebLinkInfo> getFileLinks(String project, String revision, String file) {
return filterLinks(fileLinks, webLink -> webLink.getFileWebLink(project, revision, file));
return Patch.isMagic(file)
? Collections.emptyList()
: filterLinks(fileLinks, webLink -> webLink.getFileWebLink(project, revision, file));
}
/**
@ -128,6 +132,9 @@ public class WebLinks {
* @return Links for file history
*/
public List<WebLinkInfoCommon> getFileHistoryLinks(String project, String revision, String file) {
if (Patch.isMagic(file)) {
return Collections.emptyList();
}
return FluentIterable.from(fileHistoryLinks)
.transform(
webLink -> {
@ -165,6 +172,9 @@ public class WebLinks {
final int patchSetIdB,
final String revisionB,
final String fileB) {
if (Patch.isMagic(fileA) || Patch.isMagic(fileB)) {
return Collections.emptyList();
}
return FluentIterable.from(diffLinks)
.transform(
webLink ->