Show More
@@ -1,1305 +1,1382 | |||
|
1 | 1 | Tests for wire protocol version 2 exchange. |
|
2 | 2 | Tests in this file should be folded into existing tests once protocol |
|
3 | 3 | v2 has enough features that it can be enabled via #testcase in existing |
|
4 | 4 | tests. |
|
5 | 5 | |
|
6 | 6 | $ . $TESTDIR/wireprotohelpers.sh |
|
7 | 7 | $ enablehttpv2client |
|
8 | 8 | |
|
9 | 9 | $ hg init server-simple |
|
10 | 10 | $ enablehttpv2 server-simple |
|
11 | 11 | $ cd server-simple |
|
12 | 12 | $ cat >> .hg/hgrc << EOF |
|
13 | 13 | > [phases] |
|
14 | 14 | > publish = false |
|
15 | 15 | > EOF |
|
16 | 16 | $ echo a0 > a |
|
17 | 17 | $ echo b0 > b |
|
18 | 18 | $ hg -q commit -A -m 'commit 0' |
|
19 | 19 | |
|
20 | 20 | $ echo a1 > a |
|
21 | 21 | $ hg commit -m 'commit 1' |
|
22 | 22 | $ hg phase --public -r . |
|
23 | 23 | $ echo a2 > a |
|
24 | 24 | $ hg commit -m 'commit 2' |
|
25 | 25 | |
|
26 | 26 | $ hg -q up -r 0 |
|
27 | 27 | $ echo b1 > b |
|
28 | 28 | $ hg -q commit -m 'head 2 commit 1' |
|
29 | 29 | $ echo b2 > b |
|
30 | 30 | $ hg -q commit -m 'head 2 commit 2' |
|
31 | 31 | |
|
32 | 32 | $ hg serve -p $HGPORT -d --pid-file hg.pid -E error.log |
|
33 | 33 | $ cat hg.pid > $DAEMON_PIDS |
|
34 | 34 | |
|
35 | 35 | $ cd .. |
|
36 | 36 | |
|
37 | 37 | Test basic clone |
|
38 | 38 | |
|
39 | $ hg --debug clone -U http://localhost:$HGPORT client-simple | |
|
39 | Output is flaky, save it in a file and check part independently | |
|
40 | $ hg --debug clone -U http://localhost:$HGPORT client-simple > clone-output | |
|
41 | ||
|
42 | $ cat clone-output | grep -v "received frame" | |
|
40 | 43 | using http://localhost:$HGPORT/ |
|
41 | 44 | sending capabilities command |
|
42 | 45 |
query 1 |
|
43 | 46 | sending 2 commands |
|
44 | 47 | sending command heads: {} |
|
45 | 48 | sending command known: { |
|
46 | 49 | 'nodes': [] |
|
47 | 50 | } |
|
48 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
49 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
50 | received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
51 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
52 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
53 | received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
54 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
55 | 51 | sending 1 commands |
|
56 | 52 | sending command changesetdata: { |
|
57 | 53 | 'fields': set([ |
|
58 | 54 | 'bookmarks', |
|
59 | 55 | 'parents', |
|
60 | 56 | 'phase', |
|
61 | 57 | 'revision' |
|
62 | 58 | ]), |
|
63 | 59 | 'revisions': [ |
|
64 | 60 | { |
|
65 | 61 | 'heads': [ |
|
66 | 62 | '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1', |
|
67 | 63 | '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f' |
|
68 | 64 | ], |
|
69 | 65 | 'roots': [], |
|
70 | 66 | 'type': 'changesetdagrange' |
|
71 | 67 | } |
|
72 | 68 | ] |
|
73 | 69 | } |
|
74 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
75 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
76 | received frame(size=941; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
77 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
78 | 70 | add changeset 3390ef850073 |
|
79 | 71 | add changeset 4432d83626e8 |
|
80 | 72 | add changeset cd2534766bec |
|
81 | 73 | add changeset e96ae20f4188 |
|
82 | 74 | add changeset caa2a465451d |
|
83 | 75 | checking for updated bookmarks |
|
84 | 76 | sending 1 commands |
|
85 | 77 | sending command manifestdata: { |
|
86 | 78 | 'fields': set([ |
|
87 | 79 | 'parents', |
|
88 | 80 | 'revision' |
|
89 | 81 | ]), |
|
90 | 82 | 'haveparents': True, |
|
91 | 83 | 'nodes': [ |
|
92 | 84 | '\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&A', |
|
93 | 85 | '\xa9\x88\xfbCX>\x87\x1d\x1e\xd5u\x0e\xe0t\xc6\xd8@\xbb\xbf\xc8', |
|
94 | 86 | '\xec\x80NH\x8c \x88\xc25\t\x9a\x10 u\x13\xbe\xcd\xc3\xdd\xa5', |
|
95 | 87 | '\x04\\\x7f9\'\xda\x13\xe7Z\xf8\xf0\xe4\xf0HI\xe4a\xa9x\x0f', |
|
96 | 88 | '7\x9c\xb0\xc2\xe6d\\y\xdd\xc5\x9a\x1dG\'\xa9\xfb\x83\n\xeb&' |
|
97 | 89 | ], |
|
98 | 90 | 'tree': '' |
|
99 | 91 | } |
|
100 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
101 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
102 | received frame(size=992; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
103 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
104 | 92 | sending 1 commands |
|
105 | 93 | sending command filesdata: { |
|
106 | 94 | 'fields': set([ |
|
107 | 95 | 'parents', |
|
108 | 96 | 'revision' |
|
109 | 97 | ]), |
|
110 | 98 | 'haveparents': True, |
|
111 | 99 | 'revisions': [ |
|
112 | 100 | { |
|
113 | 101 | 'nodes': [ |
|
114 | 102 | '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:', |
|
115 | 103 | 'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0', |
|
116 | 104 | '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f', |
|
117 | 105 | '\xe9j\xe2\x0fA\x88H{\x9a\xe4\xef9A\xc2|\x81\x141F\xe5', |
|
118 | 106 | '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1' |
|
119 | 107 | ], |
|
120 | 108 | 'type': 'changesetexplicit' |
|
121 | 109 | } |
|
122 | 110 | ] |
|
123 | 111 | } |
|
112 | updating the branch cache | |
|
113 | new changesets 3390ef850073:caa2a465451d (3 drafts) | |
|
114 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
115 | ||
|
116 | $ cat clone-output | grep "received frame" | |
|
117 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
118 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
119 | received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
120 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
121 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
122 | received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
123 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
124 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
125 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
126 | received frame(size=941; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
127 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
128 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
129 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
130 | received frame(size=992; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
131 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
124 | 132 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) |
|
125 | 133 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
126 | 134 | received frame(size=901; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
127 | 135 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) |
|
128 | updating the branch cache | |
|
129 | new changesets 3390ef850073:caa2a465451d (3 drafts) | |
|
130 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
136 | ||
|
137 | $ rm clone-output | |
|
131 | 138 | |
|
132 | 139 | All changesets should have been transferred |
|
133 | 140 | |
|
134 | 141 | $ hg -R client-simple debugindex -c |
|
135 | 142 | rev linkrev nodeid p1 p2 |
|
136 | 143 | 0 0 3390ef850073 000000000000 000000000000 |
|
137 | 144 | 1 1 4432d83626e8 3390ef850073 000000000000 |
|
138 | 145 | 2 2 cd2534766bec 4432d83626e8 000000000000 |
|
139 | 146 | 3 3 e96ae20f4188 3390ef850073 000000000000 |
|
140 | 147 | 4 4 caa2a465451d e96ae20f4188 000000000000 |
|
141 | 148 | |
|
142 | 149 | $ hg -R client-simple log -G -T '{rev} {node} {phase}\n' |
|
143 | 150 | o 4 caa2a465451dd1facda0f5b12312c355584188a1 draft |
|
144 | 151 | | |
|
145 | 152 | o 3 e96ae20f4188487b9ae4ef3941c27c81143146e5 draft |
|
146 | 153 | | |
|
147 | 154 | | o 2 cd2534766bece138c7c1afdc6825302f0f62d81f draft |
|
148 | 155 | | | |
|
149 | 156 | | o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public |
|
150 | 157 | |/ |
|
151 | 158 | o 0 3390ef850073fbc2f0dfff2244342c8e9229013a public |
|
152 | 159 | |
|
153 | 160 | |
|
154 | 161 | All manifests should have been transferred |
|
155 | 162 | |
|
156 | 163 | $ hg -R client-simple debugindex -m |
|
157 | 164 | rev linkrev nodeid p1 p2 |
|
158 | 165 | 0 0 992f4779029a 000000000000 000000000000 |
|
159 | 166 | 1 1 a988fb43583e 992f4779029a 000000000000 |
|
160 | 167 | 2 2 ec804e488c20 a988fb43583e 000000000000 |
|
161 | 168 | 3 3 045c7f3927da 992f4779029a 000000000000 |
|
162 | 169 | 4 4 379cb0c2e664 045c7f3927da 000000000000 |
|
163 | 170 | |
|
164 | 171 | Cloning only a specific revision works |
|
165 | 172 | |
|
166 | $ hg --debug clone -U -r 4432d83626e8 http://localhost:$HGPORT client-singlehead | |
|
173 | Output is flaky, save it in a file and check part independently | |
|
174 | $ hg --debug clone -U -r 4432d83626e8 http://localhost:$HGPORT client-singlehead > clone-output | |
|
175 | ||
|
176 | $ cat clone-output | grep -v "received frame" | |
|
167 | 177 | using http://localhost:$HGPORT/ |
|
168 | 178 | sending capabilities command |
|
169 | 179 | sending 1 commands |
|
170 | 180 | sending command lookup: { |
|
171 | 181 | 'key': '4432d83626e8' |
|
172 | 182 | } |
|
173 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
174 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
175 | received frame(size=21; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
176 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
177 | 183 | query 1; heads |
|
178 | 184 | sending 2 commands |
|
179 | 185 | sending command heads: {} |
|
180 | 186 | sending command known: { |
|
181 | 187 | 'nodes': [] |
|
182 | 188 | } |
|
183 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
184 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
185 | received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
186 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
187 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
188 | received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
189 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
190 | 189 | sending 1 commands |
|
191 | 190 | sending command changesetdata: { |
|
192 | 191 | 'fields': set([ |
|
193 | 192 | 'bookmarks', |
|
194 | 193 | 'parents', |
|
195 | 194 | 'phase', |
|
196 | 195 | 'revision' |
|
197 | 196 | ]), |
|
198 | 197 | 'revisions': [ |
|
199 | 198 | { |
|
200 | 199 | 'heads': [ |
|
201 | 200 | 'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0' |
|
202 | 201 | ], |
|
203 | 202 | 'roots': [], |
|
204 | 203 | 'type': 'changesetdagrange' |
|
205 | 204 | } |
|
206 | 205 | ] |
|
207 | 206 | } |
|
208 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
209 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
210 | received frame(size=381; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
211 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
212 | 207 | add changeset 3390ef850073 |
|
213 | 208 | add changeset 4432d83626e8 |
|
214 | 209 | checking for updated bookmarks |
|
215 | 210 | sending 1 commands |
|
216 | 211 | sending command manifestdata: { |
|
217 | 212 | 'fields': set([ |
|
218 | 213 | 'parents', |
|
219 | 214 | 'revision' |
|
220 | 215 | ]), |
|
221 | 216 | 'haveparents': True, |
|
222 | 217 | 'nodes': [ |
|
223 | 218 | '\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&A', |
|
224 | 219 | '\xa9\x88\xfbCX>\x87\x1d\x1e\xd5u\x0e\xe0t\xc6\xd8@\xbb\xbf\xc8' |
|
225 | 220 | ], |
|
226 | 221 | 'tree': '' |
|
227 | 222 | } |
|
228 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
229 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
230 | received frame(size=404; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
231 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
232 | 223 | sending 1 commands |
|
233 | 224 | sending command filesdata: { |
|
234 | 225 | 'fields': set([ |
|
235 | 226 | 'parents', |
|
236 | 227 | 'revision' |
|
237 | 228 | ]), |
|
238 | 229 | 'haveparents': True, |
|
239 | 230 | 'revisions': [ |
|
240 | 231 | { |
|
241 | 232 | 'nodes': [ |
|
242 | 233 | '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:', |
|
243 | 234 | 'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0' |
|
244 | 235 | ], |
|
245 | 236 | 'type': 'changesetexplicit' |
|
246 | 237 | } |
|
247 | 238 | ] |
|
248 | 239 | } |
|
240 | updating the branch cache | |
|
241 | new changesets 3390ef850073:4432d83626e8 | |
|
242 | (sent 6 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
243 | ||
|
244 | $ cat clone-output | grep "received frame" | |
|
245 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
246 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
247 | received frame(size=21; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
248 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
249 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
250 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
251 | received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
252 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
253 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
254 | received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
255 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
256 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
257 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
258 | received frame(size=381; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
259 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
260 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
261 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
262 | received frame(size=404; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
263 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
249 | 264 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) |
|
250 | 265 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
251 | 266 | received frame(size=439; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
252 | 267 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) |
|
253 | updating the branch cache | |
|
254 | new changesets 3390ef850073:4432d83626e8 | |
|
255 | (sent 6 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
268 | ||
|
269 | $ rm clone-output | |
|
256 | 270 | |
|
257 | 271 |
$ |
|
258 | 272 | |
|
259 | 273 | $ hg log -G -T '{rev} {node} {phase}\n' |
|
260 | 274 | o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public |
|
261 | 275 | | |
|
262 | 276 | o 0 3390ef850073fbc2f0dfff2244342c8e9229013a public |
|
263 | 277 | |
|
264 | 278 | |
|
265 | 279 | $ hg debugindex -m |
|
266 | 280 | rev linkrev nodeid p1 p2 |
|
267 | 281 | 0 0 992f4779029a 000000000000 000000000000 |
|
268 | 282 | 1 1 a988fb43583e 992f4779029a 000000000000 |
|
269 | 283 | |
|
270 | 284 | Incremental pull works |
|
271 | 285 | |
|
272 | $ hg --debug pull | |
|
286 | Output is flaky, save it in a file and check part independently | |
|
287 | $ hg --debug pull > pull-output | |
|
288 | ||
|
289 | $ cat pull-output | grep -v "received frame" | |
|
273 | 290 | pulling from http://localhost:$HGPORT/ |
|
274 | 291 | using http://localhost:$HGPORT/ |
|
275 | 292 | sending capabilities command |
|
276 | 293 |
query 1; |
|
277 | 294 | sending 2 commands |
|
278 | 295 | sending command heads: {} |
|
279 | 296 |
|
|
280 | 297 | 'nodes': [ |
|
281 | 298 | 'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0' |
|
282 | 299 | ] |
|
283 | 300 | } |
|
284 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
285 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
286 | received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
287 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
288 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
289 | received frame(size=2; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
290 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
291 | 301 |
|
|
292 | 302 | all local heads known remotely |
|
293 | 303 | sending 1 commands |
|
294 | 304 | sending command changesetdata: { |
|
295 | 305 | 'fields': set([ |
|
296 | 306 | 'bookmarks', |
|
297 | 307 | 'parents', |
|
298 | 308 | 'phase', |
|
299 | 309 | 'revision' |
|
300 | 310 | ]), |
|
301 | 311 | 'revisions': [ |
|
302 | 312 | { |
|
303 | 313 | 'heads': [ |
|
304 | 314 | '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1', |
|
305 | 315 | '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f' |
|
306 | 316 | ], |
|
307 | 317 | 'roots': [ |
|
308 | 318 | 'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0' |
|
309 | 319 | ], |
|
310 | 320 | 'type': 'changesetdagrange' |
|
311 | 321 | } |
|
312 | 322 | ] |
|
313 | 323 | } |
|
314 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
315 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
316 | received frame(size=573; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
317 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
318 | 324 | add changeset cd2534766bec |
|
319 | 325 | add changeset e96ae20f4188 |
|
320 | 326 | add changeset caa2a465451d |
|
321 | 327 | checking for updated bookmarks |
|
322 | 328 | sending 1 commands |
|
323 | 329 | sending command manifestdata: { |
|
324 | 330 | 'fields': set([ |
|
325 | 331 | 'parents', |
|
326 | 332 | 'revision' |
|
327 | 333 | ]), |
|
328 | 334 | 'haveparents': True, |
|
329 | 335 | 'nodes': [ |
|
330 | 336 | '\xec\x80NH\x8c \x88\xc25\t\x9a\x10 u\x13\xbe\xcd\xc3\xdd\xa5', |
|
331 | 337 | '\x04\\\x7f9\'\xda\x13\xe7Z\xf8\xf0\xe4\xf0HI\xe4a\xa9x\x0f', |
|
332 | 338 | '7\x9c\xb0\xc2\xe6d\\y\xdd\xc5\x9a\x1dG\'\xa9\xfb\x83\n\xeb&' |
|
333 | 339 | ], |
|
334 | 340 | 'tree': '' |
|
335 | 341 | } |
|
336 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
337 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
338 | received frame(size=601; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
339 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
340 | 342 | sending 1 commands |
|
341 | 343 | sending command filesdata: { |
|
342 | 344 | 'fields': set([ |
|
343 | 345 | 'parents', |
|
344 | 346 | 'revision' |
|
345 | 347 | ]), |
|
346 | 348 | 'haveparents': True, |
|
347 | 349 | 'revisions': [ |
|
348 | 350 | { |
|
349 | 351 | 'nodes': [ |
|
350 | 352 | '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f', |
|
351 | 353 | '\xe9j\xe2\x0fA\x88H{\x9a\xe4\xef9A\xc2|\x81\x141F\xe5', |
|
352 | 354 | '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1' |
|
353 | 355 | ], |
|
354 | 356 | 'type': 'changesetexplicit' |
|
355 | 357 | } |
|
356 | 358 | ] |
|
357 | 359 | } |
|
360 | updating the branch cache | |
|
361 | new changesets cd2534766bec:caa2a465451d (3 drafts) | |
|
362 | (run 'hg update' to get a working copy) | |
|
363 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
364 | ||
|
365 | $ cat pull-output | grep "received frame" | |
|
366 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
367 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
368 | received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
369 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
370 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
371 | received frame(size=2; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
372 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
373 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
374 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
375 | received frame(size=573; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
376 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
377 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
378 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
379 | received frame(size=601; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
380 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
358 | 381 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) |
|
359 | 382 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
360 | 383 | received frame(size=527; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
361 | 384 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) |
|
362 | updating the branch cache | |
|
363 | new changesets cd2534766bec:caa2a465451d (3 drafts) | |
|
364 | (run 'hg update' to get a working copy) | |
|
365 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
385 | ||
|
386 | $ rm pull-output | |
|
366 | 387 | |
|
367 | 388 |
$ |
|
368 | 389 | o 4 caa2a465451dd1facda0f5b12312c355584188a1 draft |
|
369 | 390 | | |
|
370 | 391 | o 3 e96ae20f4188487b9ae4ef3941c27c81143146e5 draft |
|
371 | 392 | | |
|
372 | 393 | | o 2 cd2534766bece138c7c1afdc6825302f0f62d81f draft |
|
373 | 394 | | | |
|
374 | 395 | | o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public |
|
375 | 396 | |/ |
|
376 | 397 | o 0 3390ef850073fbc2f0dfff2244342c8e9229013a public |
|
377 | 398 | |
|
378 | 399 | |
|
379 | 400 | $ hg debugindex -m |
|
380 | 401 | rev linkrev nodeid p1 p2 |
|
381 | 402 | 0 0 992f4779029a 000000000000 000000000000 |
|
382 | 403 | 1 1 a988fb43583e 992f4779029a 000000000000 |
|
383 | 404 | 2 2 ec804e488c20 a988fb43583e 000000000000 |
|
384 | 405 | 3 3 045c7f3927da 992f4779029a 000000000000 |
|
385 | 406 | 4 4 379cb0c2e664 045c7f3927da 000000000000 |
|
386 | 407 | |
|
387 | 408 | Phase-only update works |
|
388 | 409 | TODO this doesn't work |
|
389 | 410 | |
|
390 | 411 | $ hg -R ../server-simple phase --public -r caa2a465451dd |
|
391 | 412 | $ hg --debug pull |
|
392 | 413 | pulling from http://localhost:$HGPORT/ |
|
393 | 414 | using http://localhost:$HGPORT/ |
|
394 | 415 | sending capabilities command |
|
395 | 416 | query 1; heads |
|
396 | 417 | sending 2 commands |
|
397 | 418 | sending command heads: {} |
|
398 | 419 | sending command known: { |
|
399 | 420 | 'nodes': [ |
|
400 | 421 | '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f', |
|
401 | 422 | '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1' |
|
402 | 423 | ] |
|
403 | 424 | } |
|
404 | 425 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) |
|
405 | 426 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
406 | 427 | received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
407 | 428 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) |
|
408 | 429 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
409 | 430 | received frame(size=3; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
410 | 431 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) |
|
411 | 432 | searching for changes |
|
412 | 433 | all remote heads known locally |
|
413 | 434 | sending 1 commands |
|
414 | 435 | sending command changesetdata: { |
|
415 | 436 | 'fields': set([ |
|
416 | 437 | 'bookmarks', |
|
417 | 438 | 'parents', |
|
418 | 439 | 'phase', |
|
419 | 440 | 'revision' |
|
420 | 441 | ]), |
|
421 | 442 | 'revisions': [ |
|
422 | 443 | { |
|
423 | 444 | 'heads': [ |
|
424 | 445 | '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1', |
|
425 | 446 | '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f' |
|
426 | 447 | ], |
|
427 | 448 | 'roots': [ |
|
428 | 449 | '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1', |
|
429 | 450 | '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f' |
|
430 | 451 | ], |
|
431 | 452 | 'type': 'changesetdagrange' |
|
432 | 453 | } |
|
433 | 454 | ] |
|
434 | 455 | } |
|
435 | 456 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) |
|
436 | 457 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
437 | 458 | received frame(size=13; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
438 | 459 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) |
|
439 | 460 | checking for updated bookmarks |
|
440 | 461 | (run 'hg update' to get a working copy) |
|
441 | 462 | (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) |
|
442 | 463 | |
|
443 | 464 | $ hg log -G -T '{rev} {node} {phase}\n' |
|
444 | 465 | o 4 caa2a465451dd1facda0f5b12312c355584188a1 draft |
|
445 | 466 | | |
|
446 | 467 | o 3 e96ae20f4188487b9ae4ef3941c27c81143146e5 draft |
|
447 | 468 | | |
|
448 | 469 | | o 2 cd2534766bece138c7c1afdc6825302f0f62d81f draft |
|
449 | 470 | | | |
|
450 | 471 | | o 1 4432d83626e8a98655f062ec1f2a43b07f7fbbb0 public |
|
451 | 472 | |/ |
|
452 | 473 | o 0 3390ef850073fbc2f0dfff2244342c8e9229013a public |
|
453 | 474 | |
|
454 | 475 | |
|
455 | 476 | $ cd .. |
|
456 | 477 | |
|
457 | 478 | Bookmarks are transferred on clone |
|
458 | 479 | |
|
459 | 480 | $ hg -R server-simple bookmark -r 3390ef850073fbc2f0dfff2244342c8e9229013a book-1 |
|
460 | 481 | $ hg -R server-simple bookmark -r cd2534766bece138c7c1afdc6825302f0f62d81f book-2 |
|
461 | 482 | |
|
462 | $ hg --debug clone -U http://localhost:$HGPORT/ client-bookmarks | |
|
483 | Output is flaky, save it in a file and check part independently | |
|
484 | $ hg --debug clone -U http://localhost:$HGPORT/ client-bookmarks > clone-output | |
|
485 | ||
|
486 | $ cat clone-output | grep -v "received frame" | |
|
463 | 487 | using http://localhost:$HGPORT/ |
|
464 | 488 | sending capabilities command |
|
465 | 489 | query 1; heads |
|
466 | 490 | sending 2 commands |
|
467 | 491 | sending command heads: {} |
|
468 | 492 | sending command known: { |
|
469 | 493 | 'nodes': [] |
|
470 | 494 | } |
|
471 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
472 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
473 | received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
474 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
475 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
476 | received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
477 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
478 | 495 | sending 1 commands |
|
479 | 496 | sending command changesetdata: { |
|
480 | 497 | 'fields': set([ |
|
481 | 498 | 'bookmarks', |
|
482 | 499 | 'parents', |
|
483 | 500 | 'phase', |
|
484 | 501 | 'revision' |
|
485 | 502 | ]), |
|
486 | 503 | 'revisions': [ |
|
487 | 504 | { |
|
488 | 505 | 'heads': [ |
|
489 | 506 | '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1', |
|
490 | 507 | '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f' |
|
491 | 508 | ], |
|
492 | 509 | 'roots': [], |
|
493 | 510 | 'type': 'changesetdagrange' |
|
494 | 511 | } |
|
495 | 512 | ] |
|
496 | 513 | } |
|
497 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
498 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
499 | received frame(size=979; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
500 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
501 | 514 | add changeset 3390ef850073 |
|
502 | 515 | add changeset 4432d83626e8 |
|
503 | 516 | add changeset cd2534766bec |
|
504 | 517 | add changeset e96ae20f4188 |
|
505 | 518 | add changeset caa2a465451d |
|
506 | 519 | checking for updated bookmarks |
|
507 | 520 | adding remote bookmark book-1 |
|
508 | 521 | adding remote bookmark book-2 |
|
509 | 522 | sending 1 commands |
|
510 | 523 | sending command manifestdata: { |
|
511 | 524 | 'fields': set([ |
|
512 | 525 | 'parents', |
|
513 | 526 | 'revision' |
|
514 | 527 | ]), |
|
515 | 528 | 'haveparents': True, |
|
516 | 529 | 'nodes': [ |
|
517 | 530 | '\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&A', |
|
518 | 531 | '\xa9\x88\xfbCX>\x87\x1d\x1e\xd5u\x0e\xe0t\xc6\xd8@\xbb\xbf\xc8', |
|
519 | 532 | '\xec\x80NH\x8c \x88\xc25\t\x9a\x10 u\x13\xbe\xcd\xc3\xdd\xa5', |
|
520 | 533 | '\x04\\\x7f9\'\xda\x13\xe7Z\xf8\xf0\xe4\xf0HI\xe4a\xa9x\x0f', |
|
521 | 534 | '7\x9c\xb0\xc2\xe6d\\y\xdd\xc5\x9a\x1dG\'\xa9\xfb\x83\n\xeb&' |
|
522 | 535 | ], |
|
523 | 536 | 'tree': '' |
|
524 | 537 | } |
|
525 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
526 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
527 | received frame(size=992; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
528 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
529 | 538 | sending 1 commands |
|
530 | 539 | sending command filesdata: { |
|
531 | 540 | 'fields': set([ |
|
532 | 541 | 'parents', |
|
533 | 542 | 'revision' |
|
534 | 543 | ]), |
|
535 | 544 | 'haveparents': True, |
|
536 | 545 | 'revisions': [ |
|
537 | 546 | { |
|
538 | 547 | 'nodes': [ |
|
539 | 548 | '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:', |
|
540 | 549 | 'D2\xd86&\xe8\xa9\x86U\xf0b\xec\x1f*C\xb0\x7f\x7f\xbb\xb0', |
|
541 | 550 | '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f', |
|
542 | 551 | '\xe9j\xe2\x0fA\x88H{\x9a\xe4\xef9A\xc2|\x81\x141F\xe5', |
|
543 | 552 | '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1' |
|
544 | 553 | ], |
|
545 | 554 | 'type': 'changesetexplicit' |
|
546 | 555 | } |
|
547 | 556 | ] |
|
548 | 557 | } |
|
558 | updating the branch cache | |
|
559 | new changesets 3390ef850073:caa2a465451d (1 drafts) | |
|
560 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
561 | ||
|
562 | $ cat clone-output | grep "received frame" | |
|
563 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
564 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
565 | received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
566 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
567 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
568 | received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
569 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
570 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
571 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
572 | received frame(size=979; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
573 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
574 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
575 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
576 | received frame(size=992; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
577 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
549 | 578 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) |
|
550 | 579 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
551 | 580 | received frame(size=901; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
552 | 581 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) |
|
553 | updating the branch cache | |
|
554 | new changesets 3390ef850073:caa2a465451d (1 drafts) | |
|
555 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
582 | ||
|
583 | $ rm clone-output | |
|
556 | 584 | |
|
557 | 585 |
$ |
|
558 | 586 | book-1 0:3390ef850073 |
|
559 | 587 | book-2 2:cd2534766bec |
|
560 | 588 | |
|
561 | 589 | Server-side bookmark moves are reflected during `hg pull` |
|
562 | 590 | |
|
563 | 591 | $ hg -R server-simple bookmark -r cd2534766bece138c7c1afdc6825302f0f62d81f book-1 |
|
564 | 592 | moving bookmark 'book-1' forward from 3390ef850073 |
|
565 | 593 | |
|
566 | $ hg -R client-bookmarks --debug pull | |
|
594 | Output is flaky, save it in a file and check part independently | |
|
595 | $ hg -R client-bookmarks --debug pull > pull-output | |
|
596 | ||
|
597 | $ cat pull-output | grep -v "received frame" | |
|
567 | 598 | pulling from http://localhost:$HGPORT/ |
|
568 | 599 | using http://localhost:$HGPORT/ |
|
569 | 600 | sending capabilities command |
|
570 | 601 |
query 1; |
|
571 | 602 | sending 2 commands |
|
572 | 603 | sending command heads: {} |
|
573 | 604 |
|
|
574 | 605 | 'nodes': [ |
|
575 | 606 | '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f', |
|
576 | 607 | '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1' |
|
577 | 608 | ] |
|
578 | 609 | } |
|
579 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
580 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
581 | received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
582 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
583 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
584 | received frame(size=3; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
585 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
586 | 610 |
|
|
587 | 611 | all remote heads known locally |
|
588 | 612 | sending 1 commands |
|
589 | 613 | sending command changesetdata: { |
|
590 | 614 | 'fields': set([ |
|
591 | 615 | 'bookmarks', |
|
592 | 616 | 'parents', |
|
593 | 617 | 'phase', |
|
594 | 618 | 'revision' |
|
595 | 619 | ]), |
|
596 | 620 | 'revisions': [ |
|
597 | 621 | { |
|
598 | 622 | 'heads': [ |
|
599 | 623 | '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1', |
|
600 | 624 | '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f' |
|
601 | 625 | ], |
|
602 | 626 | 'roots': [ |
|
603 | 627 | '\xca\xa2\xa4eE\x1d\xd1\xfa\xcd\xa0\xf5\xb1#\x12\xc3UXA\x88\xa1', |
|
604 | 628 | '\xcd%4vk\xec\xe18\xc7\xc1\xaf\xdch%0/\x0fb\xd8\x1f' |
|
605 | 629 | ], |
|
606 | 630 | 'type': 'changesetdagrange' |
|
607 | 631 | } |
|
608 | 632 | ] |
|
609 | 633 | } |
|
634 | checking for updated bookmarks | |
|
635 | updating bookmark book-1 | |
|
636 | (run 'hg update' to get a working copy) | |
|
637 | (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
638 | ||
|
639 | $ cat pull-output | grep "received frame" | |
|
640 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
641 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
642 | received frame(size=43; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
643 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
644 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
645 | received frame(size=3; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
646 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
610 | 647 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) |
|
611 | 648 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
612 | 649 | received frame(size=65; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
613 | 650 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) |
|
614 | checking for updated bookmarks | |
|
615 | updating bookmark book-1 | |
|
616 | (run 'hg update' to get a working copy) | |
|
617 | (sent 3 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
651 | ||
|
652 | $ rm pull-output | |
|
618 | 653 | |
|
619 | 654 |
$ |
|
620 | 655 | book-1 2:cd2534766bec |
|
621 | 656 | book-2 2:cd2534766bec |
|
622 | 657 | |
|
623 | 658 | $ killdaemons.py |
|
624 | 659 | |
|
625 | 660 | Let's set up a slightly more complicated server |
|
626 | 661 | |
|
627 | 662 | $ hg init server-2 |
|
628 | 663 | $ enablehttpv2 server-2 |
|
629 | 664 | $ cd server-2 |
|
630 | 665 | $ mkdir dir0 dir1 |
|
631 | 666 | $ echo a0 > a |
|
632 | 667 | $ echo b0 > b |
|
633 | 668 | $ hg -q commit -A -m 'commit 0' |
|
634 | 669 | $ echo c0 > dir0/c |
|
635 | 670 | $ echo d0 > dir0/d |
|
636 | 671 | $ hg -q commit -A -m 'commit 1' |
|
637 | 672 | $ echo e0 > dir1/e |
|
638 | 673 | $ echo f0 > dir1/f |
|
639 | 674 | $ hg -q commit -A -m 'commit 2' |
|
640 | 675 | $ echo c1 > dir0/c |
|
641 | 676 | $ echo e1 > dir1/e |
|
642 | 677 | $ hg commit -m 'commit 3' |
|
643 | 678 | $ hg serve -p $HGPORT -d --pid-file hg.pid -E error.log |
|
644 | 679 | $ cat hg.pid > $DAEMON_PIDS |
|
645 | 680 | |
|
646 | 681 | $ cd .. |
|
647 | 682 | |
|
648 | 683 | Narrow clone only fetches some files |
|
649 | 684 | |
|
650 | $ hg --config extensions.pullext=$TESTDIR/pullext.py --debug clone -U --include dir0/ http://localhost:$HGPORT/ client-narrow-0 | |
|
685 | Output is flaky, save it in a file and check part independently | |
|
686 | $ hg --config extensions.pullext=$TESTDIR/pullext.py --debug clone -U --include dir0/ http://localhost:$HGPORT/ client-narrow-0 > clone-output | |
|
687 | ||
|
688 | $ cat clone-output | grep -v "received frame" | |
|
651 | 689 | using http://localhost:$HGPORT/ |
|
652 | 690 | sending capabilities command |
|
653 | 691 | query 1; heads |
|
654 | 692 | sending 2 commands |
|
655 | 693 | sending command heads: {} |
|
656 | 694 | sending command known: { |
|
657 | 695 | 'nodes': [] |
|
658 | 696 | } |
|
659 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
660 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
661 | received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
662 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
663 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
664 | received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
665 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
666 | 697 | sending 1 commands |
|
667 | 698 | sending command changesetdata: { |
|
668 | 699 | 'fields': set([ |
|
669 | 700 | 'bookmarks', |
|
670 | 701 | 'parents', |
|
671 | 702 | 'phase', |
|
672 | 703 | 'revision' |
|
673 | 704 | ]), |
|
674 | 705 | 'revisions': [ |
|
675 | 706 | { |
|
676 | 707 | 'heads': [ |
|
677 | 708 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
678 | 709 | ], |
|
679 | 710 | 'roots': [], |
|
680 | 711 | 'type': 'changesetdagrange' |
|
681 | 712 | } |
|
682 | 713 | ] |
|
683 | 714 | } |
|
684 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
685 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
686 | received frame(size=783; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
687 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
688 | 715 | add changeset 3390ef850073 |
|
689 | 716 | add changeset b709380892b1 |
|
690 | 717 | add changeset 47fe012ab237 |
|
691 | 718 | add changeset 97765fc3cd62 |
|
692 | 719 | checking for updated bookmarks |
|
693 | 720 | sending 1 commands |
|
694 | 721 | sending command manifestdata: { |
|
695 | 722 | 'fields': set([ |
|
696 | 723 | 'parents', |
|
697 | 724 | 'revision' |
|
698 | 725 | ]), |
|
699 | 726 | 'haveparents': True, |
|
700 | 727 | 'nodes': [ |
|
701 | 728 | '\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&A', |
|
702 | 729 | '|2 \x1a\xa3\xa1R\xa9\xe6\xa9"+?\xa8\xd0\xe3\x0f\xc2V\xe8', |
|
703 | 730 | '\x8d\xd0W<\x7f\xaf\xe2\x04F\xcc\xea\xac\x05N\xea\xa4x\x91M\xdb', |
|
704 | 731 | '113\x85\xf2!\x8b\x08^\xb2Z\x821\x1e*\xdd\x0e\xeb\x8c3' |
|
705 | 732 | ], |
|
706 | 733 | 'tree': '' |
|
707 | 734 | } |
|
708 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
709 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
710 | received frame(size=967; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
711 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
712 | 735 | sending 1 commands |
|
713 | 736 | sending command filesdata: { |
|
714 | 737 | 'fields': set([ |
|
715 | 738 | 'parents', |
|
716 | 739 | 'revision' |
|
717 | 740 | ]), |
|
718 | 741 | 'haveparents': True, |
|
719 | 742 | 'pathfilter': { |
|
720 | 743 | 'include': [ |
|
721 | 744 | 'path:dir0' |
|
722 | 745 | ] |
|
723 | 746 | }, |
|
724 | 747 | 'revisions': [ |
|
725 | 748 | { |
|
726 | 749 | 'nodes': [ |
|
727 | 750 | '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:', |
|
728 | 751 | '\xb7\t8\x08\x92\xb1\x93\xc1\t\x1d:\x81\x7fp`R\xe3F\x82\x1b', |
|
729 | 752 | 'G\xfe\x01*\xb27\xa8\xc7\xfc\x0cx\xf9\xf2mXf\xee\xf3\xf8%', |
|
730 | 753 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
731 | 754 | ], |
|
732 | 755 | 'type': 'changesetexplicit' |
|
733 | 756 | } |
|
734 | 757 | ] |
|
735 | 758 | } |
|
759 | updating the branch cache | |
|
760 | new changesets 3390ef850073:97765fc3cd62 | |
|
761 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
762 | ||
|
763 | $ cat clone-output | grep "received frame" | |
|
764 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
765 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
766 | received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
767 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
768 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
769 | received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
770 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
771 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
772 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
773 | received frame(size=783; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
774 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
775 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
776 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
777 | received frame(size=967; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
778 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
736 | 779 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) |
|
737 | 780 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
738 | 781 | received frame(size=449; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
739 | 782 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) |
|
740 | updating the branch cache | |
|
741 | new changesets 3390ef850073:97765fc3cd62 | |
|
742 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
783 | ||
|
784 | $ rm clone-output | |
|
743 | 785 | |
|
744 | 786 | #if reporevlogstore |
|
745 | 787 | $ find client-narrow-0/.hg/store -type f -name '*.i' | sort |
|
746 | 788 | client-narrow-0/.hg/store/00changelog.i |
|
747 | 789 | client-narrow-0/.hg/store/00manifest.i |
|
748 | 790 | client-narrow-0/.hg/store/data/dir0/c.i |
|
749 | 791 | client-narrow-0/.hg/store/data/dir0/d.i |
|
750 | 792 | #endif |
|
751 | 793 | |
|
752 | 794 | --exclude by itself works |
|
753 | 795 | |
|
754 | $ hg --config extensions.pullext=$TESTDIR/pullext.py --debug clone -U --exclude dir0/ http://localhost:$HGPORT/ client-narrow-1 | |
|
796 | Output is flaky, save it in a file and check part independently | |
|
797 | $ hg --config extensions.pullext=$TESTDIR/pullext.py --debug clone -U --exclude dir0/ http://localhost:$HGPORT/ client-narrow-1 > clone-output | |
|
798 | ||
|
799 | $ cat clone-output | grep -v "received frame" | |
|
755 | 800 | using http://localhost:$HGPORT/ |
|
756 | 801 | sending capabilities command |
|
757 | 802 | query 1; heads |
|
758 | 803 | sending 2 commands |
|
759 | 804 | sending command heads: {} |
|
760 | 805 | sending command known: { |
|
761 | 806 | 'nodes': [] |
|
762 | 807 | } |
|
763 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
764 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
765 | received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
766 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
767 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
768 | received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
769 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
770 | 808 | sending 1 commands |
|
771 | 809 | sending command changesetdata: { |
|
772 | 810 | 'fields': set([ |
|
773 | 811 | 'bookmarks', |
|
774 | 812 | 'parents', |
|
775 | 813 | 'phase', |
|
776 | 814 | 'revision' |
|
777 | 815 | ]), |
|
778 | 816 | 'revisions': [ |
|
779 | 817 | { |
|
780 | 818 | 'heads': [ |
|
781 | 819 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
782 | 820 | ], |
|
783 | 821 | 'roots': [], |
|
784 | 822 | 'type': 'changesetdagrange' |
|
785 | 823 | } |
|
786 | 824 | ] |
|
787 | 825 | } |
|
788 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
789 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
790 | received frame(size=783; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
791 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
792 | 826 | add changeset 3390ef850073 |
|
793 | 827 | add changeset b709380892b1 |
|
794 | 828 | add changeset 47fe012ab237 |
|
795 | 829 | add changeset 97765fc3cd62 |
|
796 | 830 | checking for updated bookmarks |
|
797 | 831 | sending 1 commands |
|
798 | 832 | sending command manifestdata: { |
|
799 | 833 | 'fields': set([ |
|
800 | 834 | 'parents', |
|
801 | 835 | 'revision' |
|
802 | 836 | ]), |
|
803 | 837 | 'haveparents': True, |
|
804 | 838 | 'nodes': [ |
|
805 | 839 | '\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&A', |
|
806 | 840 | '|2 \x1a\xa3\xa1R\xa9\xe6\xa9"+?\xa8\xd0\xe3\x0f\xc2V\xe8', |
|
807 | 841 | '\x8d\xd0W<\x7f\xaf\xe2\x04F\xcc\xea\xac\x05N\xea\xa4x\x91M\xdb', |
|
808 | 842 | '113\x85\xf2!\x8b\x08^\xb2Z\x821\x1e*\xdd\x0e\xeb\x8c3' |
|
809 | 843 | ], |
|
810 | 844 | 'tree': '' |
|
811 | 845 | } |
|
812 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
813 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
814 | received frame(size=967; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
815 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
816 | 846 | sending 1 commands |
|
817 | 847 | sending command filesdata: { |
|
818 | 848 | 'fields': set([ |
|
819 | 849 | 'parents', |
|
820 | 850 | 'revision' |
|
821 | 851 | ]), |
|
822 | 852 | 'haveparents': True, |
|
823 | 853 | 'pathfilter': { |
|
824 | 854 | 'exclude': [ |
|
825 | 855 | 'path:dir0' |
|
826 | 856 | ], |
|
827 | 857 | 'include': [ |
|
828 | 858 | 'path:.' |
|
829 | 859 | ] |
|
830 | 860 | }, |
|
831 | 861 | 'revisions': [ |
|
832 | 862 | { |
|
833 | 863 | 'nodes': [ |
|
834 | 864 | '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:', |
|
835 | 865 | '\xb7\t8\x08\x92\xb1\x93\xc1\t\x1d:\x81\x7fp`R\xe3F\x82\x1b', |
|
836 | 866 | 'G\xfe\x01*\xb27\xa8\xc7\xfc\x0cx\xf9\xf2mXf\xee\xf3\xf8%', |
|
837 | 867 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
838 | 868 | ], |
|
839 | 869 | 'type': 'changesetexplicit' |
|
840 | 870 | } |
|
841 | 871 | ] |
|
842 | 872 | } |
|
873 | updating the branch cache | |
|
874 | new changesets 3390ef850073:97765fc3cd62 | |
|
875 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
876 | ||
|
877 | $ cat clone-output | grep "received frame" | |
|
878 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
879 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
880 | received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
881 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
882 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
883 | received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
884 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
885 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
886 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
887 | received frame(size=783; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
888 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
889 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
890 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
891 | received frame(size=967; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
892 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
843 | 893 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) |
|
844 | 894 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
845 | 895 | received frame(size=709; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
846 | 896 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) |
|
847 | updating the branch cache | |
|
848 | new changesets 3390ef850073:97765fc3cd62 | |
|
849 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
897 | ||
|
898 | $ rm clone-output | |
|
850 | 899 | |
|
851 | 900 | #if reporevlogstore |
|
852 | 901 | $ find client-narrow-1/.hg/store -type f -name '*.i' | sort |
|
853 | 902 | client-narrow-1/.hg/store/00changelog.i |
|
854 | 903 | client-narrow-1/.hg/store/00manifest.i |
|
855 | 904 | client-narrow-1/.hg/store/data/a.i |
|
856 | 905 | client-narrow-1/.hg/store/data/b.i |
|
857 | 906 | client-narrow-1/.hg/store/data/dir1/e.i |
|
858 | 907 | client-narrow-1/.hg/store/data/dir1/f.i |
|
859 | 908 | #endif |
|
860 | 909 | |
|
861 | 910 | Mixing --include and --exclude works |
|
862 | 911 | |
|
863 | $ hg --config extensions.pullext=$TESTDIR/pullext.py --debug clone -U --include dir0/ --exclude dir0/c http://localhost:$HGPORT/ client-narrow-2 | |
|
912 | Output is flaky, save it in a file and check part independently | |
|
913 | $ hg --config extensions.pullext=$TESTDIR/pullext.py --debug clone -U --include dir0/ --exclude dir0/c http://localhost:$HGPORT/ client-narrow-2 > clone-output | |
|
914 | ||
|
915 | $ cat clone-output | grep -v "received frame" | |
|
864 | 916 | using http://localhost:$HGPORT/ |
|
865 | 917 | sending capabilities command |
|
866 | 918 | query 1; heads |
|
867 | 919 | sending 2 commands |
|
868 | 920 | sending command heads: {} |
|
869 | 921 | sending command known: { |
|
870 | 922 | 'nodes': [] |
|
871 | 923 | } |
|
872 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
873 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
874 | received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
875 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
876 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
877 | received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
878 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
879 | 924 | sending 1 commands |
|
880 | 925 | sending command changesetdata: { |
|
881 | 926 | 'fields': set([ |
|
882 | 927 | 'bookmarks', |
|
883 | 928 | 'parents', |
|
884 | 929 | 'phase', |
|
885 | 930 | 'revision' |
|
886 | 931 | ]), |
|
887 | 932 | 'revisions': [ |
|
888 | 933 | { |
|
889 | 934 | 'heads': [ |
|
890 | 935 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
891 | 936 | ], |
|
892 | 937 | 'roots': [], |
|
893 | 938 | 'type': 'changesetdagrange' |
|
894 | 939 | } |
|
895 | 940 | ] |
|
896 | 941 | } |
|
897 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
898 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
899 | received frame(size=783; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
900 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
901 | 942 | add changeset 3390ef850073 |
|
902 | 943 | add changeset b709380892b1 |
|
903 | 944 | add changeset 47fe012ab237 |
|
904 | 945 | add changeset 97765fc3cd62 |
|
905 | 946 | checking for updated bookmarks |
|
906 | 947 | sending 1 commands |
|
907 | 948 | sending command manifestdata: { |
|
908 | 949 | 'fields': set([ |
|
909 | 950 | 'parents', |
|
910 | 951 | 'revision' |
|
911 | 952 | ]), |
|
912 | 953 | 'haveparents': True, |
|
913 | 954 | 'nodes': [ |
|
914 | 955 | '\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&A', |
|
915 | 956 | '|2 \x1a\xa3\xa1R\xa9\xe6\xa9"+?\xa8\xd0\xe3\x0f\xc2V\xe8', |
|
916 | 957 | '\x8d\xd0W<\x7f\xaf\xe2\x04F\xcc\xea\xac\x05N\xea\xa4x\x91M\xdb', |
|
917 | 958 | '113\x85\xf2!\x8b\x08^\xb2Z\x821\x1e*\xdd\x0e\xeb\x8c3' |
|
918 | 959 | ], |
|
919 | 960 | 'tree': '' |
|
920 | 961 | } |
|
921 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
922 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
923 | received frame(size=967; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
924 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
925 | 962 | sending 1 commands |
|
926 | 963 | sending command filesdata: { |
|
927 | 964 | 'fields': set([ |
|
928 | 965 | 'parents', |
|
929 | 966 | 'revision' |
|
930 | 967 | ]), |
|
931 | 968 | 'haveparents': True, |
|
932 | 969 | 'pathfilter': { |
|
933 | 970 | 'exclude': [ |
|
934 | 971 | 'path:dir0/c' |
|
935 | 972 | ], |
|
936 | 973 | 'include': [ |
|
937 | 974 | 'path:dir0' |
|
938 | 975 | ] |
|
939 | 976 | }, |
|
940 | 977 | 'revisions': [ |
|
941 | 978 | { |
|
942 | 979 | 'nodes': [ |
|
943 | 980 | '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:', |
|
944 | 981 | '\xb7\t8\x08\x92\xb1\x93\xc1\t\x1d:\x81\x7fp`R\xe3F\x82\x1b', |
|
945 | 982 | 'G\xfe\x01*\xb27\xa8\xc7\xfc\x0cx\xf9\xf2mXf\xee\xf3\xf8%', |
|
946 | 983 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
947 | 984 | ], |
|
948 | 985 | 'type': 'changesetexplicit' |
|
949 | 986 | } |
|
950 | 987 | ] |
|
951 | 988 | } |
|
989 | updating the branch cache | |
|
990 | new changesets 3390ef850073:97765fc3cd62 | |
|
991 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
992 | ||
|
993 | $ cat clone-output | grep "received frame" | |
|
994 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
995 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
996 | received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
997 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
998 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
999 | received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1000 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1001 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1002 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1003 | received frame(size=783; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1004 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1005 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1006 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1007 | received frame(size=967; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1008 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
952 | 1009 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) |
|
953 | 1010 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
954 | 1011 | received frame(size=160; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
955 | 1012 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) |
|
956 | updating the branch cache | |
|
957 | new changesets 3390ef850073:97765fc3cd62 | |
|
958 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
1013 | ||
|
1014 | $ rm clone-output | |
|
959 | 1015 | |
|
960 | 1016 | #if reporevlogstore |
|
961 | 1017 | $ find client-narrow-2/.hg/store -type f -name '*.i' | sort |
|
962 | 1018 | client-narrow-2/.hg/store/00changelog.i |
|
963 | 1019 | client-narrow-2/.hg/store/00manifest.i |
|
964 | 1020 | client-narrow-2/.hg/store/data/dir0/d.i |
|
965 | 1021 | #endif |
|
966 | 1022 | |
|
967 | 1023 | --stream will use rawfiledata to transfer changelog and manifestlog, then |
|
968 | 1024 | fall through to get files data |
|
969 | 1025 | |
|
970 | $ hg --debug clone --stream -U http://localhost:$HGPORT client-stream-0 | |
|
1026 | Output is flaky, save it in a file and check part independently | |
|
1027 | $ hg --debug clone --stream -U http://localhost:$HGPORT client-stream-0 > clone-output | |
|
1028 | ||
|
1029 | $ cat clone-output | grep -v "received frame" | |
|
971 | 1030 | using http://localhost:$HGPORT/ |
|
972 | 1031 | sending capabilities command |
|
973 | 1032 | sending 1 commands |
|
974 | 1033 | sending command rawstorefiledata: { |
|
975 | 1034 | 'files': [ |
|
976 | 1035 | 'changelog', |
|
977 | 1036 | 'manifestlog' |
|
978 | 1037 | ] |
|
979 | 1038 | } |
|
980 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
981 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
982 | received frame(size=1275; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
983 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
984 | 1039 | updating the branch cache |
|
985 | 1040 | query 1; heads |
|
986 | 1041 | sending 2 commands |
|
987 | 1042 | sending command heads: {} |
|
988 | 1043 | sending command known: { |
|
989 | 1044 | 'nodes': [ |
|
990 | 1045 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
991 | 1046 | ] |
|
992 | 1047 | } |
|
993 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
994 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
995 | received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
996 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
997 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
998 | received frame(size=2; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
999 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1000 | 1048 | searching for changes |
|
1001 | 1049 | all remote heads known locally |
|
1002 | 1050 | sending 1 commands |
|
1003 | 1051 | sending command changesetdata: { |
|
1004 | 1052 | 'fields': set([ |
|
1005 | 1053 | 'bookmarks', |
|
1006 | 1054 | 'parents', |
|
1007 | 1055 | 'phase', |
|
1008 | 1056 | 'revision' |
|
1009 | 1057 | ]), |
|
1010 | 1058 | 'revisions': [ |
|
1011 | 1059 | { |
|
1012 | 1060 | 'heads': [ |
|
1013 | 1061 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
1014 | 1062 | ], |
|
1015 | 1063 | 'roots': [ |
|
1016 | 1064 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
1017 | 1065 | ], |
|
1018 | 1066 | 'type': 'changesetdagrange' |
|
1019 | 1067 | } |
|
1020 | 1068 | ] |
|
1021 | 1069 | } |
|
1022 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1023 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1024 | received frame(size=13; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1025 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1026 | 1070 | checking for updated bookmarks |
|
1027 | 1071 | sending 1 commands |
|
1028 | 1072 | sending command filesdata: { |
|
1029 | 1073 | 'fields': set([ |
|
1030 | 1074 | 'parents', |
|
1031 | 1075 | 'revision' |
|
1032 | 1076 | ]), |
|
1033 | 1077 | 'haveparents': True, |
|
1034 | 1078 | 'revisions': [ |
|
1035 | 1079 | { |
|
1036 | 1080 | 'nodes': [ |
|
1037 | 1081 | '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:', |
|
1038 | 1082 | '\xb7\t8\x08\x92\xb1\x93\xc1\t\x1d:\x81\x7fp`R\xe3F\x82\x1b', |
|
1039 | 1083 | 'G\xfe\x01*\xb27\xa8\xc7\xfc\x0cx\xf9\xf2mXf\xee\xf3\xf8%', |
|
1040 | 1084 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
1041 | 1085 | ], |
|
1042 | 1086 | 'type': 'changesetexplicit' |
|
1043 | 1087 | } |
|
1044 | 1088 | ] |
|
1045 | 1089 | } |
|
1090 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
1091 | ||
|
1092 | $ cat clone-output | grep "received frame" | |
|
1093 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1094 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1095 | received frame(size=1275; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1096 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1097 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1098 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1099 | received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1100 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1101 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1102 | received frame(size=2; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1103 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1104 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1105 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1106 | received frame(size=13; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1107 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1046 | 1108 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) |
|
1047 | 1109 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
1048 | 1110 | received frame(size=1133; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
1049 | 1111 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) |
|
1050 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
1112 | ||
|
1113 | $ rm clone-output | |
|
1051 | 1114 | |
|
1052 | 1115 | --stream + --include/--exclude will only obtain some files |
|
1053 | 1116 | |
|
1054 | $ hg --debug --config extensions.pullext=$TESTDIR/pullext.py clone --stream --include dir0/ -U http://localhost:$HGPORT client-stream-2 | |
|
1117 | Output is flaky, save it in a file and check part independently | |
|
1118 | $ hg --debug --config extensions.pullext=$TESTDIR/pullext.py clone --stream --include dir0/ -U http://localhost:$HGPORT client-stream-2 > clone-output | |
|
1119 | ||
|
1120 | $ cat clone-output | grep -v "received frame" | |
|
1055 | 1121 | using http://localhost:$HGPORT/ |
|
1056 | 1122 | sending capabilities command |
|
1057 | 1123 | sending 1 commands |
|
1058 | 1124 | sending command rawstorefiledata: { |
|
1059 | 1125 | 'files': [ |
|
1060 | 1126 | 'changelog', |
|
1061 | 1127 | 'manifestlog' |
|
1062 | 1128 | ] |
|
1063 | 1129 | } |
|
1064 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1065 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1066 | received frame(size=1275; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1067 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1068 | 1130 | updating the branch cache |
|
1069 | 1131 | query 1; heads |
|
1070 | 1132 | sending 2 commands |
|
1071 | 1133 | sending command heads: {} |
|
1072 | 1134 | sending command known: { |
|
1073 | 1135 | 'nodes': [ |
|
1074 | 1136 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
1075 | 1137 | ] |
|
1076 | 1138 | } |
|
1077 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1078 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1079 | received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1080 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1081 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1082 | received frame(size=2; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1083 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1084 | 1139 | searching for changes |
|
1085 | 1140 | all remote heads known locally |
|
1086 | 1141 | sending 1 commands |
|
1087 | 1142 | sending command changesetdata: { |
|
1088 | 1143 | 'fields': set([ |
|
1089 | 1144 | 'bookmarks', |
|
1090 | 1145 | 'parents', |
|
1091 | 1146 | 'phase', |
|
1092 | 1147 | 'revision' |
|
1093 | 1148 | ]), |
|
1094 | 1149 | 'revisions': [ |
|
1095 | 1150 | { |
|
1096 | 1151 | 'heads': [ |
|
1097 | 1152 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
1098 | 1153 | ], |
|
1099 | 1154 | 'roots': [ |
|
1100 | 1155 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
1101 | 1156 | ], |
|
1102 | 1157 | 'type': 'changesetdagrange' |
|
1103 | 1158 | } |
|
1104 | 1159 | ] |
|
1105 | 1160 | } |
|
1106 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1107 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1108 | received frame(size=13; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1109 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1110 | 1161 | checking for updated bookmarks |
|
1111 | 1162 | sending 1 commands |
|
1112 | 1163 | sending command filesdata: { |
|
1113 | 1164 | 'fields': set([ |
|
1114 | 1165 | 'parents', |
|
1115 | 1166 | 'revision' |
|
1116 | 1167 | ]), |
|
1117 | 1168 | 'haveparents': True, |
|
1118 | 1169 | 'pathfilter': { |
|
1119 | 1170 | 'include': [ |
|
1120 | 1171 | 'path:dir0' |
|
1121 | 1172 | ] |
|
1122 | 1173 | }, |
|
1123 | 1174 | 'revisions': [ |
|
1124 | 1175 | { |
|
1125 | 1176 | 'nodes': [ |
|
1126 | 1177 | '3\x90\xef\x85\x00s\xfb\xc2\xf0\xdf\xff"D4,\x8e\x92)\x01:', |
|
1127 | 1178 | '\xb7\t8\x08\x92\xb1\x93\xc1\t\x1d:\x81\x7fp`R\xe3F\x82\x1b', |
|
1128 | 1179 | 'G\xfe\x01*\xb27\xa8\xc7\xfc\x0cx\xf9\xf2mXf\xee\xf3\xf8%', |
|
1129 | 1180 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
1130 | 1181 | ], |
|
1131 | 1182 | 'type': 'changesetexplicit' |
|
1132 | 1183 | } |
|
1133 | 1184 | ] |
|
1134 | 1185 | } |
|
1186 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
1187 | ||
|
1188 | $ cat clone-output | grep "received frame" | |
|
1189 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1190 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1191 | received frame(size=1275; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1192 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1193 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1194 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1195 | received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1196 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1197 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1198 | received frame(size=2; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1199 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1200 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1201 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1202 | received frame(size=13; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1203 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1135 | 1204 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) |
|
1136 | 1205 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
1137 | 1206 | received frame(size=449; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
1138 | 1207 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) |
|
1139 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
1208 | ||
|
1209 | $ rm clone-output | |
|
1140 | 1210 | |
|
1141 | 1211 | #if reporevlogstore |
|
1142 | 1212 | $ find client-stream-2/.hg/store -type f -name '*.i' | sort |
|
1143 | 1213 | client-stream-2/.hg/store/00changelog.i |
|
1144 | 1214 | client-stream-2/.hg/store/00manifest.i |
|
1145 | 1215 | client-stream-2/.hg/store/data/dir0/c.i |
|
1146 | 1216 | client-stream-2/.hg/store/data/dir0/d.i |
|
1147 | 1217 | #endif |
|
1148 | 1218 | |
|
1149 | 1219 | Shallow clone doesn't work with revlogs |
|
1150 | 1220 | |
|
1151 | $ hg --debug --config extensions.pullext=$TESTDIR/pullext.py clone --depth 1 -U http://localhost:$HGPORT client-shallow-revlogs | |
|
1221 | Output is flaky, save it in a file and check part independently | |
|
1222 | $ hg --debug --config extensions.pullext=$TESTDIR/pullext.py clone --depth 1 -U http://localhost:$HGPORT client-shallow-revlogs > clone-output | |
|
1223 | transaction abort! | |
|
1224 | rollback completed | |
|
1225 | abort: revlog storage does not support missing parents write mode | |
|
1226 | [255] | |
|
1227 | ||
|
1228 | $ cat clone-output | grep -v "received frame" | |
|
1152 | 1229 | using http://localhost:$HGPORT/ |
|
1153 | 1230 | sending capabilities command |
|
1154 | 1231 |
query 1 |
|
1155 | 1232 | sending 2 commands |
|
1156 | 1233 | sending command heads: {} |
|
1157 | 1234 | sending command known: { |
|
1158 | 1235 | 'nodes': [] |
|
1159 | 1236 | } |
|
1160 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1161 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1162 | received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1163 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1164 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1165 | received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1166 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1167 | 1237 |
|
|
1168 | 1238 | sending command changesetdata: { |
|
1169 | 1239 | 'fields': set([ |
|
1170 | 1240 | 'bookmarks', |
|
1171 | 1241 | 'parents', |
|
1172 | 1242 | 'phase', |
|
1173 | 1243 | 'revision' |
|
1174 | 1244 | ]), |
|
1175 | 1245 | 'revisions': [ |
|
1176 | 1246 | { |
|
1177 | 1247 | 'heads': [ |
|
1178 | 1248 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
1179 | 1249 | ], |
|
1180 | 1250 | 'roots': [], |
|
1181 | 1251 | 'type': 'changesetdagrange' |
|
1182 | 1252 | } |
|
1183 | 1253 |
|
|
1184 | 1254 | } |
|
1185 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1186 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1187 | received frame(size=783; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1188 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1189 | 1255 |
|
|
1190 | 1256 | add changeset b709380892b1 |
|
1191 | 1257 | add changeset 47fe012ab237 |
|
1192 | 1258 | add changeset 97765fc3cd62 |
|
1193 | 1259 | checking for updated bookmarks |
|
1194 | 1260 | sending 1 commands |
|
1195 | 1261 | sending command manifestdata: { |
|
1196 | 1262 | 'fields': set([ |
|
1197 | 1263 | 'parents', |
|
1198 | 1264 | 'revision' |
|
1199 | 1265 | ]), |
|
1200 | 1266 | 'haveparents': True, |
|
1201 | 1267 | 'nodes': [ |
|
1202 | 1268 | '\x99/Gy\x02\x9a=\xf8\xd0fm\x00\xbb\x92OicN&A', |
|
1203 | 1269 | '|2 \x1a\xa3\xa1R\xa9\xe6\xa9"+?\xa8\xd0\xe3\x0f\xc2V\xe8', |
|
1204 | 1270 | '\x8d\xd0W<\x7f\xaf\xe2\x04F\xcc\xea\xac\x05N\xea\xa4x\x91M\xdb', |
|
1205 | 1271 | '113\x85\xf2!\x8b\x08^\xb2Z\x821\x1e*\xdd\x0e\xeb\x8c3' |
|
1206 | 1272 | ], |
|
1207 | 1273 | 'tree': '' |
|
1208 | 1274 | } |
|
1209 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1210 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1211 | received frame(size=967; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1212 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1213 | 1275 |
|
|
1214 | 1276 | sending command filesdata: { |
|
1215 | 1277 | 'fields': set([ |
|
1216 | 1278 | 'linknode', |
|
1217 | 1279 | 'parents', |
|
1218 | 1280 | 'revision' |
|
1219 | 1281 | ]), |
|
1220 | 1282 | 'haveparents': False, |
|
1221 | 1283 | 'revisions': [ |
|
1222 | 1284 | { |
|
1223 | 1285 | 'nodes': [ |
|
1224 | 1286 | '\x97v_\xc3\xcdbO\xd1\xfa\x01v\x93,!\xff\xd1j\xdfC.' |
|
1225 | 1287 | ], |
|
1226 | 1288 | 'type': 'changesetexplicit' |
|
1227 | 1289 | } |
|
1228 | 1290 |
|
|
1229 | 1291 | } |
|
1292 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
1293 | ||
|
1294 | $ cat clone-output | grep "received frame" | |
|
1295 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1296 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1297 | received frame(size=22; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1298 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1299 | received frame(size=11; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1300 | received frame(size=1; request=3; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1301 | received frame(size=0; request=3; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1302 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1303 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1304 | received frame(size=783; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1305 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1306 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) | |
|
1307 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1308 | received frame(size=967; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) | |
|
1309 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) | |
|
1230 | 1310 | received frame(size=9; request=1; stream=2; streamflags=stream-begin; type=stream-settings; flags=eos) |
|
1231 | 1311 | received frame(size=11; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
1232 | 1312 | received frame(size=1005; request=1; stream=2; streamflags=encoded; type=command-response; flags=continuation) |
|
1233 | 1313 | received frame(size=0; request=1; stream=2; streamflags=; type=command-response; flags=eos) |
|
1234 | transaction abort! | |
|
1235 | rollback completed | |
|
1236 | (sent 5 HTTP requests and * bytes; received * bytes in responses) (glob) | |
|
1237 | abort: revlog storage does not support missing parents write mode | |
|
1238 | [255] | |
|
1314 | ||
|
1315 | $ rm clone-output | |
|
1239 | 1316 | |
|
1240 | 1317 | $ killdaemons.py |
|
1241 | 1318 | |
|
1242 | 1319 | Repo with 2 DAG branches introducing same filenode, to test linknode adjustment |
|
1243 | 1320 | |
|
1244 | 1321 | $ hg init server-linknode |
|
1245 | 1322 | $ enablehttpv2 server-linknode |
|
1246 | 1323 | $ cd server-linknode |
|
1247 | 1324 | $ touch foo |
|
1248 | 1325 | $ hg -q commit -Am initial |
|
1249 | 1326 | $ echo foo > dupe-file |
|
1250 | 1327 | $ hg commit -Am 'dupe 1' |
|
1251 | 1328 | adding dupe-file |
|
1252 | 1329 | $ hg -q up -r 0 |
|
1253 | 1330 | $ echo foo > dupe-file |
|
1254 | 1331 | $ hg commit -Am 'dupe 2' |
|
1255 | 1332 | adding dupe-file |
|
1256 | 1333 | created new head |
|
1257 | 1334 | $ hg serve -p $HGPORT -d --pid-file hg.pid -E error.log |
|
1258 | 1335 | $ cat hg.pid > $DAEMON_PIDS |
|
1259 | 1336 | $ cd .. |
|
1260 | 1337 | |
|
1261 | 1338 | Perform an incremental pull of both heads and ensure linkrev is written out properly |
|
1262 | 1339 | |
|
1263 | 1340 | $ hg clone -r 96ee1d7354c4 http://localhost:$HGPORT client-linknode-1 |
|
1264 | 1341 | new changesets 96ee1d7354c4 |
|
1265 | 1342 | updating to branch default |
|
1266 | 1343 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1267 | 1344 | $ cd client-linknode-1 |
|
1268 | 1345 | $ touch extra |
|
1269 | 1346 | $ hg commit -Am extra |
|
1270 | 1347 | adding extra |
|
1271 | 1348 | $ cd .. |
|
1272 | 1349 | |
|
1273 | 1350 | $ hg clone -r 96ee1d7354c4 http://localhost:$HGPORT client-linknode-2 |
|
1274 | 1351 | new changesets 96ee1d7354c4 |
|
1275 | 1352 | updating to branch default |
|
1276 | 1353 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1277 | 1354 | $ cd client-linknode-2 |
|
1278 | 1355 | $ touch extra |
|
1279 | 1356 | $ hg commit -Am extra |
|
1280 | 1357 | adding extra |
|
1281 | 1358 | $ cd .. |
|
1282 | 1359 | |
|
1283 | 1360 | $ hg -R client-linknode-1 pull -r 1681c33f9f80 |
|
1284 | 1361 | pulling from http://localhost:$HGPORT/ |
|
1285 | 1362 | searching for changes |
|
1286 | 1363 | new changesets 1681c33f9f80 |
|
1287 | 1364 | (run 'hg update' to get a working copy) |
|
1288 | 1365 | |
|
1289 | 1366 | #if reporevlogstore |
|
1290 | 1367 | $ hg -R client-linknode-1 debugrevlogindex dupe-file |
|
1291 | 1368 | rev linkrev nodeid p1 p2 |
|
1292 | 1369 | 0 2 2ed2a3912a0b 000000000000 000000000000 |
|
1293 | 1370 | #endif |
|
1294 | 1371 | |
|
1295 | 1372 | $ hg -R client-linknode-2 pull -r 639c8990d6a5 |
|
1296 | 1373 | pulling from http://localhost:$HGPORT/ |
|
1297 | 1374 | searching for changes |
|
1298 | 1375 | new changesets 639c8990d6a5 |
|
1299 | 1376 | (run 'hg update' to get a working copy) |
|
1300 | 1377 | |
|
1301 | 1378 | #if reporevlogstore |
|
1302 | 1379 | $ hg -R client-linknode-2 debugrevlogindex dupe-file |
|
1303 | 1380 | rev linkrev nodeid p1 p2 |
|
1304 | 1381 | 0 2 2ed2a3912a0b 000000000000 000000000000 |
|
1305 | 1382 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now