26
26
"""Reverting a merge that adds a directory deletes the directory"""
27
27
source_tree = self.make_branch_and_tree('source')
28
28
source_tree.commit('empty tree')
29
target_tree = source_tree.bzrdir.sprout('target').open_workingtree()
29
target_tree = source_tree.controldir.sprout('target').open_workingtree()
30
30
self.build_tree(['source/dir/', 'source/dir/contents'])
31
source_tree.add(['dir', 'dir/contents'], ['dir-id', 'contents-id'])
31
source_tree.add(['dir', 'dir/contents'], [b'dir-id', b'contents-id'])
32
32
source_tree.commit('added dir')
33
33
target_tree.lock_write()
34
34
self.addCleanup(target_tree.unlock)
35
35
merge.merge_inner(target_tree.branch, source_tree.basis_tree(),
36
36
target_tree.basis_tree(), this_tree=target_tree)
37
self.failUnlessExists('target/dir')
38
self.failUnlessExists('target/dir/contents')
37
self.assertPathExists('target/dir')
38
self.assertPathExists('target/dir/contents')
39
39
target_tree.revert()
40
self.failIfExists('target/dir/contents')
41
self.failIfExists('target/dir')
40
self.assertPathDoesNotExist('target/dir/contents')
41
self.assertPathDoesNotExist('target/dir')
43
43
def test_revert_new(self):
44
44
"""Only locally-changed new files should be preserved when reverting
54
54
tree = self.make_branch_and_tree('tree')
55
55
tree.commit('empty tree')
56
merge_target = tree.bzrdir.sprout('merge_target').open_workingtree()
56
merge_target = tree.controldir.sprout('merge_target').open_workingtree()
57
57
self.build_tree(['tree/new_file'])
59
59
# newly-added files should not be deleted
60
60
tree.add('new_file')
61
61
basis_tree = tree.branch.repository.revision_tree(tree.last_revision())
63
self.failUnlessExists('tree/new_file')
63
self.assertPathExists('tree/new_file')
65
65
# unchanged files should be deleted
66
66
tree.add('new_file')
67
67
tree.commit('add new_file')
68
68
tree.revert(old_tree=basis_tree)
69
self.failIfExists('tree/new_file')
69
self.assertPathDoesNotExist('tree/new_file')
71
71
# files should be deleted if their changes came from merges
72
72
merge_target.merge_from_branch(tree.branch)
73
self.failUnlessExists('merge_target/new_file')
73
self.assertPathExists('merge_target/new_file')
74
74
merge_target.revert()
75
self.failIfExists('merge_target/new_file')
75
self.assertPathDoesNotExist('merge_target/new_file')
77
77
# files should not be deleted if changed after a merge
78
78
merge_target.merge_from_branch(tree.branch)
79
self.failUnlessExists('merge_target/new_file')
80
self.build_tree_contents([('merge_target/new_file', 'new_contents')])
79
self.assertPathExists('merge_target/new_file')
80
self.build_tree_contents([('merge_target/new_file', b'new_contents')])
81
81
merge_target.revert()
82
self.failUnlessExists('merge_target/new_file')
82
self.assertPathExists('merge_target/new_file')
84
84
def tree_with_executable(self):
85
85
tree = self.make_branch_and_tree('tree')
86
86
tt = transform.TreeTransform(tree)
87
tt.new_file('newfile', tt.root, 'helooo!', 'newfile-id', True)
87
tt.new_file('newfile', tt.root, [b'helooo!'], b'newfile-id', True)
91
self.assertTrue(tree.is_executable('newfile-id'))
91
self.assertTrue(tree.is_executable('newfile'))
92
92
tree.commit('added newfile')
97
97
def test_preserve_execute(self):
98
98
tree = self.tree_with_executable()
99
99
tt = transform.TreeTransform(tree)
100
newfile = tt.trans_id_tree_file_id('newfile-id')
100
newfile = tt.trans_id_tree_path('newfile')
101
101
tt.delete_contents(newfile)
102
102
tt.create_file('Woooorld!', newfile)
104
104
tree = workingtree.WorkingTree.open('tree')
105
105
tree.lock_write()
106
106
self.addCleanup(tree.unlock)
107
self.assertTrue(tree.is_executable('newfile-id'))
107
self.assertTrue(tree.is_executable('newfile'))
108
108
transform.revert(tree, tree.basis_tree(), None, backups=True)
109
self.assertEqual('helooo!', tree.get_file('newfile-id').read())
110
self.assertTrue(tree.is_executable('newfile-id'))
109
self.assertEqual('helooo!', tree.get_file('newfile').read())
110
self.assertTrue(tree.is_executable('newfile'))
112
112
def test_revert_executable(self):
113
113
tree = self.tree_with_executable()
114
114
tt = transform.TreeTransform(tree)
115
newfile = tt.trans_id_tree_file_id('newfile-id')
115
newfile = tt.trans_id_tree_path('newfile')
116
116
tt.set_executability(False, newfile)
118
118
tree.lock_write()
119
119
self.addCleanup(tree.unlock)
120
120
transform.revert(tree, tree.basis_tree(), None)
121
self.assertTrue(tree.is_executable('newfile-id'))
121
self.assertTrue(tree.is_executable('newfile'))
123
123
def test_revert_deletes_files_from_revert(self):
124
124
tree = self.make_branch_and_tree('.')
125
125
self.build_tree(['file'])
127
tree.commit('added file', rev_id='rev1')
127
tree.commit('added file', rev_id=b'rev1')
128
128
os.unlink('file')
129
129
tree.commit('removed file')
130
self.failIfExists('file')
131
tree.revert(old_tree=tree.branch.repository.revision_tree('rev1'))
132
self.failUnlessExists('file')
130
self.assertPathDoesNotExist('file')
131
tree.revert(old_tree=tree.branch.repository.revision_tree(b'rev1'))
132
self.assertPathExists('file')
134
self.failIfExists('file')
134
self.assertPathDoesNotExist('file')
135
135
self.assertEqual({}, tree.merge_modified())
137
def test_empty_deprecated(self):
138
tree = self.make_branch_and_tree('.')
139
self.build_tree(['file'])
141
self.callDeprecated(['Using [] to revert all files is deprecated'
142
' as of bzr 0.91. Please use None (the default) instead.'],
144
self.assertIs(None, tree.path2id('file'))
146
137
def test_revert_file_in_deleted_dir(self):
147
138
tree = self.make_branch_and_tree('.')
148
139
self.build_tree(['dir/', 'dir/file1', 'dir/file2'])
155
146
tree.remove(['dir/', 'dir/file1', 'dir/file2'])
156
147
tree.revert(['dir/file1'])
157
self.failUnlessExists('dir/file1')
158
self.failIfExists('dir/file2')
159
self.assertEqual('dir-id', tree.path2id('dir'))
148
self.assertPathExists('dir/file1')
149
self.assertPathDoesNotExist('dir/file2')
150
self.assertEqual(b'dir-id', tree.path2id('dir'))
161
152
def test_revert_root_id_change(self):
162
153
tree = self.make_branch_and_tree('.')
163
tree.set_root_id('initial-root-id')
154
tree.set_root_id(b'initial-root-id')
164
155
self.build_tree(['file1'])
165
156
tree.add(['file1'])
166
157
tree.commit('first')
167
tree.set_root_id('temp-root-id')
158
tree.set_root_id(b'temp-root-id')
168
159
self.assertEqual('temp-root-id', tree.get_root_id())
170
161
self.assertEqual('initial-root-id', tree.get_root_id())