opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.7'

Browse Source 
* stable-2.7:
  Work around MySQL refusing to be case sensitive
  Reference included plugins by absolute Urls
  Fix PatchScript's mapping of lines below the last edit
  Fix refreshing PatchScreen when fileList has not yet been loaded
  Fix login servlets when canonicalWebUrl is not set
This commit is contained in:
Shawn Pearce
2013-05-18 12:52:37 -07:00
parent 20e79b0ceb 224d87e99c
commit 0209ab71aa
11 changed files with 96 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java
View File

@@ -342,7 +342,7 @@ class PatchScriptBuilder {
}
final Edit last = edits.get(edits.size() - 1);
return last.getBeginB() + (a - last.getEndA());
return last.getEndB() + (a - last.getEndA());
}
private int mapB2A(final int b) {
@@ -368,7 +368,7 @@ class PatchScriptBuilder {
}
final Edit last = edits.get(edits.size() - 1);
return last.getBeginA() + (b - last.getEndB());
return last.getEndA() + (b - last.getEndB());
}
private void packContent(boolean ignoredWhitespace) {