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

  $ hg init repo

     2

  $ cd repo

     3

  $ echo foo > foo

     4

  $ hg ci -qAm 'add foo'

     5

  $ echo >> foo

     6

  $ hg ci -m 'change foo'

     7

  $ hg up -qC 0

     8

  $ echo bar > bar

     9

  $ hg ci -qAm 'add bar'

    10

    11

  $ hg log

    12

  changeset:   2:effea6de0384

    13

  tag:         tip

    14

  parent:      0:bbd179dfa0a7

    15

  user:        test

    16

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

    17

  summary:     add bar

    18

    19

  changeset:   1:ed1b79f46b9a

    20

  user:        test

    21

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

    22

  summary:     change foo

    23

    24

  changeset:   0:bbd179dfa0a7

    25

  user:        test

    26

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

    27

  summary:     add foo

    28

    29

  $ cd ..

    30

    31

don't show "(+1 heads)" message when pulling closed head

    32

    33

  $ hg clone -q repo repo2

    34

  $ hg clone -q repo2 repo3

    35

  $ cd repo2

    36

  $ hg up -q 0

    37

  $ echo hello >> foo

    38

  $ hg ci -mx1

    39

  created new head

    40

  $ hg ci -mx2 --close-branch

    41

  $ cd ../repo3

    42

  $ hg heads -q --closed

    43

  2:effea6de0384

    44

  1:ed1b79f46b9a

    45

  $ hg pull

    46

  pulling from $TESTTMP/repo2 (glob)

    47

  searching for changes

    48

  adding changesets

    49

  adding manifests

    50

  adding file changes

    51

  added 2 changesets with 1 changes to 1 files

    52

  (run 'hg update' to get a working copy)

    53

  $ hg heads -q --closed

    54

  4:00cfe9073916

    55

  2:effea6de0384

    56

  1:ed1b79f46b9a

    57

    58

  $ cd ..

    59

    60

  $ hg init copy

    61

  $ cd copy

    62

    63

Pull a missing revision:

    64

    65

  $ hg pull -qr missing ../repo

    66

  abort: unknown revision 'missing'!

    67

  [255]

    68

    69

Pull multiple revisions with update:

    70

    71

  $ hg pull -qu -r 0 -r 1 ../repo

    72

  $ hg -q parents

    73

  0:bbd179dfa0a7

    74

  $ hg rollback

    75

  repository tip rolled back to revision -1 (undo pull)

    76

  working directory now based on revision -1

    77

    78

  $ hg pull -qr 0 ../repo

    79

  $ hg log

    80

  changeset:   0:bbd179dfa0a7

    81

  tag:         tip

    82

  user:        test

    83

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

    84

  summary:     add foo

    85

    86

  $ hg pull -qr 1 ../repo

    87

  $ hg log

    88

  changeset:   1:ed1b79f46b9a

    89

  tag:         tip

    90

  user:        test

    91

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

    92

  summary:     change foo

    93

    94

  changeset:   0:bbd179dfa0a7

    95

  user:        test

    96

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

    97

  summary:     add foo

    98

    99

   100

This used to abort: received changelog group is empty:

   101

   102

  $ hg pull -qr 1 ../repo

   103

   104

  $ cd ..