Show More
@@ -10,7 +10,7 b'' | |||||
10 | from mercurial.i18n import gettext, _ |
|
10 | from mercurial.i18n import gettext, _ | |
11 | from mercurial import cmdutil, commands, extensions, hg, mdiff, patch |
|
11 | from mercurial import cmdutil, commands, extensions, hg, mdiff, patch | |
12 | from mercurial import util |
|
12 | from mercurial import util | |
13 |
import copy, cStringIO, errno, |
|
13 | import copy, cStringIO, errno, os, re, tempfile | |
14 |
|
14 | |||
15 | lines_re = re.compile(r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)') |
|
15 | lines_re = re.compile(r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)') | |
16 |
|
16 | |||
@@ -355,7 +355,7 b' def filterpatch(ui, chunks):' | |||||
355 | applied[chunk.filename()].append(chunk) |
|
355 | applied[chunk.filename()].append(chunk) | |
356 | else: |
|
356 | else: | |
357 | fixoffset += chunk.removed - chunk.added |
|
357 | fixoffset += chunk.removed - chunk.added | |
358 |
return |
|
358 | return sum([h for h in applied.itervalues() | |
359 |
|
|
359 | if h[0].special() or len(h) > 1], []) | |
360 |
|
360 | |||
361 | def record(ui, repo, *pats, **opts): |
|
361 | def record(ui, repo, *pats, **opts): |
General Comments 0
You need to be logged in to leave comments.
Login now