Mercurial > hg
comparison mercurial/patch.py @ 14231:8abe4db2d162
rename util.parse_patch_output to parsepatchoutput
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Fri, 06 May 2011 15:19:48 +0200 |
| parents | 202ff575d49b |
| children | 600e64004eb5 |
comparison
equal
deleted
inserted
replaced
| 14230:d51630301241 | 14231:8abe4db2d162 |
|---|---|
| 1170 | 1170 |
| 1171 for line in fp: | 1171 for line in fp: |
| 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_patch_output(line) | 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: |
| 1179 fuzz = True | 1179 fuzz = True |
| 1180 if not printed_file: | 1180 if not printed_file: |