/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_bundle.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-22 11:51:56 UTC
  • mfrom: (7356 work)
  • mto: This revision was merged to the branch mainline in revision 7358.
  • Revision ID: jelmer@jelmer.uk-20190622115156-20uwy6b97g94bbv1
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
43
43
    features,
44
44
    test_commit,
45
45
    )
46
 
from ..transform import TreeTransform
47
46
from ..tree import find_previous_path
48
47
 
49
48
 
618
617
            ])
619
618
        self.build_tree_contents([('b1/sub/sub/emptyfile.txt', b''),
620
619
                                  ('b1/dir/nolastnewline.txt', b'bloop')])
621
 
        tt = TreeTransform(self.tree1)
 
620
        tt = self.tree1.get_transform()
622
621
        tt.new_file('executable', tt.root, [b'#!/bin/sh\n'], b'exe-1', True)
623
622
        tt.apply()
624
623
        # have to fix length of file-id so that we can predictably rewrite
638
637
        self.tree1.remove(
639
638
            ['sub/sub/nonempty.txt', 'sub/sub/emptyfile.txt', 'sub/sub'
640
639
             ])
641
 
        tt = TreeTransform(self.tree1)
 
640
        tt = self.tree1.get_transform()
642
641
        trans_id = tt.trans_id_tree_path('executable')
643
642
        tt.set_executability(False, trans_id)
644
643
        tt.apply()
699
698
        self.tree1 = self.make_branch_and_tree('b1')
700
699
        self.b1 = self.tree1.branch
701
700
 
702
 
        tt = TreeTransform(self.tree1)
 
701
        tt = self.tree1.get_transform()
703
702
        tt.new_symlink(link_name, tt.root, link_target, link_id)
704
703
        tt.apply()
705
704
        self.tree1.commit('add symlink', rev_id=b'l@cset-0-1')
710
709
            self.assertEqual(
711
710
                link_target, bund_tree.get_symlink_target(link_name))
712
711
 
713
 
        tt = TreeTransform(self.tree1)
 
712
        tt = self.tree1.get_transform()
714
713
        trans_id = tt.trans_id_tree_path(link_name)
715
714
        tt.adjust_path('link2', tt.root, trans_id)
716
715
        tt.delete_contents(trans_id)
724
723
            self.assertEqual(new_link_target,
725
724
                             bund_tree.get_symlink_target('link2'))
726
725
 
727
 
        tt = TreeTransform(self.tree1)
 
726
        tt = self.tree1.get_transform()
728
727
        trans_id = tt.trans_id_tree_path('link2')
729
728
        tt.delete_contents(trans_id)
730
729
        tt.create_symlink('jupiter', trans_id)
732
731
        self.tree1.commit('just change symlink target', rev_id=b'l@cset-0-3')
733
732
        bundle = self.get_valid_bundle(b'l@cset-0-2', b'l@cset-0-3')
734
733
 
735
 
        tt = TreeTransform(self.tree1)
 
734
        tt = self.tree1.get_transform()
736
735
        trans_id = tt.trans_id_tree_path('link2')
737
736
        tt.delete_contents(trans_id)
738
737
        tt.apply()
751
750
    def test_binary_bundle(self):
752
751
        self.tree1 = self.make_branch_and_tree('b1')
753
752
        self.b1 = self.tree1.branch
754
 
        tt = TreeTransform(self.tree1)
 
753
        tt = self.tree1.get_transform()
755
754
 
756
755
        # Add
757
756
        tt.new_file('file', tt.root, [
763
762
        self.get_valid_bundle(b'null:', b'b@cset-0-1')
764
763
 
765
764
        # Delete
766
 
        tt = TreeTransform(self.tree1)
 
765
        tt = self.tree1.get_transform()
767
766
        trans_id = tt.trans_id_tree_path('file')
768
767
        tt.delete_contents(trans_id)
769
768
        tt.apply()
771
770
        self.get_valid_bundle(b'b@cset-0-1', b'b@cset-0-2')
772
771
 
773
772
        # Rename & modify
774
 
        tt = TreeTransform(self.tree1)
 
773
        tt = self.tree1.get_transform()
775
774
        trans_id = tt.trans_id_tree_path('file2')
776
775
        tt.adjust_path('file3', tt.root, trans_id)
777
776
        tt.delete_contents(trans_id)
781
780
        self.get_valid_bundle(b'b@cset-0-2', b'b@cset-0-3')
782
781
 
783
782
        # Modify
784
 
        tt = TreeTransform(self.tree1)
 
783
        tt = self.tree1.get_transform()
785
784
        trans_id = tt.trans_id_tree_path('file3')
786
785
        tt.delete_contents(trans_id)
787
786
        tt.create_file([b'\x00file\rcontents'], trans_id)
795
794
    def test_last_modified(self):
796
795
        self.tree1 = self.make_branch_and_tree('b1')
797
796
        self.b1 = self.tree1.branch
798
 
        tt = TreeTransform(self.tree1)
 
797
        tt = self.tree1.get_transform()
799
798
        tt.new_file('file', tt.root, [b'file'], b'file')
800
799
        tt.apply()
801
800
        self.tree1.commit('create file', rev_id=b'a@lmod-0-1')
802
801
 
803
 
        tt = TreeTransform(self.tree1)
 
802
        tt = self.tree1.get_transform()
804
803
        trans_id = tt.trans_id_tree_path('file')
805
804
        tt.delete_contents(trans_id)
806
805
        tt.create_file([b'file2'], trans_id)
808
807
        self.tree1.commit('modify text', rev_id=b'a@lmod-0-2a')
809
808
 
810
809
        other = self.get_checkout(b'a@lmod-0-1')
811
 
        tt = TreeTransform(other)
 
810
        tt = other.get_transform()
812
811
        trans_id = tt.trans_id_tree_path('file2')
813
812
        tt.delete_contents(trans_id)
814
813
        tt.create_file([b'file2'], trans_id)