commit 44f895fbd4141633c85b1bd6c57c736b4855c16b
author David Pursehouse <dpursehouse@collab.net> Tue Oct 03 07:31:59 2017 +0100
committer David Pursehouse <dpursehouse@collab.net> Tue Oct 03 07:51:45 2017 +0100
tree eb39eea3e8621b992b93b7da7d4f78c909ea13bd
parent 6f19edb41c2888d9c9c4883b6722949365e14900

WebLinks: Don't show file weblinks for magic files

Links for the /COMMIT_MSG and /MERGE_LIST files result in 404 on
the web viewer because those files don't actually exist in the
revision.

Change-Id: Ic2f2c083443b38721284abc7e26826eecd3bc7b7

gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
index 18fdf8f..0566804 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
@@ -31,9 +31,11 @@
 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 @@
    * @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 @@
    * @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 @@
       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 ->