Mercurial > evolve
view tests/test-evolve-phase-divergence.t @ 3629:f23946bf6625
evolve: move logic to complete interrupted orphan resolution to new fn
This patch moves logic which completes an interrupted orphan resolution to it's
own new function. We will defining such functions for completing
phase-divergence and content-divergence too.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sat, 24 Mar 2018 12:58:12 +0530 |
parents | 170b99a9c0b4 |
children | ed3032ee53eb |
line wrap: on
line source
** Test for handling of phase divergent changesets by `hg evolve` ** ==================================================================== $ cat >> $HGRCPATH <<EOF > [alias] > glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) {phase}" > [extensions] > rebase = > EOF Setting up a public repo ------------------------ $ hg init public $ cd public $ echo a > a $ mkcommit() { > echo "$1" > "$1" > hg add "$1" > hg ci -m "add $1" > } $ hg commit -A -m init adding a $ cd .. $ evolvepath=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/ Setting up a private non-publishing repo ---------------------------------------- $ hg clone -U public private $ cd private $ cat >> .hg/hgrc <<EOF > [extensions] > evolve = $evolvepath > [ui] > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n > [phases] > publish = false > EOF $ cd .. Setting up couple of more instances of private repo --------------------------------------------------- $ cp -a private alice $ cp -a private bob Creating a phase-divergence changeset ------------------------------------- Alice creating a draft changeset and pushing to main private repo $ cd alice $ hg update 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a >> a $ hg commit -u alice -m 'modify a' $ hg push ../private pushing to ../private searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files $ hg glog @ 1:4d1169d82e47 modify a | () draft o 0:d3873e73d99e init () public Bob pulling from private repo and pushing to the main public repo making the changeset public $ cd ../bob $ hg pull ../private pulling from ../private searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files new changesets 4d1169d82e47 (run 'hg update' to get a working copy) $ hg glog o 1:4d1169d82e47 modify a | () draft o 0:d3873e73d99e init () public $ hg push ../public pushing to ../public searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files $ hg glog o 1:4d1169d82e47 modify a | () public o 0:d3873e73d99e init () public *But* Alice decided to amend the changeset she had and then pulling from public repo creating phase-divergent changeset locally $ cd ../alice $ hg amend -m 'tweak a' XXX: pull should tell us how to see what is the new phase-divergent changeset $ hg pull ../public pulling from ../public searching for changes no changes found 1 new phase-divergent changesets $ hg glog @ 2:98bb3a6cfe1a tweak a | () draft | o 1:4d1169d82e47 modify a |/ () public o 0:d3873e73d99e init () public Using evolve --list to list phase-divergent changesets ------------------------------------------------------ $ hg evolve --list 98bb3a6cfe1a: tweak a phase-divergent: 4d1169d82e47 (immutable precursor) XXX-Pulkit: Trying to see instability on public changeset XXX-Pulkit: this is not helpful XXX-Marmoute: public changeset "instable themself" XXX-Marmoute: I'm not sure if we store this information and it is useful to show it. XXX-Marmoute: We should maybe point the user toward `hg obslog` instead` $ hg evolve -r 4d1169d8 --list 4d1169d82e47: modify a Understanding phasedivergence using obslog ------------------------------------------ XXX: There must be mention of phase-divergence here $ hg obslog -r . --all @ 98bb3a6cfe1a (2) tweak a | o 4d1169d82e47 (1) modify a rewritten(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000) Solving the phase divergence using evolve command -------------------------------------------------- (We do not solve evolution other than orphan by default because it turned out it was too confusing for users. We used to behave this way, but having multiple possible outcome to evolve end up scaring people) $ hg evolve nothing to evolve on current working copy parent (do you want to use --phase-divergent) [2] testing the --confirm option $ hg evolve --phase-divergent --confirm <<EOF > n > EOF recreate:[2] tweak a atop:[1] modify a perform evolve? [Ny] n abort: evolve aborted by user [255] testing the --dry-run option $ hg evolve --phase-divergent --dry-run recreate:[2] tweak a atop:[1] modify a hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e; hg update 4d1169d82e47; hg revert --all --rev 98bb3a6cfe1a; hg commit --msg "phase-divergent update to 98bb3a6cfe1a" XXX: evolve should have mentioned that draft commit is just obsoleted in favour of public one. From the message it looks like a new commit is created. $ hg evolve --phase-divergent recreate:[2] tweak a atop:[1] modify a computing new diff committed as 4d1169d82e47 working directory is now at 4d1169d82e47 $ hg glog @ 1:4d1169d82e47 modify a | () public o 0:d3873e73d99e init () public Syncying every repo with the new state -------------------------------------- $ hg push ../public pushing to ../public searching for changes no changes found 2 new obsolescence markers [1] $ hg push ../private pushing to ../private searching for changes no changes found 2 new obsolescence markers [1] $ hg push ../bob pushing to ../bob searching for changes no changes found 2 new obsolescence markers [1] Creating more phase-divergence where a new resolution commit will be formed and also testing bookmark movement -------------------------------------------------------------------------------- Alice created a commit and push to private non-publishing repo $ echo foo > foo $ hg add foo $ hg ci -m "added foo to foo" $ hg glog @ 3:aa071e5554e3 added foo to foo | () draft o 1:4d1169d82e47 modify a | () public o 0:d3873e73d99e init () public $ hg push ../private pushing to ../private searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files Bob pulled from the private repo and pushed that to publishing repo $ cd ../bob $ hg pull ../private pulling from ../private searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files new changesets aa071e5554e3 (run 'hg update' to get a working copy) $ hg push ../public pushing to ../public searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files Alice amended that changeset and then pulled from publishing repo creating phase-divergence $ cd ../alice $ echo bar >> foo $ hg amend -m "added bar to foo" $ hg bookmark bm $ hg pull ../public pulling from ../public searching for changes no changes found 1 new phase-divergent changesets $ hg glog @ 4:d47f2b37ed82 added bar to foo | (bm) draft | o 3:aa071e5554e3 added foo to foo |/ () public o 1:4d1169d82e47 modify a | () public o 0:d3873e73d99e init () public Resolving the new phase-divergence changeset using `hg evolve` -------------------------------------------------------------- XXX: this should have popped up for a new commit message of the changeset or an option should be there XXX: we should document what should user expect where running this, writing this test I have to go through code base to understand what will be the behavior $ hg evolve --phase-divergent recreate:[4] added bar to foo atop:[3] added foo to foo computing new diff committed as 3d62500c673d working directory is now at 3d62500c673d $ hg exp # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 # Node ID 3d62500c673dd1c88bb09a73e86d0210aed6fcb6 # Parent aa071e5554e36080a36cfd24accd5a71e3320f1e phase-divergent update to aa071e5554e3: added bar to foo diff -r aa071e5554e3 -r 3d62500c673d foo --- a/foo Thu Jan 01 00:00:00 1970 +0000 +++ b/foo Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +1,2 @@ foo +bar XXX: the commit message is not best one, we should give option to user to modify the commit message $ hg glog @ 5:3d62500c673d phase-divergent update to aa071e5554e3: | (bm) draft o 3:aa071e5554e3 added foo to foo | () public o 1:4d1169d82e47 modify a | () public o 0:d3873e73d99e init () public $ hg obslog -r . --all @ 3d62500c673d (5) phase-divergent update to aa071e5554e3: | x d47f2b37ed82 (4) added bar to foo | rewritten(description, parent, content) as 3d62500c673d using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | o aa071e5554e3 (3) added foo to foo rewritten(description, content) as d47f2b37ed82 using amend by test (Thu Jan 01 00:00:00 1970 +0000) Syncing all other repositories ------------------------------ These pushed should not be turned to quiet mode as the output is very helpful to make sure everything is working fine $ hg push ../bob pushing to ../bob searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers $ hg push ../private pushing to ../private searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers $ hg push ../public pushing to ../public searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers Creating a phasedivergence changeset where the divergent changeset changed in a way that we rebase that on old public changeset, there will be conflicts, but the `hg evolve` command handles it very well and uses `hg revert` logic to prevent any conflicts ------------------------------------------------------------------------------- Alice creates one more changeset and pushes to private repo $ echo bar > bar $ hg ci -Aqm "added bar to bar" $ hg push ../private pushing to ../private searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files Bob pulls from private and pushes to public repo $ cd ../bob $ hg pull ../private pulling from ../private searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files new changesets b756eb10ea73 (run 'hg update' to get a working copy) $ hg push ../public pushing to ../public searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files Alice amends the changeset and then pull from public creating phase-divergence $ cd ../alice $ echo foo > bar $ hg amend -m "foo to bar" $ hg pull ../public pulling from ../public searching for changes no changes found 1 new phase-divergent changesets $ hg glog @ 7:2c3560aedead foo to bar | (bm) draft | o 6:b756eb10ea73 added bar to bar |/ () public o 5:3d62500c673d phase-divergent update to aa071e5554e3: | () public o 3:aa071e5554e3 added foo to foo | () public o 1:4d1169d82e47 modify a | () public o 0:d3873e73d99e init () public Resolving the new phase-divergence changeset using `hg evolve` --------------------------------------------------------------- $ hg evolve --phase-divergent recreate:[7] foo to bar atop:[6] added bar to bar computing new diff committed as 502e73736632 working directory is now at 502e73736632 $ hg exp # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 # Node ID 502e737366322886cf628276aa0a2796904453b4 # Parent b756eb10ea73ee4ba69c998e64a5c6e1005d74b5 phase-divergent update to b756eb10ea73: foo to bar diff -r b756eb10ea73 -r 502e73736632 bar --- a/bar Thu Jan 01 00:00:00 1970 +0000 +++ b/bar Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +1,1 @@ -bar +foo $ hg glog @ 8:502e73736632 phase-divergent update to b756eb10ea73: | (bm) draft o 6:b756eb10ea73 added bar to bar | () public o 5:3d62500c673d phase-divergent update to aa071e5554e3: | () public o 3:aa071e5554e3 added foo to foo | () public o 1:4d1169d82e47 modify a | () public o 0:d3873e73d99e init () public Syncing all the repositories ---------------------------- $ hg push ../private pushing to ../private searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers $ hg push ../public pushing to ../public searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 2 new obsolescence markers Creating phase-divergence with divergent changeset and precursor having different parents ----------------------------------------------------------------------- Alice creates a changeset and pushes to private repo $ echo x > x $ hg ci -Am "added x to x" adding x $ hg push ../private pushing to ../private searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files Bob does what he always does, pull from private and push to public, he is acting as a CI service $ cd ../bob $ hg pull ../private pulling from ../private searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files 2 new obsolescence markers new changesets 502e73736632:2352021b3785 (run 'hg update' to get a working copy) $ hg push ../public pushing to ../public searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files Alice like always dont care about Bob existence and rebases her changeset and then pull from public repo creating phase divergence $ cd ../alice $ hg rebase -r . -d .^^^ rebasing 9:2352021b3785 "added x to x" (bm tip) $ hg pull ../public pulling from ../public searching for changes no changes found 1 new phase-divergent changesets $ hg obslog -r . @ 334e300d6db5 (10) added x to x | o 2352021b3785 (9) added x to x rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) $ hg glog -r .^:: @ 10:334e300d6db5 added x to x | (bm) draft | o 9:2352021b3785 added x to x | | () public | o 8:502e73736632 phase-divergent update to b756eb10ea73: | | () public | o 6:b756eb10ea73 added bar to bar |/ () public o 5:3d62500c673d phase-divergent update to aa071e5554e3: | () public ~ Using `hg evolve` to resolve phase-divergence --------------------------------------------- $ hg evolve --phase-divergent recreate:[10] added x to x atop:[9] added x to x rebasing to destination parent: 502e73736632 (leaving bookmark bm) computing new diff committed as 2352021b3785 working directory is now at 2352021b3785 XXX: we should move bookmark here $ hg glog @ 9:2352021b3785 added x to x | (bm) public o 8:502e73736632 phase-divergent update to b756eb10ea73: | () public o 6:b756eb10ea73 added bar to bar | () public o 5:3d62500c673d phase-divergent update to aa071e5554e3: | () public o 3:aa071e5554e3 added foo to foo | () public o 1:4d1169d82e47 modify a | () public o 0:d3873e73d99e init () public $ hg obslog -r . b1a0e143e32b --all --hidden x b1a0e143e32b (11) added x to x | pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | x 334e300d6db5 (10) added x to x | rewritten(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | @ 2352021b3785 (9) added x to x rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) $ hg exp # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 # Node ID 2352021b37851be226ebed109b0eb6eada918566 # Parent 502e737366322886cf628276aa0a2796904453b4 added x to x diff -r 502e73736632 -r 2352021b3785 x --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/x Thu Jan 01 00:00:00 1970 +0000 @@ -0,0 +1,1 @@ +x Creating divergence with parent and content change both but not resulting in conflicts ----------------------------------------------------------------------------- Alice is tired of pushing and pulling and will create phase-divergence locally $ hg glog @ 9:2352021b3785 added x to x | (bm) public o 8:502e73736632 phase-divergent update to b756eb10ea73: | () public o 6:b756eb10ea73 added bar to bar | () public o 5:3d62500c673d phase-divergent update to aa071e5554e3: | () public o 3:aa071e5554e3 added foo to foo | () public o 1:4d1169d82e47 modify a | () public o 0:d3873e73d99e init () public $ echo y > y $ echo foobar >> foo $ hg add y $ hg ci -m "y to y and foobar to foo" $ hg rebase -r . -d .^^^ rebasing 12:dc88f5aa9bc9 "y to y and foobar to foo" (tip) $ echo foo > y $ hg amend Alice making the old changeset public to have content-divergence $ hg phase -r dc88f5aa9bc9 --public --hidden 1 new phase-divergent changesets $ hg glog @ 14:13015a180eee y to y and foobar to foo | () draft | o 12:dc88f5aa9bc9 y to y and foobar to foo | | () public | o 9:2352021b3785 added x to x | | (bm) public | o 8:502e73736632 phase-divergent update to b756eb10ea73: |/ () public o 6:b756eb10ea73 added bar to bar | () public o 5:3d62500c673d phase-divergent update to aa071e5554e3: | () public o 3:aa071e5554e3 added foo to foo | () public o 1:4d1169d82e47 modify a | () public o 0:d3873e73d99e init () public $ hg obslog -r . @ 13015a180eee (14) y to y and foobar to foo | x 211ab84d1689 (13) y to y and foobar to foo | rewritten(content) as 13015a180eee using amend by test (Thu Jan 01 00:00:00 1970 +0000) | o dc88f5aa9bc9 (12) y to y and foobar to foo rewritten(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) Resolving divergence using `hg evolve` ------------------------------------- $ hg evolve --phase-divergent recreate:[14] y to y and foobar to foo atop:[12] y to y and foobar to foo rebasing to destination parent: 2352021b3785 computing new diff committed as 8c2bb6fb44e9 working directory is now at 8c2bb6fb44e9 $ hg exp # HG changeset patch # User test # Date 0 0 # Thu Jan 01 00:00:00 1970 +0000 # Node ID 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce # Parent dc88f5aa9bc90a6418899d267d9524205dfb429b phase-divergent update to dc88f5aa9bc9: y to y and foobar to foo diff -r dc88f5aa9bc9 -r 8c2bb6fb44e9 y --- a/y Thu Jan 01 00:00:00 1970 +0000 +++ b/y Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +1,1 @@ -y +foo $ hg glog @ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: | () draft o 12:dc88f5aa9bc9 y to y and foobar to foo | () public o 9:2352021b3785 added x to x | (bm) public o 8:502e73736632 phase-divergent update to b756eb10ea73: | () public o 6:b756eb10ea73 added bar to bar | () public o 5:3d62500c673d phase-divergent update to aa071e5554e3: | () public o 3:aa071e5554e3 added foo to foo | () public o 1:4d1169d82e47 modify a | () public o 0:d3873e73d99e init () public Creating divergence with parent and content change both which results in conflicts while rebasing on parent ----------------------------------------------------------------------------- $ echo l > l $ hg ci -Aqm "added l to l" $ hg rebase -r . -d .^^^^ rebasing 17:f3794e5a91dc "added l to l" (tip) $ echo kl > l $ echo foo > x $ hg add x $ hg amend $ hg obslog -r . @ 5fd38c0de46e (19) added l to l | x 2bfd56949cf0 (18) added l to l | rewritten(content) as 5fd38c0de46e using amend by test (Thu Jan 01 00:00:00 1970 +0000) | x f3794e5a91dc (17) added l to l rewritten(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) $ hg phase -r f3794e5a91dc --public --hidden 1 new phase-divergent changesets Resolution using `hg evolve --phase-divergent` ---------------------------------------------- $ hg evolve --phase-divergent recreate:[19] added l to l atop:[17] added l to l rebasing to destination parent: 8c2bb6fb44e9 merging x warning: conflicts while merging x! (edit, then use 'hg resolve --mark') evolution failed! fix conflict and run 'hg evolve --continue' abort: unresolved merge conflicts (see hg help resolve) [255] $ hg diff diff -r 8c2bb6fb44e9 l --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/l Thu Jan 01 00:00:00 1970 +0000 @@ -0,0 +1,1 @@ +kl diff -r 8c2bb6fb44e9 x --- a/x Thu Jan 01 00:00:00 1970 +0000 +++ b/x Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +1,5 @@ +<<<<<<< destination: 8c2bb6fb44e9 - test: phase-divergent update to dc88f5aa9... x +======= +foo +>>>>>>> evolving: 5fd38c0de46e - test: added l to l $ echo foo > x $ hg resolve -m (no more unresolved files) continue: hg evolve --continue XXX: we should handle this correctly here, this is not phase-divergence resolution happening $ hg evolve --continue continuing interrupted 'phasedivergent' resolution is not yet supported working directory is now at 8c2bb6fb44e9 $ hg glog * 19:5fd38c0de46e added l to l | () draft | o 17:f3794e5a91dc added l to l | | () public | @ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: | | () public | o 12:dc88f5aa9bc9 y to y and foobar to foo | | () public | o 9:2352021b3785 added x to x |/ (bm) public o 8:502e73736632 phase-divergent update to b756eb10ea73: | () public o 6:b756eb10ea73 added bar to bar | () public o 5:3d62500c673d phase-divergent update to aa071e5554e3: | () public o 3:aa071e5554e3 added foo to foo | () public o 1:4d1169d82e47 modify a | () public o 0:d3873e73d99e init () public