/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/per_intertree/test_compare.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-22 03:51:03 UTC
  • mfrom: (7192.5.2 remove-more-file-ids)
  • Revision ID: breezy.the.bot@gmail.com-20181122035103-1c5jnbdx2t5yujqb
Stop actually accepting optional file_id in many Tree methods.

Merged from https://code.launchpad.net/~jelmer/brz/remove-more-file-ids/+merge/358950

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_intertree/test_compare.py
798
798
        tree1.mkdir('changing', b'parent-id')
799
799
        tree1.mkdir('changing/unchanging', b'mid-id')
800
800
        tree1.add(['changing/unchanging/file'], [b'file-id'], ['file'])
801
 
        tree1.put_file_bytes_non_atomic(
802
 
            'changing/unchanging/file', b'a file', file_id=b'file-id')
 
801
        tree1.put_file_bytes_non_atomic('changing/unchanging/file', b'a file')
803
802
        tree2 = self.make_to_branch_and_tree('2')
804
803
        tree2.set_root_id(tree1.get_root_id())
805
804
        tree2.mkdir('changed', b'parent-id')
806
805
        tree2.mkdir('changed/unchanging', b'mid-id')
807
806
        tree2.add(['changed/unchanging/file'], [b'file-id'], ['file'])
808
 
        tree2.put_file_bytes_non_atomic(
809
 
            'changed/unchanging/file', b'changed content', file_id=b'file-id')
 
807
        tree2.put_file_bytes_non_atomic('changed/unchanging/file', b'changed content')
810
808
        tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
811
809
        # parent-id has changed, as has file-id
812
810
        root_id = tree1.path2id('')
825
823
        tree1.mkdir('changed', b'parent-id')
826
824
        tree1.mkdir('changed/unchanging', b'mid-id')
827
825
        tree1.add(['changed/unchanging/file'], [b'file-id'], ['file'])
828
 
        tree1.put_file_bytes_non_atomic(
829
 
            'changed/unchanging/file', b'a file',
830
 
            b'file-id')
 
826
        tree1.put_file_bytes_non_atomic('changed/unchanging/file', b'a file')
831
827
        tree2 = self.make_to_branch_and_tree('2')
832
828
        tree2.set_root_id(b'new')
833
829
        tree2.mkdir('changed', b'parent-id')
834
830
        tree2.mkdir('changed/unchanging', b'mid-id')
835
831
        tree2.add(['changed/unchanging/file'], [b'file-id'], ['file'])
836
832
        tree2.put_file_bytes_non_atomic(
837
 
            'changed/unchanging/file', b'changed content', file_id=b'file-id')
 
833
            'changed/unchanging/file', b'changed content')
838
834
        tree1, tree2 = self.mutable_trees_to_locked_test_trees(tree1, tree2)
839
835
        # old is gone, new is added, parent-id has changed(reparented), as has
840
836
        # file-id(content)