diff options
| author | Shawn Pearce <sop@google.com> | 2013-04-24 16:23:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-24 16:23:34 +0000 |
| commit | 6d0b1de84df8190318f0aab93f2c393dab936b6a (patch) | |
| tree | 527fdb77958a1494563c2f812c097ef09d08c035 /gerrit-httpd | |
| parent | 49e2e8361e07eb3265f4120178647df369d865a1 (diff) | |
| parent | 4467d2a098bb4dca4d634967fe0f46d7d2a484f9 (diff) | |
Merge "Distinguish between error and timeout in intraline diff error message" into stable-2.6
Diffstat (limited to 'gerrit-httpd')
| -rw-r--r-- | gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java index 502c9a39d0..5019403db0 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java @@ -133,6 +133,7 @@ class PatchScriptBuilder { throws IOException { boolean intralineDifferenceIsPossible = true; boolean intralineFailure = false; + boolean intralineTimeout = false; a.path = oldName(content); b.path = newName(content); @@ -160,10 +161,14 @@ class PatchScriptBuilder { break; case ERROR: - case TIMEOUT: intralineDifferenceIsPossible = false; intralineFailure = true; break; + + case TIMEOUT: + intralineDifferenceIsPossible = false; + intralineTimeout = true; + break; } } else { intralineDifferenceIsPossible = false; @@ -212,7 +217,7 @@ class PatchScriptBuilder { content.getOldName(), content.getNewName(), a.fileMode, b.fileMode, content.getHeaderLines(), diffPrefs, a.dst, b.dst, edits, a.displayMethod, b.displayMethod, comments, history, hugeFile, - intralineDifferenceIsPossible, intralineFailure); + intralineDifferenceIsPossible, intralineFailure, intralineTimeout); } private static boolean isModify(PatchListEntry content) { |