Show More
@@ -7,7 +7,7 b'' | |||||
7 |
|
7 | |||
8 | from node import nullid, nullrev, hex, bin |
|
8 | from node import nullid, nullrev, hex, bin | |
9 | from i18n import _ |
|
9 | from i18n import _ | |
10 | import error, util, filemerge, copies, subrepo |
|
10 | import error, util, filemerge, copies, subrepo, worker | |
11 | import errno, os, shutil |
|
11 | import errno, os, shutil | |
12 |
|
12 | |||
13 | class mergestate(object): |
|
13 | class mergestate(object): | |
@@ -432,7 +432,9 b' def applyupdates(repo, actions, wctx, mc' | |||||
432 | subrepo.submerge(repo, wctx, mctx, wctx, overwrite) |
|
432 | subrepo.submerge(repo, wctx, mctx, wctx, overwrite) | |
433 |
|
433 | |||
434 | z = 0 |
|
434 | z = 0 | |
435 | for i, item in getremove(repo, mctx, overwrite, workeractions): |
|
435 | prog = worker.worker(repo.ui, 0.001, getremove, (repo, mctx, overwrite), | |
|
436 | workeractions) | |||
|
437 | for i, item in prog: | |||
436 | z += i |
|
438 | z += i | |
437 | repo.ui.progress(_('updating'), z, item=item, total=numupdates, |
|
439 | repo.ui.progress(_('updating'), z, item=item, total=numupdates, | |
438 | unit=_('files')) |
|
440 | unit=_('files')) |
General Comments 0
You need to be logged in to leave comments.
Login now