procutil: split if condition
This prepares the code for subsequent changes where we need to differentiate
between the two cases.
===================================
Test the persistent on-disk nodemap
===================================
$ cat << EOF >> $HGRCPATH
> [format]
> use-persistent-nodemap=yes
> [devel]
> persistent-nodemap=yes
> EOF
$ hg init test-repo
$ cd test-repo
$ hg debugformat
format-variant repo
fncache: yes
dotencode: yes
generaldelta: yes
sparserevlog: yes
sidedata: no
persistent-nodemap: yes
copies-sdc: no
plain-cl-delta: yes
compression: zlib
compression-level: default
$ hg debugbuilddag .+5000 --new-file --config "storage.revlog.nodemap.mode=warn"
persistent nodemap in strict mode without efficient method (no-rust no-pure !)
persistent nodemap in strict mode without efficient method (no-rust no-pure !)
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5000
tip-node: 6b02b8c7b96654c25e86ba69eda198d7e6ad8b3c
data-length: 121088
data-unused: 0
data-unused: 0.000%
$ f --size .hg/store/00changelog.n
.hg/store/00changelog.n: size=70
Simple lookup works
$ ANYNODE=`hg log --template '{node|short}\n' --rev tip`
$ hg log -r "$ANYNODE" --template '{rev}\n'
5000
#if rust
$ f --sha256 .hg/store/00changelog-*.nd
.hg/store/00changelog-????????????????.nd: sha256=2e029d3200bd1a986b32784fc2ef1a3bd60dc331f025718bcf5ff44d93f026fd (glob)
$ f --sha256 .hg/store/00manifest-*.nd
.hg/store/00manifest-????????????????.nd: sha256=97117b1c064ea2f86664a124589e47db0e254e8d34739b5c5cc5bf31c9da2b51 (glob)
$ hg debugnodemap --dump-new | f --sha256 --size
size=121088, sha256=2e029d3200bd1a986b32784fc2ef1a3bd60dc331f025718bcf5ff44d93f026fd
$ hg debugnodemap --dump-disk | f --sha256 --bytes=256 --hexdump --size
size=121088, sha256=2e029d3200bd1a986b32784fc2ef1a3bd60dc331f025718bcf5ff44d93f026fd
0000: 00 00 00 91 00 00 00 20 00 00 00 bb 00 00 00 e7 |....... ........|
0010: 00 00 00 66 00 00 00 a1 00 00 01 13 00 00 01 22 |...f..........."|
0020: 00 00 00 23 00 00 00 fc 00 00 00 ba 00 00 00 5e |...#...........^|
0030: 00 00 00 df 00 00 01 4e 00 00 01 65 00 00 00 ab |.......N...e....|
0040: 00 00 00 a9 00 00 00 95 00 00 00 73 00 00 00 38 |...........s...8|
0050: 00 00 00 cc 00 00 00 92 00 00 00 90 00 00 00 69 |...............i|
0060: 00 00 00 ec 00 00 00 8d 00 00 01 4f 00 00 00 12 |...........O....|
0070: 00 00 02 0c 00 00 00 77 00 00 00 9c 00 00 00 8f |.......w........|
0080: 00 00 00 d5 00 00 00 6b 00 00 00 48 00 00 00 b3 |.......k...H....|
0090: 00 00 00 e5 00 00 00 b5 00 00 00 8e 00 00 00 ad |................|
00a0: 00 00 00 7b 00 00 00 7c 00 00 00 0b 00 00 00 2b |...{...|.......+|
00b0: 00 00 00 c6 00 00 00 1e 00 00 01 08 00 00 00 11 |................|
00c0: 00 00 01 30 00 00 00 26 00 00 01 9c 00 00 00 35 |...0...&.......5|
00d0: 00 00 00 b8 00 00 01 31 00 00 00 2c 00 00 00 55 |.......1...,...U|
00e0: 00 00 00 8a 00 00 00 9a 00 00 00 0c 00 00 01 1e |................|
00f0: 00 00 00 a4 00 00 00 83 00 00 00 c9 00 00 00 8c |................|
#else
$ f --sha256 .hg/store/00changelog-*.nd
.hg/store/00changelog-????????????????.nd: sha256=f544f5462ff46097432caf6d764091f6d8c46d6121be315ead8576d548c9dd79 (glob)
$ hg debugnodemap --dump-new | f --sha256 --size
size=121088, sha256=f544f5462ff46097432caf6d764091f6d8c46d6121be315ead8576d548c9dd79
$ hg debugnodemap --dump-disk | f --sha256 --bytes=256 --hexdump --size
size=121088, sha256=f544f5462ff46097432caf6d764091f6d8c46d6121be315ead8576d548c9dd79
0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
0010: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
0020: ff ff ff ff ff ff f5 06 ff ff ff ff ff ff f3 e7 |................|
0030: ff ff ef ca ff ff ff ff ff ff ff ff ff ff ff ff |................|
0040: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
0050: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ed 08 |................|
0060: ff ff ed 66 ff ff ff ff ff ff ff ff ff ff ff ff |...f............|
0070: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
0080: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
0090: ff ff ff ff ff ff ff ff ff ff ff ff ff ff f6 ed |................|
00a0: ff ff ff ff ff ff fe 61 ff ff ff ff ff ff ff ff |.......a........|
00b0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
00c0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
00d0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|
00e0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff f1 02 |................|
00f0: ff ff ff ff ff ff ed 1b ff ff ff ff ff ff ff ff |................|
#endif
$ hg debugnodemap --check
revision in index: 5001
revision in nodemap: 5001
add a new commit
$ hg up
5001 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo foo > foo
$ hg add foo
#if no-pure no-rust
$ hg ci -m 'foo' --config "storage.revlog.nodemap.mode=strict"
transaction abort!
rollback completed
abort: persistent nodemap in strict mode without efficient method
[255]
#endif
$ hg ci -m 'foo'
#if no-pure no-rust
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5001
tip-node: 16395c3cf7e231394735e6b1717823ada303fb0c
data-length: 121088
data-unused: 0
data-unused: 0.000%
#else
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5001
tip-node: 16395c3cf7e231394735e6b1717823ada303fb0c
data-length: 121344
data-unused: 256
data-unused: 0.211%
#endif
$ f --size .hg/store/00changelog.n
.hg/store/00changelog.n: size=70
(The pure code use the debug code that perform incremental update, the C code reencode from scratch)
#if pure
$ f --sha256 .hg/store/00changelog-*.nd --size
.hg/store/00changelog-????????????????.nd: size=121344, sha256=cce54c5da5bde3ad72a4938673ed4064c86231b9c64376b082b163fdb20f8f66 (glob)
#endif
#if rust
$ f --sha256 .hg/store/00changelog-*.nd --size
.hg/store/00changelog-????????????????.nd: size=121344, sha256=952b042fcf614ceb37b542b1b723e04f18f83efe99bee4e0f5ccd232ef470e58 (glob)
#endif
#if no-pure no-rust
$ f --sha256 .hg/store/00changelog-*.nd --size
.hg/store/00changelog-????????????????.nd: size=121088, sha256=df7c06a035b96cb28c7287d349d603baef43240be7736fe34eea419a49702e17 (glob)
#endif
$ hg debugnodemap --check
revision in index: 5002
revision in nodemap: 5002
Test code path without mmap
---------------------------
$ echo bar > bar
$ hg add bar
$ hg ci -m 'bar' --config storage.revlog.nodemap.mmap=no
$ hg debugnodemap --check --config storage.revlog.nodemap.mmap=yes
revision in index: 5003
revision in nodemap: 5003
$ hg debugnodemap --check --config storage.revlog.nodemap.mmap=no
revision in index: 5003
revision in nodemap: 5003
#if pure
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5002
tip-node: 880b18d239dfa9f632413a2071bfdbcc4806a4fd
data-length: 121600
data-unused: 512
data-unused: 0.421%
$ f --sha256 .hg/store/00changelog-*.nd --size
.hg/store/00changelog-????????????????.nd: size=121600, sha256=def52503d049ccb823974af313a98a935319ba61f40f3aa06a8be4d35c215054 (glob)
#endif
#if rust
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5002
tip-node: 880b18d239dfa9f632413a2071bfdbcc4806a4fd
data-length: 121600
data-unused: 512
data-unused: 0.421%
$ f --sha256 .hg/store/00changelog-*.nd --size
.hg/store/00changelog-????????????????.nd: size=121600, sha256=dacf5b5f1d4585fee7527d0e67cad5b1ba0930e6a0928f650f779aefb04ce3fb (glob)
#endif
#if no-pure no-rust
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5002
tip-node: 880b18d239dfa9f632413a2071bfdbcc4806a4fd
data-length: 121088
data-unused: 0
data-unused: 0.000%
$ f --sha256 .hg/store/00changelog-*.nd --size
.hg/store/00changelog-????????????????.nd: size=121088, sha256=59fcede3e3cc587755916ceed29e3c33748cd1aa7d2f91828ac83e7979d935e8 (glob)
#endif
Test force warming the cache
$ rm .hg/store/00changelog.n
$ hg debugnodemap --metadata
$ hg debugupdatecache
#if pure
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5002
tip-node: 880b18d239dfa9f632413a2071bfdbcc4806a4fd
data-length: 121088
data-unused: 0
data-unused: 0.000%
#else
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5002
tip-node: 880b18d239dfa9f632413a2071bfdbcc4806a4fd
data-length: 121088
data-unused: 0
data-unused: 0.000%
#endif
Check out of sync nodemap
=========================
First copy old data on the side.
$ mkdir ../tmp-copies
$ cp .hg/store/00changelog-????????????????.nd .hg/store/00changelog.n ../tmp-copies
Nodemap lagging behind
----------------------
make a new commit
$ echo bar2 > bar
$ hg ci -m 'bar2'
$ NODE=`hg log -r tip -T '{node}\n'`
$ hg log -r "$NODE" -T '{rev}\n'
5003
If the nodemap is lagging behind, it can catch up fine
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5003
tip-node: c9329770f979ade2d16912267c38ba5f82fd37b3
data-length: 121344 (pure !)
data-length: 121344 (rust !)
data-length: 121152 (no-rust no-pure !)
data-unused: 192 (pure !)
data-unused: 192 (rust !)
data-unused: 0 (no-rust no-pure !)
data-unused: 0.158% (pure !)
data-unused: 0.158% (rust !)
data-unused: 0.000% (no-rust no-pure !)
$ cp -f ../tmp-copies/* .hg/store/
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5002
tip-node: 880b18d239dfa9f632413a2071bfdbcc4806a4fd
data-length: 121088
data-unused: 0
data-unused: 0.000%
$ hg log -r "$NODE" -T '{rev}\n'
5003
changelog altered
-----------------
If the nodemap is not gated behind a requirements, an unaware client can alter
the repository so the revlog used to generate the nodemap is not longer
compatible with the persistent nodemap. We need to detect that.
$ hg up "$NODE~5"
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
$ echo bar > babar
$ hg add babar
$ hg ci -m 'babar'
created new head
$ OTHERNODE=`hg log -r tip -T '{node}\n'`
$ hg log -r "$OTHERNODE" -T '{rev}\n'
5004
$ hg --config extensions.strip= strip --rev "$NODE~1" --no-backup
the nodemap should detect the changelog have been tampered with and recover.
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5002
tip-node: b355ef8adce0949b8bdf6afc72ca853740d65944
data-length: 121536 (pure !)
data-length: 121088 (rust !)
data-length: 121088 (no-pure no-rust !)
data-unused: 448 (pure !)
data-unused: 0 (rust !)
data-unused: 0 (no-pure no-rust !)
data-unused: 0.000% (rust !)
data-unused: 0.369% (pure !)
data-unused: 0.000% (no-pure no-rust !)
$ cp -f ../tmp-copies/* .hg/store/
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5002
tip-node: 880b18d239dfa9f632413a2071bfdbcc4806a4fd
data-length: 121088
data-unused: 0
data-unused: 0.000%
$ hg log -r "$OTHERNODE" -T '{rev}\n'
5002
Check transaction related property
==================================
An up to date nodemap should be available to shell hooks,
$ echo dsljfl > a
$ hg add a
$ hg ci -m a
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5003
tip-node: a52c5079765b5865d97b993b303a18740113bbb2
data-length: 121088
data-unused: 0
data-unused: 0.000%
$ echo babar2 > babar
$ hg ci -m 'babar2' --config "hooks.pretxnclose.nodemap-test=hg debugnodemap --metadata"
uid: ???????????????? (glob)
tip-rev: 5004
tip-node: 2f5fb1c06a16834c5679d672e90da7c5f3b1a984
data-length: 121280 (pure !)
data-length: 121280 (rust !)
data-length: 121088 (no-pure no-rust !)
data-unused: 192 (pure !)
data-unused: 192 (rust !)
data-unused: 0 (no-pure no-rust !)
data-unused: 0.158% (pure !)
data-unused: 0.158% (rust !)
data-unused: 0.000% (no-pure no-rust !)
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5004
tip-node: 2f5fb1c06a16834c5679d672e90da7c5f3b1a984
data-length: 121280 (pure !)
data-length: 121280 (rust !)
data-length: 121088 (no-pure no-rust !)
data-unused: 192 (pure !)
data-unused: 192 (rust !)
data-unused: 0 (no-pure no-rust !)
data-unused: 0.158% (pure !)
data-unused: 0.158% (rust !)
data-unused: 0.000% (no-pure no-rust !)
Another process does not see the pending nodemap content during run.
$ PATH=$RUNTESTDIR/testlib/:$PATH
$ echo qpoasp > a
$ hg ci -m a2 \
> --config "hooks.pretxnclose=wait-on-file 20 sync-repo-read sync-txn-pending" \
> --config "hooks.txnclose=touch sync-txn-close" > output.txt 2>&1 &
(read the repository while the commit transaction is pending)
$ wait-on-file 20 sync-txn-pending && \
> hg debugnodemap --metadata && \
> wait-on-file 20 sync-txn-close sync-repo-read
uid: ???????????????? (glob)
tip-rev: 5004
tip-node: 2f5fb1c06a16834c5679d672e90da7c5f3b1a984
data-length: 121280 (pure !)
data-length: 121280 (rust !)
data-length: 121088 (no-pure no-rust !)
data-unused: 192 (pure !)
data-unused: 192 (rust !)
data-unused: 0 (no-pure no-rust !)
data-unused: 0.158% (pure !)
data-unused: 0.158% (rust !)
data-unused: 0.000% (no-pure no-rust !)
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5005
tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
data-length: 121536 (pure !)
data-length: 121536 (rust !)
data-length: 121088 (no-pure no-rust !)
data-unused: 448 (pure !)
data-unused: 448 (rust !)
data-unused: 0 (no-pure no-rust !)
data-unused: 0.369% (pure !)
data-unused: 0.369% (rust !)
data-unused: 0.000% (no-pure no-rust !)
$ cat output.txt
Check that a failing transaction will properly revert the data
$ echo plakfe > a
$ f --size --sha256 .hg/store/00changelog-*.nd
.hg/store/00changelog-????????????????.nd: size=121536, sha256=bb414468d225cf52d69132e1237afba34d4346ee2eb81b505027e6197b107f03 (glob) (pure !)
.hg/store/00changelog-????????????????.nd: size=121536, sha256=909ac727bc4d1c0fda5f7bff3c620c98bd4a2967c143405a1503439e33b377da (glob) (rust !)
.hg/store/00changelog-????????????????.nd: size=121088, sha256=342d36d30d86dde67d3cb6c002606c4a75bcad665595d941493845066d9c8ee0 (glob) (no-pure no-rust !)
$ hg ci -m a3 --config "extensions.abort=$RUNTESTDIR/testlib/crash_transaction_late.py"
transaction abort!
rollback completed
abort: This is a late abort
[255]
$ hg debugnodemap --metadata
uid: ???????????????? (glob)
tip-rev: 5005
tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
data-length: 121536 (pure !)
data-length: 121536 (rust !)
data-length: 121088 (no-pure no-rust !)
data-unused: 448 (pure !)
data-unused: 448 (rust !)
data-unused: 0 (no-pure no-rust !)
data-unused: 0.369% (pure !)
data-unused: 0.369% (rust !)
data-unused: 0.000% (no-pure no-rust !)
$ f --size --sha256 .hg/store/00changelog-*.nd
.hg/store/00changelog-????????????????.nd: size=121536, sha256=bb414468d225cf52d69132e1237afba34d4346ee2eb81b505027e6197b107f03 (glob) (pure !)
.hg/store/00changelog-????????????????.nd: size=121536, sha256=909ac727bc4d1c0fda5f7bff3c620c98bd4a2967c143405a1503439e33b377da (glob) (rust !)
.hg/store/00changelog-????????????????.nd: size=121088, sha256=342d36d30d86dde67d3cb6c002606c4a75bcad665595d941493845066d9c8ee0 (glob) (no-pure no-rust !)
Check that removing content does not confuse the nodemap
--------------------------------------------------------
removing data with rollback
$ echo aso > a
$ hg ci -m a4
$ hg rollback
repository tip rolled back to revision 5005 (undo commit)
working directory now based on revision 5005
$ hg id -r .
90d5d3ba2fc4 tip
roming data with strip
$ echo aso > a
$ hg ci -m a4
$ hg --config extensions.strip= strip -r . --no-backup
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg id -r . --traceback
90d5d3ba2fc4 tip
Test upgrade / downgrade
========================
downgrading
$ cat << EOF >> .hg/hgrc
> [format]
> use-persistent-nodemap=no
> EOF
$ hg debugformat -v
format-variant repo config default
fncache: yes yes yes
dotencode: yes yes yes
generaldelta: yes yes yes
sparserevlog: yes yes yes
sidedata: no no no
persistent-nodemap: yes no no
copies-sdc: no no no
plain-cl-delta: yes yes yes
compression: zlib zlib zlib
compression-level: default default default
$ hg debugupgraderepo --run --no-backup --quiet
upgrade will perform the following actions:
requirements
preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
removed: persistent-nodemap
$ ls -1 .hg/store/ | egrep '00(changelog|manifest)(\.n|-.*\.nd)'
[1]
$ hg debugnodemap --metadata
upgrading
$ cat << EOF >> .hg/hgrc
> [format]
> use-persistent-nodemap=yes
> EOF
$ hg debugformat -v
format-variant repo config default
fncache: yes yes yes
dotencode: yes yes yes
generaldelta: yes yes yes
sparserevlog: yes yes yes
sidedata: no no no
persistent-nodemap: no yes no
copies-sdc: no no no
plain-cl-delta: yes yes yes
compression: zlib zlib zlib
compression-level: default default default
$ hg debugupgraderepo --run --no-backup --quiet
upgrade will perform the following actions:
requirements
preserved: dotencode, fncache, generaldelta, revlogv1, sparserevlog, store
added: persistent-nodemap
$ ls -1 .hg/store/ | egrep '00(changelog|manifest)(\.n|-.*\.nd)'
00changelog-*.nd (glob)
00changelog.n
00manifest-*.nd (glob)
00manifest.n
$ hg debugnodemap --metadata
uid: * (glob)
tip-rev: 5005
tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
data-length: 121088
data-unused: 0
data-unused: 0.000%
Running unrelated upgrade
$ hg debugupgraderepo --run --no-backup --quiet --optimize re-delta-all
upgrade will perform the following actions:
requirements
preserved: dotencode, fncache, generaldelta, persistent-nodemap, revlogv1, sparserevlog, store
optimisations: re-delta-all
$ ls -1 .hg/store/ | egrep '00(changelog|manifest)(\.n|-.*\.nd)'
00changelog-*.nd (glob)
00changelog.n
00manifest-*.nd (glob)
00manifest.n
$ hg debugnodemap --metadata
uid: * (glob)
tip-rev: 5005
tip-node: 90d5d3ba2fc47db50f712570487cb261a68c8ffe
data-length: 121088
data-unused: 0
data-unused: 0.000%