tests/test-bundle.t
| author |
Pierre-Yves David <pierre-yves.david@octobus.net> |
|
Mon, 14 Dec 2020 11:32:24 +0100 |
| changeset 46149 |
294d5aca4ff5 |
| parent 46117 |
17a695357270
|
| child 46690 |
6fc57680cfd6 |
| permissions |
-rw-r--r-- |
copies: iterate over children directly (instead of parents)
Before this change we would gather all parent → child edges and iterate on
all parent, gathering copy information for children and aggregating them from
there.
They are not strict requirement for edges to be processed in that specific
order. We could also simply iterate over all "children" revision and aggregate
data from both parents at the same time. This patch does that.
It make various things simpler:
* since both parents are processed at the same time, we no longer need to
cache data for merge (see next changeset for details),
* we no longer need nested loop to process data,
* we no longer need to store partial merge data for a rev from distinct loop
interaction to another when processing merges,
* we no longer need to build a full parent -> children mapping (we only rely on
a simpler "parent -> number of children" map (for memory efficiency),
* the data access pattern is now simpler (from lower revisions to higher
revisions) and entirely predicable. That predictability open the way to
prefetching and parallel processing.
So that new iterations order requires simpler code and open the way to
interesting optimisation.
The effect on performance is quite good. In the worse case, we don't see any
significant negative impact. And in the best case, the reduction of roundtrip
to Python provide us with a significant speed. Some example below:
Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev
---------------------------------------------------------------------------------------------------------------------------------------------------------------
mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.962867 s, 0.502584 s, -0.460283 s, × 0.5220, 14 µs/rev
mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.110717 s, 0.076323 s, -0.034394 s, × 0.6894, 8 µs/rev
# full comparison between the previous changeset and this one
Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev
---------------------------------------------------------------------------------------------------------------------------------------------------------------
mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 1 revs, 0.000048 s, 0.000041 s, -0.000007 s, × 0.8542, 41 µs/rev
mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 6 revs, 0.000153 s, 0.000102 s, -0.000051 s, × 0.6667, 17 µs/rev
mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 1032 revs, 0.004209 s, 0.004254 s, +0.000045 s, × 1.0107, 4 µs/rev
pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 9 revs, 0.000203 s, 0.000282 s, +0.000079 s, × 1.3892, 31 µs/rev
pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 1 revs, 0.000059 s, 0.000048 s, -0.000011 s, × 0.8136, 48 µs/rev
pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 7 revs, 0.000194 s, 0.000211 s, +0.000017 s, × 1.0876, 30 µs/rev
pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 1 revs, 0.000380 s, 0.000375 s, -0.000005 s, × 0.9868, 375 µs/rev
pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 6 revs, 0.010588 s, 0.010574 s, -0.000014 s, × 0.9987, 1762 µs/rev
pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 4785 revs, 0.048961 s, 0.049974 s, +0.001013 s, × 1.0207, 10 µs/rev
pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 6780 revs, 0.083612 s, 0.084300 s, +0.000688 s, × 1.0082, 12 µs/rev
pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 5441 revs, 0.058579 s, 0.060128 s, +0.001549 s, × 1.0264, 11 µs/rev
pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 43645 revs, 0.736783 s, 0.686542 s, -0.050241 s, × 0.9318, 15 µs/rev
pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 2 revs, 0.022050 s, 0.009277 s, -0.012773 s, × 0.4207, 4638 µs/rev
pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 11316 revs, 0.120800 s, 0.114733 s, -0.006067 s, × 0.9498, 10 µs/rev
netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 2 revs, 0.000140 s, 0.000081 s, -0.000059 s, × 0.5786, 40 µs/rev
netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 2 revs, 0.000114 s, 0.000107 s, -0.000007 s, × 0.9386, 53 µs/rev
netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 3 revs, 0.000224 s, 0.000173 s, -0.000051 s, × 0.7723, 57 µs/rev
netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 9 revs, 0.000723 s, 0.000698 s, -0.000025 s, × 0.9654, 77 µs/rev
netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 1421 revs, 0.009665 s, 0.009248 s, -0.000417 s, × 0.9569, 6 µs/rev
netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 1533 revs, 0.014820 s, 0.015446 s, +0.000626 s, × 1.0422, 10 µs/rev
netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 5750 revs, 0.076049 s, 0.074373 s, -0.001676 s, × 0.9780, 12 µs/rev
netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 66949 revs, 0.683603 s, 0.639870 s, -0.043733 s, × 0.9360, 9 µs/rev
mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 2 revs, 0.000161 s, 0.000088 s, -0.000073 s, × 0.5466, 44 µs/rev
mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 8 revs, 0.000234 s, 0.000199 s, -0.000035 s, × 0.8504, 24 µs/rev
mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 9 revs, 0.000247 s, 0.000171 s, -0.000076 s, × 0.6923, 19 µs/rev
mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 7 revs, 0.000630 s, 0.000592 s, -0.000038 s, × 0.9397, 84 µs/rev
mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 3 revs, 0.003286 s, 0.003151 s, -0.000135 s, × 0.9589, 1050 µs/rev
mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.062441 s, 0.061612 s, -0.000829 s, × 0.9867, 10268 µs/rev
mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.005423 s, 0.005381 s, -0.000042 s, × 0.9923, 3 µs/rev
mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.005919 s, 0.003742 s, -0.002177 s, × 0.6322, 91 µs/rev
mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 7839 revs, 0.062597 s, 0.061983 s, -0.000614 s, × 0.9902, 7 µs/rev
mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.043551 s, 0.019861 s, -0.023690 s, × 0.4560, 32 µs/rev
mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 30263 revs, 0.192475 s, 0.188101 s, -0.004374 s, × 0.9773, 6 µs/rev
mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 153721 revs, 1.955575 s, 1.806696 s, -0.148879 s, × 0.9239, 11 µs/rev
mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 204976 revs, 2.886501 s, 2.682987 s, -0.203514 s, × 0.9295, 13 µs/rev
mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 2 revs, 0.001181 s, 0.000852 s, -0.000329 s, × 0.7214, 426 µs/rev
mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 2 revs, 0.001189 s, 0.000859 s, -0.000330 s, × 0.7225, 429 µs/rev
mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 4 revs, 0.000563 s, 0.000150 s, -0.000413 s, × 0.2664, 37 µs/rev
mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 2 revs, 0.001548 s, 0.001158 s, -0.000390 s, × 0.7481, 579 µs/rev
mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1 revs, 0.027782 s, 0.027240 s, -0.000542 s, × 0.9805, 27240 µs/rev
mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.062781 s, 0.062824 s, +0.000043 s, × 1.0007, 10470 µs/rev
mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.005778 s, 0.005463 s, -0.000315 s, × 0.9455, 3 µs/rev
mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.006192 s, 0.004238 s, -0.001954 s, × 0.6844, 103 µs/rev
mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 6657 revs, 0.065391 s, 0.064113 s, -0.001278 s, × 0.9805, 9 µs/rev
mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 40314 revs, 0.317216 s, 0.294063 s, -0.023153 s, × 0.9270, 7 µs/rev
mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 38690 revs, 0.303119 s, 0.281493 s, -0.021626 s, × 0.9287, 7 µs/rev
mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.110717 s, 0.076323 s, -0.034394 s, × 0.6894, 8 µs/rev
mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.045739 s, 0.020390 s, -0.025349 s, × 0.4458, 33 µs/rev
mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 97052 revs, 3.098021 s, 3.023879 s, -0.074142 s, × 0.9761, 31 µs/rev
mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 52031 revs, 0.771480 s, 0.735549 s, -0.035931 s, × 0.9534, 14 µs/rev
mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 363753 revs, 18.813422 s, 18.568900 s, -0.244522 s, × 0.9870, 51 µs/rev
mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.962867 s, 0.502584 s, -0.460283 s, × 0.5220, 14 µs/rev
mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 362229 revs, 18.684923 s, 18.356645 s, -0.328278 s, × 0.9824, 50 µs/rev
mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 359344 revs, 18.296305 s, 18.250393 s, -0.045912 s, × 0.9975, 50 µs/rev
mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 192665 revs, 3.061887 s, 2.792459 s, -0.269428 s, × 0.9120, 14 µs/rev
mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs, 103.869641 s, 107.697264 s, +3.827623 s, × 1.0369, 470 µs/rev
mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 382065 revs, 64.262957 s, 63.961040 s, -0.301917 s, × 0.9953, 167 µs/rev
Differential Revision: https://phab.mercurial-scm.org/D9422
Setting up test
$ hg init test
$ cd test
$ echo 0 > afile
$ hg add afile
$ hg commit -m "0.0"
$ echo 1 >> afile
$ hg commit -m "0.1"
$ echo 2 >> afile
$ hg commit -m "0.2"
$ echo 3 >> afile
$ hg commit -m "0.3"
$ hg update -C 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 1 >> afile
$ hg commit -m "1.1"
created new head
$ echo 2 >> afile
$ hg commit -m "1.2"
$ echo "a line" > fred
$ echo 3 >> afile
$ hg add fred
$ hg commit -m "1.3"
$ hg mv afile adifferentfile
$ hg commit -m "1.3m"
$ hg update -C 3
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg mv afile anotherfile
$ hg commit -m "0.3m"
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 9 changesets with 7 changes to 4 files
$ cd ..
$ hg init empty
Bundle and phase
$ hg -R test phase --force --secret 0
$ hg -R test bundle phase.hg empty
searching for changes
no changes found (ignored 9 secret changesets)
[1]
$ hg -R test phase --draft -r 'head()'
Bundle --all
$ hg -R test bundle --all all.hg
9 changesets found
Bundle test to full.hg
$ hg -R test bundle full.hg empty
searching for changes
9 changesets found
Unbundle full.hg in test
$ hg -R test unbundle full.hg
adding changesets
adding manifests
adding file changes
added 0 changesets with 0 changes to 4 files
(run 'hg update' to get a working copy)
Verify empty
$ hg -R empty heads
[1]
$ hg -R empty verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 0 changesets with 0 changes to 0 files
#if repobundlerepo
Pull full.hg into test (using --cwd)
$ hg --cwd test pull ../full.hg
pulling from ../full.hg
searching for changes
no changes found
Verify that there are no leaked temporary files after pull (issue2797)
$ ls test/.hg | grep .hg10un
[1]
Pull full.hg into empty (using --cwd)
$ hg --cwd empty pull ../full.hg
pulling from ../full.hg
requesting all changes
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
Rollback empty
$ hg -R empty rollback
repository tip rolled back to revision -1 (undo pull)
Pull full.hg into empty again (using --cwd)
$ hg --cwd empty pull ../full.hg
pulling from ../full.hg
requesting all changes
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
Pull full.hg into test (using -R)
$ hg -R test pull full.hg
pulling from full.hg
searching for changes
no changes found
Pull full.hg into empty (using -R)
$ hg -R empty pull full.hg
pulling from full.hg
searching for changes
no changes found
Rollback empty
$ hg -R empty rollback
repository tip rolled back to revision -1 (undo pull)
Pull full.hg into empty again (using -R)
$ hg -R empty pull full.hg
pulling from full.hg
requesting all changes
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
(run 'hg heads' to see heads, 'hg merge' to merge)
Log -R full.hg in fresh empty
$ rm -r empty
$ hg init empty
$ cd empty
$ hg -R bundle://../full.hg log
changeset: 8:aa35859c02ea
tag: tip
parent: 3:eebf5a27f8ca
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.3m
changeset: 7:a6a34bfa0076
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.3m
changeset: 6:7373c1169842
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.3
changeset: 5:1bb50a9436a7
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.2
changeset: 4:095197eb4973
parent: 0:f9ee2f85a263
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.1
changeset: 3:eebf5a27f8ca
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.3
changeset: 2:e38ba6f5b7e0
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.2
changeset: 1:34c2bf6b0626
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.1
changeset: 0:f9ee2f85a263
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.0
Make sure bundlerepo doesn't leak tempfiles (issue2491)
$ ls .hg
00changelog.i
cache
requires
store
wcache
Pull ../full.hg into empty (with hook)
$ cat >> .hg/hgrc <<EOF
> [hooks]
> changegroup = sh -c "printenv.py --line changegroup"
> EOF
doesn't work (yet ?)
NOTE: msys is mangling the URL below
hg -R bundle://../full.hg verify
$ hg pull bundle://../full.hg
pulling from bundle:../full.hg
requesting all changes
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
changegroup hook: HG_HOOKNAME=changegroup
HG_HOOKTYPE=changegroup
HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735
HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf
HG_SOURCE=pull
HG_TXNID=TXN:$ID$
HG_TXNNAME=pull
bundle:../full.hg (no-msys !)
bundle;../full.hg (msys !)
HG_URL=bundle:../full.hg (no-msys !)
HG_URL=bundle;../full.hg (msys !)
(run 'hg heads' to see heads, 'hg merge' to merge)
Rollback empty
$ hg rollback
repository tip rolled back to revision -1 (undo pull)
$ cd ..
Log -R bundle:empty+full.hg
$ hg -R bundle:empty+full.hg log --template="{rev} "; echo ""
8 7 6 5 4 3 2 1 0
Pull full.hg into empty again (using -R; with hook)
$ hg -R empty pull full.hg
pulling from full.hg
requesting all changes
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
changegroup hook: HG_HOOKNAME=changegroup
HG_HOOKTYPE=changegroup
HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735
HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf
HG_SOURCE=pull
HG_TXNID=TXN:$ID$
HG_TXNNAME=pull
bundle:empty+full.hg
HG_URL=bundle:empty+full.hg
(run 'hg heads' to see heads, 'hg merge' to merge)
#endif
Cannot produce streaming clone bundles with "hg bundle"
$ hg -R test bundle -t packed1 packed.hg
abort: packed bundles cannot be produced by "hg bundle"
(use 'hg debugcreatestreamclonebundle')
[10]
packed1 is produced properly
#if reporevlogstore
$ hg -R test debugcreatestreamclonebundle packed.hg
writing 2664 bytes for 6 files
bundle requirements: generaldelta, revlogv1, sparserevlog
$ f -B 64 --size --sha1 --hexdump packed.hg
packed.hg: size=2840, sha1=12bf3eee3eb8a04c503ce2d29b48f0135c7edff5
0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........|
0010: 00 00 00 00 0a 68 00 23 67 65 6e 65 72 61 6c 64 |.....h.#generald|
0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 76 31 2c 73 70 |elta,revlogv1,sp|
0030: 61 72 73 65 72 65 76 6c 6f 67 00 64 61 74 61 2f |arserevlog.data/|
$ hg debugbundle --spec packed.hg
none-packed1;requirements%3Dgeneraldelta%2Crevlogv1%2Csparserevlog
generaldelta requirement is not listed in stream clone bundles unless used
$ hg --config format.usegeneraldelta=false init testnongd
$ cd testnongd
$ touch foo
$ hg -q commit -A -m initial
$ cd ..
$ hg -R testnongd debugcreatestreamclonebundle packednongd.hg
writing 301 bytes for 3 files
bundle requirements: revlogv1
$ f -B 64 --size --sha1 --hexdump packednongd.hg
packednongd.hg: size=383, sha1=1d9c230238edd5d38907100b729ba72b1831fe6f
0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 03 00 00 |HGS1UN..........|
0010: 00 00 00 00 01 2d 00 09 72 65 76 6c 6f 67 76 31 |.....-..revlogv1|
0020: 00 64 61 74 61 2f 66 6f 6f 2e 69 00 36 34 0a 00 |.data/foo.i.64..|
0030: 01 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 |................|
$ hg debugbundle --spec packednongd.hg
none-packed1;requirements%3Drevlogv1
Warning emitted when packed bundles contain secret changesets
$ hg init testsecret
$ cd testsecret
$ touch foo
$ hg -q commit -A -m initial
$ hg phase --force --secret -r .
$ cd ..
$ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg
(warning: stream clone bundle will contain secret revisions)
writing 301 bytes for 3 files
bundle requirements: generaldelta, revlogv1, sparserevlog
Unpacking packed1 bundles with "hg unbundle" isn't allowed
$ hg init packed
$ hg -R packed unbundle packed.hg
abort: packed bundles cannot be applied with "hg unbundle"
(use "hg debugapplystreamclonebundle")
[10]
packed1 can be consumed from debug command
(this also confirms that streamclone-ed changes are visible via
@filecache properties to in-process procedures before closing
transaction)
$ cat > $TESTTMP/showtip.py <<EOF
> from __future__ import absolute_import
>
> def showtip(ui, repo, hooktype, **kwargs):
> ui.warn(b'%s: %s\n' % (hooktype, repo[b'tip'].hex()[:12]))
>
> def reposetup(ui, repo):
> # this confirms (and ensures) that (empty) 00changelog.i
> # before streamclone is already cached as repo.changelog
> ui.setconfig(b'hooks', b'pretxnopen.showtip', showtip)
>
> # this confirms that streamclone-ed changes are visible to
> # in-process procedures before closing transaction
> ui.setconfig(b'hooks', b'pretxnclose.showtip', showtip)
>
> # this confirms that streamclone-ed changes are still visible
> # after closing transaction
> ui.setconfig(b'hooks', b'txnclose.showtip', showtip)
> EOF
$ cat >> $HGRCPATH <<EOF
> [extensions]
> showtip = $TESTTMP/showtip.py
> EOF
$ hg -R packed debugapplystreamclonebundle packed.hg
6 files to transfer, 2.60 KB of data
pretxnopen: 000000000000
pretxnclose: aa35859c02ea
transferred 2.60 KB in *.* seconds (* */sec) (glob)
txnclose: aa35859c02ea
(for safety, confirm visibility of streamclone-ed changes by another
process, too)
$ hg -R packed tip -T "{node|short}\n"
aa35859c02ea
$ cat >> $HGRCPATH <<EOF
> [extensions]
> showtip = !
> EOF
Does not work on non-empty repo
$ hg -R packed debugapplystreamclonebundle packed.hg
abort: cannot apply stream clone bundle on non-empty repo
[255]
#endif
Create partial clones
$ rm -r empty
$ hg init empty
$ hg clone -r 3 test partial
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
new changesets f9ee2f85a263:eebf5a27f8ca
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg clone partial partial2
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd partial
#if repobundlerepo
Log -R full.hg in partial
$ hg -R bundle://../full.hg log -T phases
changeset: 8:aa35859c02ea
tag: tip
phase: draft
parent: 3:eebf5a27f8ca
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.3m
changeset: 7:a6a34bfa0076
phase: draft
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.3m
changeset: 6:7373c1169842
phase: draft
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.3
changeset: 5:1bb50a9436a7
phase: draft
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.2
changeset: 4:095197eb4973
phase: draft
parent: 0:f9ee2f85a263
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.1
changeset: 3:eebf5a27f8ca
phase: public
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.3
changeset: 2:e38ba6f5b7e0
phase: public
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.2
changeset: 1:34c2bf6b0626
phase: public
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.1
changeset: 0:f9ee2f85a263
phase: public
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.0
Incoming full.hg in partial
$ hg incoming bundle://../full.hg
comparing with bundle:../full.hg
searching for changes
changeset: 4:095197eb4973
parent: 0:f9ee2f85a263
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.1
changeset: 5:1bb50a9436a7
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.2
changeset: 6:7373c1169842
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.3
changeset: 7:a6a34bfa0076
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.3m
changeset: 8:aa35859c02ea
tag: tip
parent: 3:eebf5a27f8ca
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.3m
Outgoing -R full.hg vs partial2 in partial
$ hg -R bundle://../full.hg outgoing ../partial2
comparing with ../partial2
searching for changes
changeset: 4:095197eb4973
parent: 0:f9ee2f85a263
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.1
changeset: 5:1bb50a9436a7
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.2
changeset: 6:7373c1169842
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.3
changeset: 7:a6a34bfa0076
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.3m
changeset: 8:aa35859c02ea
tag: tip
parent: 3:eebf5a27f8ca
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.3m
Outgoing -R does-not-exist.hg vs partial2 in partial
$ hg -R bundle://../does-not-exist.hg outgoing ../partial2
abort: *../does-not-exist.hg* (glob)
[255]
#endif
$ cd ..
hide outer repo
$ hg init
Direct clone from bundle (all-history)
#if repobundlerepo
$ hg clone full.hg full-clone
requesting all changes
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
new changesets f9ee2f85a263:aa35859c02ea (9 drafts)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R full-clone heads
changeset: 8:aa35859c02ea
tag: tip
parent: 3:eebf5a27f8ca
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.3m
changeset: 7:a6a34bfa0076
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1.3m
$ rm -r full-clone
When cloning from a non-copiable repository into '', do not
recurse infinitely (issue2528)
$ hg clone full.hg ''
abort: empty destination path is not valid
[10]
test for https://bz.mercurial-scm.org/216
Unbundle incremental bundles into fresh empty in one go
$ rm -r empty
$ hg init empty
$ hg -R test bundle --base null -r 0 ../0.hg
1 changesets found
$ hg -R test bundle --base 0 -r 1 ../1.hg
1 changesets found
$ hg -R empty unbundle -u ../0.hg ../1.hg
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
new changesets f9ee2f85a263 (1 drafts)
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
new changesets 34c2bf6b0626 (1 drafts)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
View full contents of the bundle
$ hg -R test bundle --base null -r 3 ../partial.hg
4 changesets found
$ cd test
$ hg -R ../../partial.hg log -r "bundle()"
changeset: 0:f9ee2f85a263
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.0
changeset: 1:34c2bf6b0626
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.1
changeset: 2:e38ba6f5b7e0
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.2
changeset: 3:eebf5a27f8ca
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0.3
$ cd ..
#endif
test for 540d1059c802
$ hg init orig
$ cd orig
$ echo foo > foo
$ hg add foo
$ hg ci -m 'add foo'
$ hg clone . ../copy
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg tag foo
$ cd ../copy
$ echo >> foo
$ hg ci -m 'change foo'
$ hg bundle ../bundle.hg ../orig
searching for changes
1 changesets found
$ cd ..
#if repobundlerepo
$ cd orig
$ hg incoming ../bundle.hg
comparing with ../bundle.hg
searching for changes
changeset: 2:ed1b79f46b9a
tag: tip
parent: 0:bbd179dfa0a7
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: change foo
$ cd ..
test bundle with # in the filename (issue2154):
$ cp bundle.hg 'test#bundle.hg'
$ cd orig
$ hg incoming '../test#bundle.hg'
comparing with ../test
abort: unknown revision 'bundle.hg'
[255]
note that percent encoding is not handled:
$ hg incoming ../test%23bundle.hg
abort: repository ../test%23bundle.hg not found
[255]
$ cd ..
#endif
test to bundle revisions on the newly created branch (issue3828):
$ hg -q clone -U test test-clone
$ cd test
$ hg -q branch foo
$ hg commit -m "create foo branch"
$ hg -q outgoing ../test-clone
9:b4f5acb1ee27
$ hg -q bundle --branch foo foo.hg ../test-clone
#if repobundlerepo
$ hg -R foo.hg -q log -r "bundle()"
9:b4f5acb1ee27
#endif
$ cd ..
test for https://bz.mercurial-scm.org/1144
test that verify bundle does not traceback
partial history bundle, fails w/ unknown parent
$ hg -R bundle.hg verify
abort: 00changelog.i@bbd179dfa0a7: unknown parent
[50]
full history bundle, refuses to verify non-local repo
#if repobundlerepo
$ hg -R all.hg verify
abort: cannot verify bundle or remote repos
[255]
#endif
but, regular verify must continue to work
$ hg -R orig verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 2 changesets with 2 changes to 2 files
#if repobundlerepo
diff against bundle
$ hg init b
$ cd b
$ hg -R ../all.hg diff -r tip
diff -r aa35859c02ea anotherfile
--- a/anotherfile Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-0
-1
-2
-3
$ cd ..
#endif
bundle single branch
$ hg init branchy
$ cd branchy
$ echo a >a
$ echo x >x
$ hg ci -Ama
adding a
adding x
$ echo c >c
$ echo xx >x
$ hg ci -Amc
adding c
$ echo c1 >c1
$ hg ci -Amc1
adding c1
$ hg up 0
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo b >b
$ hg ci -Amb
adding b
created new head
$ echo b1 >b1
$ echo xx >x
$ hg ci -Amb1
adding b1
$ hg clone -q -r2 . part
== bundling via incoming
$ hg in -R part --bundle incoming.hg --template "{node}\n" .
comparing with .
searching for changes
1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a
057f4db07f61970e1c11e83be79e9d08adc4dc31
== bundling
$ hg bundle bundle.hg part --debug --config progress.debug=true
query 1; heads
searching for changes
all remote heads known locally
2 changesets found
list of changesets:
1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a
057f4db07f61970e1c11e83be79e9d08adc4dc31
bundle2-output-bundle: "HG20", (1 params) 2 parts total
bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
changesets: 1/2 chunks (50.00%)
changesets: 2/2 chunks (100.00%)
manifests: 1/2 chunks (50.00%)
manifests: 2/2 chunks (100.00%)
files: b 1/3 files (33.33%)
files: b1 2/3 files (66.67%)
files: x 3/3 files (100.00%)
bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload
#if repobundlerepo
== Test for issue3441
$ hg clone -q -r0 . part2
$ hg -q -R part2 pull bundle.hg
$ hg -R part2 verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 3 changesets with 5 changes to 4 files
#endif
== Test bundling no commits
$ hg bundle -r 'public()' no-output.hg
abort: no commits to bundle
[10]
$ cd ..
When user merges to the revision existing only in the bundle,
it should show warning that second parent of the working
directory does not exist
$ hg init update2bundled
$ cd update2bundled
$ cat <<EOF >> .hg/hgrc
> [extensions]
> strip =
> EOF
$ echo "aaa" >> a
$ hg commit -A -m 0
adding a
$ echo "bbb" >> b
$ hg commit -A -m 1
adding b
$ echo "ccc" >> c
$ hg commit -A -m 2
adding c
$ hg update -r 1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "ddd" >> d
$ hg commit -A -m 3
adding d
created new head
$ hg update -r 2
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg log -G
o changeset: 3:8bd3e1f196af
| tag: tip
| parent: 1:a01eca7af26d
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: 3
|
| @ changeset: 2:4652c276ac4f
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: 2
|
o changeset: 1:a01eca7af26d
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: 1
|
o changeset: 0:4fe08cd4693e
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0
#if repobundlerepo
$ hg bundle --base 1 -r 3 ../update2bundled.hg
1 changesets found
$ hg strip -r 3
saved backup bundle to $TESTTMP/update2bundled/.hg/strip-backup/8bd3e1f196af-017e56d8-backup.hg
$ hg merge -R ../update2bundled.hg -r 3
setting parent to node 8bd3e1f196af289b2b121be08031e76d7ae92098 that only exists in the bundle
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
When user updates to the revision existing only in the bundle,
it should show warning
$ hg update -R ../update2bundled.hg --clean -r 3
setting parent to node 8bd3e1f196af289b2b121be08031e76d7ae92098 that only exists in the bundle
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
When user updates to the revision existing in the local repository
the warning shouldn't be emitted
$ hg update -R ../update2bundled.hg -r 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
#endif
Test the option that create slim bundle
$ hg bundle -a --config devel.bundle.delta=p1 ./slim.hg
3 changesets found
Test the option that create and no-delta's bundle
$ hg bundle -a --config devel.bundle.delta=full ./full.hg
3 changesets found