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

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

     2

Testing head checking code: Case A-6

     3

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

     4

     5

Mercurial checks for the introduction of new heads on push. Evolution comes

     6

into play to detect if existing branches on the server are being replaced by

     7

some of the new one we push.

     8

     9

This case is part of a series of tests checking this behavior.

    10

    11

Category A: simple case involving a branch being superceeded by another.

    12

TestCase 6: multi-changeset branch, split on multiple other, (base on its own branch), same number of head

    13

    14

.. old-state:

    15

..

    16

.. * 2 branch (1-changeset, and 2-changesets)

    17

..

    18

.. new-state:

    19

..

    20

.. * 1 new branch superceeding the base of the old-2-changesets-branch,

    21

.. * 1 new changesets on the old-1-changeset-branch superceeding the head of the other

    22

..

    23

.. expected-result:

    24

..

    25

.. * push allowed

    26

..

    27

.. graph-summary:

    28

..

    29

.. B'◔⇢ø B

    30

..   | |

    31

.. A | ø⇠◔ A'

    32

..   | |/

    33

.. C ● |

    34

..    \|

    35

..     ●

    36

    37

  $ . $TESTDIR/testlib/push-checkheads-util.sh

    38

    39

Test setup

    40

----------

    41

    42

  $ mkdir A6

    43

  $ cd A6

    44

  $ setuprepos

    45

  creating basic server and client repo

    46

  updating to branch default

    47

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

    48

  $ cd server

    49

  $ mkcommit B0

    50

  $ hg up 0

    51

  0 files updated, 0 files merged, 2 files removed, 0 files unresolved

    52

  $ mkcommit C0

    53

  created new head

    54

  $ cd ../client

    55

  $ hg pull

    56

  pulling from $TESTTMP/A6/server (glob)

    57

  searching for changes

    58

  adding changesets

    59

  adding manifests

    60

  adding file changes

    61

  added 2 changesets with 2 changes to 2 files (+1 heads)

    62

  new changesets d73caddc5533:0f88766e02d6

    63

  (run 'hg heads' to see heads, 'hg merge' to merge)

    64

  $ hg up 0

    65

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

    66

  $ mkcommit A1

    67

  created new head

    68

  $ hg up 'desc(C0)'

    69

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

    70

  $ mkcommit B1

    71

  $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`

    72

  obsoleted 1 changesets

    73

  1 new orphan changesets

    74

  $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`

    75

  obsoleted 1 changesets

    76

  $ hg log -G --hidden

    77

  @  d70a1f75a020 (draft): B1

    78

  |

    79

  | o  f6082bc4ffef (draft): A1

    80

  | |

    81

  o |  0f88766e02d6 (draft): C0

    82

  |/

    83

  | x  d73caddc5533 (draft): B0

    84

  | |

    85

  | x  8aaa48160adc (draft): A0

    86

  |/

    87

  o  1e4be0697311 (public): root

    88

    89

    90

Actual testing

    91

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

    92

    93

  $ hg push

    94

  pushing to $TESTTMP/A6/server (glob)

    95

  searching for changes

    96

  adding changesets

    97

  adding manifests

    98

  adding file changes

    99

  added 2 changesets with 2 changes to 2 files (+1 heads)

   100

  2 new obsolescence markers

   101

  obsoleted 2 changesets

   102

   103

  $ cd ../..