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

This feature requires mercurial 3.0

     3

(and the `only()` revset is 3.0 specific)

     4

     5

  $ (hg help revset | grep '"only(' > /dev/null) || exit 80

     6

     7

Test creation of obsolescence marker by path import

     8

     9

  $ hg init auto-obsolete

    10

  $ cd auto-obsolete

    11

  $ echo '[extensions]' >> $HGRCPATH

    12

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

    13

  $ echo A > a

    14

  $ hg commit -Am A

    15

  adding a

    16

  $ echo B > b

    17

  $ hg commit -Am B

    18

  adding b

    19

  $ hg up '.^'

    20

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

    21

  $ echo C > c

    22

  $ hg commit -Am C

    23

  adding c

    24

  created new head

    25

  $ hg log -G

    26

  @  changeset:   2:eb8dd0f31b51

    27

  |  tag:         tip

    28

  |  parent:      0:f2bbf19cf96d

    29

  |  user:        test

    30

  |  date:        Thu Jan 01 00:00:00 1970 +0000

    31

  |  summary:     C

    32

  |

    33

  | o  changeset:   1:95b760afef3c

    34

  |/   user:        test

    35

  |    date:        Thu Jan 01 00:00:00 1970 +0000

    36

  |    summary:     B

    37

  |

    38

  o  changeset:   0:f2bbf19cf96d

    39

     user:        test

    40

     date:        Thu Jan 01 00:00:00 1970 +0000

    41

     summary:     A

    42

    43

    44

(actual test)

    45

    46

  $ hg export 'desc(B)' | hg import - --obsolete

    47

  applying patch from stdin

    48

  $ hg log -G

    49

  @  changeset:   3:00c49133f17e

    50

  |  tag:         tip

    51

  |  user:        test

    52

  |  date:        Thu Jan 01 00:00:00 1970 +0000

    53

  |  summary:     B

    54

  |

    55

  o  changeset:   2:eb8dd0f31b51

    56

  |  parent:      0:f2bbf19cf96d

    57

  |  user:        test

    58

  |  date:        Thu Jan 01 00:00:00 1970 +0000

    59

  |  summary:     C

    60

  |

    61

  o  changeset:   0:f2bbf19cf96d

    62

     user:        test

    63

     date:        Thu Jan 01 00:00:00 1970 +0000

    64

     summary:     A

    65

    66

  $ hg debugobsolete

    67

  95b760afef3c234ffb3f9fd391edcb36e60921a4 00c49133f17e5e5a52b6ef1b6d516c0e90b56d8a 0 (*) {'user': 'test'} (glob)

    68

    69

  $ hg rollback

    70

  repository tip rolled back to revision 2 (undo import)

    71

  working directory now based on revision 2

    72

  $ hg log -G

    73

  @  changeset:   2:eb8dd0f31b51

    74

  |  tag:         tip

    75

  |  parent:      0:f2bbf19cf96d

    76

  |  user:        test

    77

  |  date:        Thu Jan 01 00:00:00 1970 +0000

    78

  |  summary:     C

    79

  |

    80

  | o  changeset:   1:95b760afef3c

    81

  |/   user:        test

    82

  |    date:        Thu Jan 01 00:00:00 1970 +0000

    83

  |    summary:     B

    84

  |

    85

  o  changeset:   0:f2bbf19cf96d

    86

     user:        test

    87

     date:        Thu Jan 01 00:00:00 1970 +0000

    88

     summary:     A

    89

    90

  $ hg debugobsolete

    91