annotate: increase refcount of each revisions correctly (issue3841) Before this patch, refcount (managed in "needed") of parents of each revisions in "visit" is increased, only when parent is not annotated yet (examined by "p not in hist"). But this causes less refcount of the revision like "A" in the tree below ("A" is assumed as the second parent of "C"): A --- B --- C \ / \-----/ Steps of annotation for "C" in this case are shown below: 1. for "C" 1.1 increase refcount of "B" 1.2 increase refcount of "A" (=> 1) 1.3 defer annotation for "C" 2. for "A" 2.1 annotate for "A" (=> put result into "hist[A]") 2.2 clear "pcache[A]" ("pcache[A] = []") 3. for "B" 3.1 not increase refcount of "A", because "A not in hist" is False 3.2 annotate for "B" 3.3 decrease refcount of "A" (=> 0) 3.4 delete "hist[A]", even though "A" is still needed by "C" 3.5 clear "pcache[B]" 4. for "C", again 4.1 not increase refcount of "B", because "B not in hist" is False 4.2 increase refcount of "A" (=> 1) 4.3 defer annotation for "C" 5. for "A", again 5.1 annotate for "A" (=> put result into "hist[A]", again) 5.2 clear "pcache[A]" 6. for "C", once again 6.1 not increase refcount of "B", because "B not in hist" is False 6.2 not increase refcount of "A", because "A not in hist" is False 6.3 annotate for "C" 6.4 decrease refcount of "A", and delete "hist[A]" 6.5 decrease refcount of "B", and delete "hist[B]" 6.6 clear "pcache[C]" At step (5.1), annotation for "A" mis-recognizes that all lines are created at "A", because "pcache[A]" already cleared at step (2.2) prevents from scanning ancestors of "A". So, annotation for "C" or its descendants loses information about "A" or its ancestors. The root cause of this problem is that refcount of "A" is decreased at step (3.3), even though it isn't increased at step (3.1). To increase refcount correctly, this patch increases refcount of each parents of each revisions: - regardless of "p not in hist" or not, and - only once for each revisions in "visit" (by "not pcached") In fact, this problem should occur only on legacy repositories in which a filelog includes the merging between the revision and its ancestor (as the second parent), because: - tree is scanned in depth-first without such merging, revisions in "visit" refer different revisions as parent each other - recent Mercurial doesn't allow such merging changelog and manifest can include such merging someway, but filelogs can't, because "localrepository._filecommit()" converts such merging request to linear history. This patch tests merging cases below: these cases are from filelog of "mercurial/commands.py" in the repository of Mercurial itself. - both parents are same 10 --- 11 --- 12 \_/ filelogrev: changesetid: 10 00ea3613f82c 11 fc4a6e5b5812 12 4f802588cdfb - the second parent is also ancestor of the first one 37 --- 38 --- 39 --- 40 \________/ filelogrev: changesetid: 37 f8d56da6ac8f 38 38919e1c254d 39 d3400605d246 40 f06a4a3b86a7

     1

  $ cat >> $HGRCPATH <<EOF

     2

  > [extensions]

     3

  > graphlog=

     4

  > rebase=

     5

  > 

     6

  > [phases]

     7

  > publish=False

     8

  > 

     9

  > [alias]

    10

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

    11

  > EOF

    12

    13

    14

  $ hg init a

    15

  $ cd a

    16

    17

  $ echo A > A

    18

  $ hg add A

    19

  $ hg ci -m A

    20

    21

  $ echo 'B' > B

    22

  $ hg add B

    23

  $ hg ci -m B

    24

    25

  $ echo C >> A

    26

  $ hg ci -m C

    27

    28

  $ hg up -q -C 0

    29

    30

  $ echo D >> A

    31

  $ hg ci -m D

    32

  created new head

    33

    34

  $ echo E > E

    35

  $ hg add E

    36

  $ hg ci -m E

    37

    38

  $ hg up -q -C 0

    39

    40

  $ hg branch 'notdefault'

    41

  marked working directory as branch notdefault

    42

  (branches are permanent and global, did you want a bookmark?)

    43

  $ echo F >> A

    44

  $ hg ci -m F

    45

    46

  $ cd ..

    47

    48

    49

Rebasing B onto E - check keep: and phases

    50

    51

  $ hg clone -q -u . a a1

    52

  $ cd a1

    53

  $ hg phase --force --secret 2

    54

    55

  $ hg tglog

    56

  @  5:draft 'F' notdefault

    57

  |

    58

  | o  4:draft 'E'

    59

  | |

    60

  | o  3:draft 'D'

    61

  |/

    62

  | o  2:secret 'C'

    63

  | |

    64

  | o  1:draft 'B'

    65

  |/

    66

  o  0:draft 'A'

    67

    68

  $ hg rebase -s 1 -d 4 --keep

    69

  merging A

    70

  warning: conflicts during merge.

    71

  merging A incomplete! (edit conflicts, then use 'hg resolve --mark')

    72

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

    73

  [1]

    74

    75

Solve the conflict and go on:

    76

    77

  $ echo 'conflict solved' > A

    78

  $ rm A.orig

    79

  $ hg resolve -m A

    80

  $ hg rebase --continue

    81

    82

  $ hg tglog

    83

  @  7:secret 'C'

    84

  |

    85

  o  6:draft 'B'

    86

  |

    87

  | o  5:draft 'F' notdefault

    88

  | |

    89

  o |  4:draft 'E'

    90

  | |

    91

  o |  3:draft 'D'

    92

  |/

    93

  | o  2:secret 'C'

    94

  | |

    95

  | o  1:draft 'B'

    96

  |/

    97

  o  0:draft 'A'

    98

    99

  $ cd ..

   100

   101

   102

Rebase F onto E - check keepbranches:

   103

   104

  $ hg clone -q -u . a a2

   105

  $ cd a2

   106

  $ hg phase --force --secret 2

   107

   108

  $ hg tglog

   109

  @  5:draft 'F' notdefault

   110

  |

   111

  | o  4:draft 'E'

   112

  | |

   113

  | o  3:draft 'D'

   114

  |/

   115

  | o  2:secret 'C'

   116

  | |

   117

  | o  1:draft 'B'

   118

  |/

   119

  o  0:draft 'A'

   120

   121

  $ hg rebase -s 5 -d 4 --keepbranches

   122

  merging A

   123

  warning: conflicts during merge.

   124

  merging A incomplete! (edit conflicts, then use 'hg resolve --mark')

   125

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

   126

  [1]

   127

   128

Solve the conflict and go on:

   129

   130

  $ echo 'conflict solved' > A

   131

  $ rm A.orig

   132

  $ hg resolve -m A

   133

  $ hg rebase --continue

   134

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

   135

   136

  $ hg tglog

   137

  @  5:draft 'F' notdefault

   138

  |

   139

  o  4:draft 'E'

   140

  |

   141

  o  3:draft 'D'

   142

  |

   143

  | o  2:secret 'C'

   144

  | |

   145

  | o  1:draft 'B'

   146

  |/

   147

  o  0:draft 'A'

   148

   149

   150

  $ cd ..