/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-06-14 10:06:05 UTC
  • mfrom: (6963.2.19 python3-weave-fmt)
  • Revision ID: jelmer@jelmer.uk-20180614100605-7sg9ai8wdvpknkmr
Merge lp:~jelmer/brz/python3-weave-fmt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
633
633
        self.build_tree_contents([('b1/sub/sub/emptyfile.txt', b''),
634
634
                                  ('b1/dir/nolastnewline.txt', b'bloop')])
635
635
        tt = TreeTransform(self.tree1)
636
 
        tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
 
636
        tt.new_file('executable', tt.root, [b'#!/bin/sh\n'], 'exe-1', True)
637
637
        tt.apply()
638
638
        # have to fix length of file-id so that we can predictably rewrite
639
639
        # a (length-prefixed) record containing it later.
774
774
        tt = TreeTransform(self.tree1)
775
775
 
776
776
        # Add
777
 
        tt.new_file('file', tt.root, '\x00\n\x00\r\x01\n\x02\r\xff', 'binary-1')
778
 
        tt.new_file('file2', tt.root, '\x01\n\x02\r\x03\n\x04\r\xff',
 
777
        tt.new_file('file', tt.root, [b'\x00\n\x00\r\x01\n\x02\r\xff'], 'binary-1')
 
778
        tt.new_file('file2', tt.root, [b'\x01\n\x02\r\x03\n\x04\r\xff'],
779
779
            'binary-2')
780
780
        tt.apply()
781
781
        self.tree1.commit('add binary', rev_id=b'b@cset-0-1')
782
 
        self.get_valid_bundle('null:', 'b@cset-0-1')
 
782
        self.get_valid_bundle(b'null:', b'b@cset-0-1')
783
783
 
784
784
        # Delete
785
785
        tt = TreeTransform(self.tree1)
787
787
        tt.delete_contents(trans_id)
788
788
        tt.apply()
789
789
        self.tree1.commit('delete binary', rev_id=b'b@cset-0-2')
790
 
        self.get_valid_bundle('b@cset-0-1', 'b@cset-0-2')
 
790
        self.get_valid_bundle(b'b@cset-0-1', b'b@cset-0-2')
791
791
 
792
792
        # Rename & modify
793
793
        tt = TreeTransform(self.tree1)
794
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
 
        tt.create_file('file\rcontents\x00\n\x00', trans_id)
 
797
        tt.create_file(b'file\rcontents\x00\n\x00', trans_id)
798
798
        tt.apply()
799
799
        self.tree1.commit('rename and modify binary', rev_id=b'b@cset-0-3')
800
 
        self.get_valid_bundle('b@cset-0-2', 'b@cset-0-3')
 
800
        self.get_valid_bundle(b'b@cset-0-2', b'b@cset-0-3')
801
801
 
802
802
        # Modify
803
803
        tt = TreeTransform(self.tree1)
804
804
        trans_id = tt.trans_id_tree_path('file3')
805
805
        tt.delete_contents(trans_id)
806
 
        tt.create_file('\x00file\rcontents', trans_id)
 
806
        tt.create_file(b'\x00file\rcontents', trans_id)
807
807
        tt.apply()
808
808
        self.tree1.commit('just modify binary', rev_id=b'b@cset-0-4')
809
 
        self.get_valid_bundle('b@cset-0-3', 'b@cset-0-4')
 
809
        self.get_valid_bundle(b'b@cset-0-3', b'b@cset-0-4')
810
810
 
811
811
        # Rollup
812
 
        self.get_valid_bundle('null:', 'b@cset-0-4')
 
812
        self.get_valid_bundle(b'null:', b'b@cset-0-4')
813
813
 
814
814
    def test_last_modified(self):
815
815
        self.tree1 = self.make_branch_and_tree('b1')
816
816
        self.b1 = self.tree1.branch
817
817
        tt = TreeTransform(self.tree1)
818
 
        tt.new_file('file', tt.root, 'file', 'file')
 
818
        tt.new_file('file', tt.root, [b'file'], 'file')
819
819
        tt.apply()
820
820
        self.tree1.commit('create file', rev_id=b'a@lmod-0-1')
821
821
 
822
822
        tt = TreeTransform(self.tree1)
823
823
        trans_id = tt.trans_id_tree_path('file')
824
824
        tt.delete_contents(trans_id)
825
 
        tt.create_file('file2', trans_id)
 
825
        tt.create_file(b'file2', trans_id)
826
826
        tt.apply()
827
827
        self.tree1.commit('modify text', rev_id=b'a@lmod-0-2a')
828
828
 
829
 
        other = self.get_checkout('a@lmod-0-1')
 
829
        other = self.get_checkout(b'a@lmod-0-1')
830
830
        tt = TreeTransform(other)
831
831
        trans_id = tt.trans_id_tree_path('file2')
832
832
        tt.delete_contents(trans_id)
833
 
        tt.create_file('file2', trans_id)
 
833
        tt.create_file(b'file2', trans_id)
834
834
        tt.apply()
835
835
        other.commit('modify text in another tree', rev_id=b'a@lmod-0-2b')
836
836
        self.tree1.merge_from_branch(other.branch)
837
837
        self.tree1.commit(u'Merge', rev_id=b'a@lmod-0-3',
838
838
                          verbose=False)
839
839
        self.tree1.commit(u'Merge', rev_id=b'a@lmod-0-4')
840
 
        bundle = self.get_valid_bundle('a@lmod-0-2a', 'a@lmod-0-4')
 
840
        bundle = self.get_valid_bundle(b'a@lmod-0-2a', b'a@lmod-0-4')
841
841
 
842
842
    def test_hide_history(self):
843
843
        self.tree1 = self.make_branch_and_tree('b1')
1000
1000
        tree = self.make_branch_and_memory_tree('tree')
1001
1001
        tree.lock_write()
1002
1002
        self.addCleanup(tree.unlock)
1003
 
        tree.add([''], ['TREE_ROOT'])
 
1003
        tree.add([''], [b'TREE_ROOT'])
1004
1004
        tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id=b'rev1')
1005
1005
        self.b1 = tree.branch
1006
1006
        bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1017
1017
        tree.lock_write()
1018
1018
        self.addCleanup(tree.unlock)
1019
1019
 
1020
 
        tree.add([''], ['TREE_ROOT'])
 
1020
        tree.add([''], [b'TREE_ROOT'])
1021
1021
        tree.commit('One', rev_id=b'rev1',
1022
1022
                    revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
1023
1023
        self.b1 = tree.branch
1035
1035
        tree.lock_write()
1036
1036
        self.addCleanup(tree.unlock)
1037
1037
 
1038
 
        tree.add([''], ['TREE_ROOT'])
 
1038
        tree.add([''], [b'TREE_ROOT'])
1039
1039
        # Revisions themselves do not require anything about revision property
1040
1040
        # keys, other than that they are a basestring, and do not contain
1041
1041
        # whitespace.
1197
1197
        tree = self.make_branch_and_memory_tree('tree')
1198
1198
        tree.lock_write()
1199
1199
        self.addCleanup(tree.unlock)
1200
 
        tree.add([''], ['TREE_ROOT'])
 
1200
        tree.add([''], [b'TREE_ROOT'])
1201
1201
        tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id=b'rev1')
1202
1202
        self.b1 = tree.branch
1203
1203
        bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1229
1229
        tree = self.make_branch_and_memory_tree('tree')
1230
1230
        tree.lock_write()
1231
1231
        self.addCleanup(tree.unlock)
1232
 
        tree.add([''], ['TREE_ROOT'])
 
1232
        tree.add([''], [b'TREE_ROOT'])
1233
1233
        tree.commit('One', revprops={'one':'two', 'empty':''}, rev_id=b'rev1')
1234
1234
        self.b1 = tree.branch
1235
1235
        bundle_sio, revision_ids = self.create_bundle_text('null:', 'rev1')
1257
1257
        tree.lock_write()
1258
1258
        self.addCleanup(tree.unlock)
1259
1259
 
1260
 
        tree.add([''], ['TREE_ROOT'])
 
1260
        tree.add([''], [b'TREE_ROOT'])
1261
1261
        tree.commit('One', rev_id=b'rev1',
1262
1262
                    revprops={'a':'4', 'b':'3', 'c':'2', 'd':'1'})
1263
1263
        self.b1 = tree.branch
1283
1283
        tree.lock_write()
1284
1284
        self.addCleanup(tree.unlock)
1285
1285
 
1286
 
        tree.add([''], ['TREE_ROOT'])
 
1286
        tree.add([''], [b'TREE_ROOT'])
1287
1287
        # Revisions themselves do not require anything about revision property
1288
1288
        # keys, other than that they are a basestring, and do not contain
1289
1289
        # whitespace.
1404
1404
    def test_creation(self):
1405
1405
        tree = self.make_branch_and_tree('tree')
1406
1406
        self.build_tree_contents([('tree/file', b'contents1\nstatic\n')])
1407
 
        tree.add('file', 'fileid-2')
 
1407
        tree.add('file', b'fileid-2')
1408
1408
        tree.commit('added file', rev_id=b'rev1')
1409
1409
        self.build_tree_contents([('tree/file', b'contents2\nstatic\n')])
1410
1410
        tree.commit('changed file', rev_id=b'rev2')