Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/patch.py @ 2867:9a2a481ec3ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util: qualify name properly.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sat, 12 Aug 2006 15:41:26 -0700
parents 2893e51407a4
children 4ec58b157265
comparison
equal deleted inserted replaced
2866:b5f56d6c62c4 2867:9a2a481ec3ea
240 if line.startswith('patching file '): 240 if line.startswith('patching file '):
241 pf = util.parse_patch_output(line) 241 pf = util.parse_patch_output(line)
242 files.setdefault(pf, (None, None)) 242 files.setdefault(pf, (None, None))
243 code = fp.close() 243 code = fp.close()
244 if code: 244 if code:
245 raise util.Abort(_("patch command failed: %s") % explain_exit(code)[0]) 245 raise util.Abort(_("patch command failed: %s") %
246 util.explain_exit(code)[0])
246 247
247 for gp in gitpatches: 248 for gp in gitpatches:
248 files[gp.path] = (gp.op, gp) 249 files[gp.path] = (gp.op, gp)
249 250
250 return files 251 return files