/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/per_workingtree/test_parents.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-15 18:45:17 UTC
  • mto: (7045.3.3 python3-r)
  • mto: This revision was merged to the branch mainline in revision 7047.
  • Revision ID: jelmer@jelmer.uk-20180715184517-1ipa50jg36zvglc5
Fix another 300 tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_parents.py
528
528
        basis_shape = Inventory(root_id=None)  # empty tree
529
529
        new_shape = Inventory()  # tree with a root
530
530
        self.assertTransitionFromBasisToShape(basis_shape, None, new_shape,
531
 
            'new_parent')
 
531
            b'new_parent')
532
532
 
533
533
    def test_no_parents_full_tree(self):
534
534
        """Test doing a regular initial commit with files and dirs."""
537
537
        new_shape = Inventory(root_id=None)
538
538
        self.add_dir(new_shape, revid, b'root-id', None, '')
539
539
        self.add_link(new_shape, revid, b'link-id', b'root-id', 'link', 'target')
540
 
        self.add_file(new_shape, revid, b'file-id', b'root-id', 'file', '1' * 32,
 
540
        self.add_file(new_shape, revid, b'file-id', b'root-id', 'file', b'1' * 32,
541
541
            12)
542
542
        self.add_dir(new_shape, revid, b'dir-id', b'root-id', 'dir')
543
543
        self.add_file(new_shape, revid, b'subfile-id', b'dir-id', 'subfile',
544
 
            '2' * 32, 24)
 
544
            b'2' * 32, 24)
545
545
        self.assertTransitionFromBasisToShape(basis_shape, None, new_shape,
546
546
            revid)
547
547
 
550
550
        basis_shape = Inventory(root_id=None)
551
551
        self.add_dir(basis_shape, old_revid, b'root-id', None, '')
552
552
        self.add_file(basis_shape, old_revid, b'file-id', b'root-id', 'file',
553
 
            '1' * 32, 12)
 
553
            b'1' * 32, 12)
554
554
        new_revid = b'new-parent'
555
555
        new_shape = Inventory(root_id=None)
556
556
        self.add_new_root(new_shape, old_revid, new_revid)
557
557
        self.add_file(new_shape, new_revid, b'file-id', b'root-id', 'file',
558
 
            '2' * 32, 24)
 
558
            b'2' * 32, 24)
559
559
        self.assertTransitionFromBasisToShape(basis_shape, old_revid,
560
560
            new_shape, new_revid)
561
561
 
575
575
 
576
576
    def test_kind_changes(self):
577
577
        def do_file(inv, revid):
578
 
            self.add_file(inv, revid, b'path-id', b'root-id', 'path', '1' * 32,
 
578
            self.add_file(inv, revid, b'path-id', b'root-id', 'path', b'1' * 32,
579
579
                12)
580
580
 
581
581
        def do_link(inv, revid):
600
600
                    new_shape, new_revid)
601
601
 
602
602
    def test_content_from_second_parent_is_dropped(self):
603
 
        left_revid = 'left-parent'
 
603
        left_revid = b'left-parent'
604
604
        basis_shape = Inventory(root_id=None)
605
605
        self.add_dir(basis_shape, left_revid, b'root-id', None, '')
606
606
        self.add_link(basis_shape, left_revid, b'link-id', b'root-id', 'link',
607
607
            'left-target')
608
608
        # the right shape has content - file, link, subdir with a child,
609
609
        # that should all be discarded by the call.
610
 
        right_revid = 'right-parent'
 
610
        right_revid = b'right-parent'
611
611
        right_shape = Inventory(root_id=None)
612
612
        self.add_dir(right_shape, left_revid, b'root-id', None, '')
613
613
        self.add_link(right_shape, right_revid, b'link-id', b'root-id', 'link',
614
614
            'some-target')
615
615
        self.add_dir(right_shape, right_revid, b'subdir-id', b'root-id', 'dir')
616
616
        self.add_file(right_shape, right_revid, b'file-id', b'subdir-id', 'file',
617
 
            '2' * 32, 24)
 
617
            b'2' * 32, 24)
618
618
        new_revid = b'new-parent'
619
619
        new_shape = Inventory(root_id=None)
620
620
        self.add_new_root(new_shape, left_revid, new_revid)
712
712
        self.add_link(basis_shape, old_revid, b'link-id-C', b'root-id', 'C', 'C')
713
713
        self.add_link(basis_shape, old_revid, b'link-id-D', b'root-id', 'D', 'D')
714
714
        self.add_file(basis_shape, old_revid, b'file-id-E', b'root-id', 'E',
715
 
            '1' * 32, 12)
 
715
            b'1' * 32, 12)
716
716
        self.add_file(basis_shape, old_revid, b'file-id-F', b'root-id', 'F',
717
 
            '2' * 32, 24)
 
717
            b'2' * 32, 24)
718
718
        new_revid = b'new-parent'
719
719
        new_shape = Inventory(root_id=None)
720
720
        self.add_new_root(new_shape, old_revid, new_revid)
723
723
        self.add_link(new_shape, new_revid, b'link-id-C', b'root-id', 'D', 'C')
724
724
        self.add_link(new_shape, new_revid, b'link-id-D', b'root-id', 'C', 'D')
725
725
        self.add_file(new_shape, new_revid, b'file-id-E', b'root-id', 'F',
726
 
            '1' * 32, 12)
 
726
            b'1' * 32, 12)
727
727
        self.add_file(new_shape, new_revid, b'file-id-F', b'root-id', 'E',
728
 
            '2' * 32, 24)
 
728
            b'2' * 32, 24)
729
729
        self.assertTransitionFromBasisToShape(basis_shape, old_revid,
730
730
            new_shape, new_revid)
731
731
 
741
741
        self.add_dir(new_shape, new_revid, b'dir-id-A', b'root-id', 'A')
742
742
        self.add_link(new_shape, new_revid, b'link-id-B', b'root-id', 'B', 'C')
743
743
        self.add_file(new_shape, new_revid, b'file-id-C', b'root-id', 'C',
744
 
            '1' * 32, 12)
 
744
            b'1' * 32, 12)
745
745
        self.add_file(new_shape, new_revid, b'file-id-D', b'dir-id-A', 'D',
746
 
            '2' * 32, 24)
 
746
            b'2' * 32, 24)
747
747
        self.assertTransitionFromBasisToShape(basis_shape, old_revid,
748
748
            new_shape, new_revid)
749
749
 
756
756
        self.add_dir(basis_shape, old_revid, b'dir-id-A', b'root-id', 'A')
757
757
        self.add_link(basis_shape, old_revid, b'link-id-B', b'root-id', 'B', 'C')
758
758
        self.add_file(basis_shape, old_revid, b'file-id-C', b'root-id', 'C',
759
 
            '1' * 32, 12)
 
759
            b'1' * 32, 12)
760
760
        self.add_file(basis_shape, old_revid, b'file-id-D', b'dir-id-A', 'D',
761
 
            '2' * 32, 24)
 
761
            b'2' * 32, 24)
762
762
        new_revid = b'new-parent'
763
763
        new_shape = Inventory(root_id=None)
764
764
        self.add_new_root(new_shape, old_revid, new_revid)
819
819
        self.add_new_root(new_shape, old_revid, new_revid)
820
820
        self.add_dir(new_shape, old_revid, b'dir-id-A', b'root-id', 'A')
821
821
        self.add_file(new_shape, new_revid, b'file-id-B', b'dir-id-A', 'B',
822
 
            '1' * 32, 24)
 
822
            b'1' * 32, 24)
823
823
        self.assertTransitionFromBasisToShape(basis_shape, old_revid,
824
824
                new_shape, new_revid, set_current_inventory=False)