Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/patch.py @ 7247:c4461ea8b4c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: fix patched files records in externalpatcher()
author Patrick Mezard <pmezard@gmail.com>
date Sun, 26 Oct 2008 17:26:28 +0100
parents 127a624406b4
children 6a51ca1e05c3
comparison
equal deleted inserted replaced
7246:2fef3051ebb3 7247:c4461ea8b4c8
1058 line = line.rstrip() 1058 line = line.rstrip()
1059 ui.note(line + '\n') 1059 ui.note(line + '\n')
1060 if line.startswith('patching file '): 1060 if line.startswith('patching file '):
1061 pf = util.parse_patch_output(line) 1061 pf = util.parse_patch_output(line)
1062 printed_file = False 1062 printed_file = False
1063 files.setdefault(pf, (None, None)) 1063 files.setdefault(pf, None)
1064 elif line.find('with fuzz') >= 0: 1064 elif line.find('with fuzz') >= 0:
1065 fuzz = True 1065 fuzz = True
1066 if not printed_file: 1066 if not printed_file:
1067 ui.warn(pf + '\n') 1067 ui.warn(pf + '\n')
1068 printed_file = True 1068 printed_file = True