diff options
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 816bbef6eb..e4871cbc36 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) { |