opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.6'

Browse Source 
* stable-2.6:
  Enable expanding skipped lines even if 'Syntax Coloring' is off
  Fix: `gerrit review` with --message does not work with no labels
  Reword 'Working ...' message changes in 2.6 release notes
  TrivialRebase: Support custom labels
  MergeUtil: Remove legacy label ID
  TrivialRebase: Call gerrit review instead of approve
This commit is contained in:
Shawn Pearce
2013-04-22 10:40:10 -07:00
parent 932bfbae82 dbc2f75dc9
commit ec82f0de4f
6 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java
View File

@@ -298,17 +298,17 @@ public abstract class AbstractPatchContentTable extends NavigationTable<Object>
protected SparseHtmlFile getSparseHtmlFileB(PatchScript s) {
AccountDiffPreference dp = new AccountDiffPreference(s.getDiffPrefs());
SparseFileContent b = s.getB();
PrettyFormatter f = ClientSideFormatter.FACTORY.get();
f.setDiffPrefs(dp);
f.setFileName(s.getB().getPath());
f.setFileName(b.getPath());
f.setEditFilter(PrettyFormatter.B);
f.setEditList(s.getEdits());
if (dp.isSyntaxHighlighting() && s.getA().isWholeFile() && !s.getB().isWholeFile()) {
f.format(s.getB().apply(s.getA(), s.getEdits()));
} else {
f.format(s.getB());
if (s.getA().isWholeFile() && !b.isWholeFile()) {
b = b.apply(s.getA(), s.getEdits());
}
f.format(b);
return f;
}