Show More
@@ -315,6 +315,7 b' def filterpatch(ui, chunks):' | |||||
315 | return ret |
|
315 | return ret | |
316 | pos, total = 0, len(chunks) - 1 |
|
316 | pos, total = 0, len(chunks) - 1 | |
317 | while chunks: |
|
317 | while chunks: | |
|
318 | pos = total - len(chunks) + 1 | |||
318 | chunk = chunks.pop() |
|
319 | chunk = chunks.pop() | |
319 | if isinstance(chunk, header): |
|
320 | if isinstance(chunk, header): | |
320 | # new-file mark |
|
321 | # new-file mark | |
@@ -350,7 +351,6 b' def filterpatch(ui, chunks):' | |||||
350 | applied[chunk.filename()].append(chunk) |
|
351 | applied[chunk.filename()].append(chunk) | |
351 | else: |
|
352 | else: | |
352 | fixoffset += chunk.removed - chunk.added |
|
353 | fixoffset += chunk.removed - chunk.added | |
353 | pos = pos + 1 |
|
|||
354 | return reduce(operator.add, [h for h in applied.itervalues() |
|
354 | return reduce(operator.add, [h for h in applied.itervalues() | |
355 | if h[0].special() or len(h) > 1], []) |
|
355 | if h[0].special() or len(h) > 1], []) | |
356 |
|
356 |
General Comments 0
You need to be logged in to leave comments.
Login now