Show More
@@ -1,166 +1,170 b'' | |||||
1 | Test creating a consuming stream bundle v2 |
|
1 | Test creating a consuming stream bundle v2 | |
2 |
|
2 | |||
3 | $ getmainid() { |
|
3 | $ getmainid() { | |
4 | > hg -R main log --template '{node}\n' --rev "$1" |
|
4 | > hg -R main log --template '{node}\n' --rev "$1" | |
5 | > } |
|
5 | > } | |
6 |
|
6 | |||
7 | $ cp $HGRCPATH $TESTTMP/hgrc.orig |
|
7 | $ cp $HGRCPATH $TESTTMP/hgrc.orig | |
8 |
|
8 | |||
9 | $ cat >> $HGRCPATH << EOF |
|
9 | $ cat >> $HGRCPATH << EOF | |
10 | > [experimental] |
|
10 | > [experimental] | |
11 | > evolution.createmarkers=True |
|
11 | > evolution.createmarkers=True | |
12 | > evolution.exchange=True |
|
12 | > evolution.exchange=True | |
13 | > bundle2-output-capture=True |
|
13 | > bundle2-output-capture=True | |
14 | > [ui] |
|
14 | > [ui] | |
15 | > ssh="$PYTHON" "$TESTDIR/dummyssh" |
|
15 | > ssh="$PYTHON" "$TESTDIR/dummyssh" | |
16 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} |
|
16 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} | |
17 | > [web] |
|
17 | > [web] | |
18 | > push_ssl = false |
|
18 | > push_ssl = false | |
19 | > allow_push = * |
|
19 | > allow_push = * | |
20 | > [phases] |
|
20 | > [phases] | |
21 | > publish=False |
|
21 | > publish=False | |
22 | > [extensions] |
|
22 | > [extensions] | |
23 | > drawdag=$TESTDIR/drawdag.py |
|
23 | > drawdag=$TESTDIR/drawdag.py | |
24 | > clonebundles= |
|
24 | > clonebundles= | |
25 | > EOF |
|
25 | > EOF | |
26 |
|
26 | |||
27 | The extension requires a repo (currently unused) |
|
27 | The extension requires a repo (currently unused) | |
28 |
|
28 | |||
29 | $ hg init main |
|
29 | $ hg init main | |
30 | $ cd main |
|
30 | $ cd main | |
31 |
|
31 | |||
32 | $ hg debugdrawdag <<'EOF' |
|
32 | $ hg debugdrawdag <<'EOF' | |
33 | > E |
|
33 | > E | |
34 | > | |
|
34 | > | | |
35 | > D |
|
35 | > D | |
36 | > | |
|
36 | > | | |
37 | > C |
|
37 | > C | |
38 | > | |
|
38 | > | | |
39 | > B |
|
39 | > B | |
40 | > | |
|
40 | > | | |
41 | > A |
|
41 | > A | |
42 | > EOF |
|
42 | > EOF | |
43 |
|
43 | |||
44 | $ hg bundle -a --type="none-v2;stream=v2" bundle.hg |
|
44 | $ hg bundle -a --type="none-v2;stream=v2" bundle.hg | |
45 | $ hg debugbundle bundle.hg |
|
45 | $ hg debugbundle bundle.hg | |
46 | Stream params: {} |
|
46 | Stream params: {} | |
47 | stream2 -- {bytecount: 1693, filecount: 11, requirements: dotencode%2Cfncache%2Cgeneraldelta%2Crevlogv1%2Cstore} |
|
47 | stream2 -- {bytecount: 1693, filecount: 11, requirements: dotencode%2Cfncache%2Cgeneraldelta%2Crevlogv1%2Cstore} | |
48 | $ hg debugbundle --spec bundle.hg |
|
48 | $ hg debugbundle --spec bundle.hg | |
49 | none-v2;stream=v2;requirements%3Ddotencode%2Cfncache%2Cgeneraldelta%2Crevlogv1%2Cstore |
|
49 | none-v2;stream=v2;requirements%3Ddotencode%2Cfncache%2Cgeneraldelta%2Crevlogv1%2Cstore | |
50 |
|
50 | |||
51 | Test that we can apply the bundle as a stream clone bundle |
|
51 | Test that we can apply the bundle as a stream clone bundle | |
52 |
|
52 | |||
53 | $ cat > .hg/clonebundles.manifest << EOF |
|
53 | $ cat > .hg/clonebundles.manifest << EOF | |
54 | > http://localhost:$HGPORT1/bundle.hg BUNDLESPEC=`hg debugbundle --spec bundle.hg` |
|
54 | > http://localhost:$HGPORT1/bundle.hg BUNDLESPEC=`hg debugbundle --spec bundle.hg` | |
55 | > EOF |
|
55 | > EOF | |
56 |
|
56 | |||
57 | $ hg serve -d -p $HGPORT --pid-file hg.pid --accesslog access.log |
|
57 | $ hg serve -d -p $HGPORT --pid-file hg.pid --accesslog access.log | |
58 | $ cat hg.pid >> $DAEMON_PIDS |
|
58 | $ cat hg.pid >> $DAEMON_PIDS | |
59 |
|
59 | |||
60 | $ "$PYTHON" $TESTDIR/dumbhttp.py -p $HGPORT1 --pid http.pid |
|
60 | $ "$PYTHON" $TESTDIR/dumbhttp.py -p $HGPORT1 --pid http.pid | |
61 | $ cat http.pid >> $DAEMON_PIDS |
|
61 | $ cat http.pid >> $DAEMON_PIDS | |
62 |
|
62 | |||
63 | $ cd .. |
|
63 | $ cd .. | |
64 | $ hg clone http://localhost:$HGPORT streamv2-clone-implicit --debug |
|
64 | $ hg clone http://localhost:$HGPORT streamv2-clone-implicit --debug | |
65 | using http://localhost:$HGPORT/ |
|
65 | using http://localhost:$HGPORT/ | |
66 | sending capabilities command |
|
66 | sending capabilities command | |
67 | sending clonebundles command |
|
67 | sending clonebundles command | |
68 | applying clone bundle from http://localhost:$HGPORT1/bundle.hg |
|
68 | applying clone bundle from http://localhost:$HGPORT1/bundle.hg | |
69 | bundle2-input-bundle: with-transaction |
|
69 | bundle2-input-bundle: with-transaction | |
70 | bundle2-input-part: "stream2" (params: 3 mandatory) supported |
|
70 | bundle2-input-part: "stream2" (params: 3 mandatory) supported | |
71 | applying stream bundle |
|
71 | applying stream bundle | |
72 | 11 files to transfer, 1.65 KB of data |
|
72 | 11 files to transfer, 1.65 KB of data | |
|
73 | starting 4 threads for background file closing (?) | |||
|
74 | starting 4 threads for background file closing (?) | |||
73 |
|
|
75 | adding [s] data/A.i (66 bytes) | |
74 | adding [s] data/B.i (66 bytes) |
|
76 | adding [s] data/B.i (66 bytes) | |
75 | adding [s] data/C.i (66 bytes) |
|
77 | adding [s] data/C.i (66 bytes) | |
76 | adding [s] data/D.i (66 bytes) |
|
78 | adding [s] data/D.i (66 bytes) | |
77 | adding [s] data/E.i (66 bytes) |
|
79 | adding [s] data/E.i (66 bytes) | |
78 | adding [s] 00manifest.i (584 bytes) |
|
80 | adding [s] 00manifest.i (584 bytes) | |
79 | adding [s] 00changelog.i (595 bytes) |
|
81 | adding [s] 00changelog.i (595 bytes) | |
80 | adding [s] phaseroots (43 bytes) |
|
82 | adding [s] phaseroots (43 bytes) | |
81 | adding [c] branch2-served (94 bytes) |
|
83 | adding [c] branch2-served (94 bytes) | |
82 | adding [c] rbc-names-v1 (7 bytes) |
|
84 | adding [c] rbc-names-v1 (7 bytes) | |
83 | adding [c] rbc-revs-v1 (40 bytes) |
|
85 | adding [c] rbc-revs-v1 (40 bytes) | |
84 | transferred 1.65 KB in \d\.\d seconds \(.*/sec\) (re) |
|
86 | transferred 1.65 KB in \d\.\d seconds \(.*/sec\) (re) | |
85 | bundle2-input-part: total payload size 1840 |
|
87 | bundle2-input-part: total payload size 1840 | |
86 | bundle2-input-bundle: 0 parts total |
|
88 | bundle2-input-bundle: 0 parts total | |
87 | finished applying clone bundle |
|
89 | finished applying clone bundle | |
88 | query 1; heads |
|
90 | query 1; heads | |
89 | sending batch command |
|
91 | sending batch command | |
90 | searching for changes |
|
92 | searching for changes | |
91 | all remote heads known locally |
|
93 | all remote heads known locally | |
92 | no changes found |
|
94 | no changes found | |
93 | sending getbundle command |
|
95 | sending getbundle command | |
94 | bundle2-input-bundle: with-transaction |
|
96 | bundle2-input-bundle: with-transaction | |
95 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
|
97 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported | |
96 | bundle2-input-part: "phase-heads" supported |
|
98 | bundle2-input-part: "phase-heads" supported | |
97 | bundle2-input-part: total payload size 24 |
|
99 | bundle2-input-part: total payload size 24 | |
98 | bundle2-input-bundle: 1 parts total |
|
100 | bundle2-input-bundle: 1 parts total | |
99 | checking for updated bookmarks |
|
101 | checking for updated bookmarks | |
100 | updating to branch default |
|
102 | updating to branch default | |
101 | resolving manifests |
|
103 | resolving manifests | |
102 | branchmerge: False, force: False, partial: False |
|
104 | branchmerge: False, force: False, partial: False | |
103 | ancestor: 000000000000, local: 000000000000+, remote: 9bc730a19041 |
|
105 | ancestor: 000000000000, local: 000000000000+, remote: 9bc730a19041 | |
104 | A: remote created -> g |
|
106 | A: remote created -> g | |
105 | getting A |
|
107 | getting A | |
106 | B: remote created -> g |
|
108 | B: remote created -> g | |
107 | getting B |
|
109 | getting B | |
108 | C: remote created -> g |
|
110 | C: remote created -> g | |
109 | getting C |
|
111 | getting C | |
110 | D: remote created -> g |
|
112 | D: remote created -> g | |
111 | getting D |
|
113 | getting D | |
112 | E: remote created -> g |
|
114 | E: remote created -> g | |
113 | getting E |
|
115 | getting E | |
114 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
116 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
115 |
|
117 | |||
116 | $ hg clone --stream http://localhost:$HGPORT streamv2-clone-explicit --debug |
|
118 | $ hg clone --stream http://localhost:$HGPORT streamv2-clone-explicit --debug | |
117 | using http://localhost:$HGPORT/ |
|
119 | using http://localhost:$HGPORT/ | |
118 | sending capabilities command |
|
120 | sending capabilities command | |
119 | sending clonebundles command |
|
121 | sending clonebundles command | |
120 | applying clone bundle from http://localhost:$HGPORT1/bundle.hg |
|
122 | applying clone bundle from http://localhost:$HGPORT1/bundle.hg | |
121 | bundle2-input-bundle: with-transaction |
|
123 | bundle2-input-bundle: with-transaction | |
122 | bundle2-input-part: "stream2" (params: 3 mandatory) supported |
|
124 | bundle2-input-part: "stream2" (params: 3 mandatory) supported | |
123 | applying stream bundle |
|
125 | applying stream bundle | |
124 | 11 files to transfer, 1.65 KB of data |
|
126 | 11 files to transfer, 1.65 KB of data | |
|
127 | starting 4 threads for background file closing (?) | |||
|
128 | starting 4 threads for background file closing (?) | |||
125 |
|
|
129 | adding [s] data/A.i (66 bytes) | |
126 | adding [s] data/B.i (66 bytes) |
|
130 | adding [s] data/B.i (66 bytes) | |
127 | adding [s] data/C.i (66 bytes) |
|
131 | adding [s] data/C.i (66 bytes) | |
128 | adding [s] data/D.i (66 bytes) |
|
132 | adding [s] data/D.i (66 bytes) | |
129 | adding [s] data/E.i (66 bytes) |
|
133 | adding [s] data/E.i (66 bytes) | |
130 | adding [s] 00manifest.i (584 bytes) |
|
134 | adding [s] 00manifest.i (584 bytes) | |
131 | adding [s] 00changelog.i (595 bytes) |
|
135 | adding [s] 00changelog.i (595 bytes) | |
132 | adding [s] phaseroots (43 bytes) |
|
136 | adding [s] phaseroots (43 bytes) | |
133 | adding [c] branch2-served (94 bytes) |
|
137 | adding [c] branch2-served (94 bytes) | |
134 | adding [c] rbc-names-v1 (7 bytes) |
|
138 | adding [c] rbc-names-v1 (7 bytes) | |
135 | adding [c] rbc-revs-v1 (40 bytes) |
|
139 | adding [c] rbc-revs-v1 (40 bytes) | |
136 | transferred 1.65 KB in *.* seconds (*/sec) (glob) |
|
140 | transferred 1.65 KB in *.* seconds (*/sec) (glob) | |
137 | bundle2-input-part: total payload size 1840 |
|
141 | bundle2-input-part: total payload size 1840 | |
138 | bundle2-input-bundle: 0 parts total |
|
142 | bundle2-input-bundle: 0 parts total | |
139 | finished applying clone bundle |
|
143 | finished applying clone bundle | |
140 | query 1; heads |
|
144 | query 1; heads | |
141 | sending batch command |
|
145 | sending batch command | |
142 | searching for changes |
|
146 | searching for changes | |
143 | all remote heads known locally |
|
147 | all remote heads known locally | |
144 | no changes found |
|
148 | no changes found | |
145 | sending getbundle command |
|
149 | sending getbundle command | |
146 | bundle2-input-bundle: with-transaction |
|
150 | bundle2-input-bundle: with-transaction | |
147 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported |
|
151 | bundle2-input-part: "listkeys" (params: 1 mandatory) supported | |
148 | bundle2-input-part: "phase-heads" supported |
|
152 | bundle2-input-part: "phase-heads" supported | |
149 | bundle2-input-part: total payload size 24 |
|
153 | bundle2-input-part: total payload size 24 | |
150 | bundle2-input-bundle: 1 parts total |
|
154 | bundle2-input-bundle: 1 parts total | |
151 | checking for updated bookmarks |
|
155 | checking for updated bookmarks | |
152 | updating to branch default |
|
156 | updating to branch default | |
153 | resolving manifests |
|
157 | resolving manifests | |
154 | branchmerge: False, force: False, partial: False |
|
158 | branchmerge: False, force: False, partial: False | |
155 | ancestor: 000000000000, local: 000000000000+, remote: 9bc730a19041 |
|
159 | ancestor: 000000000000, local: 000000000000+, remote: 9bc730a19041 | |
156 | A: remote created -> g |
|
160 | A: remote created -> g | |
157 | getting A |
|
161 | getting A | |
158 | B: remote created -> g |
|
162 | B: remote created -> g | |
159 | getting B |
|
163 | getting B | |
160 | C: remote created -> g |
|
164 | C: remote created -> g | |
161 | getting C |
|
165 | getting C | |
162 | D: remote created -> g |
|
166 | D: remote created -> g | |
163 | getting D |
|
167 | getting D | |
164 | E: remote created -> g |
|
168 | E: remote created -> g | |
165 | getting E |
|
169 | getting E | |
166 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
170 | 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now