Show More
@@ -1,75 +1,75 b'' | |||
|
1 | 1 | # common patterns in test at can safely be replaced |
|
2 | 2 | from __future__ import absolute_import |
|
3 | 3 | |
|
4 | 4 | substitutions = [ |
|
5 | 5 | # list of possible compressions |
|
6 | (br'zstd,zlib,none,bzip2', | |
|
6 | (br'(zstd,)?zlib,none,bzip2', | |
|
7 | 7 | br'$USUAL_COMPRESSIONS$' |
|
8 | 8 | ), |
|
9 | 9 | # capabilities sent through http |
|
10 | 10 | (br'bundlecaps=HG20%2Cbundle2%3DHG20%250A' |
|
11 | 11 | br'changegroup%253D01%252C02%250A' |
|
12 | 12 | br'digests%253Dmd5%252Csha1%252Csha512%250A' |
|
13 | 13 | br'error%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250A' |
|
14 | 14 | br'hgtagsfnodes%250A' |
|
15 | 15 | br'listkeys%250A' |
|
16 | 16 | br'phases%253Dheads%250A' |
|
17 | 17 | br'pushkey%250A' |
|
18 | 18 | br'remote-changegroup%253Dhttp%252Chttps', |
|
19 | 19 | # (the replacement patterns) |
|
20 | 20 | br'$USUAL_BUNDLE_CAPS$' |
|
21 | 21 | ), |
|
22 | 22 | # bundle2 capabilities sent through ssh |
|
23 | 23 | (br'bundle2=HG20%0A' |
|
24 | 24 | br'changegroup%3D01%2C02%0A' |
|
25 | 25 | br'digests%3Dmd5%2Csha1%2Csha512%0A' |
|
26 | 26 | br'error%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0A' |
|
27 | 27 | br'hgtagsfnodes%0A' |
|
28 | 28 | br'listkeys%0A' |
|
29 | 29 | br'phases%3Dheads%0A' |
|
30 | 30 | br'pushkey%0A' |
|
31 | 31 | br'remote-changegroup%3Dhttp%2Chttps', |
|
32 | 32 | # (replacement patterns) |
|
33 | 33 | br'$USUAL_BUNDLE2_CAPS$' |
|
34 | 34 | ), |
|
35 | 35 | # HTTP log dates |
|
36 | 36 | (br' - - \[\d\d/.../2\d\d\d \d\d:\d\d:\d\d] "GET', |
|
37 | 37 | br' - - [$LOGDATE$] "GET' |
|
38 | 38 | ), |
|
39 | 39 | ] |
|
40 | 40 | |
|
41 | 41 | # Various platform error strings, keyed on a common replacement string |
|
42 | 42 | _errors = { |
|
43 | 43 | br'$ENOENT$': ( |
|
44 | 44 | # strerror() |
|
45 | 45 | br'No such file or directory', |
|
46 | 46 | |
|
47 | 47 | # FormatMessage(ERROR_FILE_NOT_FOUND) |
|
48 | 48 | br'The system cannot find the file specified', |
|
49 | 49 | ), |
|
50 | 50 | br'$ENOTDIR$': ( |
|
51 | 51 | # strerror() |
|
52 | 52 | br'Not a directory', |
|
53 | 53 | |
|
54 | 54 | # FormatMessage(ERROR_PATH_NOT_FOUND) |
|
55 | 55 | br'The system cannot find the path specified', |
|
56 | 56 | ), |
|
57 | 57 | br'$ECONNRESET$': ( |
|
58 | 58 | # strerror() |
|
59 | 59 | br'Connection reset by peer', |
|
60 | 60 | |
|
61 | 61 | # FormatMessage(WSAECONNRESET) |
|
62 | 62 | br'An existing connection was forcibly closed by the remote host', |
|
63 | 63 | ), |
|
64 | 64 | br'$EADDRINUSE$': ( |
|
65 | 65 | # strerror() |
|
66 | 66 | br'Address already in use', |
|
67 | 67 | |
|
68 | 68 | # FormatMessage(WSAEADDRINUSE) |
|
69 | 69 | br'Only one usage of each socket address' |
|
70 | 70 | br' \(protocol/network address/port\) is normally permitted', |
|
71 | 71 | ), |
|
72 | 72 | } |
|
73 | 73 | |
|
74 | 74 | for replace, msgs in _errors.items(): |
|
75 | 75 | substitutions.extend((m, replace) for m in msgs) |
@@ -1,580 +1,580 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 | new changesets d57206cc072a:a19bfa7e7328 |
|
144 | 144 | (run 'hg update' to get a working copy) |
|
145 | 145 | $ hg incoming $remote |
|
146 | 146 | comparing with http://localhost:$HGPORT/ |
|
147 | 147 | searching for changes |
|
148 | 148 | no changes found |
|
149 | 149 | [1] |
|
150 | 150 | $ cd .. |
|
151 | 151 | |
|
152 | 152 | Local is subset: |
|
153 | 153 | |
|
154 | 154 | $ hg clone main subset --rev name2 ; cd subset |
|
155 | 155 | adding changesets |
|
156 | 156 | adding manifests |
|
157 | 157 | adding file changes |
|
158 | 158 | added 6 changesets with 12 changes to 2 files |
|
159 | 159 | new changesets d57206cc072a:d8f638ac69e9 |
|
160 | 160 | updating to branch name2 |
|
161 | 161 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
162 | 162 | $ hg incoming $remote |
|
163 | 163 | comparing with http://localhost:$HGPORT/ |
|
164 | 164 | searching for changes |
|
165 | 165 | 6 a7892891da29: r2 name1 |
|
166 | 166 | 7 2c8d5d5ec612: r3 name1 |
|
167 | 167 | 8 e71dbbc70e03: r4 name1 |
|
168 | 168 | 9 025829e08038: r9 both |
|
169 | 169 | 10 8b6bad1512e1: r10 both |
|
170 | 170 | 11 a19bfa7e7328: r11 both |
|
171 | 171 | $ hg outgoing $remote |
|
172 | 172 | comparing with http://localhost:$HGPORT/ |
|
173 | 173 | searching for changes |
|
174 | 174 | no changes found |
|
175 | 175 | [1] |
|
176 | 176 | $ hg push $remote |
|
177 | 177 | pushing to http://localhost:$HGPORT/ |
|
178 | 178 | searching for changes |
|
179 | 179 | no changes found |
|
180 | 180 | [1] |
|
181 | 181 | $ hg pull $remote |
|
182 | 182 | pulling from http://localhost:$HGPORT/ |
|
183 | 183 | searching for changes |
|
184 | 184 | adding changesets |
|
185 | 185 | adding manifests |
|
186 | 186 | adding file changes |
|
187 | 187 | added 6 changesets with 12 changes to 2 files |
|
188 | 188 | new changesets a7892891da29:a19bfa7e7328 |
|
189 | 189 | (run 'hg update' to get a working copy) |
|
190 | 190 | $ hg incoming $remote |
|
191 | 191 | comparing with http://localhost:$HGPORT/ |
|
192 | 192 | searching for changes |
|
193 | 193 | no changes found |
|
194 | 194 | [1] |
|
195 | 195 | $ cd .. |
|
196 | 196 | $ tstop |
|
197 | 197 | |
|
198 | 198 | Remote is empty: |
|
199 | 199 | |
|
200 | 200 | $ tstart empty2 |
|
201 | 201 | $ cd main |
|
202 | 202 | $ hg incoming $remote |
|
203 | 203 | comparing with http://localhost:$HGPORT/ |
|
204 | 204 | searching for changes |
|
205 | 205 | no changes found |
|
206 | 206 | [1] |
|
207 | 207 | $ hg outgoing $remote |
|
208 | 208 | comparing with http://localhost:$HGPORT/ |
|
209 | 209 | searching for changes |
|
210 | 210 | 0 d57206cc072a: r0 |
|
211 | 211 | 1 0019a3b924fd: r1 |
|
212 | 212 | 2 a7892891da29: r2 name1 |
|
213 | 213 | 3 2c8d5d5ec612: r3 name1 |
|
214 | 214 | 4 e71dbbc70e03: r4 name1 |
|
215 | 215 | 5 70314b29987d: r5 name2 |
|
216 | 216 | 6 6c6f5d5f3c11: r6 name2 |
|
217 | 217 | 7 b6b4d315a2ac: r7 name2 |
|
218 | 218 | 8 d8f638ac69e9: r8 name2 |
|
219 | 219 | 9 025829e08038: r9 both |
|
220 | 220 | 10 8b6bad1512e1: r10 both |
|
221 | 221 | 11 a19bfa7e7328: r11 both |
|
222 | 222 | $ hg pull $remote |
|
223 | 223 | pulling from http://localhost:$HGPORT/ |
|
224 | 224 | searching for changes |
|
225 | 225 | no changes found |
|
226 | 226 | $ hg push $remote |
|
227 | 227 | pushing to http://localhost:$HGPORT/ |
|
228 | 228 | searching for changes |
|
229 | 229 | remote: adding changesets |
|
230 | 230 | remote: adding manifests |
|
231 | 231 | remote: adding file changes |
|
232 | 232 | remote: added 12 changesets with 24 changes to 2 files |
|
233 | 233 | $ hg outgoing $remote |
|
234 | 234 | comparing with http://localhost:$HGPORT/ |
|
235 | 235 | searching for changes |
|
236 | 236 | no changes found |
|
237 | 237 | [1] |
|
238 | 238 | $ cd .. |
|
239 | 239 | $ tstop |
|
240 | 240 | |
|
241 | 241 | Local is superset: |
|
242 | 242 | |
|
243 | 243 | $ hg clone main subset2 --rev name2 |
|
244 | 244 | adding changesets |
|
245 | 245 | adding manifests |
|
246 | 246 | adding file changes |
|
247 | 247 | added 6 changesets with 12 changes to 2 files |
|
248 | 248 | new changesets d57206cc072a:d8f638ac69e9 |
|
249 | 249 | updating to branch name2 |
|
250 | 250 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
251 | 251 | $ tstart subset2 |
|
252 | 252 | $ cd main |
|
253 | 253 | $ hg incoming $remote |
|
254 | 254 | comparing with http://localhost:$HGPORT/ |
|
255 | 255 | searching for changes |
|
256 | 256 | no changes found |
|
257 | 257 | [1] |
|
258 | 258 | $ hg outgoing $remote |
|
259 | 259 | comparing with http://localhost:$HGPORT/ |
|
260 | 260 | searching for changes |
|
261 | 261 | 2 a7892891da29: r2 name1 |
|
262 | 262 | 3 2c8d5d5ec612: r3 name1 |
|
263 | 263 | 4 e71dbbc70e03: r4 name1 |
|
264 | 264 | 9 025829e08038: r9 both |
|
265 | 265 | 10 8b6bad1512e1: r10 both |
|
266 | 266 | 11 a19bfa7e7328: r11 both |
|
267 | 267 | $ hg pull $remote |
|
268 | 268 | pulling from http://localhost:$HGPORT/ |
|
269 | 269 | searching for changes |
|
270 | 270 | no changes found |
|
271 | 271 | $ hg push $remote |
|
272 | 272 | pushing to http://localhost:$HGPORT/ |
|
273 | 273 | searching for changes |
|
274 | 274 | abort: push creates new remote branches: both, name1! |
|
275 | 275 | (use 'hg push --new-branch' to create new remote branches) |
|
276 | 276 | [255] |
|
277 | 277 | $ hg push $remote --new-branch |
|
278 | 278 | pushing to http://localhost:$HGPORT/ |
|
279 | 279 | searching for changes |
|
280 | 280 | remote: adding changesets |
|
281 | 281 | remote: adding manifests |
|
282 | 282 | remote: adding file changes |
|
283 | 283 | remote: added 6 changesets with 12 changes to 2 files |
|
284 | 284 | $ hg outgoing $remote |
|
285 | 285 | comparing with http://localhost:$HGPORT/ |
|
286 | 286 | searching for changes |
|
287 | 287 | no changes found |
|
288 | 288 | [1] |
|
289 | 289 | $ cd .. |
|
290 | 290 | $ tstop |
|
291 | 291 | |
|
292 | 292 | Partial pull: |
|
293 | 293 | |
|
294 | 294 | $ tstart main |
|
295 | 295 | $ hg clone $remote partial --rev name2 |
|
296 | 296 | adding changesets |
|
297 | 297 | adding manifests |
|
298 | 298 | adding file changes |
|
299 | 299 | added 6 changesets with 12 changes to 2 files |
|
300 | 300 | new changesets d57206cc072a:d8f638ac69e9 |
|
301 | 301 | updating to branch name2 |
|
302 | 302 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
303 | 303 | $ cd partial |
|
304 | 304 | $ hg incoming $remote |
|
305 | 305 | comparing with http://localhost:$HGPORT/ |
|
306 | 306 | searching for changes |
|
307 | 307 | 6 a7892891da29: r2 name1 |
|
308 | 308 | 7 2c8d5d5ec612: r3 name1 |
|
309 | 309 | 8 e71dbbc70e03: r4 name1 |
|
310 | 310 | 9 025829e08038: r9 both |
|
311 | 311 | 10 8b6bad1512e1: r10 both |
|
312 | 312 | 11 a19bfa7e7328: r11 both |
|
313 | 313 | $ hg incoming $remote --rev name1 |
|
314 | 314 | comparing with http://localhost:$HGPORT/ |
|
315 | 315 | searching for changes |
|
316 | 316 | 6 a7892891da29: r2 name1 |
|
317 | 317 | 7 2c8d5d5ec612: r3 name1 |
|
318 | 318 | 8 e71dbbc70e03: r4 name1 |
|
319 | 319 | $ hg pull $remote --rev name1 |
|
320 | 320 | pulling from http://localhost:$HGPORT/ |
|
321 | 321 | searching for changes |
|
322 | 322 | adding changesets |
|
323 | 323 | adding manifests |
|
324 | 324 | adding file changes |
|
325 | 325 | added 3 changesets with 6 changes to 2 files (+1 heads) |
|
326 | 326 | new changesets a7892891da29:e71dbbc70e03 |
|
327 | 327 | (run 'hg heads' to see heads) |
|
328 | 328 | $ hg incoming $remote |
|
329 | 329 | comparing with http://localhost:$HGPORT/ |
|
330 | 330 | searching for changes |
|
331 | 331 | 9 025829e08038: r9 both |
|
332 | 332 | 10 8b6bad1512e1: r10 both |
|
333 | 333 | 11 a19bfa7e7328: r11 both |
|
334 | 334 | $ cd .. |
|
335 | 335 | $ tstop |
|
336 | 336 | |
|
337 | 337 | Both have new stuff in new named branches: |
|
338 | 338 | |
|
339 | 339 | $ hg clone main repo1a --rev name1 -q |
|
340 | 340 | $ hg clone repo1a repo1b -q |
|
341 | 341 | $ hg clone main repo2a --rev name2 -q |
|
342 | 342 | $ hg clone repo2a repo2b -q |
|
343 | 343 | $ tstart repo1a |
|
344 | 344 | |
|
345 | 345 | $ cd repo2a |
|
346 | 346 | $ hg incoming $remote |
|
347 | 347 | comparing with http://localhost:$HGPORT/ |
|
348 | 348 | searching for changes |
|
349 | 349 | 6 a7892891da29: r2 name1 |
|
350 | 350 | 7 2c8d5d5ec612: r3 name1 |
|
351 | 351 | 8 e71dbbc70e03: r4 name1 |
|
352 | 352 | $ hg outgoing $remote |
|
353 | 353 | comparing with http://localhost:$HGPORT/ |
|
354 | 354 | searching for changes |
|
355 | 355 | 2 70314b29987d: r5 name2 |
|
356 | 356 | 3 6c6f5d5f3c11: r6 name2 |
|
357 | 357 | 4 b6b4d315a2ac: r7 name2 |
|
358 | 358 | 5 d8f638ac69e9: r8 name2 |
|
359 | 359 | $ hg push $remote --new-branch |
|
360 | 360 | pushing to http://localhost:$HGPORT/ |
|
361 | 361 | searching for changes |
|
362 | 362 | remote: adding changesets |
|
363 | 363 | remote: adding manifests |
|
364 | 364 | remote: adding file changes |
|
365 | 365 | remote: added 4 changesets with 8 changes to 2 files (+1 heads) |
|
366 | 366 | $ hg pull $remote |
|
367 | 367 | pulling from http://localhost:$HGPORT/ |
|
368 | 368 | searching for changes |
|
369 | 369 | adding changesets |
|
370 | 370 | adding manifests |
|
371 | 371 | adding file changes |
|
372 | 372 | added 3 changesets with 6 changes to 2 files (+1 heads) |
|
373 | 373 | new changesets a7892891da29:e71dbbc70e03 |
|
374 | 374 | (run 'hg heads' to see heads) |
|
375 | 375 | $ hg incoming $remote |
|
376 | 376 | comparing with http://localhost:$HGPORT/ |
|
377 | 377 | searching for changes |
|
378 | 378 | no changes found |
|
379 | 379 | [1] |
|
380 | 380 | $ hg outgoing $remote |
|
381 | 381 | comparing with http://localhost:$HGPORT/ |
|
382 | 382 | searching for changes |
|
383 | 383 | no changes found |
|
384 | 384 | [1] |
|
385 | 385 | $ cd .. |
|
386 | 386 | $ tstop |
|
387 | 387 | |
|
388 | 388 | $ tstart repo1b |
|
389 | 389 | $ cd repo2b |
|
390 | 390 | $ hg incoming $remote |
|
391 | 391 | comparing with http://localhost:$HGPORT/ |
|
392 | 392 | searching for changes |
|
393 | 393 | 6 a7892891da29: r2 name1 |
|
394 | 394 | 7 2c8d5d5ec612: r3 name1 |
|
395 | 395 | 8 e71dbbc70e03: r4 name1 |
|
396 | 396 | $ hg outgoing $remote |
|
397 | 397 | comparing with http://localhost:$HGPORT/ |
|
398 | 398 | searching for changes |
|
399 | 399 | 2 70314b29987d: r5 name2 |
|
400 | 400 | 3 6c6f5d5f3c11: r6 name2 |
|
401 | 401 | 4 b6b4d315a2ac: r7 name2 |
|
402 | 402 | 5 d8f638ac69e9: r8 name2 |
|
403 | 403 | $ hg pull $remote |
|
404 | 404 | pulling from http://localhost:$HGPORT/ |
|
405 | 405 | searching for changes |
|
406 | 406 | adding changesets |
|
407 | 407 | adding manifests |
|
408 | 408 | adding file changes |
|
409 | 409 | added 3 changesets with 6 changes to 2 files (+1 heads) |
|
410 | 410 | new changesets a7892891da29:e71dbbc70e03 |
|
411 | 411 | (run 'hg heads' to see heads) |
|
412 | 412 | $ hg push $remote --new-branch |
|
413 | 413 | pushing to http://localhost:$HGPORT/ |
|
414 | 414 | searching for changes |
|
415 | 415 | remote: adding changesets |
|
416 | 416 | remote: adding manifests |
|
417 | 417 | remote: adding file changes |
|
418 | 418 | remote: added 4 changesets with 8 changes to 2 files (+1 heads) |
|
419 | 419 | $ hg incoming $remote |
|
420 | 420 | comparing with http://localhost:$HGPORT/ |
|
421 | 421 | searching for changes |
|
422 | 422 | no changes found |
|
423 | 423 | [1] |
|
424 | 424 | $ hg outgoing $remote |
|
425 | 425 | comparing with http://localhost:$HGPORT/ |
|
426 | 426 | searching for changes |
|
427 | 427 | no changes found |
|
428 | 428 | [1] |
|
429 | 429 | $ cd .. |
|
430 | 430 | $ tstop |
|
431 | 431 | |
|
432 | 432 | Both have new stuff in existing named branches: |
|
433 | 433 | |
|
434 | 434 | $ rm -r repo1a repo1b repo2a repo2b |
|
435 | 435 | $ hg clone main repo1a --rev 3 --rev 8 -q |
|
436 | 436 | $ hg clone repo1a repo1b -q |
|
437 | 437 | $ hg clone main repo2a --rev 4 --rev 7 -q |
|
438 | 438 | $ hg clone repo2a repo2b -q |
|
439 | 439 | $ tstart repo1a |
|
440 | 440 | |
|
441 | 441 | $ cd repo2a |
|
442 | 442 | $ hg incoming $remote |
|
443 | 443 | comparing with http://localhost:$HGPORT/ |
|
444 | 444 | searching for changes |
|
445 | 445 | 8 d8f638ac69e9: r8 name2 |
|
446 | 446 | $ hg outgoing $remote |
|
447 | 447 | comparing with http://localhost:$HGPORT/ |
|
448 | 448 | searching for changes |
|
449 | 449 | 4 e71dbbc70e03: r4 name1 |
|
450 | 450 | $ hg push $remote --new-branch |
|
451 | 451 | pushing to http://localhost:$HGPORT/ |
|
452 | 452 | searching for changes |
|
453 | 453 | remote: adding changesets |
|
454 | 454 | remote: adding manifests |
|
455 | 455 | remote: adding file changes |
|
456 | 456 | remote: added 1 changesets with 2 changes to 2 files |
|
457 | 457 | $ hg pull $remote |
|
458 | 458 | pulling from http://localhost:$HGPORT/ |
|
459 | 459 | searching for changes |
|
460 | 460 | adding changesets |
|
461 | 461 | adding manifests |
|
462 | 462 | adding file changes |
|
463 | 463 | added 1 changesets with 2 changes to 2 files |
|
464 | 464 | new changesets d8f638ac69e9 |
|
465 | 465 | (run 'hg update' to get a working copy) |
|
466 | 466 | $ hg incoming $remote |
|
467 | 467 | comparing with http://localhost:$HGPORT/ |
|
468 | 468 | searching for changes |
|
469 | 469 | no changes found |
|
470 | 470 | [1] |
|
471 | 471 | $ hg outgoing $remote |
|
472 | 472 | comparing with http://localhost:$HGPORT/ |
|
473 | 473 | searching for changes |
|
474 | 474 | no changes found |
|
475 | 475 | [1] |
|
476 | 476 | $ cd .. |
|
477 | 477 | $ tstop |
|
478 | 478 | |
|
479 | 479 | $ tstart repo1b |
|
480 | 480 | $ cd repo2b |
|
481 | 481 | $ hg incoming $remote |
|
482 | 482 | comparing with http://localhost:$HGPORT/ |
|
483 | 483 | searching for changes |
|
484 | 484 | 8 d8f638ac69e9: r8 name2 |
|
485 | 485 | $ hg outgoing $remote |
|
486 | 486 | comparing with http://localhost:$HGPORT/ |
|
487 | 487 | searching for changes |
|
488 | 488 | 4 e71dbbc70e03: r4 name1 |
|
489 | 489 | $ hg pull $remote |
|
490 | 490 | pulling from http://localhost:$HGPORT/ |
|
491 | 491 | searching for changes |
|
492 | 492 | adding changesets |
|
493 | 493 | adding manifests |
|
494 | 494 | adding file changes |
|
495 | 495 | added 1 changesets with 2 changes to 2 files |
|
496 | 496 | new changesets d8f638ac69e9 |
|
497 | 497 | (run 'hg update' to get a working copy) |
|
498 | 498 | $ hg push $remote --new-branch |
|
499 | 499 | pushing to http://localhost:$HGPORT/ |
|
500 | 500 | searching for changes |
|
501 | 501 | remote: adding changesets |
|
502 | 502 | remote: adding manifests |
|
503 | 503 | remote: adding file changes |
|
504 | 504 | remote: added 1 changesets with 2 changes to 2 files |
|
505 | 505 | $ hg incoming $remote |
|
506 | 506 | comparing with http://localhost:$HGPORT/ |
|
507 | 507 | searching for changes |
|
508 | 508 | no changes found |
|
509 | 509 | [1] |
|
510 | 510 | $ hg outgoing $remote |
|
511 | 511 | comparing with http://localhost:$HGPORT/ |
|
512 | 512 | searching for changes |
|
513 | 513 | no changes found |
|
514 | 514 | [1] |
|
515 | 515 | $ cd .. |
|
516 | 516 | #if zstd |
|
517 | 517 | $ tstop show |
|
518 | 518 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
519 | 519 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
520 | 520 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
521 | 521 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
522 | 522 | "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
523 | 523 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
524 | 524 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
525 | 525 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
526 | 526 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
527 | 527 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
528 | 528 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
529 | 529 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
530 | 530 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
531 | 531 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
532 | 532 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
533 | 533 | "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961+2c8d5d5ec612be65cdfdeac78b7662ab1696324a x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
534 | 534 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
535 | 535 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
536 | 536 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
537 | 537 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
538 | 538 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
539 | 539 | "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
540 | 540 | "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
541 | 541 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
542 | 542 | "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91* (glob) |
|
543 | 543 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
544 | 544 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
545 | 545 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
546 | 546 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
547 | 547 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ |
|
548 | 548 | #else |
|
549 | 549 | $ tstop show |
|
550 | 550 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
551 |
"GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp= |
|
|
552 |
"GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp= |
|
|
553 |
"GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp= |
|
|
554 |
"GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp= |
|
|
555 |
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp= |
|
|
551 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
552 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
553 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
554 | "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
555 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
556 | 556 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
557 |
"GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp= |
|
|
558 |
"GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp= |
|
|
559 |
"GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp= |
|
|
557 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
558 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
559 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
560 | 560 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
561 |
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp= |
|
|
562 |
"GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp= |
|
|
563 |
"GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp= |
|
|
564 |
"GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp= |
|
|
565 |
"GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961+2c8d5d5ec612be65cdfdeac78b7662ab1696324a x-hgproto-1:0.1 0.2 comp= |
|
|
566 |
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp= |
|
|
561 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
562 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
563 | "GET /?cmd=branches HTTP/1.1" 200 - x-hgarg-1:nodes=d8f638ac69e9ae8dea4f09f11d696546a912d961 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
564 | "GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
565 | "GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961+2c8d5d5ec612be65cdfdeac78b7662ab1696324a x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
566 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
567 | 567 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
568 |
"GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp= |
|
|
569 |
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp= |
|
|
570 |
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp= |
|
|
571 |
"GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp= |
|
|
572 |
"GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp= |
|
|
573 |
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp= |
|
|
568 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
569 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
570 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
571 | "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
572 | "GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
573 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
574 | 574 | "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91* (glob) |
|
575 |
"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp= |
|
|
575 | "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
576 | 576 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
577 |
"GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp= |
|
|
577 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
578 | 578 | "GET /?cmd=capabilities HTTP/1.1" 200 - |
|
579 |
"GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp= |
|
|
579 | "GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ | |
|
580 | 580 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now