/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 bzrlib/tests/test_bundle.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-10 23:50:51 UTC
  • mfrom: (1848.1.1 bundle-binaries)
  • mto: This revision was merged to the branch mainline in revision 1850.
  • Revision ID: john@arbash-meinel.com-20060710235051-1b84cec91844d4f8
[merge] bundle fixes for binary files with \r

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
610
610
        self.tree1 = BzrDir.create_standalone_workingtree('b1')
611
611
        self.b1 = self.tree1.branch
612
612
        tt = TreeTransform(self.tree1)
613
 
        tt.new_file('file', tt.root, '\x00\xff', 'binary-1')
614
 
        tt.new_file('file2', tt.root, '\x00\xff', 'binary-2')
 
613
        
 
614
        # Add
 
615
        tt.new_file('file', tt.root, '\x00\n\x00\r\x01\n\x02\r\xff', 'binary-1')
 
616
        tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff', 'binary-2')
615
617
        tt.apply()
616
618
        self.tree1.commit('add binary', rev_id='b@cset-0-1')
617
619
        self.get_valid_bundle(None, 'b@cset-0-1')
 
620
 
 
621
        # Delete
618
622
        tt = TreeTransform(self.tree1)
619
623
        trans_id = tt.trans_id_tree_file_id('binary-1')
620
624
        tt.delete_contents(trans_id)
621
625
        tt.apply()
622
626
        self.tree1.commit('delete binary', rev_id='b@cset-0-2')
623
627
        self.get_valid_bundle('b@cset-0-1', 'b@cset-0-2')
 
628
 
 
629
        # Rename & modify
624
630
        tt = TreeTransform(self.tree1)
625
631
        trans_id = tt.trans_id_tree_file_id('binary-2')
626
632
        tt.adjust_path('file3', tt.root, trans_id)
627
633
        tt.delete_contents(trans_id)
628
 
        tt.create_file('filecontents\x00', trans_id)
 
634
        tt.create_file('file\rcontents\x00\n\x00', trans_id)
629
635
        tt.apply()
630
636
        self.tree1.commit('rename and modify binary', rev_id='b@cset-0-3')
631
637
        self.get_valid_bundle('b@cset-0-2', 'b@cset-0-3')
 
638
 
 
639
        # Modify
632
640
        tt = TreeTransform(self.tree1)
633
641
        trans_id = tt.trans_id_tree_file_id('binary-2')
634
642
        tt.delete_contents(trans_id)
635
 
        tt.create_file('\x00filecontents', trans_id)
 
643
        tt.create_file('\x00file\rcontents', trans_id)
636
644
        tt.apply()
637
645
        self.tree1.commit('just modify binary', rev_id='b@cset-0-4')
638
646
        self.get_valid_bundle('b@cset-0-3', 'b@cset-0-4')
639
647
 
 
648
        # Rollup
 
649
        self.get_valid_bundle(None, 'b@cset-0-4')
 
650
 
640
651
    def test_last_modified(self):
641
652
        self.tree1 = BzrDir.create_standalone_workingtree('b1')
642
653
        self.b1 = self.tree1.branch