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

Testing `hg stack` on complex cases when we have multiple successors because of

     2

divergence, split etc.

     3

  $ . "$TESTDIR/testlib/topic_setup.sh"

     4

     5

Setup

     6

     7

  $ cat << EOF >> $HGRCPATH

     8

  > [experimental]

     9

  > evolution = all

    10

  > [ui]

    11

  > interactive = True

    12

  > [extensions]

    13

  > show =

    14

  > EOF

    15

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

    16

    17

  $ hg init test

    18

  $ cd test

    19

  $ echo foo > foo

    20

  $ hg add foo

    21

  $ hg ci -m "Added foo"

    22

  $ hg phase -r . --public

    23

  $ hg topic foo

    24

  marked working directory as topic: foo

    25

  $ echo a > a

    26

  $ echo b > b

    27

  $ hg ci -Aqm "Added a and b"

    28

  $ echo c > c

    29

  $ echo d > d

    30

  $ hg ci -Aqm "Added c and d"

    31

  $ echo e > e

    32

  $ echo f > f

    33

  $ hg ci -Aqm "Added e and f"

    34

  $ hg show work

    35

  @  f1d3 (foo) Added e and f

    36

  o  8e82 (foo) Added c and d

    37

  o  002b (foo) Added a and b

    38

  o  f360 Added foo

    39

    40

Testing in case of split within the topic

    41

    42

  $ hg stack

    43

  ### topic: foo

    44

  ### target: default (branch)

    45

  t3@ Added e and f (current)

    46

  t2: Added c and d

    47

  t1: Added a and b

    48

  t0^ Added foo (base)

    49

  $ hg prev

    50

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

    51

  [2] Added c and d

    52

    53

  $ echo 0 > num

    54

  $ cat > editor.sh << '__EOF__'

    55

  > NUM=$(cat num)

    56

  > NUM=`expr "$NUM" + 1`

    57

  > echo "$NUM" > num

    58

  > echo "split$NUM" > "$1"

    59

  > __EOF__

    60

  $ export HGEDITOR="\"sh\" \"editor.sh\""

    61

    62

  $ hg split << EOF

    63

  > y

    64

  > y

    65

  > n

    66

  > y

    67

  > EOF

    68

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

    69

  adding c

    70

  adding d

    71

  diff --git a/c b/c

    72

  new file mode 100644

    73

  examine changes to 'c'? [Ynesfdaq?] y

    74

    75

  @@ -0,0 +1,1 @@

    76

  +c

    77

  record change 1/2 to 'c'? [Ynesfdaq?] y

    78

    79

  diff --git a/d b/d

    80

  new file mode 100644

    81

  examine changes to 'd'? [Ynesfdaq?] n

    82

    83

  Done splitting? [yN] y

    84

  1 new orphan changesets

    85

    86

  $ hg stack

    87

  ### topic: foo

    88

  ### target: default (branch)

    89

  t4$ Added e and f (unstable)

    90

  t3@ split2 (current)

    91

  t2: split1

    92

  t1: Added a and b

    93

  t0^ Added foo (base)

    94

    95

  $ hg show work

    96

  @  5cce (foo) split2

    97

  o  f26c (foo) split1

    98

  | *  f1d3 (foo) Added e and f

    99

  | x  8e82 (foo) Added c and d

   100

  |/

   101

  o  002b (foo) Added a and b

   102

  o  f360 Added foo

   103

   104

  $ hg prev

   105

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

   106

  [4] split1

   107

  $ echo foo > c

   108

  $ hg diff

   109

  diff -r f26c1b9addde c

   110

  --- a/c	Thu Jan 01 00:00:00 1970 +0000

   111

  +++ b/c	Thu Jan 01 00:00:00 1970 +0000

   112

  @@ -1,1 +1,1 @@

   113

  -c

   114

  +foo

   115

   116

  $ hg amend

   117

  1 new orphan changesets

   118

  $ hg show work

   119

  @  7d94 (foo) split1

   120

  | *  5cce (foo) split2

   121

  | x  f26c (foo) split1

   122

  |/

   123

  | *  f1d3 (foo) Added e and f

   124

  | x  8e82 (foo) Added c and d

   125

  |/

   126

  o  002b (foo) Added a and b

   127

  o  f360 Added foo

   128

   129

  $ hg stack

   130

  ### topic: foo (2 heads)

   131

  ### target: default (branch), 2 behind

   132

  t4$ Added e and f (unstable)

   133

  t3$ split2 (unstable)

   134

  t2@ split1 (current)

   135

  t1: Added a and b

   136

  t0^ Added foo (base)