/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: 2018-03-24 10:24:48 UTC
  • mfrom: (6910 work)
  • mto: This revision was merged to the branch mainline in revision 6913.
  • Revision ID: jelmer@jelmer.uk-20180324102448-132p8l8t5ogdzhhu
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
663
663
                , 'sub/sub'
664
664
                ])
665
665
        tt = TreeTransform(self.tree1)
666
 
        trans_id = tt.trans_id_tree_file_id('exe-1')
 
666
        trans_id = tt.trans_id_tree_path('executable')
667
667
        tt.set_executability(False, trans_id)
668
668
        tt.apply()
669
669
        self.tree1.commit('removed', rev_id='a@cset-0-3')
731
731
            self.assertEqual(link_target, bund_tree.get_symlink_target(link_name))
732
732
 
733
733
        tt = TreeTransform(self.tree1)
734
 
        trans_id = tt.trans_id_tree_file_id(link_id)
 
734
        trans_id = tt.trans_id_tree_path(link_name)
735
735
        tt.adjust_path('link2', tt.root, trans_id)
736
736
        tt.delete_contents(trans_id)
737
737
        tt.create_symlink(new_link_target, trans_id)
745
745
                             bund_tree.get_symlink_target('link2'))
746
746
 
747
747
        tt = TreeTransform(self.tree1)
748
 
        trans_id = tt.trans_id_tree_file_id(link_id)
 
748
        trans_id = tt.trans_id_tree_path('link2')
749
749
        tt.delete_contents(trans_id)
750
750
        tt.create_symlink('jupiter', trans_id)
751
751
        tt.apply()
753
753
        bundle = self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
754
754
 
755
755
        tt = TreeTransform(self.tree1)
756
 
        trans_id = tt.trans_id_tree_file_id(link_id)
 
756
        trans_id = tt.trans_id_tree_path('link2')
757
757
        tt.delete_contents(trans_id)
758
758
        tt.apply()
759
759
        self.tree1.commit('Delete symlink', rev_id='l@cset-0-4')
783
783
 
784
784
        # Delete
785
785
        tt = TreeTransform(self.tree1)
786
 
        trans_id = tt.trans_id_tree_file_id('binary-1')
 
786
        trans_id = tt.trans_id_tree_path('file')
787
787
        tt.delete_contents(trans_id)
788
788
        tt.apply()
789
789
        self.tree1.commit('delete binary', rev_id='b@cset-0-2')
791
791
 
792
792
        # Rename & modify
793
793
        tt = TreeTransform(self.tree1)
794
 
        trans_id = tt.trans_id_tree_file_id('binary-2')
 
794
        trans_id = tt.trans_id_tree_path('file2')
795
795
        tt.adjust_path('file3', tt.root, trans_id)
796
796
        tt.delete_contents(trans_id)
797
797
        tt.create_file('file\rcontents\x00\n\x00', trans_id)
801
801
 
802
802
        # Modify
803
803
        tt = TreeTransform(self.tree1)
804
 
        trans_id = tt.trans_id_tree_file_id('binary-2')
 
804
        trans_id = tt.trans_id_tree_path('file3')
805
805
        tt.delete_contents(trans_id)
806
806
        tt.create_file('\x00file\rcontents', trans_id)
807
807
        tt.apply()
820
820
        self.tree1.commit('create file', rev_id='a@lmod-0-1')
821
821
 
822
822
        tt = TreeTransform(self.tree1)
823
 
        trans_id = tt.trans_id_tree_file_id('file')
 
823
        trans_id = tt.trans_id_tree_path('file')
824
824
        tt.delete_contents(trans_id)
825
825
        tt.create_file('file2', trans_id)
826
826
        tt.apply()
828
828
 
829
829
        other = self.get_checkout('a@lmod-0-1')
830
830
        tt = TreeTransform(other)
831
 
        trans_id = tt.trans_id_tree_file_id('file')
 
831
        trans_id = tt.trans_id_tree_path('file2')
832
832
        tt.delete_contents(trans_id)
833
833
        tt.create_file('file2', trans_id)
834
834
        tt.apply()