view tests/test-annotate.py @ 50671:e06d1a779eb6

store: stop relying on a `revlog_type` property

We want to know if a file is related to a revlog, but the rest is dealt with
differently already, so we simplify things further.

as a bonus, this cleanup This provides a small but noticeable  speedup.

The number below use `hg perf::stream-locked-section` to measure the time spend
in the locked section of the streaming clone. Number are run on various
repository and compare different steps.:

1) the effect of this patchs,
2) the effect of the cleanup series,
2) current state compared to because large refactoring.

All benchmarks are run on linux with Python 3.10.7.


### Effect of this patch
# mercurial-2018-08-01-zstd-sparse-revlog
  # benchmark.name         = perf-stream-locked-section
before:   0.030246 seconds
after:    0.029274 seconds   (-3.21%)
# pypy-2018-08-01-zstd-sparse-revlog
before:   0.545012 seconds
after:    0.520872 seconds   (-4.43%)
# netbeans-2018-08-01-zstd-sparse-revlog
before:   2.719939 seconds
after:    2.626791 seconds   (-3.42%)
# mozilla-central-2018-08-01-zstd-sparse-revlog
before:   6.304179 seconds
after:    6.096700 seconds   (-3.29%)
# mozilla-try-2019-02-18-zstd-sparse-revlog
before:  14.142687 seconds
after:   13.640779 seconds   (-3.55%)

### Effect of this series

A small but sizeable speedup

# mercurial-2018-08-01-zstd-sparse-revlog
before:  0.031122 seconds
after:   0.029274 seconds   (-5.94%)
# pypy-2018-08-01-zstd-sparse-revlog
before:  0.589970 seconds
after:   0.520872 seconds  (-11.71%)
# netbeans-2018-08-01-zstd-sparse-revlog
before:  2.980300 seconds
after:   2.626791 seconds  (-11.86%)
# mozilla-central-2018-08-01-zstd-sparse-revlog
before:  6.863204 seconds
after:   6.096700 seconds  (-11.17%)
# mozilla-try-2019-02-18-zstd-sparse-revlog
before: 14.921393 seconds
after:  13.640779 seconds   (-8.58%)


### Current state compared to the pre-refactoring state

The refactoring introduced multiple string manipulation and dictionary creation
that seems to induce a signifiant slowdown
Slowdown

# mercurial-2018-08-01-zstd-sparse-revlog
6.4.3:  0.019459 seconds
after:  0.029274 seconds  (+50.44%)
## pypy-2018-08-01-zstd-sparse-revlog
6.4.3:  0.290715 seconds
after:  0.520872 seconds  (+79.17%)
# netbeans-2018-08-01-zstd-sparse-revlog
6.4.3:  1.403447 seconds
after:  2.626791 seconds  (+87.17%)
# mozilla-central-2018-08-01-zstd-sparse-revlog
6.4.3:  3.163549 seconds
after:  6.096700 seconds  (+92.72%)
# mozilla-try-2019-02-18-zstd-sparse-revlog
6.4.3:  6.702184 seconds
after: 13.640779 seconds (+103.53%)

import unittest

from mercurial import (
    mdiff,
    pycompat,
)
from mercurial.dagop import (
    annotateline,
    _annotatedfile,
    _annotatepair,
)


def tr(a):
    return [
        annotateline(fctx, lineno, skip)
        for fctx, lineno, skip in zip(a.fctxs, a.linenos, a.skips)
    ]


class AnnotateTests(unittest.TestCase):
    """Unit tests for annotate code."""

    def testannotatepair(self):
        self.maxDiff = None  # camelcase-required

        oldfctx = b'old'
        p1fctx, p2fctx, childfctx = b'p1', b'p2', b'c'
        olddata = b'a\nb\n'
        p1data = b'a\nb\nc\n'
        p2data = b'a\nc\nd\n'
        childdata = b'a\nb2\nc\nc2\nd\n'
        diffopts = mdiff.diffopts()

        def decorate(text, fctx):
            n = text.count(b'\n')
            linenos = pycompat.rangelist(1, n + 1)
            return _annotatedfile([fctx] * n, linenos, [False] * n, text)

        # Basic usage

        oldann = decorate(olddata, oldfctx)
        p1ann = decorate(p1data, p1fctx)
        p1ann = _annotatepair([oldann], p1fctx, p1ann, False, diffopts)
        self.assertEqual(
            tr(p1ann),
            [
                annotateline(b'old', 1),
                annotateline(b'old', 2),
                annotateline(b'p1', 3),
            ],
        )

        p2ann = decorate(p2data, p2fctx)
        p2ann = _annotatepair([oldann], p2fctx, p2ann, False, diffopts)
        self.assertEqual(
            tr(p2ann),
            [
                annotateline(b'old', 1),
                annotateline(b'p2', 2),
                annotateline(b'p2', 3),
            ],
        )

        # Test with multiple parents (note the difference caused by ordering)

        childann = decorate(childdata, childfctx)
        childann = _annotatepair(
            [p1ann, p2ann], childfctx, childann, False, diffopts
        )
        self.assertEqual(
            tr(childann),
            [
                annotateline(b'old', 1),
                annotateline(b'c', 2),
                annotateline(b'p2', 2),
                annotateline(b'c', 4),
                annotateline(b'p2', 3),
            ],
        )

        childann = decorate(childdata, childfctx)
        childann = _annotatepair(
            [p2ann, p1ann], childfctx, childann, False, diffopts
        )
        self.assertEqual(
            tr(childann),
            [
                annotateline(b'old', 1),
                annotateline(b'c', 2),
                annotateline(b'p1', 3),
                annotateline(b'c', 4),
                annotateline(b'p2', 3),
            ],
        )

        # Test with skipchild (note the difference caused by ordering)

        childann = decorate(childdata, childfctx)
        childann = _annotatepair(
            [p1ann, p2ann], childfctx, childann, True, diffopts
        )
        self.assertEqual(
            tr(childann),
            [
                annotateline(b'old', 1),
                annotateline(b'old', 2, True),
                # note that this line was carried over from earlier so it is *not*
                # marked skipped
                annotateline(b'p2', 2),
                annotateline(b'p2', 2, True),
                annotateline(b'p2', 3),
            ],
        )

        childann = decorate(childdata, childfctx)
        childann = _annotatepair(
            [p2ann, p1ann], childfctx, childann, True, diffopts
        )
        self.assertEqual(
            tr(childann),
            [
                annotateline(b'old', 1),
                annotateline(b'old', 2, True),
                annotateline(b'p1', 3),
                annotateline(b'p1', 3, True),
                annotateline(b'p2', 3),
            ],
        )


if __name__ == '__main__':
    import silenttestrunner

    silenttestrunner.main(__name__)