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

     2

  $ "$TESTDIR/hghave" git || exit 80

     3

  $ echo "[core]" >> $HOME/.gitconfig

     4

  $ echo "autocrlf = false" >> $HOME/.gitconfig

     5

  $ echo "[core]" >> $HOME/.gitconfig

     6

  $ echo "autocrlf = false" >> $HOME/.gitconfig

     7

  $ echo "[extensions]" >> $HGRCPATH

     8

  $ echo "convert=" >> $HGRCPATH

     9

  $ echo 'hgext.graphlog =' >> $HGRCPATH

    10

  $ echo '[convert]' >> $HGRCPATH

    11

  $ echo 'hg.usebranchnames = True' >> $HGRCPATH

    12

  $ echo 'hg.tagsbranch = tags-update' >> $HGRCPATH

    13

  $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME

    14

  $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL

    15

  $ GIT_AUTHOR_DATE="2007-01-01 00:00:00 +0000"; export GIT_AUTHOR_DATE

    16

  $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME

    17

  $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL

    18

  $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE

    19

  $ count=10

    20

  $ action()

    21

  > {

    22

  >     GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000"

    23

  >     GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"

    24

  >     git "$@" >/dev/null 2>/dev/null || echo "git command error"

    25

  >     count=`expr $count + 1`

    26

  > }

    27

  $ glog()

    28

  > {

    29

  >     hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"

    30

  > }

    31

  $ convertrepo()

    32

  > {

    33

  >     hg convert --datesort git-repo hg-repo

    34

  > }

    35

    36

Build a GIT repo with at least 1 tag

    37

    38

  $ mkdir git-repo

    39

  $ cd git-repo

    40

  $ git init >/dev/null 2>&1

    41

  $ echo a > a

    42

  $ git add a

    43

  $ action commit -m "rev1"

    44

  $ action tag -m "tag1" tag1

    45

  $ cd ..

    46

    47

Do a first conversion

    48

    49

  $ convertrepo

    50

  initializing destination hg-repo repository

    51

  scanning source...

    52

  sorting...

    53

  converting...

    54

  0 rev1

    55

  updating tags

    56

  updating bookmarks

    57

    58

Simulate upstream  updates after first conversion

    59

    60

  $ cd git-repo

    61

  $ echo b > a

    62

  $ git add a

    63

  $ action commit -m "rev2"

    64

  $ action tag -m "tag2" tag2

    65

  $ cd ..

    66

    67

Perform an incremental conversion

    68

    69

  $ convertrepo

    70

  scanning source...

    71

  sorting...

    72

  converting...

    73

  0 rev2

    74

  updating tags

    75

  updating bookmarks

    76

    77

Print the log

    78

    79

  $ cd hg-repo

    80

  $ glog

    81

  o  3 "update tags" files: .hgtags

    82

  |

    83

  | o  2 "rev2" files: a

    84

  | |

    85

  o |  1 "update tags" files: .hgtags

    86

   /

    87

  o  0 "rev1" files: a

    88

    89

    90

  $ cd ..