Merge "Show whether a related change is merged or old."

gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java

@@ -199,8 +199,10 @@ public interface GerritCss extends CssResource {
   String projectFilterPanel();
   String projectNameColumn();
   String publishCommentsScreen();
-  String relatedChangesTabPanel();
+  String relatedChangesGitweb();
+  String relatedChangesNotCurrent();
   String relatedChangesSubject();
+  String relatedChangesTabPanel();
   String registerScreenExplain();
   String registerScreenNextLinks();
   String registerScreenSection();

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java

@@ -330,18 +330,27 @@ public class RelatedChanges extends TabPanel {
     final native boolean has_revision_number()
     /*-{ return this.hasOwnProperty('_revision_number') }-*/;
 
+    final native boolean has_current_revision_number()
+    /*-{ return this.hasOwnProperty('_current_revision_number') }-*/;
+
     final native int _change_number()
     /*-{ return this._change_number }-*/;
 
     final native int _revision_number()
     /*-{ return this._revision_number }-*/;
 
+    final native int _current_revision_number()
+    /*-{ return this._current_revision_number }-*/;
+
     final native void set_change_number(int n)
     /*-{ this._change_number=n; }-*/;
 
     final native void set_revision_number(int n)
     /*-{ this._revision_number=n; }-*/;
 
+    final native void set_current_revision_number(int n)
+    /*-{ this._current_revision_number=n; }-*/;
+
     protected ChangeAndCommit() {
     }
   }

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChangesTab.java

@@ -17,6 +17,7 @@ package com.google.gerrit.client.change;
 import com.google.gerrit.client.Gerrit;
 import com.google.gerrit.client.GitwebLink;
 import com.google.gerrit.client.change.RelatedChanges.ChangeAndCommit;
+import com.google.gerrit.client.changes.Util;
 import com.google.gerrit.client.ui.NavigationTable;
 import com.google.gerrit.common.PageLinks;
 import com.google.gerrit.reviewdb.client.PatchSet;
@@ -278,6 +279,18 @@ class RelatedChangesTab implements IsWidget {
       }
       sb.closeTd();
 
+      sb.openTd();
+      GitwebLink gw = Gerrit.getGitwebLink();
+      if (gw != null && (!info.has_change_number() || !info.has_revision_number())) {
+        sb.addStyleName(Gerrit.RESOURCES.css().relatedChangesGitweb());
+        sb.setAttribute("title", gw.getLinkName());
+      } else if (info.has_current_revision_number() && info.has_revision_number()
+          && info._current_revision_number() != info._revision_number()) {
+        sb.addStyleName(Gerrit.RESOURCES.css().relatedChangesNotCurrent());
+        sb.setAttribute("title", Util.C.notCurrent());
+      }
+      sb.closeTd();
+
       sb.closeTr();
     }
 

gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css

@@ -1642,3 +1642,11 @@ a:hover.downloadLink {
 .relatedChangesTabPanel .gwt-TabBarItem-disabled {
   display: none;
 }
+.relatedChangesNotCurrent:after {
+  content: '\25CF'; /* circle */
+  color: #FFA62F;   /* orange */
+}
+.relatedChangesGitweb:after {
+  content: '\25CF'; /* circle */
+  color: #000;
+}

gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java

@@ -287,12 +287,15 @@ public class GetRelated implements RestReadView<RevisionResource> {
     CommitInfo commit;
     Integer _changeNumber;
     Integer _revisionNumber;
+    Integer _currentRevisionNumber;
 
     ChangeAndCommit(@Nullable Change change, @Nullable PatchSet ps, RevCommit c) {
       if (change != null) {
         changeId = change.getKey().get();
         _changeNumber = change.getChangeId();
         _revisionNumber = ps != null ? ps.getPatchSetId() : null;
+        PatchSet.Id curr = change.currentPatchSetId();
+        _currentRevisionNumber = curr != null ? curr.get() : null;
       }
 
       commit = new CommitInfo();