/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_merge_directive.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge_directive.py
355
355
        tree_a = self.make_branch_and_tree('tree_a')
356
356
        tree_a.branch.get_config_stack().set(
357
357
            'email', 'J. Random Hacker <jrandom@example.com>')
358
 
        self.build_tree_contents([('tree_a/file', b'content_a\ncontent_b\n'),
359
 
                                  ('tree_a/file_2', b'content_x\rcontent_y\r')])
 
358
        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_b\n'),
 
359
                                  ('tree_a/file_2', 'content_x\rcontent_y\r')])
360
360
        tree_a.add(['file', 'file_2'])
361
 
        tree_a.commit('message', rev_id=b'rev1')
 
361
        tree_a.commit('message', rev_id='rev1')
362
362
        tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
363
363
        branch_c = tree_a.controldir.sprout('branch_c').open_branch()
364
 
        tree_b.commit('message', rev_id=b'rev2b')
365
 
        self.build_tree_contents([('tree_a/file', b'content_a\ncontent_c \n'),
366
 
                                  ('tree_a/file_2', b'content_x\rcontent_z\r')])
367
 
        tree_a.commit('Commit of rev2a', rev_id=b'rev2a')
 
364
        tree_b.commit('message', rev_id='rev2b')
 
365
        self.build_tree_contents([('tree_a/file', 'content_a\ncontent_c \n'),
 
366
                                  ('tree_a/file_2', 'content_x\rcontent_z\r')])
 
367
        tree_a.commit('Commit of rev2a', rev_id='rev2a')
368
368
        return tree_a, tree_b, branch_c
369
369
 
370
370
    def test_empty_target(self):
371
371
        tree_a, tree_b, branch_c = self.make_trees()
372
372
        tree_d = self.make_branch_and_tree('tree_d')
373
 
        md2 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
 
373
        md2 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
374
374
            tree_d.branch.base, patch_type='diff',
375
375
            public_branch=tree_a.branch.base)
376
376
 
377
377
    def test_disk_name(self):
378
378
        tree_a, tree_b, branch_c = self.make_trees()
379
379
        tree_a.branch.nick = 'fancy <name>'
380
 
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
 
380
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
381
381
            tree_b.branch.base)
382
382
        self.assertEqual('fancy-name-2', md.get_disk_name(tree_a.branch))
383
383
 
384
384
    def test_disk_name_old_revno(self):
385
385
        tree_a, tree_b, branch_c = self.make_trees()
386
386
        tree_a.branch.nick = 'fancy-name'
387
 
        md = self.from_objects(tree_a.branch.repository, b'rev1', 500, 120,
 
387
        md = self.from_objects(tree_a.branch.repository, 'rev1', 500, 120,
388
388
            tree_b.branch.base)
389
389
        self.assertEqual('fancy-name-1', md.get_disk_name(tree_a.branch))
390
390
 
391
391
    def test_generate_patch(self):
392
392
        tree_a, tree_b, branch_c = self.make_trees()
393
 
        md2 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
 
393
        md2 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
394
394
            tree_b.branch.base, patch_type='diff',
395
395
            public_branch=tree_a.branch.base)
396
396
        self.assertNotContainsRe(md2.patch, 'Bazaar revision bundle')
401
401
    def test_public_branch(self):
402
402
        tree_a, tree_b, branch_c = self.make_trees()
403
403
        self.assertRaises(errors.PublicBranchOutOfDate,
404
 
            self.from_objects, tree_a.branch.repository, b'rev2a', 500, 144,
 
404
            self.from_objects, tree_a.branch.repository, 'rev2a', 500, 144,
405
405
            tree_b.branch.base, public_branch=branch_c.base, patch_type='diff')
406
406
        self.assertRaises(errors.PublicBranchOutOfDate,
407
 
            self.from_objects, tree_a.branch.repository, b'rev2a', 500, 144,
 
407
            self.from_objects, tree_a.branch.repository, 'rev2a', 500, 144,
408
408
            tree_b.branch.base, public_branch=branch_c.base, patch_type=None)
409
409
        # public branch is not checked if patch format is bundle.
410
 
        md1 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 144,
 
410
        md1 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 144,
411
411
            tree_b.branch.base, public_branch=branch_c.base)
412
412
        # public branch is provided with a bundle, despite possibly being out
413
413
        # of date, because it's not required if a bundle is present.
414
414
        self.assertEqual(md1.source_branch, branch_c.base)
415
415
        # Once we update the public branch, we can generate a diff.
416
416
        branch_c.pull(tree_a.branch)
417
 
        md3 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 144,
 
417
        md3 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 144,
418
418
            tree_b.branch.base, patch_type=None, public_branch=branch_c.base)
419
419
 
420
420
    def test_use_public_submit_branch(self):
421
421
        tree_a, tree_b, branch_c = self.make_trees()
422
422
        branch_c.pull(tree_a.branch)
423
 
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 144,
 
423
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 144,
424
424
            tree_b.branch.base, patch_type=None, public_branch=branch_c.base)
425
425
        self.assertEqual(md.target_branch, tree_b.branch.base)
426
426
        tree_b.branch.set_public_branch('http://example.com')
427
427
        md2 = self.from_objects(
428
 
              tree_a.branch.repository, b'rev2a', 500, 144, tree_b.branch.base,
 
428
              tree_a.branch.repository, 'rev2a', 500, 144, tree_b.branch.base,
429
429
              patch_type=None, public_branch=branch_c.base)
430
430
        self.assertEqual(md2.target_branch, 'http://example.com')
431
431
 
432
432
    def test_message(self):
433
433
        tree_a, tree_b, branch_c = self.make_trees()
434
 
        md3 = self.from_objects(tree_a.branch.repository, b'rev1', 500, 120,
 
434
        md3 = self.from_objects(tree_a.branch.repository, 'rev1', 500, 120,
435
435
            tree_b.branch.base, patch_type=None, public_branch=branch_c.base,
436
436
            message='Merge message')
437
437
        md3.to_lines()
440
440
 
441
441
    def test_generate_bundle(self):
442
442
        tree_a, tree_b, branch_c = self.make_trees()
443
 
        md1 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
 
443
        md1 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
444
444
            tree_b.branch.base, public_branch=branch_c.base)
445
445
 
446
446
        self.assertContainsRe(md1.get_raw_bundle(), 'Bazaar revision bundle')
451
451
 
452
452
    def test_broken_bundle(self):
453
453
        tree_a, tree_b, branch_c = self.make_trees()
454
 
        md1 = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 120,
 
454
        md1 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
455
455
            tree_b.branch.base, public_branch=branch_c.base)
456
456
        lines = md1.to_lines()
457
457
        lines = [l.replace('\n', '\r\n') for l in lines]
458
458
        md2 = merge_directive.MergeDirective.from_lines(lines)
459
 
        self.assertEqual(b'rev2a', md2.revision_id)
 
459
        self.assertEqual('rev2a', md2.revision_id)
460
460
 
461
461
    def test_signing(self):
462
462
        time = 453
479
479
 
480
480
    def test_email(self):
481
481
        tree_a, tree_b, branch_c = self.make_trees()
482
 
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 476, 60,
 
482
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 476, 60,
483
483
            tree_b.branch.base, patch_type=None,
484
484
            public_branch=tree_a.branch.base)
485
485
        message = md.to_email('pqm@example.com', tree_a.branch)
490
490
 
491
491
    def test_install_revisions_branch(self):
492
492
        tree_a, tree_b, branch_c = self.make_trees()
493
 
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
 
493
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
494
494
            tree_b.branch.base, patch_type=None,
495
495
            public_branch=tree_a.branch.base)
496
 
        self.assertFalse(tree_b.branch.repository.has_revision(b'rev2a'))
 
496
        self.assertFalse(tree_b.branch.repository.has_revision('rev2a'))
497
497
        revision = md.install_revisions(tree_b.branch.repository)
498
 
        self.assertEqual(b'rev2a', revision)
499
 
        self.assertTrue(tree_b.branch.repository.has_revision(b'rev2a'))
 
498
        self.assertEqual('rev2a', revision)
 
499
        self.assertTrue(tree_b.branch.repository.has_revision('rev2a'))
500
500
 
501
501
    def test_get_merge_request(self):
502
502
        tree_a, tree_b, branch_c = self.make_trees()
503
 
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
 
503
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
504
504
            tree_b.branch.base, patch_type='bundle',
505
505
            public_branch=tree_a.branch.base)
506
 
        self.assertFalse(tree_b.branch.repository.has_revision(b'rev2a'))
 
506
        self.assertFalse(tree_b.branch.repository.has_revision('rev2a'))
507
507
        md.install_revisions(tree_b.branch.repository)
508
508
        base, revision, verified = md.get_merge_request(
509
509
            tree_b.branch.repository)
511
511
            self.assertIs(None, base)
512
512
            self.assertEqual('inapplicable', verified)
513
513
        else:
514
 
            self.assertEqual(b'rev1', base)
 
514
            self.assertEqual('rev1', base)
515
515
            self.assertEqual('verified', verified)
516
 
        self.assertEqual(b'rev2a', revision)
517
 
        self.assertTrue(tree_b.branch.repository.has_revision(b'rev2a'))
518
 
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
 
516
        self.assertEqual('rev2a', revision)
 
517
        self.assertTrue(tree_b.branch.repository.has_revision('rev2a'))
 
518
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
519
519
            tree_b.branch.base, patch_type=None,
520
520
            public_branch=tree_a.branch.base)
521
521
        base, revision, verified = md.get_merge_request(
524
524
            self.assertIs(None, base)
525
525
            self.assertEqual('inapplicable', verified)
526
526
        else:
527
 
            self.assertEqual(b'rev1', base)
 
527
            self.assertEqual('rev1', base)
528
528
            self.assertEqual('inapplicable', verified)
529
 
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
 
529
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
530
530
            tree_b.branch.base, patch_type='diff',
531
531
            public_branch=tree_a.branch.base)
532
532
        base, revision, verified = md.get_merge_request(
535
535
            self.assertIs(None, base)
536
536
            self.assertEqual('inapplicable', verified)
537
537
        else:
538
 
            self.assertEqual(b'rev1', base)
 
538
            self.assertEqual('rev1', base)
539
539
            self.assertEqual('verified', verified)
540
540
        md.patch='asdf'
541
541
        base, revision, verified = md.get_merge_request(
544
544
            self.assertIs(None, base)
545
545
            self.assertEqual('inapplicable', verified)
546
546
        else:
547
 
            self.assertEqual(b'rev1', base)
 
547
            self.assertEqual('rev1', base)
548
548
            self.assertEqual('failed', verified)
549
549
 
550
550
    def test_install_revisions_bundle(self):
551
551
        tree_a, tree_b, branch_c = self.make_trees()
552
 
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 36,
 
552
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 36,
553
553
            tree_b.branch.base, patch_type='bundle',
554
554
            public_branch=tree_a.branch.base)
555
 
        self.assertFalse(tree_b.branch.repository.has_revision(b'rev2a'))
 
555
        self.assertFalse(tree_b.branch.repository.has_revision('rev2a'))
556
556
        revision = md.install_revisions(tree_b.branch.repository)
557
 
        self.assertEqual(b'rev2a', revision)
558
 
        self.assertTrue(tree_b.branch.repository.has_revision(b'rev2a'))
 
557
        self.assertEqual('rev2a', revision)
 
558
        self.assertTrue(tree_b.branch.repository.has_revision('rev2a'))
559
559
 
560
560
    def test_get_target_revision_nofetch(self):
561
561
        tree_a, tree_b, branch_c = self.make_trees()
562
562
        tree_b.branch.fetch(tree_a.branch)
563
 
        md = self.from_objects( tree_a.branch.repository, b'rev2a', 500, 36,
 
563
        md = self.from_objects( tree_a.branch.repository, 'rev2a', 500, 36,
564
564
            tree_b.branch.base, patch_type=None,
565
565
            public_branch=tree_a.branch.base)
566
566
        md.source_branch = '/dev/null'
567
567
        revision = md.install_revisions(tree_b.branch.repository)
568
 
        self.assertEqual(b'rev2a', revision)
 
568
        self.assertEqual('rev2a', revision)
569
569
 
570
570
    def test_use_submit_for_missing_dependency(self):
571
571
        tree_a, tree_b, branch_c = self.make_trees()
572
572
        branch_c.pull(tree_a.branch)
573
 
        self.build_tree_contents([('tree_a/file', b'content_q\ncontent_r\n')])
574
 
        tree_a.commit('rev3a', rev_id=b'rev3a')
575
 
        md = self.from_objects(tree_a.branch.repository, b'rev3a', 500, 36,
576
 
            branch_c.base, base_revision_id=b'rev2a')
 
573
        self.build_tree_contents([('tree_a/file', 'content_q\ncontent_r\n')])
 
574
        tree_a.commit('rev3a', rev_id='rev3a')
 
575
        md = self.from_objects(tree_a.branch.repository, 'rev3a', 500, 36,
 
576
            branch_c.base, base_revision_id='rev2a')
577
577
        revision = md.install_revisions(tree_b.branch.repository)
578
578
 
579
579
    def test_handle_target_not_a_branch(self):
580
580
        tree_a, tree_b, branch_c = self.make_trees()
581
581
        branch_c.pull(tree_a.branch)
582
 
        self.build_tree_contents([('tree_a/file', b'content_q\ncontent_r\n')])
583
 
        tree_a.commit('rev3a', rev_id=b'rev3a')
584
 
        md = self.from_objects(tree_a.branch.repository, b'rev3a', 500, 36,
585
 
            branch_c.base, base_revision_id=b'rev2a')
 
582
        self.build_tree_contents([('tree_a/file', 'content_q\ncontent_r\n')])
 
583
        tree_a.commit('rev3a', rev_id='rev3a')
 
584
        md = self.from_objects(tree_a.branch.repository, 'rev3a', 500, 36,
 
585
            branch_c.base, base_revision_id='rev2a')
586
586
        md.target_branch = self.get_url('not-a-branch')
587
587
        self.assertRaises(errors.TargetNotBranch, md.install_revisions,
588
588
                tree_b.branch.repository)
651
651
 
652
652
    def test_base_revision(self):
653
653
        tree_a, tree_b, branch_c = self.make_trees()
654
 
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 60,
 
654
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 60,
655
655
            tree_b.branch.base, patch_type='bundle',
656
656
            public_branch=tree_a.branch.base, base_revision_id=None)
657
 
        self.assertEqual(b'rev1', md.base_revision_id)
658
 
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 60,
 
657
        self.assertEqual('rev1', md.base_revision_id)
 
658
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 60,
659
659
            tree_b.branch.base, patch_type='bundle',
660
660
            public_branch=tree_a.branch.base, base_revision_id='null:')
661
661
        self.assertEqual('null:', md.base_revision_id)
665
665
 
666
666
    def test_patch_verification(self):
667
667
        tree_a, tree_b, branch_c = self.make_trees()
668
 
        md = self.from_objects(tree_a.branch.repository, b'rev2a', 500, 60,
 
668
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 60,
669
669
            tree_b.branch.base, patch_type='bundle',
670
670
            public_branch=tree_a.branch.base)
671
671
        lines = md.to_lines()