view tests/test-filebranch.t @ 52176:72bc29f01570

revlog: add glue to use a pure-Rust VFS

This will save us a lot of calling back into Python, which is always
horribly expensive.

We are now faster in all benchmarked cases except for `log --patch`
specifically on mozilla-try. Fixing this will happen in a later patch.

```
### data-env-vars.name            = mercurial-devel-2024-03-22-ds2-pnm
  # benchmark.name                = hg.command.cat
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.files      = all-root
  # benchmark.variants.output     = plain
  # benchmark.variants.rev        = tip
e679697a6ca4: 1.760765  ~~~~~
5559d7e63ec3: 1.555513  (-11.66%, -0.21)
### data-env-vars.name            = mozilla-try-2024-03-26-ds2-pnm
  # benchmark.name                = hg.command.cat
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.files      = all-root
  # benchmark.variants.output     = plain
  # benchmark.variants.rev        = tip
e679697a6ca4: 62.848869  ~~~~~
5559d7e63ec3: 58.113051   (-7.54%, -4.74)
### data-env-vars.name            = mozilla-try-2024-03-26-ds2-pnm
  # benchmark.name                = hg.command.log
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.limit-rev  = 10
  # benchmark.variants.patch      = yes
  # benchmark.variants.rev        = none
e679697a6ca4: 3.173532  ~~~~~
5559d7e63ec3: 3.543591  (+11.66%, +0.37)
### data-env-vars.name            = mozilla-try-2024-03-26-ds2-pnm
  # benchmark.name                = hg.command.log
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.limit-rev  = 1000
  # benchmark.variants.patch      = no
  # benchmark.variants.rev        = none
e679697a6ca4: 1.214698  ~~~~~
5559d7e63ec3: 1.192478   (-1.83%, -0.02)
### data-env-vars.name            = mozilla-unified-2024-03-22-ds2-pnm
  # benchmark.name                = hg.command.cat
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.files      = all-root
  # benchmark.variants.output     = plain
  # benchmark.variants.rev        = tip
e679697a6ca4: 56.205474  ~~~~~
5559d7e63ec3: 51.520074   (-8.34%, -4.69)
### data-env-vars.name            = mozilla-unified-2024-03-22-ds2-pnm
  # benchmark.name                = hg.command.log
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.limit-rev  = 10
  # benchmark.variants.patch      = yes
  # benchmark.variants.rev        = none
e679697a6ca4: 2.105419  ~~~~~
5559d7e63ec3: 2.051849   (-2.54%, -0.05)
### data-env-vars.name            = mozilla-unified-2024-03-22-ds2-pnm
  # benchmark.name                = hg.command.log
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.limit-rev  = 1000
  # benchmark.variants.patch      = no
  # benchmark.variants.rev        = none
e679697a6ca4: 0.309960  ~~~~~
5559d7e63ec3: 0.299035   (-3.52%, -0.01)
### data-env-vars.name            = tryton-public-2024-03-22-ds2-pnm
  # benchmark.name                = hg.command.cat
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.files      = all-root
  # benchmark.variants.output     = plain
  # benchmark.variants.rev        = tip
e679697a6ca4: 1.849832  ~~~~~
5559d7e63ec3: 1.805076   (-2.42%, -0.04)
### data-env-vars.name            = tryton-public-2024-03-22-ds2-pnm
  # benchmark.name                = hg.command.log
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.limit-rev  = 10
  # benchmark.variants.patch      = yes
  # benchmark.variants.rev        = none
e679697a6ca4: 0.289521  ~~~~~
5559d7e63ec3: 0.279889   (-3.33%, -0.01)
### data-env-vars.name            = tryton-public-2024-03-22-ds2-pnm
  # benchmark.name                = hg.command.log
  # bin-env-vars.hg.flavor        = rust
  # bin-env-vars.hg.py-re2-module = default
  # benchmark.variants.limit-rev  = 1000
  # benchmark.variants.patch      = no
  # benchmark.variants.rev        = none
e679697a6ca4: 0.332270  ~~~~~
5559d7e63ec3: 0.323324   (-2.69%, -0.01)
```

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

  $ cat <<EOF > merge
  > 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-nodeid    p2-nodeid
       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-nodeid    p2-nodeid
       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-nodeid    p2-nodeid
       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-nodeid    p2-nodeid
       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-nodeid    p2-nodeid
       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 -q

  $ cd ..