opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.8'

Browse Source 
* stable-2.8:
  Support committing Lucene writes within a fixed interval
  Fix ArrayIndexOutOfBoundsException on intraline diff again

Conflicts:
	gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java

Change-Id: I7b93d81d8e5c53615ef1684b653d6fa9e941d935
This commit is contained in:
David Pursehouse
2014-02-18 09:58:17 +09:00
parent 863e987e6a d08b045b7a
commit ae866cd96f
5 changed files with 248 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-prettify/src/main/java/com/google/gerrit/prettify/client/PrettyFormatter.java
View File

@@ -145,7 +145,7 @@ public abstract class PrettyFormatter implements SparseHtmlFile {
// separated by '</span>'. For the prettify parser this now looks like two
// separate line endings. This messes up the line counting below.
// Drop any '\r' to avoid this problem.
html = html.replace("\r</span>\n", "</span>\n");
html = html.replaceAll("\r</span>(<span class=\"wdc\">)?\n", "</span>$1\n");
html = html.replaceAll("(\r)?\n", " $1\n");
html = prettify(html, getFileType());