equal
deleted
inserted
replaced
297 audit_path = util.path_auditor(repo.root) |
297 audit_path = util.path_auditor(repo.root) |
298 |
298 |
299 numupdates = len(action) |
299 numupdates = len(action) |
300 for i, a in enumerate(action): |
300 for i, a in enumerate(action): |
301 f, m = a[:2] |
301 f, m = a[:2] |
302 u.progress(_('updating'), i + 1, item=f, total=numupdates, unit='files') |
302 u.progress(_('updating'), i + 1, item=f, total=numupdates, |
|
303 unit=_('files')) |
303 if f and f[0] == "/": |
304 if f and f[0] == "/": |
304 continue |
305 continue |
305 if m == "r": # remove |
306 if m == "r": # remove |
306 repo.ui.note(_("removing %s\n") % f) |
307 repo.ui.note(_("removing %s\n") % f) |
307 audit_path(f) |
308 audit_path(f) |
359 repo.ui.warn(" %s\n" % nf) |
360 repo.ui.warn(" %s\n" % nf) |
360 elif m == "e": # exec |
361 elif m == "e": # exec |
361 flags = a[2] |
362 flags = a[2] |
362 util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) |
363 util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) |
363 ms.commit() |
364 ms.commit() |
364 u.progress(_('updating'), None, total=numupdates, unit='files') |
365 u.progress(_('updating'), None, total=numupdates, unit=_('files')) |
365 |
366 |
366 return updated, merged, removed, unresolved |
367 return updated, merged, removed, unresolved |
367 |
368 |
368 def recordupdates(repo, action, branchmerge): |
369 def recordupdates(repo, action, branchmerge): |
369 "record merge actions to the dirstate" |
370 "record merge actions to the dirstate" |