← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revert.py

Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revert.py
34
34
                          target_tree.basis_tree(), this_tree=target_tree)
35
35
        self.failUnlessExists('target/dir')
36
36
        self.failUnlessExists('target/dir/contents')
37
 
        target_tree.revert([])
 
37
        target_tree.revert()
38
38
        self.failIfExists('target/dir/contents')
39
39
        self.failIfExists('target/dir')
40
40
 
57
57
        # newly-added files should not be deleted
58
58
        tree.add('new_file')
59
59
        basis_tree = tree.branch.repository.revision_tree(tree.last_revision())
60
 
        tree.revert([])
 
60
        tree.revert()
61
61
        self.failUnlessExists('tree/new_file')
62
62
 
63
63
        # unchanged files should be deleted
64
64
        tree.add('new_file')
65
65
        tree.commit('add new_file')
66
 
        tree.revert([], old_tree=basis_tree)
 
66
        tree.revert(old_tree=basis_tree)
67
67
        self.failIfExists('tree/new_file')
68
68
        
69
69
        # files should be deleted if their changes came from merges
70
70
        merge_target.merge_from_branch(tree.branch)
71
71
        self.failUnlessExists('merge_target/new_file')
72
 
        merge_target.revert([])
 
72
        merge_target.revert()
73
73
        self.failIfExists('merge_target/new_file')
74
74
 
75
75
        # files should not be deleted if changed after a merge
76
76
        merge_target.merge_from_branch(tree.branch)
77
77
        self.failUnlessExists('merge_target/new_file')
78
78
        self.build_tree_contents([('merge_target/new_file', 'new_contents')])
79
 
        merge_target.revert([])
 
79
        merge_target.revert()
80
80
        self.failUnlessExists('merge_target/new_file')
81
81
 
82
82
    def tree_with_executable(self):
97
97
        tt.apply()
98
98
        tree = workingtree.WorkingTree.open('tree')
99
99
        self.assertTrue(tree.is_executable('newfile-id'))
100
 
        transform.revert(tree, tree.basis_tree(), [], backups=True)
 
100
        transform.revert(tree, tree.basis_tree(), None, backups=True)
101
101
        self.assertEqual('helooo!', tree.get_file('newfile-id').read())
102
102
        self.assertTrue(tree.is_executable('newfile-id'))
103
103
 
107
107
        newfile = tt.trans_id_tree_file_id('newfile-id')
108
108
        tt.set_executability(False, newfile)
109
109
        tt.apply()
110
 
        transform.revert(tree, tree.basis_tree(), [])
 
110
        transform.revert(tree, tree.basis_tree(), None)
111
111
        self.assertTrue(tree.is_executable('newfile-id'))
112
112
 
113
113
    def test_revert_deletes_files_from_revert(self):
118
118
        os.unlink('file')
119
119
        tree.commit('removed file')
120
120
        self.failIfExists('file')
121
 
        tree.revert([], old_tree=tree.branch.repository.revision_tree('rev1'))
 
121
        tree.revert(old_tree=tree.branch.repository.revision_tree('rev1'))
122
122
        self.failUnlessExists('file')
123
 
        tree.revert([])
 
123
        tree.revert()
124
124
        self.failIfExists('file')
125
125
        self.assertEqual({}, tree.merge_modified())
 
126
 
 
127
    def test_empty_deprecated(self):
 
128
        tree = self.make_branch_and_tree('.')
 
129
        self.build_tree(['file'])
 
130
        tree.add('file')
 
131
        self.callDeprecated(['Using [] to revert all files is deprecated'
 
132
            ' as of bzr 0.91.  Please use None (the default) instead.'],
 
133
            tree.revert, [])
 
134
        self.assertIs(None, tree.path2id('file'))