Mercurial > evolve
changeset 688:f2c3fd21fa63 stable
prune: add an informative message about the number of pruned changesets
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Mon, 04 Feb 2013 22:05:03 +0100 |
| parents | 6c1fbef2952e |
| children | d48aae167b9d |
| files | hgext/evolve.py tests/test-corrupt.t tests/test-evolve.t tests/test-obsolete-push.t tests/test-prune.t tests/test-tutorial.t |
| diffstat | 6 files changed, 15 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Mon Feb 04 22:04:50 2013 +0100 +++ b/hgext/evolve.py Mon Feb 04 22:05:03 2013 +0100 @@ -1281,6 +1281,8 @@ for p in precs: markers.append((p, sucs)) createmarkers(repo, markers) + # informs that changeset have been pruned + ui.status(_('%i changesets pruned\n') % len(precs)) # update to an unkilled parent wdp = repo['.'] newnode = wdp
--- a/tests/test-corrupt.t Mon Feb 04 22:04:50 2013 +0100 +++ b/tests/test-corrupt.t Mon Feb 04 22:05:03 2013 +0100 @@ -103,6 +103,7 @@ $ hg kill -n -1 -- -2 -3 + 2 changesets pruned $ hg push ../other pushing to ../other searching for changes
--- a/tests/test-evolve.t Mon Feb 04 22:04:50 2013 +0100 +++ b/tests/test-evolve.t Mon Feb 04 22:05:03 2013 +0100 @@ -69,6 +69,7 @@ $ hg id -n 5 $ hg kill . + 1 changesets pruned 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at fbb94e3a0ecf $ hg qlog @@ -81,6 +82,7 @@ test multiple kill $ hg kill 4 -r 3 + 2 changesets pruned 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at 7c3bad9141dc $ hg qlog @@ -95,6 +97,7 @@ $ echo 4 > g $ hg add g $ hg kill . + 1 changesets pruned 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at 7c3bad9141dc $ hg st
--- a/tests/test-obsolete-push.t Mon Feb 04 22:04:50 2013 +0100 +++ b/tests/test-obsolete-push.t Mon Feb 04 22:05:03 2013 +0100 @@ -27,6 +27,7 @@ $ hg ci -qAm C c $ hg phase --secret --force . $ hg kill 0 1 + 2 changesets pruned 1 new unstable changesets $ glog --hidden @ 2:244232c2222a@default(unstable/secret) C
--- a/tests/test-prune.t Mon Feb 04 22:04:50 2013 +0100 +++ b/tests/test-prune.t Mon Feb 04 22:05:03 2013 +0100 @@ -38,6 +38,7 @@ prune current and tip changeset $ hg prune . + 1 changesets pruned 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at 47d2a3944de8 $ hg debugobsolete @@ -46,6 +47,7 @@ prune leaving unstability behind $ hg prune 1 + 1 changesets pruned 2 new unstable changesets $ hg debugobsolete 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '*', 'user': 'test'} (glob) @@ -54,6 +56,7 @@ pruning multiple changeset at once $ hg prune 2: + 2 changesets pruned 0 files updated, 0 files merged, 3 files removed, 0 files unresolved working directory now at 1f0dee641bb7 $ hg debugobsolete @@ -112,6 +115,7 @@ one old, one new $ hg prune 'desc("add ee")' -s 'desc("add nE")' + 1 changesets pruned $ hg debugobsolete 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '*', 'user': 'test'} (glob) 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) @@ -139,6 +143,7 @@ one old, two new $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")' + 1 changesets pruned $ hg debugobsolete 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '*', 'user': 'test'} (glob) 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob) @@ -178,6 +183,7 @@ two old, one new: $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nB")' + 2 changesets pruned $ hg debugobsolete 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '*', 'user': 'test'} (glob) 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '*', 'user': 'test'} (glob)
--- a/tests/test-tutorial.t Mon Feb 04 22:04:50 2013 +0100 +++ b/tests/test-tutorial.t Mon Feb 04 22:05:03 2013 +0100 @@ -281,6 +281,7 @@ not fit well in my standard shopping list) $ hg prune . # . is for working directory parent + 1 changesets pruned 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory now at 41aff6a42b75 @@ -708,6 +709,7 @@ In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: $ hg prune ee942144f952 + 1 changesets pruned 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory now at a44c85f957d3 1 new unstable changesets