Mercurial > hg
diff tests/test-obsolete-divergent.t @ 33274:68f3e819d41d
obsolete: closest divergent support
Add a closest argument to successorssets changing the definition of latest
successors.
With "closest=false" (current behavior), latest successors are "leafs" on the
obsmarker graph. They don't have any successor and are known locally.
With "closest=true", latest successors are the closest locally-known
changesets that are visible in the repository or repoview. Closest successors
can be then obsolete, orphan.
This will be used in a later patch to show the closest successor of
changesets with the successorssets template.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Fri, 30 Jun 2017 15:27:19 +0200 |
parents | fab9dda0f2a3 |
children | ba43e5ee9c6d |
line wrap: on
line diff
--- a/tests/test-obsolete-divergent.t Fri Jun 30 15:02:19 2017 +0200 +++ b/tests/test-obsolete-divergent.t Fri Jun 30 15:27:19 2017 +0200 @@ -80,6 +80,23 @@ $ hg log -r 'divergent()' 2:82623d38b9ba A_1 3:392fd25390da A_2 + $ hg debugsuccessorssets 'all()' --closest + d20a80d4def3 + d20a80d4def3 + 82623d38b9ba + 82623d38b9ba + 392fd25390da + 392fd25390da + $ hg debugsuccessorssets 'all()' --closest --hidden + d20a80d4def3 + d20a80d4def3 + 007dc284c1f8 + 82623d38b9ba + 392fd25390da + 82623d38b9ba + 82623d38b9ba + 392fd25390da + 392fd25390da check that mercurial refuse to push @@ -128,6 +145,25 @@ $ hg log -r 'divergent()' 2:82623d38b9ba A_1 4:01f36c5a8fda A_3 + $ hg debugsuccessorssets 'all()' --closest + d20a80d4def3 + d20a80d4def3 + 82623d38b9ba + 82623d38b9ba + 01f36c5a8fda + 01f36c5a8fda + $ hg debugsuccessorssets 'all()' --closest --hidden + d20a80d4def3 + d20a80d4def3 + 007dc284c1f8 + 82623d38b9ba + 392fd25390da + 82623d38b9ba + 82623d38b9ba + 392fd25390da + 392fd25390da + 01f36c5a8fda + 01f36c5a8fda $ cd .. @@ -160,6 +196,23 @@ $ hg log -r 'divergent()' 2:82623d38b9ba A_1 3:392fd25390da A_2 + $ hg debugsuccessorssets 'all()' --closest + d20a80d4def3 + d20a80d4def3 + 82623d38b9ba + 82623d38b9ba + 392fd25390da + 392fd25390da + $ hg debugsuccessorssets 'all()' --closest --hidden + d20a80d4def3 + d20a80d4def3 + 007dc284c1f8 + 82623d38b9ba + 392fd25390da + 82623d38b9ba + 82623d38b9ba + 392fd25390da + 392fd25390da $ cd .. do not take unknown node in account if they are final @@ -175,6 +228,10 @@ $ hg debugsuccessorssets --hidden 'desc('A_0')' 007dc284c1f8 392fd25390da + $ hg debugsuccessorssets 'desc('A_0')' --closest + $ hg debugsuccessorssets 'desc('A_0')' --closest --hidden + 007dc284c1f8 + 82623d38b9ba $ cd .. @@ -211,6 +268,23 @@ 01f36c5a8fda 01f36c5a8fda $ hg log -r 'divergent()' + $ hg debugsuccessorssets 'all()' --closest + d20a80d4def3 + d20a80d4def3 + 01f36c5a8fda + 01f36c5a8fda + $ hg debugsuccessorssets 'all()' --closest --hidden + d20a80d4def3 + d20a80d4def3 + 007dc284c1f8 + 82623d38b9ba + 392fd25390da + 82623d38b9ba + 82623d38b9ba + 392fd25390da + 392fd25390da + 01f36c5a8fda + 01f36c5a8fda $ cd .. split is not divergences @@ -237,6 +311,22 @@ 392fd25390da 392fd25390da $ hg log -r 'divergent()' + $ hg debugsuccessorssets 'all()' --closest + d20a80d4def3 + d20a80d4def3 + 82623d38b9ba + 82623d38b9ba + 392fd25390da + 392fd25390da + $ hg debugsuccessorssets 'all()' --closest --hidden + d20a80d4def3 + d20a80d4def3 + 007dc284c1f8 + 82623d38b9ba 392fd25390da + 82623d38b9ba + 82623d38b9ba + 392fd25390da + 392fd25390da Even when subsequent rewriting happen @@ -283,6 +373,28 @@ e442cfc57690 e442cfc57690 e442cfc57690 + $ hg debugsuccessorssets 'all()' --closest + d20a80d4def3 + d20a80d4def3 + 01f36c5a8fda + 01f36c5a8fda + e442cfc57690 + e442cfc57690 + $ hg debugsuccessorssets 'all()' --closest --hidden + d20a80d4def3 + d20a80d4def3 + 007dc284c1f8 + 82623d38b9ba 392fd25390da + 82623d38b9ba + 82623d38b9ba + 392fd25390da + 392fd25390da + 01f36c5a8fda + 01f36c5a8fda + 6a411f0d7a0a + e442cfc57690 + e442cfc57690 + e442cfc57690 $ hg log -r 'divergent()' Check more complex obsolescence graft (with divergence) @@ -352,6 +464,40 @@ 14608b260df8 bed64f5d2f5a bed64f5d2f5a + $ hg debugsuccessorssets 'all()' --closest + d20a80d4def3 + d20a80d4def3 + 01f36c5a8fda + 01f36c5a8fda + 7ae126973a96 + 7ae126973a96 + 14608b260df8 + 14608b260df8 + bed64f5d2f5a + bed64f5d2f5a + $ hg debugsuccessorssets 'all()' --closest --hidden + d20a80d4def3 + d20a80d4def3 + 007dc284c1f8 + 82623d38b9ba 392fd25390da + 82623d38b9ba + 82623d38b9ba + 392fd25390da + 392fd25390da + 01f36c5a8fda + 01f36c5a8fda + 6a411f0d7a0a + e442cfc57690 + e442cfc57690 + e442cfc57690 + 3750ebee865d + 392fd25390da + 7ae126973a96 + 7ae126973a96 + 14608b260df8 + 14608b260df8 + bed64f5d2f5a + bed64f5d2f5a $ hg log -r 'divergent()' 4:01f36c5a8fda A_3 8:7ae126973a96 A_7 @@ -416,6 +562,38 @@ a139f71be9da a139f71be9da a139f71be9da + $ hg debugsuccessorssets 'all()' --closest + d20a80d4def3 + d20a80d4def3 + 01f36c5a8fda + 01f36c5a8fda + a139f71be9da + a139f71be9da + $ hg debugsuccessorssets 'all()' --closest --hidden + d20a80d4def3 + d20a80d4def3 + 007dc284c1f8 + 82623d38b9ba 392fd25390da + 82623d38b9ba + 82623d38b9ba + 392fd25390da + 392fd25390da + 01f36c5a8fda + 01f36c5a8fda + 6a411f0d7a0a + e442cfc57690 + e442cfc57690 + e442cfc57690 + 3750ebee865d + 392fd25390da + 7ae126973a96 + a139f71be9da + 14608b260df8 + a139f71be9da + bed64f5d2f5a + a139f71be9da + a139f71be9da + a139f71be9da $ hg log -r 'divergent()' $ cd .. @@ -433,5 +611,9 @@ $ hg debugsuccessorssets --hidden 'desc('A_0')' 007dc284c1f8 82623d38b9ba 392fd25390da + $ hg debugsuccessorssets 'desc('A_0')' --closest + $ hg debugsuccessorssets 'desc('A_0')' --closest --hidden + 007dc284c1f8 + 82623d38b9ba 392fd25390da $ cd ..