** Test for handling of phase divergent changesets by `hg evolve` **

====================================================================

  $ . $TESTDIR/testlib/common.sh

  $ cat >> $HGRCPATH <<EOF

  > [alias]

  > glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) {phase}"

  > [extensions]

  > rebase =

  > [extensions]

  > evolve =

  > 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 public private

  updating to branch default

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ cd private

  $ cat >> .hg/hgrc <<EOF

  > [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

  $ cp -a private split

  $ cp -a private split-across-branches

  $ cp -a private split-and-amend

  $ cp -a private merge-no-conflict

Simple phase-divergence case

============================

Creating a phase-divergence changeset

-------------------------------------

Alice creating a draft changeset and pushing to main private repo

  $ cd alice

  $ 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 (1 drafts)

  (run 'hg update' to get a working copy)

  $ hg glog

  o  1:4d1169d82e47 modify a

  |   () draft

  @  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

  @  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

  1 local changesets published

  $ 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

       reworded(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 --update

  recreate:[2] tweak a

  atop:[1] modify a

  no changes to commit

  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]

phase-divergence that lead to new commit and bookmark movement

==============================================================

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 (1 drafts)

  (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

  1 local changesets published

  $ 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 --update

  recreate:[4] added bar to foo

  atop:[3] added foo to foo

  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

  %  3:aa071e5554e3 added foo to foo

  |   () public

  o  1:4d1169d82e47 modify a

  |   () public

  o  0:d3873e73d99e init

      () public

  $ hg debugobsolete

  4d1169d82e47b11570c7f380790da5f89f7cabc2 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}

  98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 {d3873e73d99ef67873dac33fbcc66268d5d2b6f4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}

  aa071e5554e36080a36cfd24accd5a71e3320f1e d47f2b37ed8216234c503b3a2657989958754a59 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}

  d47f2b37ed8216234c503b3a2657989958754a59 3d62500c673dd1c88bb09a73e86d0210aed6fcb6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}

  $ hg obslog -r . --all

  @  3d62500c673d (5) phase-divergent update to aa071e5554e3:

  |

  %  d47f2b37ed82 (4) added bar to foo

  |    rewritten(description, parent, content) as 3d62500c673d using evolve by test (Thu Jan 01 00:00:00 1970 +0000)

  |

  %  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

phase divergence rebasing back to old changeset - with (unrelated?) conflict

============================================================================

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