rebase: skip resolved but emptied revisions When rebasing, if a conflict occurs and is resolved in a way the rebased revision becomes empty, it is not skipped, unlike revisions being emptied without conflicts. The reason is: - File 'x' is merged and resolved, merge.update() marks it as 'm' in the dirstate. - rebase.concludenode() calls localrepo.commit(), which calls localrepo.status() which calls dirstate.status(). 'x' shows up as 'm' and is unconditionnally added to the modified files list, instead of being checked again. - localrepo.commit() detects 'x' as changed an create a new revision where only the manifest parents and linkrev differ. Marking 'x' as modified without checking it makes sense for regular merges. But in rebase case, the merge looks normal but the second parent is usually discarded. When this happens, 'm' files in dirstate are a bit irrelevant and should be considered 'n' possibly dirty instead. That is what the current patch does. Another approach, maybe more efficient, would be to pass another flag to merge.update() saying the 'branchmerge' is a bit of a lie and recordupdate() should call dirstate.normallookup() instead of merge(). It is also tempting to add this logic to dirstate.setparents(), moving from two to one parent is what invalidates the 'm' markers. But this is a far bigger change to make. v2: succumb to the temptation and move the logic in dirstate.setparents(). mpm suggested trying _filecommit() first but it is called by commitctx() which knows nothing about the dirstate and comes too late into the game. A second approach was to rewrite the 'm' state into 'n' on the fly in dirstate.status() which failed for graft in the following case: $ hg init repo $ cd repo $ echo a > a $ hg ci -qAm0 $ echo a >> a $ hg ci -m1 $ hg up 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg mv a b $ echo c > b $ hg ci -m2 created new head $ hg graft 1 --tool internal:local grafting revision 1 $ hg --config extensions.graphlog= glog --template '{rev} {desc|firstline}\n' @ 3 1 | o 2 2 | | o 1 1 |/ o 0 0 $ hg log -r 3 --debug --patch --git --copies changeset: 3:19cd7d1417952af13161b94c32e901769104560c tag: tip phase: draft parent: 2:b5c505595c9e9a12d5dd457919c143e05fc16fb8 parent: -1:0000000000000000000000000000000000000000 manifest: 3:3d27ce8d02241aa59b60804805edf103c5c0cda4 user: test date: Thu Jan 01 00:00:00 1970 +0000 extra: branch=default extra: source=a03df74c41413a75c0a42997fc36c2de97b26658 description: 1 Here, revision 3 is created because there is a copy record for 'b' in the dirstate and thus 'b' is considered modified. But this information is discarded at commit time since 'b' content is unchanged. I do not know if discarding this information is correct or not, but at this time we cannot represent it anyway. This patch therefore implements the last solution of moving the logic into dirstate.setparents(). It does not sound crazy as 'm' files makes no sense with only one parent. It also makes dirstate.merge() calls .lookupnormal() if there is one parent, to preserve the invariant. I am a bit concerned about introducing this kind of stateful behaviour to existing code which historically treated setparents() as a basic setter without side-effects. And doing that during the code freeze.

     1

This emulates the effects of an hg pull --rebase in which the remote repo

     2

already has one local mq patch

     3

     4

  $ cat >> $HGRCPATH <<EOF

     5

  > [extensions]

     6

  > graphlog=

     7

  > rebase=

     8

  > mq=

     9

  > 

    10

  > [phases]

    11

  > publish=False

    12

  > 

    13

  > [alias]

    14

  > tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n"

    15

  > EOF

    16

    17

    18

  $ hg init a

    19

  $ cd a

    20

  $ hg qinit -c

    21

    22

  $ echo c1 > c1

    23

  $ hg add c1

    24

  $ hg ci -m C1

    25

    26

  $ echo r1 > r1

    27

  $ hg add r1

    28

  $ hg ci -m R1

    29

    30

  $ hg up -q 0

    31

    32

  $ hg qnew p0.patch

    33

  $ echo p0 > p0

    34

  $ hg add p0

    35

  $ hg qref -m P0

    36

    37

  $ hg qnew p1.patch

    38

  $ echo p1 > p1

    39

  $ hg add p1

    40

  $ hg qref -m P1

    41

    42

  $ hg export qtip > p1.patch 

    43

    44

  $ hg up -q -C 1

    45

    46

  $ hg import p1.patch

    47

  applying p1.patch

    48

    49

  $ rm p1.patch

    50

    51

  $ hg up -q -C qtip

    52

    53

  $ hg rebase

    54

  saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)

    55

    56

  $ hg tglog

    57

  @  3: 'P0' tags: p0.patch qbase qtip tip

    58

  |

    59

  o  2: 'P1' tags: qparent

    60

  |

    61

  o  1: 'R1' tags:

    62

  |

    63

  o  0: 'C1' tags:

    64

    65

  $ cd ..

    66

    67

    68

  $ hg init b

    69

  $ cd b

    70

  $ hg qinit -c

    71

    72

  $ for i in r0 r1 r2 r3 r4 r5 r6;

    73

  > do

    74

  >     echo $i > $i

    75

  >     hg ci -Am $i

    76

  > done

    77

  adding r0

    78

  adding r1

    79

  adding r2

    80

  adding r3

    81

  adding r4

    82

  adding r5

    83

  adding r6

    84

    85

  $ hg qimport -r 1:tip

    86

    87

  $ hg up -q 0

    88

    89

  $ for i in r1 r3 r7 r8;

    90

  > do

    91

  >     echo $i > $i

    92

  >     hg ci -Am branch2-$i

    93

  > done

    94

  adding r1

    95

  created new head

    96

  adding r3

    97

  adding r7

    98

  adding r8

    99

   100

  $ echo somethingelse > r4

   101

  $ hg ci -Am branch2-r4

   102

  adding r4

   103

   104

  $ echo r6 > r6

   105

  $ hg ci -Am branch2-r6

   106

  adding r6

   107

   108

  $ hg up -q qtip

   109

   110

  $ HGMERGE=internal:fail hg rebase

   111

  abort: unresolved conflicts (see hg resolve, then hg rebase --continue)

   112

  [255]

   113

   114

  $ HGMERGE=internal:local hg resolve --all

   115

   116

  $ hg rebase --continue

   117

  saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)

   118

   119

  $ hg tglog

   120

  @  8: 'r5' tags: 5.diff qtip tip

   121

  |

   122

  o  7: 'r2' tags: 2.diff qbase

   123

  |

   124

  o  6: 'branch2-r6' tags: qparent

   125

  |

   126

  o  5: 'branch2-r4' tags:

   127

  |

   128

  o  4: 'branch2-r8' tags:

   129

  |

   130

  o  3: 'branch2-r7' tags:

   131

  |

   132

  o  2: 'branch2-r3' tags:

   133

  |

   134

  o  1: 'branch2-r1' tags:

   135

  |

   136

  o  0: 'r0' tags:

   137