Mercurial > evolve
changeset 49:4e804af47e57
Change test output again
(get a better distinction between rev number and hash to detect hidden
changeset)
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Thu, 08 Sep 2011 16:54:01 +0200 |
| parents | 5fd7b64aa8c5 |
| children | 19b22ad56b32 |
| files | tests/test-obsolete.t |
| diffstat | 1 files changed, 85 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-obsolete.t Thu Sep 08 16:44:51 2011 +0200 +++ b/tests/test-obsolete.t Thu Sep 08 16:54:01 2011 +0200 @@ -11,7 +11,7 @@ > hg ci -m "add $1" > } - $ alias qlog="hg log --template='{rev} {node|short}\n'" + $ alias qlog="hg log --template='{rev}\n- {node|short}\n'" $ hg init local $ cd local $ mkcommit a # 0 @@ -27,16 +27,24 @@ Test that obsolete changeset are hidden $ qlog - 3 0d3f46688ccc - 1 7c3bad9141dc - 0 1f0dee641bb7 + 3 + - 0d3f46688ccc + 1 + - 7c3bad9141dc + 0 + - 1f0dee641bb7 $ qlog --hidden - 3 0d3f46688ccc - 2 4538525df7e2 - 1 7c3bad9141dc - 0 1f0dee641bb7 + 3 + - 0d3f46688ccc + 2 + - 4538525df7e2 + 1 + - 7c3bad9141dc + 0 + - 1f0dee641bb7 $ qlog -r 'obsolete()' --hidden - 2 4538525df7e2 + 2 + - 4538525df7e2 test obsolete changeset with no-obsolete descendant $ hg up 1 -q @@ -44,16 +52,22 @@ created new head $ hg debugobsolete 4 3 $ qlog - 4 725c380fe99b - 1 7c3bad9141dc - 0 1f0dee641bb7 + 4 + - 725c380fe99b + 1 + - 7c3bad9141dc + 0 + - 1f0dee641bb7 $ qlog -r 'obsolete()' --hidden - 2 4538525df7e2 - 3 0d3f46688ccc + 2 + - 4538525df7e2 + 3 + - 0d3f46688ccc $ hg up 3 -q $ mkcommit d # 5 (on 3) $ qlog -r 'obsolete()' - 3 0d3f46688ccc + 3 + - 0d3f46688ccc Test communication of obsolete relation with a compatible client @@ -66,25 +80,37 @@ adding file changes added 5 changesets with 5 changes to 5 files (+1 heads) $ qlog -R ../other-new -r 'obsolete()' - 2 0d3f46688ccc + 2 + - 0d3f46688ccc $ qlog -R ../other-new - 4 a7a6f2b5d8a5 - 3 725c380fe99b - 2 0d3f46688ccc - 1 7c3bad9141dc - 0 1f0dee641bb7 + 4 + - a7a6f2b5d8a5 + 3 + - 725c380fe99b + 2 + - 0d3f46688ccc + 1 + - 7c3bad9141dc + 0 + - 1f0dee641bb7 $ hg up 3 -q $ mkcommit obsol_d # 6 created new head $ hg debugobsolete 6 5 $ qlog - 6 95de7fc6918d - 4 725c380fe99b - 3 0d3f46688ccc - 1 7c3bad9141dc - 0 1f0dee641bb7 + 6 + - 95de7fc6918d + 4 + - 725c380fe99b + 3 + - 0d3f46688ccc + 1 + - 7c3bad9141dc + 0 + - 1f0dee641bb7 $ qlog -r 'obsolete()' - 3 0d3f46688ccc + 3 + - 0d3f46688ccc $ hg push ../other-new -f # XXX should not have to use -f pushing to ../other-new searching for changes @@ -93,13 +119,19 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) $ qlog -R ../other-new - 5 95de7fc6918d - 3 725c380fe99b - 2 0d3f46688ccc - 1 7c3bad9141dc - 0 1f0dee641bb7 + 5 + - 95de7fc6918d + 3 + - 725c380fe99b + 2 + - 0d3f46688ccc + 1 + - 7c3bad9141dc + 0 + - 1f0dee641bb7 $ qlog -R ../other-new -r 'obsolete()' - 2 0d3f46688ccc + 2 + - 0d3f46688ccc $ hg up -q .^ $ mkcommit "obsol_d'" # 7 created new head @@ -113,11 +145,16 @@ added 2 changesets with 2 changes to 2 files (+2 heads) (run 'hg heads .' to see heads, 'hg merge' to merge) $ qlog -R ../other-new - 7 909a0fb57e5d - 3 725c380fe99b - 2 0d3f46688ccc - 1 7c3bad9141dc - 0 1f0dee641bb7 + 7 + - 909a0fb57e5d + 3 + - 725c380fe99b + 2 + - 0d3f46688ccc + 1 + - 7c3bad9141dc + 0 + - 1f0dee641bb7 pushing to stuff that doesn't support obsolete @@ -132,11 +169,16 @@ adding file changes added 5 changesets with 5 changes to 5 files (+1 heads) $ qlog -R ../other-old - 4 909a0fb57e5d - 3 725c380fe99b - 2 0d3f46688ccc - 1 7c3bad9141dc - 0 1f0dee641bb7 + 4 + - 909a0fb57e5d + 3 + - 725c380fe99b + 2 + - 0d3f46688ccc + 1 + - 7c3bad9141dc + 0 + - 1f0dee641bb7