Show old file paths on renamed files

In the side-by-side view its hard to know that a file was actually
a rename from somewhere else.  Make it clear by showing the old
path in the column header when its not the same location.

Change-Id: I1d0e2fd370d34f9d4da481f7034380de0099a6af
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2010-02-23 20:18:33 -08:00
parent 0a53362384
commit eb2d4caa7c
3 changed files with 37 additions and 11 deletions

View File

@@ -23,6 +23,7 @@ import com.google.gerrit.prettify.common.SparseFileContent;
import com.google.gerrit.prettify.common.SparseHtmlFile;
import com.google.gerrit.reviewdb.Change;
import com.google.gerrit.reviewdb.Patch;
import com.google.gerrit.reviewdb.Patch.ChangeType;
import org.eclipse.jgit.diff.Edit;
@@ -34,6 +35,9 @@ public class PatchScript {
}
protected Change.Key changeId;
protected ChangeType changeType;
protected String oldName;
protected String newName;
protected List<String> header;
protected PatchScriptSettings settings;
protected SparseFileContent a;
@@ -44,11 +48,15 @@ public class PatchScript {
protected CommentDetail comments;
protected List<Patch> history;
public PatchScript(final Change.Key ck, final List<String> h,
final PatchScriptSettings s, final SparseFileContent ca,
final SparseFileContent cb, final List<Edit> e, final DisplayMethod ma,
final DisplayMethod mb, final CommentDetail cd, final List<Patch> hist) {
public PatchScript(final Change.Key ck, final ChangeType ct, final String on,
final String nn, final List<String> h, final PatchScriptSettings s,
final SparseFileContent ca, final SparseFileContent cb,
final List<Edit> e, final DisplayMethod ma, final DisplayMethod mb,
final CommentDetail cd, final List<Patch> hist) {
changeId = ck;
changeType = ct;
oldName = on;
newName = nn;
header = h;
settings = s;
a = ca;
@@ -79,6 +87,18 @@ public class PatchScript {
return header;
}
public ChangeType getChangeType() {
return changeType;
}
public String getOldName() {
return oldName;
}
public String getNewName() {
return newName;
}
public CommentDetail getCommentDetail() {
return comments;
}