Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 11717:a286a4ecbfeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 31 Jul 2010 18:12:50 -0500
parents eb07fbc21e9c db426935fa94
children 05deba16c5d5
comparison
equal deleted inserted replaced
11714:aae1dd12fce6 11717:a286a4ecbfeb
284 audit_path = util.path_auditor(repo.root) 284 audit_path = util.path_auditor(repo.root)
285 285
286 numupdates = len(action) 286 numupdates = len(action)
287 for i, a in enumerate(action): 287 for i, a in enumerate(action):
288 f, m = a[:2] 288 f, m = a[:2]
289 u.progress('update', i + 1, item=f, total=numupdates, unit='files') 289 u.progress(_('updating'), i + 1, item=f, total=numupdates, unit='files')
290 if f and f[0] == "/": 290 if f and f[0] == "/":
291 continue 291 continue
292 if m == "r": # remove 292 if m == "r": # remove
293 repo.ui.note(_("removing %s\n") % f) 293 repo.ui.note(_("removing %s\n") % f)
294 audit_path(f) 294 audit_path(f)
344 for nf in fl: 344 for nf in fl:
345 repo.ui.warn(" %s\n" % nf) 345 repo.ui.warn(" %s\n" % nf)
346 elif m == "e": # exec 346 elif m == "e": # exec
347 flags = a[2] 347 flags = a[2]
348 util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) 348 util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags)
349 u.progress('update', None, total=numupdates, unit='files') 349 u.progress(_('updating'), None, total=numupdates, unit='files')
350 350
351 return updated, merged, removed, unresolved 351 return updated, merged, removed, unresolved
352 352
353 def recordupdates(repo, action, branchmerge): 353 def recordupdates(repo, action, branchmerge):
354 "record merge actions to the dirstate" 354 "record merge actions to the dirstate"