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

Check that evolve shows error while handling split commits

     2

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

     3

  $ cat >> $HGRCPATH <<EOF

     4

  > [defaults]

     5

  > amend=-d "0 0"

     6

  > fold=-d "0 0"

     7

  > [web]

     8

  > push_ssl = false

     9

  > allow_push = *

    10

  > [phases]

    11

  > publish = False

    12

  > [diff]

    13

  > git = 1

    14

  > unified = 0

    15

  > [ui]

    16

  > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n

    17

  > [extensions]

    18

  > EOF

    19

  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH

    20

  $ mkcommit() {

    21

  >    echo "$1" > "$1"

    22

  >    hg add "$1"

    23

  >    hg ci -m "add $1"

    24

  > }

    25

    26

  $ hg init split

    27

  $ cd split

    28

  $ mkcommit aa

    29

    30

Create a split commit

    31

  $ printf "oo" > oo;

    32

  $ printf "pp" > pp;

    33

  $ hg add oo pp

    34

  $ hg commit -m "oo+pp"

    35

  $ mkcommit uu

    36

  $ hg up 0

    37

  0 files updated, 0 files merged, 3 files removed, 0 files unresolved

    38

  $ printf "oo" > oo;

    39

  $ hg add oo

    40

  $ hg commit -m "_oo"

    41

  created new head

    42

  $ printf "pp" > pp;

    43

  $ hg add pp

    44

  $ hg commit -m "_pp"

    45

  $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split

    46

  1 changesets pruned

    47

  1 new orphan changesets

    48

  $ hg log -G

    49

  @  4:d0dcf24cddd3@default(draft) _pp

    50

  |

    51

  o  3:a7fdfda64c08@default(draft) _oo

    52

  |

    53

  | *  2:f52200b086ca@default(draft) add uu

    54

  | |

    55

  | x  1:d55647aaa0c6@default(draft) oo+pp

    56

  |/

    57

  o  0:58663bb03074@default(draft) add aa

    58

    59

  $ hg evolve --rev "0::"

    60

  move:[2] add uu

    61

  atop:[4] _pp

    62

  working directory is now at 6f5bbe2e3df3