Merge "ChangeScreen2: Show rename/copy source paths in file table"

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

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java
index 7a611ff..c974180 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java
@@ -63,16 +63,18 @@
   }
 
   interface FileTableCss extends CssResource {
+    String table();
     String pointer();
     String reviewed();
     String status();
     String pathColumn();
+    String commonPrefix();
+    String renameCopySource();
     String draftColumn();
     String newColumn();
     String commentColumn();
     String deltaColumn1();
     String deltaColumn2();
-    String commonPrefix();
     String inserted();
     String deleted();
   }
@@ -335,6 +337,7 @@
       this.comments = comments;
       this.drafts = drafts;
       this.hasUser = Gerrit.isSignedIn();
+      table.addStyleName(R.css().table());
     }
 
     public boolean execute() {
@@ -474,8 +477,14 @@
         lastPath = path;
       }
 
-      sb.closeAnchor()
-        .closeTd();
+      sb.closeAnchor();
+      if (info.old_path() != null) {
+        sb.br();
+        sb.openSpan().setStyleName(R.css().renameCopySource())
+          .append(info.old_path())
+          .closeSpan();
+      }
+      sb.closeTd();
     }
 
     private int commonPrefix(String path) {

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

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/file_table.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/file_table.css
index a9d5a38..c2947cf 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/file_table.css
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/file_table.css
@@ -19,6 +19,10 @@
   vertical-align: top;
 }
 
+.table tr {
+  vertical-align: top;
+}
+
 .status {
   padding-right: 4px;
   color: #888;
@@ -34,6 +38,10 @@
 .commonPrefix {
   color: #888;
 }
+.renameCopySource {
+  color: #888;
+  font-size: smaller;
+}
 
 .draftColumn,
 .newColumn,