--- a/mercurial/crecord.py	Mon Mar 16 13:25:19 2015 -0500
+++ b/mercurial/crecord.py	Mon Mar 16 13:32:28 2015 -0500
@@ -419,7 +419,7 @@
     def __repr__(self):
         return '<hunk %r@%d>' % (self.filename(), self.fromline)
 
-def filterpatch(ui, chunks, chunk_selector):
+def filterpatch(ui, chunks, chunkselector):
     """interactively filter patch chunks into applied-only chunks"""
 
     chunks = list(chunks)
@@ -433,7 +433,7 @@
     uiheaders = [uiheader(h) for h in headers]
     # let user choose headers/hunks/lines, and mark their applied flags
     # accordingly
-    chunk_selector(uiheaders, ui)
+    chunkselector(uiheaders, ui)
     appliedhunklist = []
     for hdr in uiheaders:
         if (hdr.applied and