evolve: create a new commit instead of amending one of the divergents This patch changes the behavior of evolve command while resolving content-divergence to create a new commit instead of amending one of the divergent ones. In past, I have made this change, backed out this change and now today again I am doing this change, so let's dive in some history. Using cmdrewrite.amend() was never a good option as that requires hack to delete the evolvestate and also gives us less control over things. We can't make the commit on top of different parents as that of content-divergent ones. Due to all these, I first made this change to create a new commit instead of amending one. But, after few days, there was flakiness observed in the tests and turned out that we need to do some dirstate dance as repo.dirstate.setparents() does not always fix the dirstate. That flakiness was a blocker for progress at that time and we decided to switch to amend back so that we can have things working with some hacks and we can later fix the implementation part. Now, yesterday while tackling resolving content-divergence of a stack which is as follows: C1 C2 | | B1 B2 | | A1 A2 \/ base where, A1-A2, B1-B2, C1-C2 are content-divergent with each other. Now we can resolve A1-A2 very well because they have the same parent and let's say that resolution leads to A3. Now, we want to resolve B1-B2 and make the new resolution commit on top of A3 so that we can end up something like: C3 | B3 | A3 | base however, amending one of the divergent changesets, it's not possible to create a commit on a different parent like A3 here without some relocation. We should prevent relocation as that may leads to some conflicts and should change the parent before committing. So, looking ahead, we can't move with using amend as still using that we will need some relocation hacks making code ugly and prone to bad behaviors, bugs. Let's change back to creating a new commit so that we can move forward in a good way. About repo.dirstate.setparents() not setting the dirstate, I have researched yesterday night about how we can do that and found out that we can use cmdrewrite._uncommitdirstate() here. Expect upcoming patches to improve the documentation of that function. There are lot of test changes because of change in hash but there is no behavior change. The only behavior change is in test-evolve-abort-contentdiv.t which is nice because creating a new commit helps us in stripping that while aborting. We have a lot of testing of content-divergence and no behavior change gives enough confidence for making this change. I reviewed the patch carefully to make sure there is no behavior change and I suggest reviewer to do the same.

     1

This test file test the #5720 issue

     2

     3

Check that `hg evolve --continue` doesn't change changeset phase from secret

     4

to draft after a merge conflict.

     5

     6

https://bz.mercurial-scm.org/show_bug.cgi?id=5720

     7

     8

Global setup

     9

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

    10

    11

  $ . $TESTDIR/testlib/common.sh

    12

  $ cat >> $HGRCPATH <<EOF

    13

  > [ui]

    14

  > interactive = true

    15

  > [phases]

    16

  > publish=False

    17

  > [extensions]

    18

  > evolve =

    19

  > EOF

    20

    21

Test

    22

====

    23

    24

  $ hg init $TESTTMP/issue-5720

    25

  $ cd $TESTTMP/issue-5720

    26

    27

Create two drafts commits and one secret

    28

  $ echo a > a

    29

  $ hg commit -Am a

    30

  adding a

    31

  $ echo b > a

    32

  $ hg commit -m b

    33

  $ echo c > a

    34

  $ hg commit --secret -m c

    35

  $ hg log -G -T "{rev}: {phase}"

    36

  @  2: secret

    37

  |

    38

  o  1: draft

    39

  |

    40

  o  0: draft

    41

    42

Amend the second draft with new content

    43

  $ hg prev

    44

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

    45

  [1] b

    46

  $ echo b2 > a

    47

  $ hg amend

    48

  1 new orphan changesets

    49

  $ hg log -G -T "{rev}: {phase}"

    50

  @  3: draft

    51

  |

    52

  | *  2: secret

    53

  | |

    54

  | x  1: draft

    55

  |/

    56

  o  0: draft

    57

    58

Evolve which triggers a conflict

    59

  $ hg evolve

    60

  move:[2] c

    61

  atop:[3] b

    62

  merging a

    63

  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')

    64

  abort: fix conflicts and see `hg help evolve.interrupted`

    65

  [255]

    66

    67

Fix the conflict

    68

  $ echo c2 > a

    69

  $ hg resolve -m

    70

  (no more unresolved files)

    71

  continue: hg evolve --continue

    72

    73

Continue the evolution

    74

  $ hg evolve --continue

    75

  evolving 2:13833940840c "c"

    76

  working directory is now at 3d2080c198e5

    77

    78

Tip should stay in secret phase

    79

  $ hg log -G -T "{rev}: {phase}"

    80

  @  4: secret

    81

  |

    82

  o  3: draft

    83

  |

    84

  o  0: draft

    85

    86

  $ hg log -r . -T '{phase}\n'

    87

  secret