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

  • Committer: Jelmer Vernooij
  • Date: 2020-07-18 23:14:00 UTC
  • mfrom: (7490.40.62 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200718231400-jaes9qltn8oi8xss
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/tests/test_bundle.py
39
39
from ..bundle.serializer.v09 import BundleSerializerV09
40
40
from ..bundle.serializer.v4 import BundleSerializerV4
41
41
from ..import knitrepo
 
42
from ..inventorytree import InventoryTree
42
43
from ...tests import (
43
44
    features,
44
45
    test_commit,
59
60
        return get_text(repo.inventories, (revision_id,))
60
61
 
61
62
 
62
 
class MockTree(object):
 
63
class MockTree(InventoryTree):
63
64
 
64
65
    def __init__(self):
65
66
        from ..inventory import InventoryDirectory, ROOT_ID
592
593
            ])
593
594
        self.build_tree_contents([('b1/sub/sub/emptyfile.txt', b''),
594
595
                                  ('b1/dir/nolastnewline.txt', b'bloop')])
595
 
        tt = self.tree1.get_transform()
 
596
        tt = self.tree1.transform()
596
597
        tt.new_file('executable', tt.root, [b'#!/bin/sh\n'], b'exe-1', True)
597
598
        tt.apply()
598
599
        # have to fix length of file-id so that we can predictably rewrite
612
613
        self.tree1.remove(
613
614
            ['sub/sub/nonempty.txt', 'sub/sub/emptyfile.txt', 'sub/sub'
614
615
             ])
615
 
        tt = self.tree1.get_transform()
 
616
        tt = self.tree1.transform()
616
617
        trans_id = tt.trans_id_tree_path('executable')
617
618
        tt.set_executability(False, trans_id)
618
619
        tt.apply()
673
674
        self.tree1 = self.make_branch_and_tree('b1')
674
675
        self.b1 = self.tree1.branch
675
676
 
676
 
        tt = self.tree1.get_transform()
 
677
        tt = self.tree1.transform()
677
678
        tt.new_symlink(link_name, tt.root, link_target, link_id)
678
679
        tt.apply()
679
680
        self.tree1.commit('add symlink', rev_id=b'l@cset-0-1')
684
685
            self.assertEqual(
685
686
                link_target, bund_tree.get_symlink_target(link_name))
686
687
 
687
 
        tt = self.tree1.get_transform()
 
688
        tt = self.tree1.transform()
688
689
        trans_id = tt.trans_id_tree_path(link_name)
689
690
        tt.adjust_path('link2', tt.root, trans_id)
690
691
        tt.delete_contents(trans_id)
698
699
            self.assertEqual(new_link_target,
699
700
                             bund_tree.get_symlink_target('link2'))
700
701
 
701
 
        tt = self.tree1.get_transform()
 
702
        tt = self.tree1.transform()
702
703
        trans_id = tt.trans_id_tree_path('link2')
703
704
        tt.delete_contents(trans_id)
704
705
        tt.create_symlink('jupiter', trans_id)
706
707
        self.tree1.commit('just change symlink target', rev_id=b'l@cset-0-3')
707
708
        bundle = self.get_valid_bundle(b'l@cset-0-2', b'l@cset-0-3')
708
709
 
709
 
        tt = self.tree1.get_transform()
 
710
        tt = self.tree1.transform()
710
711
        trans_id = tt.trans_id_tree_path('link2')
711
712
        tt.delete_contents(trans_id)
712
713
        tt.apply()
725
726
    def test_binary_bundle(self):
726
727
        self.tree1 = self.make_branch_and_tree('b1')
727
728
        self.b1 = self.tree1.branch
728
 
        tt = self.tree1.get_transform()
 
729
        tt = self.tree1.transform()
729
730
 
730
731
        # Add
731
732
        tt.new_file('file', tt.root, [
737
738
        self.get_valid_bundle(b'null:', b'b@cset-0-1')
738
739
 
739
740
        # Delete
740
 
        tt = self.tree1.get_transform()
 
741
        tt = self.tree1.transform()
741
742
        trans_id = tt.trans_id_tree_path('file')
742
743
        tt.delete_contents(trans_id)
743
744
        tt.apply()
745
746
        self.get_valid_bundle(b'b@cset-0-1', b'b@cset-0-2')
746
747
 
747
748
        # Rename & modify
748
 
        tt = self.tree1.get_transform()
 
749
        tt = self.tree1.transform()
749
750
        trans_id = tt.trans_id_tree_path('file2')
750
751
        tt.adjust_path('file3', tt.root, trans_id)
751
752
        tt.delete_contents(trans_id)
755
756
        self.get_valid_bundle(b'b@cset-0-2', b'b@cset-0-3')
756
757
 
757
758
        # Modify
758
 
        tt = self.tree1.get_transform()
 
759
        tt = self.tree1.transform()
759
760
        trans_id = tt.trans_id_tree_path('file3')
760
761
        tt.delete_contents(trans_id)
761
762
        tt.create_file([b'\x00file\rcontents'], trans_id)
769
770
    def test_last_modified(self):
770
771
        self.tree1 = self.make_branch_and_tree('b1')
771
772
        self.b1 = self.tree1.branch
772
 
        tt = self.tree1.get_transform()
 
773
        tt = self.tree1.transform()
773
774
        tt.new_file('file', tt.root, [b'file'], b'file')
774
775
        tt.apply()
775
776
        self.tree1.commit('create file', rev_id=b'a@lmod-0-1')
776
777
 
777
 
        tt = self.tree1.get_transform()
 
778
        tt = self.tree1.transform()
778
779
        trans_id = tt.trans_id_tree_path('file')
779
780
        tt.delete_contents(trans_id)
780
781
        tt.create_file([b'file2'], trans_id)
782
783
        self.tree1.commit('modify text', rev_id=b'a@lmod-0-2a')
783
784
 
784
785
        other = self.get_checkout(b'a@lmod-0-1')
785
 
        tt = other.get_transform()
 
786
        tt = other.transform()
786
787
        trans_id = tt.trans_id_tree_path('file2')
787
788
        tt.delete_contents(trans_id)
788
789
        tt.create_file([b'file2'], trans_id)