Mercurial > hg

comparison tests/test-bundle2-remote-changegroup.t @ 23591:414374cfb531

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: lowercase part types Since the capitalization no longer carries any meaning (previous diff), this patch normalizes all of the bundle2 part type strings to lower case.
author Eric Sumner <ericsumner@fb.com>
date Wed, 17 Dec 2014 15:11:26 -0800
parents 149fc8a44184
children e0e28e910fa3
comparison
equal deleted inserted replaced
23590:4440c7cc3728 23591:414374cfb531
48 > if verb == 'remote-changegroup': 48 > if verb == 'remote-changegroup':
49 > url, file = args.split() 49 > url, file = args.split()
50 > bundledata = open(file, 'rb').read() 50 > bundledata = open(file, 'rb').read()
51 > digest = util.digester.preferred(b2caps['digests']) 51 > digest = util.digester.preferred(b2caps['digests'])
52 > d = util.digester([digest], bundledata) 52 > d = util.digester([digest], bundledata)
53 > part = newpart('B2X:REMOTE-CHANGEGROUP') 53 > part = newpart('b2x:remote-changegroup')
54 > part.addparam('url', url) 54 > part.addparam('url', url)
55 > part.addparam('size', str(len(bundledata))) 55 > part.addparam('size', str(len(bundledata)))
56 > part.addparam('digests', digest) 56 > part.addparam('digests', digest)
57 > part.addparam('digest:%s' % digest, d[digest]) 57 > part.addparam('digest:%s' % digest, d[digest])
58 > elif verb == 'raw-remote-changegroup': 58 > elif verb == 'raw-remote-changegroup':
59 > part = newpart('B2X:REMOTE-CHANGEGROUP') 59 > part = newpart('b2x:remote-changegroup')
60 > for k, v in eval(args).items(): 60 > for k, v in eval(args).items():
61 > part.addparam(k, str(v)) 61 > part.addparam(k, str(v))
62 > elif verb == 'changegroup': 62 > elif verb == 'changegroup':
63 > _common, heads = args.split() 63 > _common, heads = args.split()
64 > common.extend(repo.lookup(r) for r in repo.revs(_common)) 64 > common.extend(repo.lookup(r) for r in repo.revs(_common))
65 > heads = [repo.lookup(r) for r in repo.revs(heads)] 65 > heads = [repo.lookup(r) for r in repo.revs(heads)]
66 > cg = changegroup.getchangegroup(repo, 'changegroup', 66 > cg = changegroup.getchangegroup(repo, 'changegroup',
67 > heads=heads, common=common) 67 > heads=heads, common=common)
68 > newpart('B2X:CHANGEGROUP', cg.getchunks()) 68 > newpart('b2x:changegroup', cg.getchunks())
69 > else: 69 > else:
70 > raise Exception('unknown verb') 70 > raise Exception('unknown verb')
71 > 71 >
72 > exchange.getbundle2partsmapping['changegroup'] = _getbundlechangegrouppart 72 > exchange.getbundle2partsmapping['changegroup'] = _getbundlechangegrouppart
73 > EOF 73 > EOF
135 updating to branch default 135 updating to branch default
136 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 136 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
137 $ hg pull -R clone ssh://user@dummy/repo 137 $ hg pull -R clone ssh://user@dummy/repo
138 pulling from ssh://user@dummy/repo 138 pulling from ssh://user@dummy/repo
139 searching for changes 139 searching for changes
140 remote: B2X:REMOTE-CHANGEGROUP 140 remote: b2x:remote-changegroup
141 adding changesets 141 adding changesets
142 adding manifests 142 adding manifests
143 adding file changes 143 adding file changes
144 added 3 changesets with 2 changes to 2 files (+1 heads) 144 added 3 changesets with 2 changes to 2 files (+1 heads)
145 (run 'hg heads .' to see heads, 'hg merge' to merge) 145 (run 'hg heads .' to see heads, 'hg merge' to merge)
178 updating to branch default 178 updating to branch default
179 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 179 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
180 $ hg pull -R clone ssh://user@dummy/repo 180 $ hg pull -R clone ssh://user@dummy/repo
181 pulling from ssh://user@dummy/repo 181 pulling from ssh://user@dummy/repo
182 searching for changes 182 searching for changes
183 remote: B2X:REMOTE-CHANGEGROUP 183 remote: b2x:remote-changegroup
184 adding changesets 184 adding changesets
185 adding manifests 185 adding manifests
186 adding file changes 186 adding file changes
187 added 2 changesets with 2 changes to 2 files (+1 heads) 187 added 2 changesets with 2 changes to 2 files (+1 heads)
188 remote: B2X:CHANGEGROUP 188 remote: b2x:changegroup
189 adding changesets 189 adding changesets
190 adding manifests 190 adding manifests
191 adding file changes 191 adding file changes
192 added 3 changesets with 2 changes to 2 files (+1 heads) 192 added 3 changesets with 2 changes to 2 files (+1 heads)
193 (run 'hg heads' to see heads, 'hg merge' to merge) 193 (run 'hg heads' to see heads, 'hg merge' to merge)
226 updating to branch default 226 updating to branch default
227 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 227 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
228 $ hg pull -R clone ssh://user@dummy/repo 228 $ hg pull -R clone ssh://user@dummy/repo
229 pulling from ssh://user@dummy/repo 229 pulling from ssh://user@dummy/repo
230 searching for changes 230 searching for changes
231 remote: B2X:CHANGEGROUP 231 remote: b2x:changegroup
232 adding changesets 232 adding changesets
233 adding manifests 233 adding manifests
234 adding file changes 234 adding file changes
235 added 2 changesets with 2 changes to 2 files (+1 heads) 235 added 2 changesets with 2 changes to 2 files (+1 heads)
236 remote: B2X:REMOTE-CHANGEGROUP 236 remote: b2x:remote-changegroup
237 adding changesets 237 adding changesets
238 adding manifests 238 adding manifests
239 adding file changes 239 adding file changes
240 added 3 changesets with 2 changes to 2 files (+1 heads) 240 added 3 changesets with 2 changes to 2 files (+1 heads)
241 (run 'hg heads' to see heads, 'hg merge' to merge) 241 (run 'hg heads' to see heads, 'hg merge' to merge)
277 updating to branch default 277 updating to branch default
278 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 278 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
279 $ hg pull -R clone ssh://user@dummy/repo 279 $ hg pull -R clone ssh://user@dummy/repo
280 pulling from ssh://user@dummy/repo 280 pulling from ssh://user@dummy/repo
281 searching for changes 281 searching for changes
282 remote: B2X:REMOTE-CHANGEGROUP 282 remote: b2x:remote-changegroup
283 adding changesets 283 adding changesets
284 adding manifests 284 adding manifests
285 adding file changes 285 adding file changes
286 added 2 changesets with 2 changes to 2 files (+1 heads) 286 added 2 changesets with 2 changes to 2 files (+1 heads)
287 remote: B2X:REMOTE-CHANGEGROUP 287 remote: b2x:remote-changegroup
288 adding changesets 288 adding changesets
289 adding manifests 289 adding manifests
290 adding file changes 290 adding file changes
291 added 2 changesets with 1 changes to 1 files 291 added 2 changesets with 1 changes to 1 files
292 remote: B2X:CHANGEGROUP 292 remote: b2x:changegroup
293 adding changesets 293 adding changesets
294 adding manifests 294 adding manifests
295 adding file changes 295 adding file changes
296 added 1 changesets with 1 changes to 1 files (+1 heads) 296 added 1 changesets with 1 changes to 1 files (+1 heads)
297 (run 'hg heads' to see heads, 'hg merge' to merge) 297 (run 'hg heads' to see heads, 'hg merge' to merge)
322 $ cat > repo/.hg/bundle2maker << EOF 322 $ cat > repo/.hg/bundle2maker << EOF
323 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'sha1', 'digest:sha1': '2c880cfec23cff7d8f80c2f12958d1563cbdaba6'} 323 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'sha1', 'digest:sha1': '2c880cfec23cff7d8f80c2f12958d1563cbdaba6'}
324 > EOF 324 > EOF
325 $ hg clone ssh://user@dummy/repo clone 325 $ hg clone ssh://user@dummy/repo clone
326 requesting all changes 326 requesting all changes
327 remote: B2X:REMOTE-CHANGEGROUP 327 remote: b2x:remote-changegroup
328 adding changesets 328 adding changesets
329 adding manifests 329 adding manifests
330 adding file changes 330 adding file changes
331 added 8 changesets with 7 changes to 7 files (+2 heads) 331 added 8 changesets with 7 changes to 7 files (+2 heads)
332 updating to branch default 332 updating to branch default
336 $ cat > repo/.hg/bundle2maker << EOF 336 $ cat > repo/.hg/bundle2maker << EOF
337 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5', 'digest:md5': 'e22172c2907ef88794b7bea6642c2394'} 337 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5', 'digest:md5': 'e22172c2907ef88794b7bea6642c2394'}
338 > EOF 338 > EOF
339 $ hg clone ssh://user@dummy/repo clone 339 $ hg clone ssh://user@dummy/repo clone
340 requesting all changes 340 requesting all changes
341 remote: B2X:REMOTE-CHANGEGROUP 341 remote: b2x:remote-changegroup
342 adding changesets 342 adding changesets
343 adding manifests 343 adding manifests
344 adding file changes 344 adding file changes
345 added 8 changesets with 7 changes to 7 files (+2 heads) 345 added 8 changesets with 7 changes to 7 files (+2 heads)
346 updating to branch default 346 updating to branch default
352 $ cat > repo/.hg/bundle2maker << EOF 352 $ cat > repo/.hg/bundle2maker << EOF
353 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'sha1', 'digest:sha1': '0' * 40} 353 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'sha1', 'digest:sha1': '0' * 40}
354 > EOF 354 > EOF
355 $ hg clone ssh://user@dummy/repo clone 355 $ hg clone ssh://user@dummy/repo clone
356 requesting all changes 356 requesting all changes
357 remote: B2X:REMOTE-CHANGEGROUP 357 remote: b2x:remote-changegroup
358 adding changesets 358 adding changesets
359 adding manifests 359 adding manifests
360 adding file changes 360 adding file changes
361 added 8 changesets with 7 changes to 7 files (+2 heads) 361 added 8 changesets with 7 changes to 7 files (+2 heads)
362 transaction abort! 362 transaction abort!
370 $ cat > repo/.hg/bundle2maker << EOF 370 $ cat > repo/.hg/bundle2maker << EOF
371 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5 sha1', 'digest:md5': 'e22172c2907ef88794b7bea6642c2394', 'digest:sha1': '2c880cfec23cff7d8f80c2f12958d1563cbdaba6'} 371 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5 sha1', 'digest:md5': 'e22172c2907ef88794b7bea6642c2394', 'digest:sha1': '2c880cfec23cff7d8f80c2f12958d1563cbdaba6'}
372 > EOF 372 > EOF
373 $ hg clone ssh://user@dummy/repo clone 373 $ hg clone ssh://user@dummy/repo clone
374 requesting all changes 374 requesting all changes
375 remote: B2X:REMOTE-CHANGEGROUP 375 remote: b2x:remote-changegroup
376 adding changesets 376 adding changesets
377 adding manifests 377 adding manifests
378 adding file changes 378 adding file changes
379 added 8 changesets with 7 changes to 7 files (+2 heads) 379 added 8 changesets with 7 changes to 7 files (+2 heads)
380 updating to branch default 380 updating to branch default
386 $ cat > repo/.hg/bundle2maker << EOF 386 $ cat > repo/.hg/bundle2maker << EOF
387 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5 sha1', 'digest:md5': '0' * 32, 'digest:sha1': '2c880cfec23cff7d8f80c2f12958d1563cbdaba6'} 387 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5 sha1', 'digest:md5': '0' * 32, 'digest:sha1': '2c880cfec23cff7d8f80c2f12958d1563cbdaba6'}
388 > EOF 388 > EOF
389 $ hg clone ssh://user@dummy/repo clone 389 $ hg clone ssh://user@dummy/repo clone
390 requesting all changes 390 requesting all changes
391 remote: B2X:REMOTE-CHANGEGROUP 391 remote: b2x:remote-changegroup
392 adding changesets 392 adding changesets
393 adding manifests 393 adding manifests
394 adding file changes 394 adding file changes
395 added 8 changesets with 7 changes to 7 files (+2 heads) 395 added 8 changesets with 7 changes to 7 files (+2 heads)
396 transaction abort! 396 transaction abort!
402 $ cat > repo/.hg/bundle2maker << EOF 402 $ cat > repo/.hg/bundle2maker << EOF
403 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5 sha1', 'digest:md5': 'e22172c2907ef88794b7bea6642c2394', 'digest:sha1': '0' * 40} 403 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle6.hg', 'size': 1663, 'digests': 'md5 sha1', 'digest:md5': 'e22172c2907ef88794b7bea6642c2394', 'digest:sha1': '0' * 40}
404 > EOF 404 > EOF
405 $ hg clone ssh://user@dummy/repo clone 405 $ hg clone ssh://user@dummy/repo clone
406 requesting all changes 406 requesting all changes
407 remote: B2X:REMOTE-CHANGEGROUP 407 remote: b2x:remote-changegroup
408 adding changesets 408 adding changesets
409 adding manifests 409 adding manifests
410 adding file changes 410 adding file changes
411 added 8 changesets with 7 changes to 7 files (+2 heads) 411 added 8 changesets with 7 changes to 7 files (+2 heads)
412 transaction abort! 412 transaction abort!
431 > changegroup 0:6 7 431 > changegroup 0:6 7
432 > EOF 432 > EOF
433 $ hg pull -R clone ssh://user@dummy/repo 433 $ hg pull -R clone ssh://user@dummy/repo
434 pulling from ssh://user@dummy/repo 434 pulling from ssh://user@dummy/repo
435 searching for changes 435 searching for changes
436 remote: B2X:REMOTE-CHANGEGROUP 436 remote: b2x:remote-changegroup
437 adding changesets 437 adding changesets
438 adding manifests 438 adding manifests
439 adding file changes 439 adding file changes
440 added 2 changesets with 2 changes to 2 files (+1 heads) 440 added 2 changesets with 2 changes to 2 files (+1 heads)
441 remote: B2X:REMOTE-CHANGEGROUP 441 remote: b2x:remote-changegroup
442 adding changesets 442 adding changesets
443 adding manifests 443 adding manifests
444 adding file changes 444 adding file changes
445 added 2 changesets with 1 changes to 1 files 445 added 2 changesets with 1 changes to 1 files
446 transaction abort! 446 transaction abort!
465 > raw-remote-changegroup {} 465 > raw-remote-changegroup {}
466 > EOF 466 > EOF
467 $ hg pull -R clone ssh://user@dummy/repo 467 $ hg pull -R clone ssh://user@dummy/repo
468 pulling from ssh://user@dummy/repo 468 pulling from ssh://user@dummy/repo
469 searching for changes 469 searching for changes
470 remote: B2X:REMOTE-CHANGEGROUP 470 remote: b2x:remote-changegroup
471 abort: remote-changegroup: missing "url" param 471 abort: remote-changegroup: missing "url" param
472 [255] 472 [255]
473 473
474 Missing size 474 Missing size
475 475
477 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg'} 477 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg'}
478 > EOF 478 > EOF
479 $ hg pull -R clone ssh://user@dummy/repo 479 $ hg pull -R clone ssh://user@dummy/repo
480 pulling from ssh://user@dummy/repo 480 pulling from ssh://user@dummy/repo
481 searching for changes 481 searching for changes
482 remote: B2X:REMOTE-CHANGEGROUP 482 remote: b2x:remote-changegroup
483 abort: remote-changegroup: missing "size" param 483 abort: remote-changegroup: missing "size" param
484 [255] 484 [255]
485 485
486 Invalid size 486 Invalid size
487 487
489 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 'foo'} 489 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 'foo'}
490 > EOF 490 > EOF
491 $ hg pull -R clone ssh://user@dummy/repo 491 $ hg pull -R clone ssh://user@dummy/repo
492 pulling from ssh://user@dummy/repo 492 pulling from ssh://user@dummy/repo
493 searching for changes 493 searching for changes
494 remote: B2X:REMOTE-CHANGEGROUP 494 remote: b2x:remote-changegroup
495 abort: remote-changegroup: invalid value for param "size" 495 abort: remote-changegroup: invalid value for param "size"
496 [255] 496 [255]
497 497
498 Size mismatch 498 Size mismatch
499 499
501 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 42} 501 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 42}
502 > EOF 502 > EOF
503 $ hg pull -R clone ssh://user@dummy/repo 503 $ hg pull -R clone ssh://user@dummy/repo
504 pulling from ssh://user@dummy/repo 504 pulling from ssh://user@dummy/repo
505 searching for changes 505 searching for changes
506 remote: B2X:REMOTE-CHANGEGROUP 506 remote: b2x:remote-changegroup
507 adding changesets 507 adding changesets
508 adding manifests 508 adding manifests
509 adding file changes 509 adding file changes
510 added 2 changesets with 2 changes to 2 files (+1 heads) 510 added 2 changesets with 2 changes to 2 files (+1 heads)
511 transaction abort! 511 transaction abort!
520 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 581, 'digests': 'foo', 'digest:foo': 'bar'} 520 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 581, 'digests': 'foo', 'digest:foo': 'bar'}
521 > EOF 521 > EOF
522 $ hg pull -R clone ssh://user@dummy/repo 522 $ hg pull -R clone ssh://user@dummy/repo
523 pulling from ssh://user@dummy/repo 523 pulling from ssh://user@dummy/repo
524 searching for changes 524 searching for changes
525 remote: B2X:REMOTE-CHANGEGROUP 525 remote: b2x:remote-changegroup
526 abort: missing support for b2x:remote-changegroup - digest:foo 526 abort: missing support for b2x:remote-changegroup - digest:foo
527 [255] 527 [255]
528 528
529 Missing digest 529 Missing digest
530 530
532 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 581, 'digests': 'sha1'} 532 > raw-remote-changegroup {'url': 'http://localhost:$HGPORT/bundle4.hg', 'size': 581, 'digests': 'sha1'}
533 > EOF 533 > EOF
534 $ hg pull -R clone ssh://user@dummy/repo 534 $ hg pull -R clone ssh://user@dummy/repo
535 pulling from ssh://user@dummy/repo 535 pulling from ssh://user@dummy/repo
536 searching for changes 536 searching for changes
537 remote: B2X:REMOTE-CHANGEGROUP 537 remote: b2x:remote-changegroup
538 abort: remote-changegroup: missing "digest:sha1" param 538 abort: remote-changegroup: missing "digest:sha1" param
539 [255] 539 [255]
540 540
541 Not an HTTP url 541 Not an HTTP url
542 542
544 > raw-remote-changegroup {'url': 'ssh://localhost:$HGPORT/bundle4.hg', 'size': 581} 544 > raw-remote-changegroup {'url': 'ssh://localhost:$HGPORT/bundle4.hg', 'size': 581}
545 > EOF 545 > EOF
546 $ hg pull -R clone ssh://user@dummy/repo 546 $ hg pull -R clone ssh://user@dummy/repo
547 pulling from ssh://user@dummy/repo 547 pulling from ssh://user@dummy/repo
548 searching for changes 548 searching for changes
549 remote: B2X:REMOTE-CHANGEGROUP 549 remote: b2x:remote-changegroup
550 abort: remote-changegroup does not support ssh urls 550 abort: remote-changegroup does not support ssh urls
551 [255] 551 [255]
552 552
553 Not a bundle 553 Not a bundle
554 554
559 > remote-changegroup http://localhost:$HGPORT/notbundle.hg notbundle.hg 559 > remote-changegroup http://localhost:$HGPORT/notbundle.hg notbundle.hg
560 > EOF 560 > EOF
561 $ hg pull -R clone ssh://user@dummy/repo 561 $ hg pull -R clone ssh://user@dummy/repo
562 pulling from ssh://user@dummy/repo 562 pulling from ssh://user@dummy/repo
563 searching for changes 563 searching for changes
564 remote: B2X:REMOTE-CHANGEGROUP 564 remote: b2x:remote-changegroup
565 abort: http://localhost:$HGPORT/notbundle.hg: not a Mercurial bundle 565 abort: http://localhost:$HGPORT/notbundle.hg: not a Mercurial bundle
566 [255] 566 [255]
567 567
568 Not a bundle 1.0 568 Not a bundle 1.0
569 569
574 > remote-changegroup http://localhost:$HGPORT/notbundle10.hg notbundle10.hg 574 > remote-changegroup http://localhost:$HGPORT/notbundle10.hg notbundle10.hg
575 > EOF 575 > EOF
576 $ hg pull -R clone ssh://user@dummy/repo 576 $ hg pull -R clone ssh://user@dummy/repo
577 pulling from ssh://user@dummy/repo 577 pulling from ssh://user@dummy/repo
578 searching for changes 578 searching for changes
579 remote: B2X:REMOTE-CHANGEGROUP 579 remote: b2x:remote-changegroup
580 abort: http://localhost:$HGPORT/notbundle10.hg: not a bundle version 1.0 580 abort: http://localhost:$HGPORT/notbundle10.hg: not a bundle version 1.0
581 [255] 581 [255]
582 582
583 $ hg -R clone log -G 583 $ hg -R clone log -G
584 @ 2:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C 584 @ 2:5fddd98957c8 public Nicolas Dumazet <nicdumz.commits@gmail.com> C