1
# Copyright (C) 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""Tests of the WorkingTree.unversion API."""
23
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
26
class TestUnversion(TestCaseWithWorkingTree):
28
def test_unversion_requires_write_lock(self):
29
"""WT.unversion([]) in a read lock raises ReadOnlyError."""
30
tree = self.make_branch_and_tree('.')
32
self.assertRaises(errors.ReadOnlyError, tree.unversion, [])
35
def test_unversion_missing_file(self):
36
"""WT.unversion(['missing-id']) raises NoSuchId."""
37
tree = self.make_branch_and_tree('.')
38
self.assertRaises(errors.NoSuchId, tree.unversion, ['missing-id'])
40
def test_unversion_several_files(self):
41
"""After unversioning several files, they should not be versioned."""
42
tree = self.make_branch_and_tree('.')
43
self.build_tree(['a', 'b', 'c'])
44
tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
45
# within a lock unversion should take effect
47
tree.unversion(['a-id', 'b-id'])
48
self.assertFalse(tree.has_id('a-id'))
49
self.assertFalse(tree.has_id('b-id'))
50
self.assertTrue(tree.has_id('c-id'))
51
self.assertTrue(tree.has_filename('a'))
52
self.assertTrue(tree.has_filename('b'))
53
self.assertTrue(tree.has_filename('c'))
55
# the changes should have persisted to disk - reopen the workingtree
57
tree = tree.bzrdir.open_workingtree()
59
self.assertFalse(tree.has_id('a-id'))
60
self.assertFalse(tree.has_id('b-id'))
61
self.assertTrue(tree.has_id('c-id'))
62
self.assertTrue(tree.has_filename('a'))
63
self.assertTrue(tree.has_filename('b'))
64
self.assertTrue(tree.has_filename('c'))
67
def test_unversion_subtree(self):
68
"""Unversioning the root of a subtree unversions the entire subtree."""
69
tree = self.make_branch_and_tree('.')
70
self.build_tree(['a/', 'a/b', 'c'])
71
tree.add(['a', 'a/b', 'c'], ['a-id', 'b-id', 'c-id'])
72
# within a lock unversion should take effect
74
tree.unversion(['a-id'])
75
self.assertFalse(tree.has_id('a-id'))
76
self.assertFalse(tree.has_id('b-id'))
77
self.assertTrue(tree.has_id('c-id'))
78
self.assertTrue(tree.has_filename('a'))
79
self.assertTrue(tree.has_filename('a/b'))
80
self.assertTrue(tree.has_filename('c'))
83
def test_unversion_subtree_and_children(self):
84
"""Passing a child id will raise NoSuchId.
86
This is because the parent directory will have already been removed.
88
tree = self.make_branch_and_tree('.')
89
self.build_tree(['a/', 'a/b', 'a/c', 'd'])
90
tree.add(['a', 'a/b', 'a/c', 'd'], ['a-id', 'b-id', 'c-id', 'd-id'])
93
tree.unversion(['b-id', 'a-id'])
94
self.assertFalse(tree.has_id('a-id'))
95
self.assertFalse(tree.has_id('b-id'))
96
self.assertFalse(tree.has_id('c-id'))
97
self.assertTrue(tree.has_id('d-id'))
98
# The files are still on disk
99
self.assertTrue(tree.has_filename('a'))
100
self.assertTrue(tree.has_filename('a/b'))
101
self.assertTrue(tree.has_filename('a/c'))
102
self.assertTrue(tree.has_filename('d'))
106
def test_unversion_renamed(self):
107
tree = self.make_branch_and_tree('a')
108
self.build_tree(['a/dir/', 'a/dir/f1', 'a/dir/f2', 'a/dir/f3',
110
tree.add(['dir', 'dir/f1', 'dir/f2', 'dir/f3', 'dir2'],
111
['dir-id', 'f1-id', 'f2-id', 'f3-id', 'dir2-id'])
112
rev_id1 = tree.commit('init')
113
# Start off by renaming entries, and then unversion a bunch of entries
114
# https://bugs.launchpad.net/bzr/+bug/114615
115
tree.rename_one('dir/f1', 'dir/a')
116
tree.rename_one('dir/f2', 'dir/z')
117
tree.move(['dir/f3'], 'dir2')
121
root_id = tree.get_root_id()
122
paths = [(path, ie.file_id)
123
for path, ie in tree.iter_entries_by_dir()]
126
self.assertEqual([('', root_id),
131
('dir2/f3', 'f3-id'),
134
tree.unversion(set(['dir-id']))
135
paths = [(path, ie.file_id)
136
for path, ie in tree.iter_entries_by_dir()]
138
self.assertEqual([('', root_id),
140
('dir2/f3', 'f3-id'),
143
def test_unversion_after_conflicted_merge(self):
144
# Test for bug #114615
145
tree_a = self.make_branch_and_tree('A')
146
self.build_tree(['A/a/', 'A/a/m', 'A/a/n'])
147
tree_a.add(['a', 'a/m', 'a/n'], ['a-id', 'm-id', 'n-id'])
148
tree_a.commit('init')
152
root_id = tree_a.get_root_id()
156
tree_b = tree_a.bzrdir.sprout('B').open_workingtree()
157
self.build_tree(['B/xyz/'])
158
tree_b.add(['xyz'], ['xyz-id'])
159
tree_b.rename_one('a/m', 'xyz/m')
160
tree_b.unversion(['a-id'])
161
tree_b.commit('delete in B')
163
paths = [(path, ie.file_id)
164
for path, ie in tree_b.iter_entries_by_dir()]
165
self.assertEqual([('', root_id),
170
self.build_tree_contents([('A/a/n', 'new contents for n\n')])
171
tree_a.commit('change n in A')
173
# Merging from A should introduce conflicts because 'n' was modified
174
# and removed, so 'a' needs to be restored. We also have a conflict
175
# because 'a' is still an existing directory
176
num_conflicts = tree_b.merge_from_branch(tree_a.branch)
177
self.assertEqual(4, num_conflicts)
178
paths = [(path, ie.file_id)
179
for path, ie in tree_b.iter_entries_by_dir()]
180
self.assertEqual([('', root_id),
183
('a/n.OTHER', 'n-id'),
186
tree_b.unversion(['a-id'])
187
paths = [(path, ie.file_id)
188
for path, ie in tree_b.iter_entries_by_dir()]
189
self.assertEqual([('', root_id),