tests/test-filebranch.t

treemanifests: remove _loadalllazy in _diff()

The benchmarks below use a similar setup as in ee7ee0c516ca and my other recent
commits.  Yes, in some cases this runs in literally 5% of the time it
previously took.

before = a6f8ab53

    diff --git:
    repo  | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before
    ------+---+---+------------------------+-----------------------+------------
    m-u   |   |   | 1.301 s +-  0.004 s    | 1.309 s +-  0.012 s   | 100.6%
    m-u   |   | x | 1.303 s +-  0.009 s    | 1.302 s +-  0.006 s   |  99.9%
    m-u   | x |   | 1.308 s +-  0.006 s    | 1.309 s +-  0.007 s   | 100.1%
    m-u   | x | x | 85.7 ms +-   0.6 ms    | 86.0 ms +-   0.3 ms   | 100.4%
    l-d-r |   |   | 197.5 ms +-   0.7 ms   | 197.8 ms +-   2.2 ms  | 100.2%
    l-d-r |   | x | 199.4 ms +-   0.6 ms   | 199.3 ms +-   0.9 ms  |  99.9%
    l-d-r | x |   | 86.1 ms +-   0.5 ms    | 85.8 ms +-   0.9 ms   |  99.7%
    l-d-r | x | x | 64.4 ms +-   0.4 ms    | 64.4 ms +-   0.3 ms   | 100.0%

    diff -c . --git:
    repo  | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before
    ------+---+---+------------------------+-----------------------+------------
    m-u   |   |   | 236.7 ms +-   1.1 ms   | 236.5 ms +-   1.3 ms  |  99.9%
    m-u   |   | x | 158.7 ms +-   1.0 ms   | 128.0 ms +-   1.0 ms  |  80.7% <--
    m-u   | x |   | 239.7 ms +-   1.8 ms   | 238.1 ms +-   1.5 ms  |  99.3%
    m-u   | x | x | 132.4 ms +-   0.9 ms   | 132.3 ms +-   0.6 ms  |  99.9%
    l-d-r |   |   | 81.8 ms +-   0.4 ms    | 81.8 ms +-   0.3 ms   | 100.0%
    l-d-r |   | x | 3.894 s +-  0.017 s    | 193.6 ms +-   0.4 ms  |   5.0% <--
    l-d-r | x |   | 106.9 ms +-   0.4 ms   | 106.6 ms +-   0.3 ms  |  99.7%
    l-d-r | x | x | 182.7 ms +-   0.8 ms   | 183.3 ms +-   0.9 ms  | 100.3%

    rebase -r . --keep -d .^^:
    repo  | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before
    ------+---+---+------------------------+-----------------------+------------
    m-u   |   |   | 5.615 s +-  0.109 s    | 5.562 s +-  0.015 s   |  99.1%
    m-u   |   | x | 5.701 s +-  0.027 s    | 5.715 s +-  0.023 s   | 100.2%
    m-u   | x |   | 5.572 s +-  0.128 s    | 5.613 s +-  0.182 s   | 100.7%
    m-u   | x | x | 633.3 ms +-  28.7 ms   | 636.2 ms +-  13.8 ms  | 100.5%
    l-d-r |   |   | 666.4 ms +-  17.0 ms   | 658.5 ms +-   9.3 ms  |  98.8%
    l-d-r |   | x | 6.520 s +-  0.070 s    | 6.505 s +-  0.026 s   |  99.8%
    l-d-r | x |   | 279.0 ms +-  13.0 ms   | 276.5 ms +-   4.7 ms  |  99.1%
    l-d-r | x | x | 1.636 s +-  0.058 s    | 1.657 s +-  0.014 s   | 101.3%

    status --change . --copies:
    repo  | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before
    ------+---+---+------------------------+-----------------------+------------
    m-u   |   |   | 218.6 ms +-   1.4 ms   | 217.9 ms +-   1.5 ms  |  99.7%
    m-u   |   | x | 138.5 ms +-   0.4 ms   | 108.4 ms +-   0.2 ms  |  78.3% <--
    m-u   | x |   | 220.1 ms +-   1.3 ms   | 219.7 ms +-   1.5 ms  |  99.8%
    m-u   | x | x | 113.2 ms +-   0.4 ms   | 112.4 ms +-   0.8 ms  |  99.3%
    l-d-r |   |   | 80.2 ms +-   0.3 ms    | 80.6 ms +-   0.6 ms   | 100.5%
    l-d-r |   | x | 3.899 s +-  0.020 s    | 194.8 ms +-   4.0 ms  |   5.0% <--
    l-d-r | x |   | 83.4 ms +-   0.8 ms    | 83.2 ms +-   0.2 ms   |  99.8%
    l-d-r | x | x | 732.2 ms +-   4.3 ms   | 194.9 ms +-   1.0 ms  |  26.6% <--

    status --copies:
    repo  | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before
    ------+---+---+------------------------+-----------------------+------------
    m-u   |   |   | 1.917 s +-  0.005 s    | 1.914 s +-  0.004 s   |  99.8%
    m-u   |   | x | 1.909 s +-  0.012 s    | 1.934 s +-  0.004 s   | 101.3%
    m-u   | x |   | 1.915 s +-  0.005 s    | 1.904 s +-  0.004 s   |  99.4%
    m-u   | x | x | 94.8 ms +-   0.3 ms    | 94.7 ms +-   0.2 ms   |  99.9%
    l-d-r |   |   | 593.9 ms +-   1.2 ms   | 594.6 ms +-   9.4 ms  | 100.1%
    l-d-r |   | x | 595.2 ms +-   3.8 ms   | 597.2 ms +-   2.6 ms  | 100.3%
    l-d-r | x |   | 182.5 ms +-   1.6 ms   | 182.1 ms +-   0.6 ms  |  99.8%
    l-d-r | x | x | 149.6 ms +-   0.9 ms   | 149.1 ms +-   0.8 ms  |  99.7%

    update $rev^; ~/src/hg/hg{hg}/hg update $rev:
    repo  | N | T | before (mean +- stdev) | after (mean +- stdev) | % of before
    ------+---+---+------------------------+-----------------------+------------
    m-u   |   |   | 3.121 s +-  0.007 s    | 3.129 s +-  0.012 s   | 100.3%
    m-u   |   | x | 2.972 s +-  0.011 s    | 2.981 s +-  0.012 s   | 100.3%
    m-u   | x |   | 3.144 s +-  0.014 s    | 3.141 s +-  0.011 s   |  99.9%
    m-u   | x | x | 312.2 ms +-   2.4 ms   | 312.3 ms +-   2.1 ms  | 100.0%
    l-d-r |   |   | 444.4 ms +-   4.3 ms   | 446.9 ms +-   5.3 ms  | 100.6%
    l-d-r |   | x | 9.159 s +-  0.069 s    | 9.182 s +-  0.040 s   | 100.3%
    l-d-r | x |   | 254.6 ms +-   1.6 ms   | 255.2 ms +-   1.6 ms  | 100.2%
    l-d-r | x | x | 1.525 s +-  0.007 s    | 1.577 s +-  0.007 s   | 103.4% <--?

Differential Revision: https://phab.mercurial-scm.org/D4845

This test makes sure that we don't mark a file as merged with its ancestor
when we do a merge.

  $ cat <<EOF > merge
  > from __future__ import print_function
  > import sys, os
  > print("merging for", os.path.basename(sys.argv[1]))
  > EOF
  $ HGMERGE="$PYTHON ../merge"; export HGMERGE

Creating base:

  $ hg init a
  $ cd a
  $ echo 1 > foo
  $ echo 1 > bar
  $ echo 1 > baz
  $ echo 1 > quux
  $ hg add foo bar baz quux
  $ hg commit -m "base"

  $ cd ..
  $ hg clone a b
  updating to branch default
  4 files updated, 0 files merged, 0 files removed, 0 files unresolved

Creating branch a:

  $ cd a
  $ echo 2a > foo
  $ echo 2a > bar
  $ hg commit -m "branch a"

Creating branch b:

  $ cd ..
  $ cd b
  $ echo 2b > foo
  $ echo 2b > baz
  $ hg commit -m "branch b"

We shouldn't have anything but n state here:

  $ hg debugstate --no-dates | grep -v "^n"
  [1]

Merging:

  $ hg pull ../a
  pulling from ../a
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 1 changesets with 2 changes to 2 files (+1 heads)
  new changesets bdd988058d16
  (run 'hg heads' to see heads, 'hg merge' to merge)

  $ hg merge -v
  resolving manifests
  getting bar
  merging foo
  merging for foo
  1 files updated, 1 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)

  $ echo 2m > foo
  $ echo 2b > baz
  $ echo new > quux

  $ hg ci -m "merge"

main: we should have a merge here:

  $ hg debugindex --changelog
     rev linkrev nodeid       p1           p2
       0       0 cdca01651b96 000000000000 000000000000
       1       1 f6718a9cb7f3 cdca01651b96 000000000000
       2       2 bdd988058d16 cdca01651b96 000000000000
       3       3 d8a521142a3c f6718a9cb7f3 bdd988058d16

log should show foo and quux changed:

  $ hg log -v -r tip
  changeset:   3:d8a521142a3c
  tag:         tip
  parent:      1:f6718a9cb7f3
  parent:      2:bdd988058d16
  user:        test
  date:        Thu Jan 01 00:00:00 1970 +0000
  files:       foo quux
  description:
  merge
  
  

foo: we should have a merge here:

  $ hg debugindex foo
     rev linkrev nodeid       p1           p2
       0       0 b8e02f643373 000000000000 000000000000
       1       1 2ffeddde1b65 b8e02f643373 000000000000
       2       2 33d1fb69067a b8e02f643373 000000000000
       3       3 aa27919ee430 2ffeddde1b65 33d1fb69067a

bar: we should not have a merge here:

  $ hg debugindex bar
     rev linkrev nodeid       p1           p2
       0       0 b8e02f643373 000000000000 000000000000
       1       2 33d1fb69067a b8e02f643373 000000000000

baz: we should not have a merge here:

  $ hg debugindex baz
     rev linkrev nodeid       p1           p2
       0       0 b8e02f643373 000000000000 000000000000
       1       1 2ffeddde1b65 b8e02f643373 000000000000

quux: we should not have a merge here:

  $ hg debugindex quux
     rev linkrev nodeid       p1           p2
       0       0 b8e02f643373 000000000000 000000000000
       1       3 6128c0f33108 b8e02f643373 000000000000

Manifest entries should match tips of all files:

  $ hg manifest --debug
  33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644   bar
  2ffeddde1b65b4827f6746174a145474129fa2ce 644   baz
  aa27919ee4303cfd575e1fb932dd64d75aa08be4 644   foo
  6128c0f33108e8cfbb4e0824d13ae48b466d7280 644   quux

Everything should be clean now:

  $ hg status

  $ hg verify
  checking changesets
  checking manifests
  crosschecking files in changesets and manifests
  checking files
  checked 4 changesets with 10 changes to 4 files

  $ cd ..