--- a/mercurial/cmdutil.py Tue Jun 07 10:37:19 2016 +0200
+++ b/mercurial/cmdutil.py Tue Jun 07 11:57:11 2016 +0200
@@ -83,7 +83,7 @@
else:
recordfn = crecordmod.chunkselector
- return crecordmod.filterpatch(ui, originalhunks, recordfn, operation)
+ return crecordmod.filterpatch(ui, originalhunks, recordfn)
else:
return patch.filterpatch(ui, originalhunks, operation)
--- a/mercurial/crecord.py Tue Jun 07 10:37:19 2016 +0200
+++ b/mercurial/crecord.py Tue Jun 07 11:57:11 2016 +0200
@@ -440,11 +440,8 @@
def __repr__(self):
return '<hunk %r@%d>' % (self.filename(), self.fromline)
-def filterpatch(ui, chunks, chunkselector, operation=None):
+def filterpatch(ui, chunks, chunkselector):
"""interactively filter patch chunks into applied-only chunks"""
-
- if operation is None:
- operation = _('confirm')
chunks = list(chunks)
# convert chunks list into structure suitable for displaying/modifying
# with curses. create a list of headers only.