Mercurial > hg-stable
annotate tests/test-clone-uncompressed.t @ 35767:5f5fb279fd39
streamclone: also stream caches to the client
When stream clone is used over bundle2, relevant cache files are also streamed.
This is expected to be a massive performance win for clone since no important
cache will have to be recomputed.
Some performance numbers:
(All times are wall-clock times in seconds, 2 attempts per case.)
# Mozilla-Central
## Clone over ssh over lan
V1 streaming: 234.3 239.6
V2 streaming: 248.4 243.7
## Clone over ssh over Internet
V1 streaming: 175.5 110.9
V2 streaming: 109.1 111.0
## Clone over HTTP over lan
V1 streaming: 105.3 105.6
V2 streaming: 112.7 111.4
## Clone over HTTP over internet
V1 streaming: 105.6 114.6
V2 streaming: 226.7 225.9
## Hg tags
V1 streaming (no cache): 1.084 1.071
V2 streaming (cache): 0.312 0.325
## Hg branches
V1 streaming (no cache): 14.047 14.148
V2 streaming (with cache): 0.312 0.333
# Pypy
## Clone over ssh over internet
V1 streaming: 29.4 30.1
V2 streaming: 31.2 30.1
## Clone over http over internet
V1 streaming: 29.7 29.7
V2 streaming: 75.2 72.9
(since ssh and lan are not affected, there seems to be an issue with how we
read/write the http stream on connection with latency, unrelated to the format)
## Hg tags
V1 streaming (no cache): 1.752 1.664
V2 streaming (with cache): 0.274 0.260
## Hg branches
V1 streaming (no cache): 4.469 4.728
V2 streaming (with cache): 0.318 0.321
# Private repository:
* 500K revision revisions
* 11K topological heads
* 28K branch heads
## hg tags
no cache: 1543.332
with cache: 4.900
## hg branches
no cache: 91.828
with cache: 2.955
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 18 Jan 2018 00:50:12 +0100 |
parents | 56c30b31afbe |
children | a84dbc87dae9 |
rev | line source |
---|---|
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
1 #require serve |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
2 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
3 #testcases stream-legacy stream-bundle2 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
4 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
5 #if stream-bundle2 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
6 $ cat << EOF >> $HGRCPATH |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
7 > [experimental] |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
8 > bundle2.stream = yes |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
9 > EOF |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
10 #endif |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
11 |
28389
9ab45fbe045e
bdiff: (pure) support array.array arrays (issue5130)
timeless <timeless@mozdev.org>
parents:
27897
diff
changeset
|
12 Initialize repository |
9ab45fbe045e
bdiff: (pure) support array.array arrays (issue5130)
timeless <timeless@mozdev.org>
parents:
27897
diff
changeset
|
13 the status call is to check for issue5130 |
9ab45fbe045e
bdiff: (pure) support array.array arrays (issue5130)
timeless <timeless@mozdev.org>
parents:
27897
diff
changeset
|
14 |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
15 $ hg init server |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
16 $ cd server |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
17 $ touch foo |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
18 $ hg -q commit -A -m initial |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
19 >>> for i in range(1024): |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
20 ... with open(str(i), 'wb') as fh: |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
21 ... fh.write(str(i)) |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
22 $ hg -q commit -A -m 'add a lot of files' |
28389
9ab45fbe045e
bdiff: (pure) support array.array arrays (issue5130)
timeless <timeless@mozdev.org>
parents:
27897
diff
changeset
|
23 $ hg st |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
24 $ hg serve -p $HGPORT -d --pid-file=hg.pid |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
25 $ cat hg.pid >> $DAEMON_PIDS |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
26 $ cd .. |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
27 |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
28 Basic clone |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
29 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
30 #if stream-legacy |
34394
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
31 $ hg clone --stream -U http://localhost:$HGPORT clone1 |
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
32 streaming all changes |
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
33 1027 files to transfer, 96.3 KB of data |
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
34 transferred 96.3 KB in * seconds (*/sec) (glob) |
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
35 searching for changes |
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
36 no changes found |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
37 #endif |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
38 #if stream-bundle2 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
39 $ hg clone --stream -U http://localhost:$HGPORT clone1 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
40 streaming all changes |
35767
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
41 1030 files to transfer, 96.4 KB of data |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
42 transferred 96.4 KB in * seconds (* */sec) (glob) |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
43 |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
44 $ ls -1 clone1/.hg/cache |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
45 branch2-served |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
46 rbc-names-v1 |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
47 rbc-revs-v1 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
48 #endif |
34394
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
49 |
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
50 --uncompressed is an alias to --stream |
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
51 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
52 #if stream-legacy |
34394
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
53 $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
54 streaming all changes |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
55 1027 files to transfer, 96.3 KB of data |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
56 transferred 96.3 KB in * seconds (*/sec) (glob) |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
57 searching for changes |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
58 no changes found |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
59 #endif |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
60 #if stream-bundle2 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
61 $ hg clone --uncompressed -U http://localhost:$HGPORT clone1-uncompressed |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
62 streaming all changes |
35767
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
63 1030 files to transfer, 96.4 KB of data |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
64 transferred 96.4 KB in * seconds (* */sec) (glob) |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
65 #endif |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
66 |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
67 Clone with background file closing enabled |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
68 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
69 #if stream-legacy |
34394
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
70 $ hg --debug --config worker.backgroundclose=true --config worker.backgroundcloseminfilecount=1 clone --stream -U http://localhost:$HGPORT clone-background | grep -v adding |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
71 using http://localhost:$HGPORT/ |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
72 sending capabilities command |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
73 sending branchmap command |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
74 streaming all changes |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
75 sending stream_out command |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
76 1027 files to transfer, 96.3 KB of data |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
77 starting 4 threads for background file closing |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
78 transferred 96.3 KB in * seconds (*/sec) (glob) |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
79 query 1; heads |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
80 sending batch command |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
81 searching for changes |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
82 all remote heads known locally |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
83 no changes found |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
84 sending getbundle command |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
85 bundle2-input-bundle: with-transaction |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
86 bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
34329
10e162bb9bf5
pull: use 'phase-heads' to retrieve phase information
Boris Feld <boris.feld@octobus.net>
parents:
32764
diff
changeset
|
87 bundle2-input-part: "phase-heads" supported |
10e162bb9bf5
pull: use 'phase-heads' to retrieve phase information
Boris Feld <boris.feld@octobus.net>
parents:
32764
diff
changeset
|
88 bundle2-input-part: total payload size 24 |
27897
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
89 bundle2-input-bundle: 1 parts total |
2fdbf22a1b63
streamclone: use backgroundfilecloser (issue4889)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff
changeset
|
90 checking for updated bookmarks |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
91 #endif |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
92 #if stream-bundle2 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
93 $ hg --debug --config worker.backgroundclose=true --config worker.backgroundcloseminfilecount=1 clone --stream -U http://localhost:$HGPORT clone-background | grep -v adding |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
94 using http://localhost:$HGPORT/ |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
95 sending capabilities command |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
96 query 1; heads |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
97 sending batch command |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
98 streaming all changes |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
99 sending getbundle command |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
100 bundle2-input-bundle: with-transaction |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
101 bundle2-input-part: "stream" (params: 4 mandatory) supported |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
102 applying stream bundle |
35767
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
103 1030 files to transfer, 96.4 KB of data |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
104 starting 4 threads for background file closing |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
105 starting 4 threads for background file closing |
35767
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
106 transferred 96.4 KB in * seconds (* */sec) (glob) |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
107 bundle2-input-part: total payload size 112077 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
108 bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
35765
56c30b31afbe
streamclone: add support for cloning non append-only file
Boris Feld <boris.feld@octobus.net>
parents:
35764
diff
changeset
|
109 bundle2-input-bundle: 1 parts total |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
110 checking for updated bookmarks |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
111 #endif |
28517
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
112 |
32764
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
113 Cannot stream clone when there are secret changesets |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
114 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
115 $ hg -R server phase --force --secret -r tip |
34394
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
116 $ hg clone --stream -U http://localhost:$HGPORT secret-denied |
32764
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
117 warning: stream clone requested but server has them disabled |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
118 requesting all changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
119 adding changesets |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
120 adding manifests |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
121 adding file changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
122 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34483
diff
changeset
|
123 new changesets 96ee1d7354c4 |
32764
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
124 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
125 $ killdaemons.py |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
126 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
127 Streaming of secrets can be overridden by server config |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
128 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
129 $ cd server |
34483
a6d95a8b7243
serve: make tests compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents:
34394
diff
changeset
|
130 $ hg serve --config server.uncompressedallowsecret=true -p $HGPORT -d --pid-file=hg.pid |
32764
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
131 $ cat hg.pid > $DAEMON_PIDS |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
132 $ cd .. |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
133 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
134 #if stream-legacy |
34394
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
135 $ hg clone --stream -U http://localhost:$HGPORT secret-allowed |
32764
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
136 streaming all changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
137 1027 files to transfer, 96.3 KB of data |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
138 transferred 96.3 KB in * seconds (*/sec) (glob) |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
139 searching for changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
140 no changes found |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
141 #endif |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
142 #if stream-bundle2 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
143 $ hg clone --stream -U http://localhost:$HGPORT secret-allowed |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
144 streaming all changes |
35767
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
145 1030 files to transfer, 96.4 KB of data |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
146 transferred 96.4 KB in * seconds (* */sec) (glob) |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
147 #endif |
32764
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
148 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
149 $ killdaemons.py |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
150 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
151 Verify interaction between preferuncompressed and secret presence |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
152 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
153 $ cd server |
34483
a6d95a8b7243
serve: make tests compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents:
34394
diff
changeset
|
154 $ hg serve --config server.preferuncompressed=true -p $HGPORT -d --pid-file=hg.pid |
32764
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
155 $ cat hg.pid > $DAEMON_PIDS |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
156 $ cd .. |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
157 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
158 $ hg clone -U http://localhost:$HGPORT preferuncompressed-secret |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
159 requesting all changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
160 adding changesets |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
161 adding manifests |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
162 adding file changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
163 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34483
diff
changeset
|
164 new changesets 96ee1d7354c4 |
32764
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
165 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
166 $ killdaemons.py |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
167 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
168 Clone not allowed when full bundles disabled and can't serve secrets |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
169 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
170 $ cd server |
34483
a6d95a8b7243
serve: make tests compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents:
34394
diff
changeset
|
171 $ hg serve --config server.disablefullbundle=true -p $HGPORT -d --pid-file=hg.pid |
32764
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
172 $ cat hg.pid > $DAEMON_PIDS |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
173 $ cd .. |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
174 |
34394
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
175 $ hg clone --stream http://localhost:$HGPORT secret-full-disabled |
32764
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
176 warning: stream clone requested but server has them disabled |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
177 requesting all changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
178 remote: abort: server has pull-based clones disabled |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
179 abort: pull failed on remote |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
180 (remove --pull if specified or upgrade Mercurial) |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
181 [255] |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
182 |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
183 Local stream clone with secrets involved |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
184 (This is just a test over behavior: if you have access to the repo's files, |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
185 there is no security so it isn't important to prevent a clone here.) |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
186 |
34394
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
187 $ hg clone -U --stream server local-secret |
32764
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
188 warning: stream clone requested but server has them disabled |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
189 requesting all changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
190 adding changesets |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
191 adding manifests |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
192 adding file changes |
33b7283a3828
streamclone: consider secret changesets (BC) (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31262
diff
changeset
|
193 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34483
diff
changeset
|
194 new changesets 96ee1d7354c4 |
28517
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
195 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
196 Stream clone while repo is changing: |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
197 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
198 $ mkdir changing |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
199 $ cd changing |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
200 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
201 extension for delaying the server process so we reliably can modify the repo |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
202 while cloning |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
203 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
204 $ cat > delayer.py <<EOF |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
205 > import time |
31262
e7a35f18d91f
vfs: use 'vfs' module directly in 'test-clone-uncompressed'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29064
diff
changeset
|
206 > from mercurial import extensions, vfs |
28517
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
207 > def __call__(orig, self, path, *args, **kwargs): |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
208 > if path == 'data/f1.i': |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
209 > time.sleep(2) |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
210 > return orig(self, path, *args, **kwargs) |
31262
e7a35f18d91f
vfs: use 'vfs' module directly in 'test-clone-uncompressed'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29064
diff
changeset
|
211 > extensions.wrapfunction(vfs.vfs, '__call__', __call__) |
28517
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
212 > EOF |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
213 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
214 prepare repo with small and big file to cover both code paths in emitrevlogdata |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
215 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
216 $ hg init repo |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
217 $ touch repo/f1 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
218 $ $TESTDIR/seq.py 50000 > repo/f2 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
219 $ hg -R repo ci -Aqm "0" |
34483
a6d95a8b7243
serve: make tests compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents:
34394
diff
changeset
|
220 $ hg serve -R repo -p $HGPORT1 -d --pid-file=hg.pid --config extensions.delayer=delayer.py |
28517
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
221 $ cat hg.pid >> $DAEMON_PIDS |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
222 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
223 clone while modifying the repo between stating file with write lock and |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
224 actually serving file content |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
225 |
34394
fffd3369aa83
commands: rename clone --uncompressed to --stream and document
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34329
diff
changeset
|
226 $ hg clone -q --stream -U http://localhost:$HGPORT1 clone & |
28517
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
227 $ sleep 1 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
228 $ echo >> repo/f1 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
229 $ echo >> repo/f2 |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
230 $ hg -R repo ci -m "1" |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
231 $ wait |
95163ababeb8
tests: add test of stream clone of repo that is changing
Mads Kiilerich <madski@unity3d.com>
parents:
28389
diff
changeset
|
232 $ hg -R clone id |
28518
aa440c3d7c5d
streamclone: fix error when store files grow while stream cloning
Mads Kiilerich <madski@unity3d.com>
parents:
28517
diff
changeset
|
233 000000000000 |
35747
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
234 $ cd .. |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
235 |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
236 Stream repository with bookmarks |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
237 -------------------------------- |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
238 |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
239 (revert introduction of secret changeset) |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
240 |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
241 $ hg -R server phase --draft 'secret()' |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
242 |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
243 add a bookmark |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
244 |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
245 $ hg -R server bookmark -r tip some-bookmark |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
246 |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
247 clone it |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
248 |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
249 #if stream-legacy |
35747
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
250 $ hg clone --stream http://localhost:$HGPORT with-bookmarks |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
251 streaming all changes |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
252 1027 files to transfer, 96.3 KB of data |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
253 transferred 96.3 KB in * seconds (*) (glob) |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
254 searching for changes |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
255 no changes found |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
256 updating to branch default |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
257 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
258 #endif |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
259 #if stream-bundle2 |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
260 $ hg clone --stream http://localhost:$HGPORT with-bookmarks |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
261 streaming all changes |
35767
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
262 1033 files to transfer, 96.6 KB of data |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
263 transferred 96.6 KB in * seconds (* */sec) (glob) |
35763
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
264 updating to branch default |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
265 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7eedbd5d4880
streamclone: add support for bundle2 based stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35747
diff
changeset
|
266 #endif |
35747
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
267 $ hg -R with-bookmarks bookmarks |
de32acb24949
stream: add a test showing we also clone bookmarks
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
268 some-bookmark 1:c17445101a72 |
35764
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
269 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
270 Stream repository with phases |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
271 ----------------------------- |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
272 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
273 Clone as publishing |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
274 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
275 $ hg -R server phase -r 'all()' |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
276 0: draft |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
277 1: draft |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
278 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
279 #if stream-legacy |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
280 $ hg clone --stream http://localhost:$HGPORT phase-publish |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
281 streaming all changes |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
282 1027 files to transfer, 96.3 KB of data |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
283 transferred 96.3 KB in * seconds (*) (glob) |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
284 searching for changes |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
285 no changes found |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
286 updating to branch default |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
287 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
288 #endif |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
289 #if stream-bundle2 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
290 $ hg clone --stream http://localhost:$HGPORT phase-publish |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
291 streaming all changes |
35767
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
292 1033 files to transfer, 96.6 KB of data |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
293 transferred 96.6 KB in * seconds (* */sec) (glob) |
35764
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
294 updating to branch default |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
295 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
296 #endif |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
297 $ hg -R phase-publish phase -r 'all()' |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
298 0: public |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
299 1: public |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
300 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
301 Clone as non publishing |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
302 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
303 $ cat << EOF >> server/.hg/hgrc |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
304 > [phases] |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
305 > publish = False |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
306 > EOF |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
307 $ killdaemons.py |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
308 $ hg -R server serve -p $HGPORT -d --pid-file=hg.pid |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
309 $ cat hg.pid >> $DAEMON_PIDS |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
310 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
311 #if stream-legacy |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
312 $ hg clone --stream http://localhost:$HGPORT phase-no-publish |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
313 streaming all changes |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
314 1027 files to transfer, 96.3 KB of data |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
315 transferred 96.3 KB in * seconds (*) (glob) |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
316 searching for changes |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
317 no changes found |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
318 updating to branch default |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
319 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
320 $ hg -R phase-no-publish phase -r 'all()' |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
321 0: public |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
322 1: public |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
323 #endif |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
324 #if stream-bundle2 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
325 $ hg clone --stream http://localhost:$HGPORT phase-no-publish |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
326 streaming all changes |
35767
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
327 1034 files to transfer, 96.7 KB of data |
5f5fb279fd39
streamclone: also stream caches to the client
Boris Feld <boris.feld@octobus.net>
parents:
35765
diff
changeset
|
328 transferred 96.7 KB in * seconds (* */sec) (glob) |
35764
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
329 updating to branch default |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
330 1025 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
331 $ hg -R phase-no-publish phase -r 'all()' |
35765
56c30b31afbe
streamclone: add support for cloning non append-only file
Boris Feld <boris.feld@octobus.net>
parents:
35764
diff
changeset
|
332 0: draft |
56c30b31afbe
streamclone: add support for cloning non append-only file
Boris Feld <boris.feld@octobus.net>
parents:
35764
diff
changeset
|
333 1: draft |
35764
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
334 #endif |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
335 |
b6ffd4194639
streamclone: tests phase exchange during stream clone
Boris Feld <boris.feld@octobus.net>
parents:
35763
diff
changeset
|
336 $ killdaemons.py |