Mercurial > hg > mercurial-crew-with-dirclash
comparison hgext/mq.py @ 2787:8ec1b1f0a5f7
mq: use more portable util.parse_patch_output instead of handrolled version.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sat, 05 Aug 2006 14:59:47 -0700 |
parents | f4d916351366 |
children | 86c54b7cd331 |
comparison
equal
deleted
inserted
replaced
2786:f4d916351366 | 2787:8ec1b1f0a5f7 |
---|---|
282 for l in f: | 282 for l in f: |
283 l = l.rstrip('\r\n'); | 283 l = l.rstrip('\r\n'); |
284 if self.ui.verbose: | 284 if self.ui.verbose: |
285 self.ui.warn(l + "\n") | 285 self.ui.warn(l + "\n") |
286 if l[:14] == 'patching file ': | 286 if l[:14] == 'patching file ': |
287 pf = os.path.normpath(l[14:]) | 287 pf = os.path.normpath(util.parse_patch_output(l)) |
288 # when patch finds a space in the file name, it puts | |
289 # single quotes around the filename. strip them off | |
290 if pf[0] == "'" and pf[-1] == "'": | |
291 pf = pf[1:-1] | |
292 if pf not in files: | 288 if pf not in files: |
293 files.append(pf) | 289 files.append(pf) |
294 printed_file = False | 290 printed_file = False |
295 file_str = l | 291 file_str = l |
296 elif l.find('with fuzz') >= 0: | 292 elif l.find('with fuzz') >= 0: |