##// END OF EJS Templates
tests: fix up some http tests for no-zstd case
Augie Fackler -
r30840:a1dd2c0c 4.1-rc stable
parent child Browse files
Show More
@@ -1,167 +1,167 b''
1 1 $ cat >> $HGRCPATH << EOF
2 2 > [web]
3 3 > push_ssl = false
4 4 > allow_push = *
5 5 > EOF
6 6
7 7 $ hg init server
8 8 $ cd server
9 9 $ touch a
10 10 $ hg -q commit -A -m initial
11 11 $ cd ..
12 12
13 13 $ hg -R server serve -p $HGPORT -d --pid-file hg.pid
14 14 $ cat hg.pid >> $DAEMON_PIDS
15 15
16 16 compression formats are advertised in compression capability
17 17
18 18 #if zstd
19 19 $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=capabilities' | tr ' ' '\n' | grep compression
20 20 compression=zstd,zlib
21 21 #else
22 22 $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=capabilities' | tr ' ' '\n' | grep compression
23 compression=ZL
23 compression=zlib
24 24 #endif
25 25
26 26 $ killdaemons.py
27 27
28 28 server.compressionengines can replace engines list wholesale
29 29
30 30 $ hg --config server.compressionengines=none -R server serve -p $HGPORT -d --pid-file hg.pid
31 31 $ cat hg.pid > $DAEMON_PIDS
32 32 $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=capabilities' | tr ' ' '\n' | grep compression
33 33 compression=none
34 34
35 35 $ killdaemons.py
36 36
37 37 Order of engines can also change
38 38
39 39 $ hg --config server.compressionengines=none,zlib -R server serve -p $HGPORT -d --pid-file hg.pid
40 40 $ cat hg.pid > $DAEMON_PIDS
41 41 $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=capabilities' | tr ' ' '\n' | grep compression
42 42 compression=none,zlib
43 43
44 44 $ killdaemons.py
45 45
46 46 Start a default server again
47 47
48 48 $ hg -R server serve -p $HGPORT -d --pid-file hg.pid
49 49 $ cat hg.pid > $DAEMON_PIDS
50 50
51 51 Server should send application/mercurial-0.1 to clients if no Accept is used
52 52
53 53 $ get-with-headers.py --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' -
54 54 200 Script output follows
55 55 content-type: application/mercurial-0.1
56 56 date: * (glob)
57 57 server: * (glob)
58 58 transfer-encoding: chunked
59 59
60 60 Server should send application/mercurial-0.1 when client says it wants it
61 61
62 62 $ get-with-headers.py --hgproto '0.1' --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' -
63 63 200 Script output follows
64 64 content-type: application/mercurial-0.1
65 65 date: * (glob)
66 66 server: * (glob)
67 67 transfer-encoding: chunked
68 68
69 69 Server should send application/mercurial-0.2 when client says it wants it
70 70
71 71 $ get-with-headers.py --hgproto '0.2' --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' -
72 72 200 Script output follows
73 73 content-type: application/mercurial-0.2
74 74 date: * (glob)
75 75 server: * (glob)
76 76 transfer-encoding: chunked
77 77
78 78 $ get-with-headers.py --hgproto '0.1 0.2' --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' -
79 79 200 Script output follows
80 80 content-type: application/mercurial-0.2
81 81 date: * (glob)
82 82 server: * (glob)
83 83 transfer-encoding: chunked
84 84
85 85 Requesting a compression format that server doesn't support results will fall back to 0.1
86 86
87 87 $ get-with-headers.py --hgproto '0.2 comp=aa' --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' -
88 88 200 Script output follows
89 89 content-type: application/mercurial-0.1
90 90 date: * (glob)
91 91 server: * (glob)
92 92 transfer-encoding: chunked
93 93
94 94 #if zstd
95 95 zstd is used if available
96 96
97 97 $ get-with-headers.py --hgproto '0.2 comp=zstd' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp
98 98 $ f --size --hexdump --bytes 36 --sha1 resp
99 99 resp: size=248, sha1=4d8d8f87fb82bd542ce52881fdc94f850748
100 100 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu|
101 101 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 04 7a 73 74 64 |t follows...zstd|
102 102 0020: 28 b5 2f fd |(./.|
103 103
104 104 #endif
105 105
106 106 application/mercurial-0.2 is not yet used on non-streaming responses
107 107
108 108 $ get-with-headers.py --hgproto '0.2' 127.0.0.1:$HGPORT '?cmd=heads' -
109 109 200 Script output follows
110 110 content-length: 41
111 111 content-type: application/mercurial-0.1
112 112 date: * (glob)
113 113 server: * (glob)
114 114
115 115 e93700bd72895c5addab234c56d4024b487a362f
116 116
117 117 Now test protocol preference usage
118 118
119 119 $ killdaemons.py
120 120 $ hg --config server.compressionengines=none,zlib -R server serve -p $HGPORT -d --pid-file hg.pid
121 121 $ cat hg.pid > $DAEMON_PIDS
122 122
123 123 No Accept will send 0.1+zlib, even though "none" is preferred b/c "none" isn't supported on 0.1
124 124
125 125 $ get-with-headers.py --headeronly 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' Content-Type
126 126 200 Script output follows
127 127 content-type: application/mercurial-0.1
128 128
129 129 $ get-with-headers.py 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp
130 130 $ f --size --hexdump --bytes 28 --sha1 resp
131 131 resp: size=227, sha1=35a4c074da74f32f5440da3cbf04
132 132 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu|
133 133 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 78 |t follows..x|
134 134
135 135 Explicit 0.1 will send zlib because "none" isn't supported on 0.1
136 136
137 137 $ get-with-headers.py --hgproto '0.1' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp
138 138 $ f --size --hexdump --bytes 28 --sha1 resp
139 139 resp: size=227, sha1=35a4c074da74f32f5440da3cbf04
140 140 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu|
141 141 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 78 |t follows..x|
142 142
143 143 0.2 with no compression will get "none" because that is server's preference
144 144 (spec says ZL and UN are implicitly supported)
145 145
146 146 $ get-with-headers.py --hgproto '0.2' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp
147 147 $ f --size --hexdump --bytes 32 --sha1 resp
148 148 resp: size=432, sha1=ac931b412ec185a02e0e5bcff98dac83
149 149 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu|
150 150 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 04 6e 6f 6e 65 |t follows...none|
151 151
152 152 Client receives server preference even if local order doesn't match
153 153
154 154 $ get-with-headers.py --hgproto '0.2 comp=zlib,none' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp
155 155 $ f --size --hexdump --bytes 32 --sha1 resp
156 156 resp: size=432, sha1=ac931b412ec185a02e0e5bcff98dac83
157 157 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu|
158 158 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 04 6e 6f 6e 65 |t follows...none|
159 159
160 160 Client receives only supported format even if not server preferred format
161 161
162 162 $ get-with-headers.py --hgproto '0.2 comp=zlib' 127.0.0.1:$HGPORT '?cmd=getbundle&heads=e93700bd72895c5addab234c56d4024b487a362f&common=0000000000000000000000000000000000000000' > resp
163 163 $ f --size --hexdump --bytes 33 --sha1 resp
164 164 resp: size=232, sha1=a1c727f0c9693ca15742a75c30419bc36
165 165 0000: 32 30 30 20 53 63 72 69 70 74 20 6f 75 74 70 75 |200 Script outpu|
166 166 0010: 74 20 66 6f 6c 6c 6f 77 73 0a 0a 04 7a 6c 69 62 |t follows...zlib|
167 167 0020: 78 |x|
@@ -1,536 +1,570 b''
1 1 #require killdaemons
2 2
3 3 Tests discovery against servers without getbundle support:
4 4
5 5 $ CAP="getbundle bundle2"
6 6 $ . "$TESTDIR/notcapable"
7 7 $ cat >> $HGRCPATH <<EOF
8 8 > [ui]
9 9 > logtemplate="{rev} {node|short}: {desc} {branches}\n"
10 10 > EOF
11 11
12 12 Setup HTTP server control:
13 13
14 14 $ remote=http://localhost:$HGPORT/
15 15 $ export remote
16 16 $ tstart() {
17 17 > echo '[web]' > $1/.hg/hgrc
18 18 > echo 'push_ssl = false' >> $1/.hg/hgrc
19 19 > echo 'allow_push = *' >> $1/.hg/hgrc
20 20 > hg serve -R $1 -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
21 21 > cat hg.pid >> $DAEMON_PIDS
22 22 > }
23 23 $ tstop() {
24 24 > killdaemons.py
25 25 > [ "$1" ] && cut -d' ' -f6- access.log && cat errors.log
26 26 > rm access.log errors.log
27 27 > }
28 28
29 29 Both are empty:
30 30
31 31 $ hg init empty1
32 32 $ hg init empty2
33 33 $ tstart empty2
34 34 $ hg incoming -R empty1 $remote
35 35 comparing with http://localhost:$HGPORT/
36 36 no changes found
37 37 [1]
38 38 $ hg outgoing -R empty1 $remote
39 39 comparing with http://localhost:$HGPORT/
40 40 no changes found
41 41 [1]
42 42 $ hg pull -R empty1 $remote
43 43 pulling from http://localhost:$HGPORT/
44 44 no changes found
45 45 $ hg push -R empty1 $remote
46 46 pushing to http://localhost:$HGPORT/
47 47 no changes found
48 48 [1]
49 49 $ tstop
50 50
51 51 Base repo:
52 52
53 53 $ hg init main
54 54 $ cd main
55 55 $ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 <tbase @name2 +4:thead2 @both /thead1 +2:tmaintip'
56 56 $ hg log -G
57 57 o 11 a19bfa7e7328: r11 both
58 58 |
59 59 o 10 8b6bad1512e1: r10 both
60 60 |
61 61 o 9 025829e08038: r9 both
62 62 |\
63 63 | o 8 d8f638ac69e9: r8 name2
64 64 | |
65 65 | o 7 b6b4d315a2ac: r7 name2
66 66 | |
67 67 | o 6 6c6f5d5f3c11: r6 name2
68 68 | |
69 69 | o 5 70314b29987d: r5 name2
70 70 | |
71 71 o | 4 e71dbbc70e03: r4 name1
72 72 | |
73 73 o | 3 2c8d5d5ec612: r3 name1
74 74 | |
75 75 o | 2 a7892891da29: r2 name1
76 76 |/
77 77 o 1 0019a3b924fd: r1
78 78 |
79 79 o 0 d57206cc072a: r0
80 80
81 81 $ cd ..
82 82 $ tstart main
83 83
84 84 Full clone:
85 85
86 86 $ hg clone main full
87 87 updating to branch default
88 88 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
89 89 $ cd full
90 90 $ hg incoming $remote
91 91 comparing with http://localhost:$HGPORT/
92 92 searching for changes
93 93 no changes found
94 94 [1]
95 95 $ hg outgoing $remote
96 96 comparing with http://localhost:$HGPORT/
97 97 searching for changes
98 98 no changes found
99 99 [1]
100 100 $ hg pull $remote
101 101 pulling from http://localhost:$HGPORT/
102 102 searching for changes
103 103 no changes found
104 104 $ hg push $remote
105 105 pushing to http://localhost:$HGPORT/
106 106 searching for changes
107 107 no changes found
108 108 [1]
109 109 $ cd ..
110 110
111 111 Local is empty:
112 112
113 113 $ cd empty1
114 114 $ hg incoming $remote
115 115 comparing with http://localhost:$HGPORT/
116 116 0 d57206cc072a: r0
117 117 1 0019a3b924fd: r1
118 118 2 a7892891da29: r2 name1
119 119 3 2c8d5d5ec612: r3 name1
120 120 4 e71dbbc70e03: r4 name1
121 121 5 70314b29987d: r5 name2
122 122 6 6c6f5d5f3c11: r6 name2
123 123 7 b6b4d315a2ac: r7 name2
124 124 8 d8f638ac69e9: r8 name2
125 125 9 025829e08038: r9 both
126 126 10 8b6bad1512e1: r10 both
127 127 11 a19bfa7e7328: r11 both
128 128 $ hg outgoing $remote
129 129 comparing with http://localhost:$HGPORT/
130 130 no changes found
131 131 [1]
132 132 $ hg push $remote
133 133 pushing to http://localhost:$HGPORT/
134 134 no changes found
135 135 [1]
136 136 $ hg pull $remote
137 137 pulling from http://localhost:$HGPORT/
138 138 requesting all changes
139 139 adding changesets
140 140 adding manifests
141 141 adding file changes
142 142 added 12 changesets with 24 changes to 2 files
143 143 (run 'hg update' to get a working copy)
144 144 $ hg incoming $remote
145 145 comparing with http://localhost:$HGPORT/
146 146 searching for changes
147 147 no changes found
148 148 [1]
149 149 $ cd ..
150 150
151 151 Local is subset:
152 152
153 153 $ hg clone main subset --rev name2 ; cd subset
154 154 adding changesets
155 155 adding manifests
156 156 adding file changes
157 157 added 6 changesets with 12 changes to 2 files
158 158 updating to branch name2
159 159 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
160 160 $ hg incoming $remote
161 161 comparing with http://localhost:$HGPORT/
162 162 searching for changes
163 163 6 a7892891da29: r2 name1
164 164 7 2c8d5d5ec612: r3 name1
165 165 8 e71dbbc70e03: r4 name1
166 166 9 025829e08038: r9 both
167 167 10 8b6bad1512e1: r10 both
168 168 11 a19bfa7e7328: r11 both
169 169 $ hg outgoing $remote
170 170 comparing with http://localhost:$HGPORT/
171 171 searching for changes
172 172 no changes found
173 173 [1]
174 174 $ hg push $remote
175 175 pushing to http://localhost:$HGPORT/
176 176 searching for changes
177 177 no changes found
178 178 [1]
179 179 $ hg pull $remote
180 180 pulling from http://localhost:$HGPORT/
181 181 searching for changes
182 182 adding changesets
183 183 adding manifests
184 184 adding file changes
185 185 added 6 changesets with 12 changes to 2 files
186 186 (run 'hg update' to get a working copy)
187 187 $ hg incoming $remote
188 188 comparing with http://localhost:$HGPORT/
189 189 searching for changes
190 190 no changes found
191 191 [1]
192 192 $ cd ..
193 193 $ tstop
194 194
195 195 Remote is empty:
196 196
197 197 $ tstart empty2
198 198 $ cd main
199 199 $ hg incoming $remote
200 200 comparing with http://localhost:$HGPORT/
201 201 searching for changes
202 202 no changes found
203 203 [1]
204 204 $ hg outgoing $remote
205 205 comparing with http://localhost:$HGPORT/
206 206 searching for changes
207 207 0 d57206cc072a: r0
208 208 1 0019a3b924fd: r1
209 209 2 a7892891da29: r2 name1
210 210 3 2c8d5d5ec612: r3 name1
211 211 4 e71dbbc70e03: r4 name1
212 212 5 70314b29987d: r5 name2
213 213 6 6c6f5d5f3c11: r6 name2
214 214 7 b6b4d315a2ac: r7 name2
215 215 8 d8f638ac69e9: r8 name2
216 216 9 025829e08038: r9 both
217 217 10 8b6bad1512e1: r10 both
218 218 11 a19bfa7e7328: r11 both
219 219 $ hg pull $remote
220 220 pulling from http://localhost:$HGPORT/
221 221 searching for changes
222 222 no changes found
223 223 $ hg push $remote
224 224 pushing to http://localhost:$HGPORT/
225 225 searching for changes
226 226 remote: adding changesets
227 227 remote: adding manifests
228 228 remote: adding file changes
229 229 remote: added 12 changesets with 24 changes to 2 files
230 230 $ hg outgoing $remote
231 231 comparing with http://localhost:$HGPORT/
232 232 searching for changes
233 233 no changes found
234 234 [1]
235 235 $ cd ..
236 236 $ tstop
237 237
238 238 Local is superset:
239 239
240 240 $ hg clone main subset2 --rev name2
241 241 adding changesets
242 242 adding manifests
243 243 adding file changes
244 244 added 6 changesets with 12 changes to 2 files
245 245 updating to branch name2
246 246 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
247 247 $ tstart subset2
248 248 $ cd main
249 249 $ hg incoming $remote
250 250 comparing with http://localhost:$HGPORT/
251 251 searching for changes
252 252 no changes found
253 253 [1]
254 254 $ hg outgoing $remote
255 255 comparing with http://localhost:$HGPORT/
256 256 searching for changes
257 257 2 a7892891da29: r2 name1
258 258 3 2c8d5d5ec612: r3 name1
259 259 4 e71dbbc70e03: r4 name1
260 260 9 025829e08038: r9 both
261 261 10 8b6bad1512e1: r10 both
262 262 11 a19bfa7e7328: r11 both
263 263 $ hg pull $remote
264 264 pulling from http://localhost:$HGPORT/
265 265 searching for changes
266 266 no changes found
267 267 $ hg push $remote
268 268 pushing to http://localhost:$HGPORT/
269 269 searching for changes
270 270 abort: push creates new remote branches: both, name1!
271 271 (use 'hg push --new-branch' to create new remote branches)
272 272 [255]
273 273 $ hg push $remote --new-branch
274 274 pushing to http://localhost:$HGPORT/
275 275 searching for changes
276 276 remote: adding changesets
277 277 remote: adding manifests
278 278 remote: adding file changes
279 279 remote: added 6 changesets with 12 changes to 2 files
280 280 $ hg outgoing $remote
281 281 comparing with http://localhost:$HGPORT/
282 282 searching for changes
283 283 no changes found
284 284 [1]
285 285 $ cd ..
286 286 $ tstop
287 287
288 288 Partial pull:
289 289
290 290 $ tstart main
291 291 $ hg clone $remote partial --rev name2
292 292 adding changesets
293 293 adding manifests
294 294 adding file changes
295 295 added 6 changesets with 12 changes to 2 files
296 296 updating to branch name2
297 297 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
298 298 $ cd partial
299 299 $ hg incoming $remote
300 300 comparing with http://localhost:$HGPORT/
301 301 searching for changes
302 302 6 a7892891da29: r2 name1
303 303 7 2c8d5d5ec612: r3 name1
304 304 8 e71dbbc70e03: r4 name1
305 305 9 025829e08038: r9 both
306 306 10 8b6bad1512e1: r10 both
307 307 11 a19bfa7e7328: r11 both
308 308 $ hg incoming $remote --rev name1
309 309 comparing with http://localhost:$HGPORT/
310 310 searching for changes
311 311 6 a7892891da29: r2 name1
312 312 7 2c8d5d5ec612: r3 name1
313 313 8 e71dbbc70e03: r4 name1
314 314 $ hg pull $remote --rev name1
315 315 pulling from http://localhost:$HGPORT/
316 316 searching for changes
317 317 adding changesets
318 318 adding manifests
319 319 adding file changes
320 320 added 3 changesets with 6 changes to 2 files (+1 heads)
321 321 (run 'hg heads' to see heads)
322 322 $ hg incoming $remote
323 323 comparing with http://localhost:$HGPORT/
324 324 searching for changes
325 325 9 025829e08038: r9 both
326 326 10 8b6bad1512e1: r10 both
327 327 11 a19bfa7e7328: r11 both
328 328 $ cd ..
329 329 $ tstop
330 330
331 331 Both have new stuff in new named branches:
332 332
333 333 $ hg clone main repo1a --rev name1 -q
334 334 $ hg clone repo1a repo1b -q
335 335 $ hg clone main repo2a --rev name2 -q
336 336 $ hg clone repo2a repo2b -q
337 337 $ tstart repo1a
338 338
339 339 $ cd repo2a
340 340 $ hg incoming $remote
341 341 comparing with http://localhost:$HGPORT/
342 342 searching for changes
343 343 6 a7892891da29: r2 name1
344 344 7 2c8d5d5ec612: r3 name1
345 345 8 e71dbbc70e03: r4 name1
346 346 $ hg outgoing $remote
347 347 comparing with http://localhost:$HGPORT/
348 348 searching for changes
349 349 2 70314b29987d: r5 name2
350 350 3 6c6f5d5f3c11: r6 name2
351 351 4 b6b4d315a2ac: r7 name2
352 352 5 d8f638ac69e9: r8 name2
353 353 $ hg push $remote --new-branch
354 354 pushing to http://localhost:$HGPORT/
355 355 searching for changes
356 356 remote: adding changesets
357 357 remote: adding manifests
358 358 remote: adding file changes
359 359 remote: added 4 changesets with 8 changes to 2 files (+1 heads)
360 360 $ hg pull $remote
361 361 pulling from http://localhost:$HGPORT/
362 362 searching for changes
363 363 adding changesets
364 364 adding manifests
365 365 adding file changes
366 366 added 3 changesets with 6 changes to 2 files (+1 heads)
367 367 (run 'hg heads' to see heads)
368 368 $ hg incoming $remote
369 369 comparing with http://localhost:$HGPORT/
370 370 searching for changes
371 371 no changes found
372 372 [1]
373 373 $ hg outgoing $remote
374 374 comparing with http://localhost:$HGPORT/
375 375 searching for changes
376 376 no changes found
377 377 [1]
378 378 $ cd ..
379 379 $ tstop
380 380
381 381 $ tstart repo1b
382 382 $ cd repo2b
383 383 $ hg incoming $remote
384 384 comparing with http://localhost:$HGPORT/
385 385 searching for changes
386 386 6 a7892891da29: r2 name1
387 387 7 2c8d5d5ec612: r3 name1
388 388 8 e71dbbc70e03: r4 name1
389 389 $ hg outgoing $remote
390 390 comparing with http://localhost:$HGPORT/
391 391 searching for changes
392 392 2 70314b29987d: r5 name2
393 393 3 6c6f5d5f3c11: r6 name2
394 394 4 b6b4d315a2ac: r7 name2
395 395 5 d8f638ac69e9: r8 name2
396 396 $ hg pull $remote
397 397 pulling from http://localhost:$HGPORT/
398 398 searching for changes
399 399 adding changesets
400 400 adding manifests
401 401 adding file changes
402 402 added 3 changesets with 6 changes to 2 files (+1 heads)
403 403 (run 'hg heads' to see heads)
404 404 $ hg push $remote --new-branch
405 405 pushing to http://localhost:$HGPORT/
406 406 searching for changes
407 407 remote: adding changesets
408 408 remote: adding manifests
409 409 remote: adding file changes
410 410 remote: added 4 changesets with 8 changes to 2 files (+1 heads)
411 411 $ hg incoming $remote
412 412 comparing with http://localhost:$HGPORT/
413 413 searching for changes
414 414 no changes found
415 415 [1]
416 416 $ hg outgoing $remote
417 417 comparing with http://localhost:$HGPORT/
418 418 searching for changes
419 419 no changes found
420 420 [1]
421 421 $ cd ..
422 422 $ tstop
423 423
424 424 Both have new stuff in existing named branches:
425 425
426 426 $ rm -r repo1a repo1b repo2a repo2b
427 427 $ hg clone main repo1a --rev 3 --rev 8 -q
428 428 $ hg clone repo1a repo1b -q
429 429 $ hg clone main repo2a --rev 4 --rev 7 -q
430 430 $ hg clone repo2a repo2b -q
431 431 $ tstart repo1a
432 432
433 433 $ cd repo2a
434 434 $ hg incoming $remote
435 435 comparing with http://localhost:$HGPORT/
436 436 searching for changes
437 437 8 d8f638ac69e9: r8 name2
438 438 $ hg outgoing $remote
439 439 comparing with http://localhost:$HGPORT/
440 440 searching for changes
441 441 4 e71dbbc70e03: r4 name1
442 442 $ hg push $remote --new-branch
443 443 pushing to http://localhost:$HGPORT/
444 444 searching for changes
445 445 remote: adding changesets
446 446 remote: adding manifests
447 447 remote: adding file changes
448 448 remote: added 1 changesets with 2 changes to 2 files
449 449 $ hg pull $remote
450 450 pulling from http://localhost:$HGPORT/
451 451 searching for changes
452 452 adding changesets
453 453 adding manifests
454 454 adding file changes
455 455 added 1 changesets with 2 changes to 2 files
456 456 (run 'hg update' to get a working copy)
457 457 $ hg incoming $remote
458 458 comparing with http://localhost:$HGPORT/
459 459 searching for changes
460 460 no changes found
461 461 [1]
462 462 $ hg outgoing $remote
463 463 comparing with http://localhost:$HGPORT/
464 464 searching for changes
465 465 no changes found
466 466 [1]
467 467 $ cd ..
468 468 $ tstop
469 469
470 470 $ tstart repo1b
471 471 $ cd repo2b
472 472 $ hg incoming $remote
473 473 comparing with http://localhost:$HGPORT/
474 474 searching for changes
475 475 8 d8f638ac69e9: r8 name2
476 476 $ hg outgoing $remote
477 477 comparing with http://localhost:$HGPORT/
478 478 searching for changes
479 479 4 e71dbbc70e03: r4 name1
480 480 $ hg pull $remote
481 481 pulling from http://localhost:$HGPORT/
482 482 searching for changes
483 483 adding changesets
484 484 adding manifests
485 485 adding file changes
486 486 added 1 changesets with 2 changes to 2 files
487 487 (run 'hg update' to get a working copy)
488 488 $ hg push $remote --new-branch
489 489 pushing to http://localhost:$HGPORT/
490 490 searching for changes
491 491 remote: adding changesets
492 492 remote: adding manifests
493 493 remote: adding file changes
494 494 remote: added 1 changesets with 2 changes to 2 files
495 495 $ hg incoming $remote
496 496 comparing with http://localhost:$HGPORT/
497 497 searching for changes
498 498 no changes found
499 499 [1]
500 500 $ hg outgoing $remote
501 501 comparing with http://localhost:$HGPORT/
502 502 searching for changes
503 503 no changes found
504 504 [1]
505 505 $ cd ..
506 #if zstd
506 507 $ tstop show
507 508 "GET /?cmd=capabilities HTTP/1.1" 200 -
508 509 "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
509 510 "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
510 511 "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
511 512 "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
512 513 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
513 514 "GET /?cmd=capabilities HTTP/1.1" 200 -
514 515 "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
515 516 "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
516 517 "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
517 518 "GET /?cmd=capabilities HTTP/1.1" 200 -
518 519 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
519 520 "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
520 521 "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
521 522 "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
522 523 "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
523 524 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
524 525 "GET /?cmd=capabilities HTTP/1.1" 200 -
525 526 "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
526 527 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
527 528 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
528 529 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
529 530 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
530 531 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
531 532 "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91* (glob)
532 533 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
533 534 "GET /?cmd=capabilities HTTP/1.1" 200 -
534 535 "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
535 536 "GET /?cmd=capabilities HTTP/1.1" 200 -
536 537 "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zstd,zlib,none,bzip2
538 #else
539 $ tstop show
540 "GET /?cmd=capabilities HTTP/1.1" 200 -
541 "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
542 "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
543 "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
544 "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
545 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
546 "GET /?cmd=capabilities HTTP/1.1" 200 -
547 "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
548 "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
549 "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
550 "GET /?cmd=capabilities HTTP/1.1" 200 -
551 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
552 "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
553 "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
554 "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
555 "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
556 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
557 "GET /?cmd=capabilities HTTP/1.1" 200 -
558 "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
559 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
560 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
561 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
562 "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
563 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
564 "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91* (glob)
565 "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
566 "GET /?cmd=capabilities HTTP/1.1" 200 -
567 "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
568 "GET /?cmd=capabilities HTTP/1.1" 200 -
569 "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=zlib,none,bzip2
570 #endif
General Comments 0
You need to be logged in to leave comments. Login now