Show More
@@ -455,8 +455,10 b' def applyupdates(repo, actions, wctx, mc' | |||||
455 |
|
455 | |||
456 | numupdates = len(actions) |
|
456 | numupdates = len(actions) | |
457 | workeractions = [a for a in actions if a[1] in 'gr'] |
|
457 | workeractions = [a for a in actions if a[1] in 'gr'] | |
458 |
update |
|
458 | updateactions = [a for a in workeractions if a[1] == 'g'] | |
459 | removed = len([a for a in workeractions if a[1] == 'r']) |
|
459 | updated = len(updateactions) | |
|
460 | removeactions = [a for a in workeractions if a[1] == 'r'] | |||
|
461 | removed = len(removeactions) | |||
460 | actions = [a for a in actions if a[1] not in 'gr'] |
|
462 | actions = [a for a in actions if a[1] not in 'gr'] | |
461 |
|
463 | |||
462 | hgsub = [a[1] for a in workeractions if a[0] == '.hgsubstate'] |
|
464 | hgsub = [a[1] for a in workeractions if a[0] == '.hgsubstate'] | |
@@ -465,7 +467,13 b' def applyupdates(repo, actions, wctx, mc' | |||||
465 |
|
467 | |||
466 | z = 0 |
|
468 | z = 0 | |
467 | prog = worker.worker(repo.ui, 0.001, getremove, (repo, mctx, overwrite), |
|
469 | prog = worker.worker(repo.ui, 0.001, getremove, (repo, mctx, overwrite), | |
468 |
|
|
470 | removeactions) | |
|
471 | for i, item in prog: | |||
|
472 | z += i | |||
|
473 | repo.ui.progress(_('updating'), z, item=item, total=numupdates, | |||
|
474 | unit=_('files')) | |||
|
475 | prog = worker.worker(repo.ui, 0.001, getremove, (repo, mctx, overwrite), | |||
|
476 | updateactions) | |||
469 | for i, item in prog: |
|
477 | for i, item in prog: | |
470 | z += i |
|
478 | z += i | |
471 | repo.ui.progress(_('updating'), z, item=item, total=numupdates, |
|
479 | repo.ui.progress(_('updating'), z, item=item, total=numupdates, |
@@ -37,6 +37,7 b' http://mercurial.selenic.com/bts/issue67' | |||||
37 | 1: other deleted -> r |
|
37 | 1: other deleted -> r | |
38 | 1a: remote created -> g |
|
38 | 1a: remote created -> g | |
39 | removing 1 |
|
39 | removing 1 | |
|
40 | updating: 1 1/2 files (50.00%) | |||
40 | getting 1a |
|
41 | getting 1a | |
41 | updating: 1a 2/2 files (100.00%) |
|
42 | updating: 1a 2/2 files (100.00%) | |
42 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
43 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
@@ -46,6 +46,7 b'' | |||||
46 | b/b: remote created -> g |
|
46 | b/b: remote created -> g | |
47 | removing a/a |
|
47 | removing a/a | |
48 | removing a/b |
|
48 | removing a/b | |
|
49 | updating: a/b 2/5 files (40.00%) | |||
49 | getting b/a |
|
50 | getting b/a | |
50 | getting b/b |
|
51 | getting b/b | |
51 | updating: b/b 4/5 files (80.00%) |
|
52 | updating: b/b 4/5 files (80.00%) |
@@ -290,6 +290,7 b' args:' | |||||
290 | rev: versions differ -> m |
|
290 | rev: versions differ -> m | |
291 | preserving rev for resolve of rev |
|
291 | preserving rev for resolve of rev | |
292 | removing a |
|
292 | removing a | |
|
293 | updating: a 1/3 files (33.33%) | |||
293 | getting b |
|
294 | getting b | |
294 | updating: b 2/3 files (66.67%) |
|
295 | updating: b 2/3 files (66.67%) | |
295 | updating: rev 3/3 files (100.00%) |
|
296 | updating: rev 3/3 files (100.00%) |
@@ -73,6 +73,7 b'' | |||||
73 | main: remote created -> g |
|
73 | main: remote created -> g | |
74 | removing side1 |
|
74 | removing side1 | |
75 | removing side2 |
|
75 | removing side2 | |
|
76 | updating: side2 2/3 files (66.67%) | |||
76 | getting main |
|
77 | getting main | |
77 | updating: main 3/3 files (100.00%) |
|
78 | updating: main 3/3 files (100.00%) | |
78 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
79 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now