Mercurial > hg
view tests/test-branch-change.t @ 42044:bb271ec2fbfb
compression: introduce a `storage.revlog.zstd.level` configuration
This option control the zstd compression level used when compressing revlog
chunk. The usage of zstd for revlog compression has not graduated from
experimental yet, but we intend to fix that soon.
The option name for the compression level is more straight forward to pick, so
this changesets comes first. Having a dedicated option for each compression
engine is useful because they don't support the same range of values.
I ran the same measurement as for the zlib compression level (in the parent
changesets). The variation in repository size is stay mostly in the same (small)
range. The "read/write" performance see smallish variation, but are overall much
better than zlib. Write performance show the same tend of having better write
performance for when reaching high-end compression.
Again, we don't intend to change the default zstd compression level (currently:
3) in this series. However this is worth investigating in the future.
The Performance comparison of zlib vs zstd is quite impressive. The repository
size stay in the same range, but the performance are much better in all
situations.
Comparison summary
==================
We are looking at:
- performance range for zlib
- performance range for zstd
- comparison of default zstd (level-3) to default zlib (level 6)
- comparison of the slowest zstd time to the fastest zlib time
Read performance:
-----------------
| zlib | zstd | cmp | f2s
mercurial | 0.170159 - 0.189219 | 0.144127 - 0.149624 | 80% | 88%
pypy | 2.679217 - 2.768691 | 1.532317 - 1.705044 | 60% | 63%
netbeans | 122.477027 - 141.620281 | 72.996346 - 89.731560 | 58% | 73%
mozilla | 147.867662 - 170.572118 | 91.700995 - 105.853099 | 56% | 71%
Write performance:
------------------
| zlib | zstd | cmp | f2s
mercurial | 53.250304 - 56.2936129 | 40.877025 - 45.677286 | 75% | 86%
pypy | 460.721984 - 476.589918 | 270.545409 - 301.002219 | 63% | 65%
netbeans | 520.560316 - 715.930400 | 370.356311 - 428.329652 | 55% | 82%
mozilla | 739.803002 - 987.056093 | 505.152906 - 591.930683 | 57% | 80%
Raw data
--------
repo alg lvl .hg/store size 00manifest.d read write
mercurial zlib 1 49,402,813 5,963,475 0.170159 53.250304
mercurial zlib 6 47,197,397 5,875,730 0.182820 56.264320
mercurial zlib 9 47,121,596 5,849,781 0.189219 56.293612
mercurial zstd 1 49,737,084 5,966,355 0.144127 40.877025
mercurial zstd 3 48,961,867 5,895,208 0.146376 42.268142
mercurial zstd 5 48,200,592 5,938,676 0.149624 43.162875
mercurial zstd 10 47,833,520 5,913,353 0.145185 44.012489
mercurial zstd 15 47,314,604 5,728,679 0.147686 45.677286
mercurial zstd 20 47,330,502 5,830,539 0.145789 45.025407
mercurial zstd 22 47,330,076 5,830,539 0.143996 44.690460
pypy zlib 1 370,830,572 28,462,425 2.679217 460.721984
pypy zlib 6 340,112,317 27,648,747 2.768691 467.537158
pypy zlib 9 338,360,736 27,639,003 2.763495 476.589918
pypy zstd 1 362,377,479 27,916,214 1.532317 270.545409
pypy zstd 3 354,137,693 27,905,988 1.686718 294.951509
pypy zstd 5 342,640,043 27,655,774 1.705044 301.002219
pypy zstd 10 334,224,327 27,164,493 1.567287 285.186239
pypy zstd 15 329,000,363 26,645,965 1.637729 299.561332
pypy zstd 20 324,534,039 26,199,547 1.526813 302.149827
pypy zstd 22 324,530,595 26,198,932 1.525718 307.821218
netbeans zlib 1 1,281,847,810 165,495,457 122.477027 520.560316
netbeans zlib 6 1,205,284,353 159,161,207 139.876147 715.930400
netbeans zlib 9 1,197,135,671 155,034,586 141.620281 678.297064
netbeans zstd 1 1,259,581,737 160,840,613 72.996346 370.356311
netbeans zstd 3 1,232,978,122 157,691,551 81.622317 396.733087
netbeans zstd 5 1,208,034,075 160,246,880 83.080549 364.342626
netbeans zstd 10 1,188,624,176 156,083,417 79.323935 403.594602
netbeans zstd 15 1,176,973,589 153,859,477 89.731560 428.329652
netbeans zstd 20 1,162,958,258 151,147,535 82.842667 392.335349
netbeans zstd 22 1,162,707,029 151,150,220 82.565695 402.840655
mozilla zlib 1 2,775,497,186 298,527,987 147.867662 751.263721
mozilla zlib 6 2,596,856,420 286,597,671 170.572118 987.056093
mozilla zlib 9 2,587,542,494 287,018,264 163.622338 739.803002
mozilla zstd 1 2,723,159,348 286,617,532 91.700995 570.042751
mozilla zstd 3 2,665,055,001 286,152,013 95.240155 561.412805
mozilla zstd 5 2,607,819,817 288,060,030 101.978048 505.152906
mozilla zstd 10 2,558,761,085 283,967,648 104.113481 497.771202
mozilla zstd 15 2,526,216,060 275,581,300 105.853099 591.930683
mozilla zstd 20 2,485,114,806 266,478,859 95.268795 576.515389
mozilla zstd 22 2,484,869,080 266,456,505 94.429282 572.785537
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 27 Mar 2019 18:35:59 +0100 |
parents | 69268a13ffa5 |
children | c7d236b55a3e |
line wrap: on
line source
Testing changing branch on commits ================================== Setup $ cat >> $HGRCPATH << EOF > [alias] > glog = log -G -T "{rev}:{node|short} {desc}\n{branch} ({bookmarks})" > [experimental] > evolution = createmarkers > [extensions] > rebase= > EOF $ hg init repo $ cd repo $ for ch in a b c d e; do echo foo >> $ch; hg ci -Aqm "Added "$ch; done $ hg glog @ 4:aa98ab95a928 Added e | default () o 3:62615734edd5 Added d | default () o 2:28ad74487de9 Added c | default () o 1:29becc82797a Added b | default () o 0:18d04c59bb5d Added a default () $ hg branches default 4:aa98ab95a928 Try without passing a new branch name $ hg branch -r . abort: no branch name specified for the revisions [255] Setting an invalid branch name $ hg branch -r . a:b abort: ':' cannot be used in a name [255] $ hg branch -r . tip abort: the name 'tip' is reserved [255] $ hg branch -r . 1234 abort: cannot use an integer as a name [255] Change on non-linear set of commits $ hg branch -r 2 -r 4 foo abort: cannot change branch of non-linear revisions [255] Change in middle of the stack (linear commits) $ hg branch -r 1::3 foo abort: cannot change branch of changeset with children [255] Change with dirty working directory $ echo bar > a $ hg branch -r . foo abort: uncommitted changes [255] $ hg revert --all reverting a Change on empty revision set $ hg branch -r 'draft() - all()' foo abort: empty revision set [255] Changing branch on linear set of commits from head Without obsmarkers $ hg branch -r 3:4 foo --config experimental.evolution=! changed branch on 2 changesets saved backup bundle to $TESTTMP/repo/.hg/strip-backup/62615734edd5-e86bd13a-branch-change.hg $ hg glog @ 4:3938acfb5c0f Added e | foo () o 3:9435da006bdc Added d | foo () o 2:28ad74487de9 Added c | default () o 1:29becc82797a Added b | default () o 0:18d04c59bb5d Added a default () $ hg branches foo 4:3938acfb5c0f default 2:28ad74487de9 (inactive) With obsmarkers $ hg branch -r 3::4 bar changed branch on 2 changesets $ hg glog @ 6:7c1991464886 Added e | bar () o 5:1ea05e93925f Added d | bar () o 2:28ad74487de9 Added c | default () o 1:29becc82797a Added b | default () o 0:18d04c59bb5d Added a default () $ hg branches bar 6:7c1991464886 default 2:28ad74487de9 (inactive) Change branch name to an existing branch $ hg branch -r . default abort: a branch of the same name already exists [255] Changing on a branch head which is not topological head $ hg branch -r 2 stable abort: cannot change branch of changeset with children [255] Enabling the allowunstable config and trying to change branch on a branch head which is not a topological head $ echo "[experimental]" >> .hg/hgrc $ echo "evolution.allowunstable=yes" >> .hg/hgrc $ hg branch -r 2 foo changed branch on 1 changesets 2 new orphan changesets Changing branch of an obsoleted changeset $ hg branch -r 4 foobar abort: hidden revision '4' was rewritten as: 7c1991464886! (use --hidden to access hidden revisions) [255] $ hg branch -r 4 --hidden foobar abort: cannot change branch of a obsolete changeset [255] Make sure bookmark movement is correct $ hg bookmark b1 $ hg glog -r '.^::' @ 6:7c1991464886 Added e | bar (b1) * 5:1ea05e93925f Added d | bar () ~ $ hg branch -r '(.^)::' wat --debug changing branch of '1ea05e93925f806d875a2163f9b76764be644636' from 'bar' to 'wat' committing files: d committing manifest committing changelog new node id is 343660ccab7400da637bd6a211d07f413536d718 changing branch of '7c19914648869f5b02fc7fed31ddee9783fdd680' from 'bar' to 'wat' committing files: e committing manifest committing changelog new node id is de1404b45a69f8cc6437d7679033ee33e9efb4ba moving bookmarks ['b1'] from 7c19914648869f5b02fc7fed31ddee9783fdd680 to de1404b45a69f8cc6437d7679033ee33e9efb4ba resolving manifests branchmerge: False, force: False, partial: False ancestor: 7c1991464886, local: 7c1991464886+, remote: de1404b45a69 starting 4 threads for background file closing (?) changed branch on 2 changesets updating the branch cache invalid branchheads cache (served): tip differs $ hg glog -r '(.^)::' @ 9:de1404b45a69 Added e | wat (b1) * 8:343660ccab74 Added d | wat () ~ Make sure phase handling is correct $ echo foo >> bar $ hg ci -Aqm "added bar" --secret 1 new orphan changesets $ hg glog -r . @ 10:8ad1294c1660 added bar | wat (b1) ~ $ hg branch -r . secret changed branch on 1 changesets $ hg phase -r . 11: secret $ hg branches secret 11:38a9b2d53f98 foo 7:8a4729a5e2b8 wat 9:de1404b45a69 (inactive) default 2:28ad74487de9 (inactive) $ hg branch secret Changing branch of another head, different from one on which we are $ hg glog @ 11:38a9b2d53f98 added bar | secret (b1) * 9:de1404b45a69 Added e | wat () * 8:343660ccab74 Added d | wat () | o 7:8a4729a5e2b8 Added c | | foo () x | 2:28ad74487de9 Added c |/ default () o 1:29becc82797a Added b | default () o 0:18d04c59bb5d Added a default () $ hg branch secret $ hg branch -r 7 foobar changed branch on 1 changesets The current branch must be preserved $ hg branch secret Changing branch on multiple heads at once $ hg rebase -s 8 -d 12 --keepbranches -q $ hg rebase -s 14 -d 1 --keepbranches -q $ hg branch -r 0: stable changed branch on 6 changesets $ hg glog @ 23:6a5ddbcfb870 added bar | stable (b1) o 22:baedc6e98a67 Added e | stable () | o 21:99ac7bf8aad1 Added d | | stable () | o 20:0ecb4d39c4bd Added c |/ stable () o 19:fd45b986b109 Added b | stable () o 18:204d2769eca2 Added a stable () $ hg branches stable 23:6a5ddbcfb870 $ hg branch stable Changing to same branch is no-op $ hg branch -r 19::21 stable changed branch on 0 changesets Changing branch name to existing branch name if the branch of parent of root of revs is same as the new branch name $ hg branch -r 20::21 bugfix changed branch on 2 changesets $ hg glog o 25:714defe1cf34 Added d | bugfix () o 24:98394def28fc Added c | bugfix () | @ 23:6a5ddbcfb870 added bar | | stable (b1) | o 22:baedc6e98a67 Added e |/ stable () o 19:fd45b986b109 Added b | stable () o 18:204d2769eca2 Added a stable () $ hg branch -r 24:25 stable changed branch on 2 changesets $ hg glog o 27:4ec342341562 Added d | stable () o 26:83f48859c2de Added c | stable () | @ 23:6a5ddbcfb870 added bar | | stable (b1) | o 22:baedc6e98a67 Added e |/ stable () o 19:fd45b986b109 Added b | stable () o 18:204d2769eca2 Added a stable () Changing branch of a merge commit $ hg branch -q ghi $ echo f > f $ hg ci -qAm 'Added f' $ hg up -q 27 $ hg branch -q jkl $ echo g > g $ hg ci -qAm 'Added g' $ hg glog -r 'heads(:)' @ 29:6bc1c6c2c9da Added g | jkl () ~ o 28:2f1019bd29d2 Added f | ghi (b1) ~ $ hg branch -q default $ hg merge -r 28 4 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg branch -r . abcd abort: outstanding uncommitted merge [255] $ hg ci -m "Merge commit" $ hg glog -r 'parents(.)::' @ 30:4d56e6b1eb6b Merge commit |\ default () | o 29:6bc1c6c2c9da Added g | | jkl () | ~ o 28:2f1019bd29d2 Added f | ghi (b1) ~ $ hg branch -r . ghi 0 files updated, 0 files merged, 4 files removed, 0 files unresolved changed branch on 1 changesets $ hg branch -r . jkl changed branch on 1 changesets $ hg branch -r . default changed branch on 1 changesets $ hg branch -r . stable abort: a branch of the same name already exists [255] Changing branch on public changeset $ hg phase -r . -p $ hg branch -r . def abort: cannot change branch of public changesets (see 'hg help phases' for details) [255] Merge commit with conflicts, with evolution and without $ mklozenge() { > echo foo > a > hg ci -qAm foo > echo bar > a > hg ci -qm bar > hg up -q '.^' > echo baz > a > hg ci -qm baz > hg merge -q -t :local > echo neither > a > hg ci -qm neither > } $ cd .. $ hg init merge-with-evolution $ cd merge-with-evolution $ mklozenge $ hg branch -r '(.^)::' abc changed branch on 2 changesets $ hg glog @ 5:c07fa8b34d54 neither |\ abc () | o 4:f2aa51777cc9 baz | | abc () o | 1:2e33c4f0856b bar |/ default () o 0:91cfb6004abf foo default () $ hg cat a neither $ cd .. $ hg init merge-without-evolution $ cd merge-without-evolution $ mklozenge $ cat > .hg/hgrc << EOF > [experimental] > evolution = no > evolution.allowunstable = no > EOF $ hg branch -r '(.^)::' abc changed branch on 2 changesets saved backup bundle to $TESTTMP/merge-without-evolution/.hg/strip-backup/9a3a2af368f4-8db1a361-branch-change.hg $ hg glog @ 3:c07fa8b34d54 neither |\ abc () | o 2:f2aa51777cc9 baz | | abc () o | 1:2e33c4f0856b bar |/ default () o 0:91cfb6004abf foo default () $ hg cat a neither