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

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

     2

     3

Test raw style of hgweb

     4

     5

  $ hg init test

     6

  $ cd test

     7

  $ mkdir sub

     8

  $ cat >'sub/some text%.txt' <<ENDSOME

     9

  > This is just some random text

    10

  > that will go inside the file and take a few lines.

    11

  > It is very boring to read, but computers don't

    12

  > care about things like that.

    13

  > ENDSOME

    14

  $ hg add 'sub/some text%.txt'

    15

  $ hg commit -d "1 0" -m "Just some text"

    16

    17

  $ hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid

    18

    19

  $ cat hg.pid >> $DAEMON_PIDS

    20

  $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw' content-type content-length content-disposition) >getoutput.txt

    21

    22

  $ "$TESTDIR/killdaemons.py" hg.pid

    23

    24

  $ cat getoutput.txt

    25

  200 Script output follows

    26

  content-type: application/binary

    27

  content-length: 157

    28

  content-disposition: inline; filename="some text%.txt"

    29

    30

  This is just some random text

    31

  that will go inside the file and take a few lines.

    32

  It is very boring to read, but computers don't

    33

  care about things like that.

    34

  $ cat access.log error.log

    35

  127.0.0.1 - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob)

    36

    37

  $ rm access.log error.log

    38

  $ hg serve -p $HGPORT -A access.log -E error.log -d --pid-file=hg.pid \

    39

  > --config web.guessmime=True

    40

    41

  $ cat hg.pid >> $DAEMON_PIDS

    42

  $ ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw' content-type content-length content-disposition) >getoutput.txt

    43

  $ "$TESTDIR/killdaemons.py" hg.pid

    44

    45

  $ cat getoutput.txt

    46

  200 Script output follows

    47

  content-type: text/plain; charset="ascii"

    48

  content-length: 157

    49

  content-disposition: inline; filename="some text%.txt"

    50

    51

  This is just some random text

    52

  that will go inside the file and take a few lines.

    53

  It is very boring to read, but computers don't

    54

  care about things like that.

    55

  $ cat access.log error.log

    56

  127.0.0.1 - - [*] "GET /?f=bf0ff59095c9;file=sub/some%20text%25.txt;style=raw HTTP/1.1" 200 - (glob)

    57

    58

  $ cd ..