--- a/mercurial/patch.py Fri May 06 15:16:22 2011 +0200
+++ b/mercurial/patch.py Fri May 06 15:19:48 2011 +0200
@@ -1172,7 +1172,7 @@
line = line.rstrip()
ui.note(line + '\n')
if line.startswith('patching file '):
- pf = util.parse_patch_output(line)
+ pf = util.parsepatchoutput(line)
printed_file = False
files.setdefault(pf, None)
elif line.find('with fuzz') >= 0:
--- a/mercurial/posix.py Fri May 06 15:16:22 2011 +0200
+++ b/mercurial/posix.py Fri May 06 15:19:48 2011 +0200
@@ -28,7 +28,7 @@
'''return number of hardlinks for the given file'''
return os.lstat(name).st_nlink
-def parse_patch_output(output_line):
+def parsepatchoutput(output_line):
"""parses the output produced by patch and returns the filename"""
pf = output_line[14:]
if os.sys.platform == 'OpenVMS':
--- a/mercurial/windows.py Fri May 06 15:16:22 2011 +0200
+++ b/mercurial/windows.py Fri May 06 15:19:48 2011 +0200
@@ -74,7 +74,7 @@
def openhardlinks():
return not _is_win_9x()
-def parse_patch_output(output_line):
+def parsepatchoutput(output_line):
"""parses the output produced by patch and returns the filename"""
pf = output_line[14:]
if pf[0] == '`':