annotate: pre-calculate the "needed" dictionary (issue5360) The "needed" dict is used as a reference counter to free items in the giant "hist" dict. However, currently it is not very accurate and can lead to dropping "hist" items unnecessarily, for example, with the following DAG, -3- / \ 0--1--2--4-- The current algorithm will visit and calculate rev 1 twice, undesired. And it tries to be smart by clearing rev 1's parents: "pcache[1] = []" at the time hist[1] being accessed (note: hist[1] needs to be used twice, by rev 2 and rev 3). It can result in incorrect results if p1 of rev 4 deletes chunks belonging to rev 0. However, simply removing "needed" is not okay, because it will consume 10x memory: # without any change % HGRCPATH= lrun ./hg annotate mercurial/commands.py -r d130a38 3>&2 [1] MEMORY 49074176 CPUTIME 9.213 REALTIME 9.270 # with "needed" removed MEMORY 637673472 CPUTIME 8.164 REALTIME 8.249 This patch moves "needed" (and "pcache") calculation to a separate DFS to address the issue. It improves perf and fixes issue5360 by correctly reusing hist, while maintaining low memory usage. Some additional attempt has been made to further reduce memory usage, like changing "pcache[f] = []" to "del pcache[f]". Therefore the result can be both faster and lower memory usage: # with this patch applied MEMORY 47575040 CPUTIME 7.870 REALTIME 7.926 [1]: lrun is a lightweight sandbox built on Linux cgroup and namespace. It's used to measure CPU and memory usage here. Source code is available at github.com/quark-zju/lrun.

     1

from __future__ import absolute_import, print_function

     2

import os

     3

from mercurial import (

     4

    dispatch,

     5

)

     6

     7

def testdispatch(cmd):

     8

    """Simple wrapper around dispatch.dispatch()

     9

    10

    Prints command and result value, but does not handle quoting.

    11

    """

    12

    print("running: %s" % (cmd,))

    13

    req = dispatch.request(cmd.split())

    14

    result = dispatch.dispatch(req)

    15

    print("result: %r" % (result,))

    16

    17

# create file 'foo', add and commit

    18

f = open('foo', 'wb')

    19

f.write('foo\n')

    20

f.close()

    21

testdispatch("add foo")

    22

testdispatch("commit -m commit1 -d 2000-01-01 foo")

    23

    24

# append to file 'foo' and commit

    25

f = open('foo', 'ab')

    26

f.write('bar\n')

    27

f.close()

    28

# remove blackbox.log directory (proxy for readonly log file)

    29

os.rmdir(".hg/blackbox.log")

    30

# replace it with the real blackbox.log file

    31

os.rename(".hg/blackbox.log-", ".hg/blackbox.log")

    32

testdispatch("commit -m commit2 -d 2000-01-02 foo")

    33

    34

# check 88803a69b24 (fancyopts modified command table)

    35

testdispatch("log -r 0")

    36

testdispatch("log -r tip")