Mercurial > evolve
diff tests/test-evolve-obshistory-lots-of-splits.t @ 5301:e8660b28bfee
obslog: makes --origin flag the default
Test change have been carefully validated.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 07 May 2020 01:29:48 +0200 |
| parents | 258c0a99c5b0 |
| children | e6e92835d42d 87966baf6ea9 |
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-lots-of-splits.t Thu May 07 01:29:24 2020 +0200 +++ b/tests/test-evolve-obshistory-lots-of-splits.t Thu May 07 01:29:48 2020 +0200 @@ -173,12 +173,12 @@ Actual test ----------- - $ hg obslog de7290d8b885 --hidden --patch + $ hg obslog de7290d8b885 --hidden --patch --no-origin x de7290d8b885 (1) A0 split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, too many successors (4)) - $ hg obslog de7290d8b885 --hidden --all --patch + $ hg obslog de7290d8b885 --hidden --all --patch --no-origin o 1ae8bc733a14 (4) A0 | | o 337fec4d2edc (2) A0 @@ -191,7 +191,41 @@ split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, too many successors (4)) - $ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool + $ hg obslog de7290d8b885 --hidden --all --patch + o 1ae8bc733a14 (4) A0 + | split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | (No patch available, changesets rebased) + | + | o 337fec4d2edc (2) A0 + |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | diff -r de7290d8b885 -r 337fec4d2edc b + | --- a/b Thu Jan 01 00:00:00 1970 +0000 + | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 + | @@ -1,1 +0,0 @@ + | -43 + | diff -r de7290d8b885 -r 337fec4d2edc c + | --- a/c Thu Jan 01 00:00:00 1970 +0000 + | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 + | @@ -1,1 +0,0 @@ + | -44 + | diff -r de7290d8b885 -r 337fec4d2edc d + | --- a/d Thu Jan 01 00:00:00 1970 +0000 + | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 + | @@ -1,1 +0,0 @@ + | -45 + | + | + | @ c7f044602e9b (5) A0 + |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | (No patch available, changesets rebased) + | + | o f257fde29c7a (3) A0 + |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | (No patch available, changesets rebased) + | + x de7290d8b885 (1) A0 + + $ hg obslog de7290d8b885 --hidden --no-graph --no-origin -Tjson | python -m json.tool [ { "markers": [ @@ -225,14 +259,21 @@ "shortdescription": "A0" } ] - $ hg obslog c7f044602e9b --patch + $ hg obslog c7f044602e9b --patch --no-origin @ c7f044602e9b (5) A0 | x de7290d8b885 (1) A0 split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) (No patch available, too many successors (4)) - $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool + $ hg obslog c7f044602e9b --patch + @ c7f044602e9b (5) A0 + | split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | (No patch available, changesets rebased) + | + x de7290d8b885 (1) A0 + + $ hg obslog c7f044602e9b --no-graph --no-origin -Tjson | python -m json.tool [ { "markers": [], @@ -271,9 +312,92 @@ "shortdescription": "A0" } ] + $ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool + [ + { + "markers": [ + { + "dates": [ + [ + *, (glob) + 0 + ] + ], + "effects": [ + "parent", + "content" + ], + "operations": [ + "split" + ], + "prednodes": [ + "de7290d8b885925115bb9e88887252dfc20ef2a8" + ], + "users": [ + "test" + ], + "verb": "split" + } + ], + "node": "c7f044602e9bd5dec6528b33114df3d0221e6359", + "shortdescription": "A0" + }, + { + "markers": [], + "node": "de7290d8b885925115bb9e88887252dfc20ef2a8", + "shortdescription": "A0" + } + ] Check that obslog on all heads shows a coherent graph + $ hg obslog 2::5 --patch --no-origin + o 1ae8bc733a14 (4) A0 + | + | o 337fec4d2edc (2) A0 + |/ + | @ c7f044602e9b (5) A0 + |/ + | o f257fde29c7a (3) A0 + |/ + x de7290d8b885 (1) A0 + split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + (No patch available, too many successors (4)) + $ hg obslog 2::5 --patch o 1ae8bc733a14 (4) A0 + | split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | (No patch available, changesets rebased) + | + | o 337fec4d2edc (2) A0 + |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | diff -r de7290d8b885 -r 337fec4d2edc b + | --- a/b Thu Jan 01 00:00:00 1970 +0000 + | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 + | @@ -1,1 +0,0 @@ + | -43 + | diff -r de7290d8b885 -r 337fec4d2edc c + | --- a/c Thu Jan 01 00:00:00 1970 +0000 + | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 + | @@ -1,1 +0,0 @@ + | -44 + | diff -r de7290d8b885 -r 337fec4d2edc d + | --- a/d Thu Jan 01 00:00:00 1970 +0000 + | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 + | @@ -1,1 +0,0 @@ + | -45 + | + | + | @ c7f044602e9b (5) A0 + |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | (No patch available, changesets rebased) + | + | o f257fde29c7a (3) A0 + |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | (No patch available, changesets rebased) + | + x de7290d8b885 (1) A0 + + $ hg obslog 5 --all --patch --no-origin + o 1ae8bc733a14 (4) A0 | | o 337fec4d2edc (2) A0 |/ @@ -287,16 +411,37 @@ $ hg obslog 5 --all --patch o 1ae8bc733a14 (4) A0 + | split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | (No patch available, changesets rebased) | | o 337fec4d2edc (2) A0 - |/ + |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | diff -r de7290d8b885 -r 337fec4d2edc b + | --- a/b Thu Jan 01 00:00:00 1970 +0000 + | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 + | @@ -1,1 +0,0 @@ + | -43 + | diff -r de7290d8b885 -r 337fec4d2edc c + | --- a/c Thu Jan 01 00:00:00 1970 +0000 + | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 + | @@ -1,1 +0,0 @@ + | -44 + | diff -r de7290d8b885 -r 337fec4d2edc d + | --- a/d Thu Jan 01 00:00:00 1970 +0000 + | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 + | @@ -1,1 +0,0 @@ + | -45 + | + | | @ c7f044602e9b (5) A0 - |/ + |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | (No patch available, changesets rebased) + | | o f257fde29c7a (3) A0 - |/ + |/ split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000) + | (No patch available, changesets rebased) + | x de7290d8b885 (1) A0 - split(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) - (No patch available, too many successors (4)) $ hg update de7290d8b885 abort: hidden revision 'de7290d8b885' was split as: 337fec4d2edc, f257fde29c7a and 2 more!