/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_transform.py

  • Committer: Jelmer Vernooij
  • Date: 2017-11-12 17:53:47 UTC
  • mfrom: (6813 trunk)
  • mto: This revision was merged to the branch mainline in revision 6819.
  • Revision ID: jelmer@jelmer.uk-20171112175347-wovgaqmkbyo8fo7f
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
632
632
        create_tree.new_file('moving_file2', root, 'later2', 'mfile2')
633
633
        create_tree.apply()
634
634
 
635
 
        mangle_tree,root = self.get_transform()
 
635
        mangle_tree, root = self.get_transform()
636
636
        root = mangle_tree.root
637
637
        #swap names
638
638
        name1 = mangle_tree.trans_id_tree_file_id('name1')
660
660
        mangle_tree.apply()
661
661
        self.assertEqual(file(self.wt.abspath('name1')).read(), 'hello2')
662
662
        self.assertEqual(file(self.wt.abspath('name2')).read(), 'hello1')
663
 
        mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
 
663
        mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
664
664
        self.assertEqual(mangle_tree.final_parent(mfile2), newdir)
665
665
        self.assertEqual(file(mfile2_path).read(), 'later2')
666
666
        self.assertEqual(self.wt.id2path('mfile2'), 'new_directory/mfile2')
667
667
        self.assertEqual(self.wt.path2id('new_directory/mfile2'), 'mfile2')
668
 
        newfile_path = self.wt.abspath(pathjoin('new_directory','newfile'))
 
668
        newfile_path = self.wt.abspath(pathjoin('new_directory', 'newfile'))
669
669
        self.assertEqual(file(newfile_path).read(), 'hello3')
670
670
        self.assertEqual(self.wt.path2id('dying_directory'), 'ddir')
671
671
        self.assertIs(self.wt.path2id('dying_directory/dying_file'), None)
672
 
        mfile2_path = self.wt.abspath(pathjoin('new_directory','mfile2'))
 
672
        mfile2_path = self.wt.abspath(pathjoin('new_directory', 'mfile2'))
673
673
 
674
674
    def test_both_rename(self):
675
 
        create_tree,root = self.get_transform()
 
675
        create_tree, root = self.get_transform()
676
676
        newdir = create_tree.new_directory('selftest', root, 'selftest-id')
677
677
        create_tree.new_file('blackbox.py', newdir, 'hello1', 'blackbox-id')
678
678
        create_tree.apply()
679
 
        mangle_tree,root = self.get_transform()
 
679
        mangle_tree, root = self.get_transform()
680
680
        selftest = mangle_tree.trans_id_tree_file_id('selftest-id')
681
681
        blackbox = mangle_tree.trans_id_tree_file_id('blackbox-id')
682
682
        mangle_tree.adjust_path('test', root, selftest)
685
685
        mangle_tree.apply()
686
686
 
687
687
    def test_both_rename2(self):
688
 
        create_tree,root = self.get_transform()
 
688
        create_tree, root = self.get_transform()
689
689
        breezy = create_tree.new_directory('breezy', root, 'breezy-id')
690
690
        tests = create_tree.new_directory('tests', breezy, 'tests-id')
691
691
        blackbox = create_tree.new_directory('blackbox', tests, 'blackbox-id')
692
692
        create_tree.new_file('test_too_much.py', blackbox, 'hello1',
693
693
                             'test_too_much-id')
694
694
        create_tree.apply()
695
 
        mangle_tree,root = self.get_transform()
 
695
        mangle_tree, root = self.get_transform()
696
696
        breezy = mangle_tree.trans_id_tree_file_id('breezy-id')
697
697
        tests = mangle_tree.trans_id_tree_file_id('tests-id')
698
698
        test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
702
702
        mangle_tree.apply()
703
703
 
704
704
    def test_both_rename3(self):
705
 
        create_tree,root = self.get_transform()
 
705
        create_tree, root = self.get_transform()
706
706
        tests = create_tree.new_directory('tests', root, 'tests-id')
707
707
        create_tree.new_file('test_too_much.py', tests, 'hello1',
708
708
                             'test_too_much-id')
709
709
        create_tree.apply()
710
 
        mangle_tree,root = self.get_transform()
 
710
        mangle_tree, root = self.get_transform()
711
711
        tests = mangle_tree.trans_id_tree_file_id('tests-id')
712
712
        test_too_much = mangle_tree.trans_id_tree_file_id('test_too_much-id')
713
713
        mangle_tree.adjust_path('selftest', root, tests)
752
752
        resolve_conflicts(replace)
753
753
        replace.apply()
754
754
 
755
 
    def _test_symlinks(self, link_name1,link_target1,
 
755
    def _test_symlinks(self, link_name1, link_target1,
756
756
                       link_name2, link_target2):
757
757
 
758
758
        def ozpath(p): return 'oz/' + p
810
810
                os.symlink = os_symlink
811
811
 
812
812
    def get_conflicted(self):
813
 
        create,root = self.get_transform()
 
813
        create, root = self.get_transform()
814
814
        create.new_file('dorothy', root, 'dorothy', 'dorothy-id')
815
815
        oz = create.new_directory('oz', root, 'oz-id')
816
816
        create.new_directory('emeraldcity', oz, 'emerald-id')
817
817
        create.apply()
818
 
        conflicts,root = self.get_transform()
 
818
        conflicts, root = self.get_transform()
819
819
        # set up duplicate entry, duplicate id
820
820
        new_dorothy = conflicts.new_file('dorothy', root, 'dorothy',
821
821
                                         'dorothy-id')
3214
3214
 
3215
3215
    def test_merge_into_preview(self):
3216
3216
        work_tree = self.make_branch_and_tree('tree')
3217
 
        self.build_tree_contents([('tree/file','b\n')])
 
3217
        self.build_tree_contents([('tree/file', 'b\n')])
3218
3218
        work_tree.add('file', 'file-id')
3219
3219
        work_tree.commit('first commit')
3220
3220
        child_tree = work_tree.controldir.sprout('child').open_workingtree()
3221
 
        self.build_tree_contents([('child/file','b\nc\n')])
 
3221
        self.build_tree_contents([('child/file', 'b\nc\n')])
3222
3222
        child_tree.commit('child commit')
3223
3223
        child_tree.lock_write()
3224
3224
        self.addCleanup(child_tree.unlock)