revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-12-25 23:10:56 +01:00
Code Issues Releases Wiki Activity

There's an off-by-one derp issue with this.

Browse source
This commit is contained in:
epriestley 2011-11-07 17:19:23 -08:00
parent 0888d59ac9
commit a5bd88e5cb
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/parser/bundle/ArcanistBundle.php
View file

@ -301,14 +301,14 @@ class ArcanistBundle {
$last_change = $jj;
for (; $jj < $n; ++$jj) {
if ($lines[$jj][0] == ' ') {
// NOTE: We must use "context * 2" or we may generate overlapping
// hunks. For instance, if we have "context = 3" and four unchanged
// lines between hunks, we'll include unchanged lines 1, 2, 3 in
// the first hunk and 2, 3, and 4 in the second hunk -- that is, lines
// 2 and 3 will appear twice in the patch. Some time after 1.7.3.4,
// Git stopped cleanly applying patches with overlapping hunks, so be
// careful to avoid generating them.
if ($jj - $last_change > ($context * 2)) {
// NOTE: We must look past the context size or we may generate
// overlapping hunks. For instance, if we have "context = 3" and four
// unchanged lines between hunks, we'll include unchanged lines 1, 2,
// 3 in the first hunk and 2, 3, and 4 in the second hunk -- that is,
// lines 2 and 3 will appear twice in the patch. Some time after
// 1.7.3.4, Git stopped cleanly applying patches with overlapping
// hunks, so be careful to avoid generating them.
if ($jj - $last_change > (($context + 1) * 2)) {
break;
}
} else {