Show More
@@ -1172,7 +1172,7 def _externalpatch(patcher, patchname, u | |||||
1172 | line = line.rstrip() |
|
1172 | line = line.rstrip() | |
1173 | ui.note(line + '\n') |
|
1173 | ui.note(line + '\n') | |
1174 | if line.startswith('patching file '): |
|
1174 | if line.startswith('patching file '): | |
1175 |
pf = util.parse |
|
1175 | pf = util.parsepatchoutput(line) | |
1176 | printed_file = False |
|
1176 | printed_file = False | |
1177 | files.setdefault(pf, None) |
|
1177 | files.setdefault(pf, None) | |
1178 | elif line.find('with fuzz') >= 0: |
|
1178 | elif line.find('with fuzz') >= 0: |
@@ -28,7 +28,7 def nlinks(name): | |||||
28 | '''return number of hardlinks for the given file''' |
|
28 | '''return number of hardlinks for the given file''' | |
29 | return os.lstat(name).st_nlink |
|
29 | return os.lstat(name).st_nlink | |
30 |
|
30 | |||
31 |
def parse |
|
31 | def parsepatchoutput(output_line): | |
32 | """parses the output produced by patch and returns the filename""" |
|
32 | """parses the output produced by patch and returns the filename""" | |
33 | pf = output_line[14:] |
|
33 | pf = output_line[14:] | |
34 | if os.sys.platform == 'OpenVMS': |
|
34 | if os.sys.platform == 'OpenVMS': |
@@ -74,7 +74,7 def _is_win_9x(): | |||||
74 | def openhardlinks(): |
|
74 | def openhardlinks(): | |
75 | return not _is_win_9x() |
|
75 | return not _is_win_9x() | |
76 |
|
76 | |||
77 |
def parse |
|
77 | def parsepatchoutput(output_line): | |
78 | """parses the output produced by patch and returns the filename""" |
|
78 | """parses the output produced by patch and returns the filename""" | |
79 | pf = output_line[14:] |
|
79 | pf = output_line[14:] | |
80 | if pf[0] == '`': |
|
80 | if pf[0] == '`': |
General Comments 0
You need to be logged in to leave comments.
Login now