Show More
@@ -299,7 +299,8 b' def applyupdates(repo, action, wctx, mct' | |||
|
299 | 299 | numupdates = len(action) |
|
300 | 300 | for i, a in enumerate(action): |
|
301 | 301 | f, m = a[:2] |
|
302 |
u.progress(_('updating'), i + 1, item=f, total=numupdates, |
|
|
302 | u.progress(_('updating'), i + 1, item=f, total=numupdates, | |
|
303 | unit=_('files')) | |
|
303 | 304 | if f and f[0] == "/": |
|
304 | 305 | continue |
|
305 | 306 | if m == "r": # remove |
@@ -361,7 +362,7 b' def applyupdates(repo, action, wctx, mct' | |||
|
361 | 362 | flags = a[2] |
|
362 | 363 | util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) |
|
363 | 364 | ms.commit() |
|
364 | u.progress(_('updating'), None, total=numupdates, unit='files') | |
|
365 | u.progress(_('updating'), None, total=numupdates, unit=_('files')) | |
|
365 | 366 | |
|
366 | 367 | return updated, merged, removed, unresolved |
|
367 | 368 |
General Comments 0
You need to be logged in to leave comments.
Login now