5557.1.15
by John Arbash Meinel
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt |
1 |
# Copyright (C) 2006-2011 Canonical Ltd
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
2 |
# Authors: Robert Collins <robert.collins@canonical.com>
|
2255.13.4
by Martin Pool
merge |
3 |
# and others
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
4 |
#
|
5 |
# This program is free software; you can redistribute it and/or modify
|
|
6 |
# it under the terms of the GNU General Public License as published by
|
|
7 |
# the Free Software Foundation; either version 2 of the License, or
|
|
8 |
# (at your option) any later version.
|
|
9 |
#
|
|
10 |
# This program is distributed in the hope that it will be useful,
|
|
11 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
12 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
13 |
# GNU General Public License for more details.
|
|
14 |
#
|
|
15 |
# You should have received a copy of the GNU General Public License
|
|
16 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
17 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
18 |
|
19 |
from cStringIO import StringIO |
|
3136.1.10
by Aaron Bentley
Clean error if filesystem does not support hard-links |
20 |
import errno |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
21 |
import os |
22 |
||
3287.20.3
by John Arbash Meinel
Aaron recommended to make this a WT_impl test. |
23 |
from bzrlib import ( |
24 |
branch, |
|
25 |
bzrdir, |
|
6059.4.4
by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config. |
26 |
config, |
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
27 |
controldir, |
3287.20.3
by John Arbash Meinel
Aaron recommended to make this a WT_impl test. |
28 |
errors, |
29 |
osutils, |
|
6241.3.1
by Jelmer Vernooij
Support WorkingTree.clone() having its revision argument set to the NULL revision. |
30 |
revision as _mod_revision, |
5718.8.9
by Jelmer Vernooij
Avoid using _set_revision_history as it's not present on older branch formats. |
31 |
symbol_versioning, |
3287.20.3
by John Arbash Meinel
Aaron recommended to make this a WT_impl test. |
32 |
tests, |
6059.4.4
by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config. |
33 |
trace, |
3287.20.3
by John Arbash Meinel
Aaron recommended to make this a WT_impl test. |
34 |
urlutils, |
5582.4.3
by Jelmer Vernooij
remove more unused imports, avoid relying on a specific set of working tree formats that support references. |
35 |
)
|
36 |
from bzrlib.errors import ( |
|
37 |
UnsupportedOperation, |
|
38 |
PathsNotVersionedError, |
|
39 |
)
|
|
1852.15.14
by Robert Collins
test that WorkingTree._write_inventory works as expected by the current code. |
40 |
from bzrlib.inventory import Inventory |
6435.1.1
by Jelmer Vernooij
Add post_build_tree hook. |
41 |
from bzrlib.mutabletree import MutableTree |
1685.1.45
by John Arbash Meinel
Moved url functions into bzrlib.urlutils |
42 |
from bzrlib.osutils import pathjoin, getcwd, has_symlinks |
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
43 |
from bzrlib.tests import ( |
44 |
features, |
|
45 |
TestSkipped, |
|
46 |
TestNotApplicable, |
|
47 |
)
|
|
4523.1.4
by Martin Pool
Rename remaining *_implementations tests |
48 |
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree |
5582.4.3
by Jelmer Vernooij
remove more unused imports, avoid relying on a specific set of working tree formats that support references. |
49 |
from bzrlib.workingtree import ( |
50 |
TreeDirectory, |
|
51 |
TreeFile, |
|
52 |
TreeLink, |
|
5807.1.2
by Jelmer Vernooij
Skip some inventory-specific tests for non-inventory working trees. |
53 |
InventoryWorkingTree, |
5582.4.3
by Jelmer Vernooij
remove more unused imports, avoid relying on a specific set of working tree formats that support references. |
54 |
WorkingTree, |
55 |
)
|
|
1551.7.11
by Aaron Bentley
Add WorkingTree.add_conflicts |
56 |
from bzrlib.conflicts import ConflictList, TextConflict, ContentsConflict |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
57 |
|
1711.7.19
by John Arbash Meinel
file:// urls look slightly different on win32 |
58 |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
59 |
class TestWorkingTree(TestCaseWithWorkingTree): |
60 |
||
5516.1.1
by Vincent Ladeuil
TestCaseWithWorkingTree.make_branch_builder respects its relpath parameter. |
61 |
def test_branch_builder(self): |
62 |
# Just a smoke test that we get a branch at the specified relpath
|
|
63 |
builder = self.make_branch_builder('foobar') |
|
64 |
br = branch.Branch.open('foobar') |
|
65 |
||
1732.1.8
by John Arbash Meinel
Adding a test for list_files |
66 |
def test_list_files(self): |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
67 |
tree = self.make_branch_and_tree('.') |
1732.1.8
by John Arbash Meinel
Adding a test for list_files |
68 |
self.build_tree(['dir/', 'file']) |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
69 |
if has_symlinks(): |
70 |
os.symlink('target', 'symlink') |
|
2255.2.52
by Robert Collins
Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory. |
71 |
tree.lock_read() |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
72 |
files = list(tree.list_files()) |
2255.2.52
by Robert Collins
Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory. |
73 |
tree.unlock() |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
74 |
self.assertEqual(files[0], ('dir', '?', 'directory', None, TreeDirectory())) |
75 |
self.assertEqual(files[1], ('file', '?', 'file', None, TreeFile())) |
|
76 |
if has_symlinks(): |
|
77 |
self.assertEqual(files[2], ('symlink', '?', 'symlink', None, TreeLink())) |
|
78 |
||
1732.1.8
by John Arbash Meinel
Adding a test for list_files |
79 |
def test_list_files_sorted(self): |
80 |
tree = self.make_branch_and_tree('.') |
|
1836.1.18
by John Arbash Meinel
Cleaned up the last failing tests. All tests pass again. |
81 |
self.build_tree(['dir/', 'file', 'dir/file', 'dir/b', |
82 |
'dir/subdir/', 'a', 'dir/subfile', |
|
83 |
'zz_dir/', 'zz_dir/subfile']) |
|
2255.2.52
by Robert Collins
Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory. |
84 |
tree.lock_read() |
1836.1.18
by John Arbash Meinel
Cleaned up the last failing tests. All tests pass again. |
85 |
files = [(path, kind) for (path, v, kind, file_id, entry) |
86 |
in tree.list_files()] |
|
2255.2.52
by Robert Collins
Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory. |
87 |
tree.unlock() |
1732.1.8
by John Arbash Meinel
Adding a test for list_files |
88 |
self.assertEqual([ |
89 |
('a', 'file'), |
|
90 |
('dir', 'directory'), |
|
91 |
('file', 'file'), |
|
1732.1.25
by John Arbash Meinel
Fix list_files test, we don't need to check if children are empty if we fall off the loop. |
92 |
('zz_dir', 'directory'), |
1732.1.8
by John Arbash Meinel
Adding a test for list_files |
93 |
], files) |
94 |
||
1732.1.25
by John Arbash Meinel
Fix list_files test, we don't need to check if children are empty if we fall off the loop. |
95 |
tree.add(['dir', 'zz_dir']) |
2255.2.52
by Robert Collins
Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory. |
96 |
tree.lock_read() |
1836.1.18
by John Arbash Meinel
Cleaned up the last failing tests. All tests pass again. |
97 |
files = [(path, kind) for (path, v, kind, file_id, entry) |
98 |
in tree.list_files()] |
|
2255.2.52
by Robert Collins
Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory. |
99 |
tree.unlock() |
1732.1.8
by John Arbash Meinel
Adding a test for list_files |
100 |
self.assertEqual([ |
101 |
('a', 'file'), |
|
102 |
('dir', 'directory'), |
|
103 |
('dir/b', 'file'), |
|
104 |
('dir/file', 'file'), |
|
105 |
('dir/subdir', 'directory'), |
|
106 |
('dir/subfile', 'file'), |
|
107 |
('file', 'file'), |
|
1732.1.22
by John Arbash Meinel
Bug in list_files if the last entry in a directory is another directory |
108 |
('zz_dir', 'directory'), |
109 |
('zz_dir/subfile', 'file'), |
|
1732.1.8
by John Arbash Meinel
Adding a test for list_files |
110 |
], files) |
111 |
||
1551.10.29
by Aaron Bentley
Fix tree.list_files when file kind changes |
112 |
def test_list_files_kind_change(self): |
113 |
tree = self.make_branch_and_tree('tree') |
|
114 |
self.build_tree(['tree/filename']) |
|
115 |
tree.add('filename', 'file-id') |
|
116 |
os.unlink('tree/filename') |
|
117 |
self.build_tree(['tree/filename/']) |
|
118 |
tree.lock_read() |
|
119 |
self.addCleanup(tree.unlock) |
|
120 |
result = list(tree.list_files()) |
|
121 |
self.assertEqual(1, len(result)) |
|
122 |
self.assertEqual(('filename', 'V', 'directory', 'file-id'), |
|
123 |
result[0][:4]) |
|
124 |
||
6449.4.5
by Jelmer Vernooij
Review feedback from vila. |
125 |
def test_get_config_stack(self): |
6449.4.1
by Jelmer Vernooij
Add convenience method WorkingTree.get_config_stack(). |
126 |
# Smoke test that all working trees succeed getting a config
|
127 |
wt = self.make_branch_and_tree('.') |
|
6449.4.3
by Jelmer Vernooij
Use WorkingTree.get_config_stack. |
128 |
conf = wt.get_config_stack() |
6449.4.6
by Jelmer Vernooij
Fix typo. |
129 |
self.assertIsInstance(conf, config.Stack) |
6449.4.1
by Jelmer Vernooij
Add convenience method WorkingTree.get_config_stack(). |
130 |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
131 |
def test_open_containing(self): |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
132 |
branch = self.make_branch_and_tree('.').branch |
1711.7.28
by John Arbash Meinel
clean up the WorkingTree.open_containing tests |
133 |
local_base = urlutils.local_path_from_url(branch.base) |
134 |
||
135 |
# Empty opens '.'
|
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
136 |
wt, relpath = WorkingTree.open_containing() |
137 |
self.assertEqual('', relpath) |
|
1711.7.28
by John Arbash Meinel
clean up the WorkingTree.open_containing tests |
138 |
self.assertEqual(wt.basedir + '/', local_base) |
139 |
||
140 |
# '.' opens this dir
|
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
141 |
wt, relpath = WorkingTree.open_containing(u'.') |
142 |
self.assertEqual('', relpath) |
|
1711.7.28
by John Arbash Meinel
clean up the WorkingTree.open_containing tests |
143 |
self.assertEqual(wt.basedir + '/', local_base) |
144 |
||
145 |
# './foo' finds '.' and a relpath of 'foo'
|
|
146 |
wt, relpath = WorkingTree.open_containing('./foo') |
|
147 |
self.assertEqual('foo', relpath) |
|
148 |
self.assertEqual(wt.basedir + '/', local_base) |
|
149 |
||
150 |
# abspath(foo) finds '.' and relpath of 'foo'
|
|
151 |
wt, relpath = WorkingTree.open_containing('./foo') |
|
152 |
wt, relpath = WorkingTree.open_containing(getcwd() + '/foo') |
|
153 |
self.assertEqual('foo', relpath) |
|
154 |
self.assertEqual(wt.basedir + '/', local_base) |
|
155 |
||
156 |
# can even be a url: finds '.' and relpath of 'foo'
|
|
157 |
wt, relpath = WorkingTree.open_containing('./foo') |
|
158 |
wt, relpath = WorkingTree.open_containing( |
|
159 |
urlutils.local_path_to_url(getcwd() + '/foo')) |
|
160 |
self.assertEqual('foo', relpath) |
|
161 |
self.assertEqual(wt.basedir + '/', local_base) |
|
162 |
||
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
163 |
def test_basic_relpath(self): |
164 |
# for comprehensive relpath tests, see whitebox.py.
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
165 |
tree = self.make_branch_and_tree('.') |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
166 |
self.assertEqual('child', |
167 |
tree.relpath(pathjoin(getcwd(), 'child'))) |
|
168 |
||
169 |
def test_lock_locks_branch(self): |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
170 |
tree = self.make_branch_and_tree('.') |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
171 |
tree.lock_read() |
172 |
self.assertEqual('r', tree.branch.peek_lock_mode()) |
|
173 |
tree.unlock() |
|
174 |
self.assertEqual(None, tree.branch.peek_lock_mode()) |
|
175 |
tree.lock_write() |
|
176 |
self.assertEqual('w', tree.branch.peek_lock_mode()) |
|
177 |
tree.unlock() |
|
178 |
self.assertEqual(None, tree.branch.peek_lock_mode()) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
179 |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
180 |
def test_revert(self): |
181 |
"""Test selected-file revert"""
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
182 |
tree = self.make_branch_and_tree('.') |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
183 |
|
184 |
self.build_tree(['hello.txt']) |
|
6437.20.3
by Wouter van Heyst
mechanically replace file().write() pattern with a with-keyword version |
185 |
with file('hello.txt', 'w') as f: f.write('initial hello') |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
186 |
|
1551.7.17
by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees |
187 |
self.assertRaises(PathsNotVersionedError, |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
188 |
tree.revert, ['hello.txt']) |
189 |
tree.add(['hello.txt']) |
|
190 |
tree.commit('create initial hello.txt') |
|
191 |
||
192 |
self.check_file_contents('hello.txt', 'initial hello') |
|
6437.20.3
by Wouter van Heyst
mechanically replace file().write() pattern with a with-keyword version |
193 |
with file('hello.txt', 'w') as f: f.write('new hello') |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
194 |
self.check_file_contents('hello.txt', 'new hello') |
195 |
||
196 |
# revert file modified since last revision
|
|
197 |
tree.revert(['hello.txt']) |
|
198 |
self.check_file_contents('hello.txt', 'initial hello') |
|
1534.10.29
by Aaron Bentley
Fixed backup numbering to match GNU standard better |
199 |
self.check_file_contents('hello.txt.~1~', 'new hello') |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
200 |
|
201 |
# reverting again does not clobber the backup
|
|
202 |
tree.revert(['hello.txt']) |
|
203 |
self.check_file_contents('hello.txt', 'initial hello') |
|
1534.10.29
by Aaron Bentley
Fixed backup numbering to match GNU standard better |
204 |
self.check_file_contents('hello.txt.~1~', 'new hello') |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
205 |
|
1534.10.28
by Aaron Bentley
Use numbered backup files |
206 |
# backup files are numbered
|
6437.20.3
by Wouter van Heyst
mechanically replace file().write() pattern with a with-keyword version |
207 |
with file('hello.txt', 'w') as f: f.write('new hello2') |
1534.10.28
by Aaron Bentley
Use numbered backup files |
208 |
tree.revert(['hello.txt']) |
209 |
self.check_file_contents('hello.txt', 'initial hello') |
|
1534.10.29
by Aaron Bentley
Fixed backup numbering to match GNU standard better |
210 |
self.check_file_contents('hello.txt.~1~', 'new hello') |
211 |
self.check_file_contents('hello.txt.~2~', 'new hello2') |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
212 |
|
1558.12.7
by Aaron Bentley
Fixed revert with missing files |
213 |
def test_revert_missing(self): |
214 |
# Revert a file that has been deleted since last commit
|
|
215 |
tree = self.make_branch_and_tree('.') |
|
6437.20.3
by Wouter van Heyst
mechanically replace file().write() pattern with a with-keyword version |
216 |
with file('hello.txt', 'w') as f: f.write('initial hello') |
1558.12.7
by Aaron Bentley
Fixed revert with missing files |
217 |
tree.add('hello.txt') |
218 |
tree.commit('added hello.txt') |
|
219 |
os.unlink('hello.txt') |
|
220 |
tree.remove('hello.txt') |
|
221 |
tree.revert(['hello.txt']) |
|
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
222 |
self.assertPathExists('hello.txt') |
1558.12.7
by Aaron Bentley
Fixed revert with missing files |
223 |
|
1740.6.1
by Martin Pool
Remove Scratch objects used by doctests |
224 |
def test_versioned_files_not_unknown(self): |
225 |
tree = self.make_branch_and_tree('.') |
|
1831.1.1
by Martin Pool
[merge] remove default ignore list & update |
226 |
self.build_tree(['hello.txt']) |
1740.6.1
by Martin Pool
Remove Scratch objects used by doctests |
227 |
tree.add('hello.txt') |
228 |
self.assertEquals(list(tree.unknowns()), |
|
229 |
[])
|
|
1831.1.1
by Martin Pool
[merge] remove default ignore list & update |
230 |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
231 |
def test_unknowns(self): |
232 |
tree = self.make_branch_and_tree('.') |
|
233 |
self.build_tree(['hello.txt', |
|
1534.10.29
by Aaron Bentley
Fixed backup numbering to match GNU standard better |
234 |
'hello.txt.~1~']) |
1765.1.1
by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add. |
235 |
self.build_tree_contents([('.bzrignore', '*.~*\n')]) |
236 |
tree.add('.bzrignore') |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
237 |
self.assertEquals(list(tree.unknowns()), |
238 |
['hello.txt']) |
|
239 |
||
240 |
def test_initialize(self): |
|
241 |
# initialize should create a working tree and branch in an existing dir
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
242 |
t = self.make_branch_and_tree('.') |
1773.4.1
by Martin Pool
Add pyflakes makefile target; fix many warnings |
243 |
b = branch.Branch.open('.') |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
244 |
self.assertEqual(t.branch.base, b.base) |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
245 |
t2 = WorkingTree.open('.') |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
246 |
self.assertEqual(t.basedir, t2.basedir) |
247 |
self.assertEqual(b.base, t2.branch.base) |
|
248 |
# TODO maybe we should check the branch format? not sure if its
|
|
249 |
# appropriate here.
|
|
250 |
||
251 |
def test_rename_dirs(self): |
|
252 |
"""Test renaming directories and the files within them."""
|
|
253 |
wt = self.make_branch_and_tree('.') |
|
254 |
b = wt.branch |
|
255 |
self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file']) |
|
256 |
wt.add(['dir', 'dir/sub', 'dir/sub/file']) |
|
257 |
||
258 |
wt.commit('create initial state') |
|
259 |
||
6165.4.4
by Jelmer Vernooij
Avoid .revision_history(). |
260 |
revid = b.last_revision() |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
261 |
self.log('first revision_id is {%s}' % revid) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
262 |
|
5807.1.5
by Jelmer Vernooij
Fix more things to use tree objects. |
263 |
tree = b.repository.revision_tree(revid) |
264 |
self.log('contents of tree: %r' % list(tree.iter_entries_by_dir())) |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
265 |
|
5807.1.5
by Jelmer Vernooij
Fix more things to use tree objects. |
266 |
self.check_tree_shape(tree, ['dir/', 'dir/sub/', 'dir/sub/file']) |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
267 |
wt.rename_one('dir', 'newdir') |
268 |
||
2255.2.57
by Robert Collins
Dirstate test change: TestWorkingTree.test_rename_dirs should lock around accessing the trees inventory. |
269 |
wt.lock_read() |
5807.1.5
by Jelmer Vernooij
Fix more things to use tree objects. |
270 |
self.check_tree_shape(wt, |
2545.3.2
by James Westby
Add a test for check_inventory_shape. |
271 |
['newdir/', 'newdir/sub/', 'newdir/sub/file']) |
2255.2.57
by Robert Collins
Dirstate test change: TestWorkingTree.test_rename_dirs should lock around accessing the trees inventory. |
272 |
wt.unlock() |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
273 |
wt.rename_one('newdir/sub', 'newdir/newsub') |
2255.2.57
by Robert Collins
Dirstate test change: TestWorkingTree.test_rename_dirs should lock around accessing the trees inventory. |
274 |
wt.lock_read() |
5807.1.5
by Jelmer Vernooij
Fix more things to use tree objects. |
275 |
self.check_tree_shape(wt, ['newdir/', 'newdir/newsub/', |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
276 |
'newdir/newsub/file']) |
2255.2.57
by Robert Collins
Dirstate test change: TestWorkingTree.test_rename_dirs should lock around accessing the trees inventory. |
277 |
wt.unlock() |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
278 |
|
279 |
def test_add_in_unversioned(self): |
|
280 |
"""Try to add a file in an unversioned directory.
|
|
281 |
||
282 |
"bzr add" adds the parent as necessary, but simple working tree add
|
|
283 |
doesn't do that.
|
|
284 |
"""
|
|
285 |
from bzrlib.errors import NotVersionedError |
|
286 |
wt = self.make_branch_and_tree('.') |
|
287 |
self.build_tree(['foo/', |
|
288 |
'foo/hello']) |
|
6072.1.2
by Jelmer Vernooij
Fix versioned directories tests. |
289 |
if not wt._format.supports_versioned_directories: |
6072.1.1
by Jelmer Vernooij
Various fixes for tests of foreign plugins. |
290 |
wt.add('foo/hello') |
291 |
else: |
|
292 |
self.assertRaises(NotVersionedError, |
|
293 |
wt.add, |
|
294 |
'foo/hello') |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
295 |
|
296 |
def test_add_missing(self): |
|
297 |
# adding a msising file -> NoSuchFile
|
|
298 |
wt = self.make_branch_and_tree('.') |
|
299 |
self.assertRaises(errors.NoSuchFile, wt.add, 'fpp') |
|
300 |
||
301 |
def test_remove_verbose(self): |
|
302 |
#FIXME the remove api should not print or otherwise depend on the
|
|
303 |
# text UI - RBC 20060124
|
|
304 |
wt = self.make_branch_and_tree('.') |
|
305 |
self.build_tree(['hello']) |
|
306 |
wt.add(['hello']) |
|
307 |
wt.commit(message='add hello') |
|
308 |
stdout = StringIO() |
|
309 |
stderr = StringIO() |
|
310 |
self.assertEqual(None, self.apply_redirected(None, stdout, stderr, |
|
311 |
wt.remove, |
|
312 |
['hello'], |
|
313 |
verbose=True)) |
|
314 |
self.assertEqual('? hello\n', stdout.getvalue()) |
|
315 |
self.assertEqual('', stderr.getvalue()) |
|
316 |
||
317 |
def test_clone_trivial(self): |
|
318 |
wt = self.make_branch_and_tree('source') |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
319 |
cloned_dir = wt.bzrdir.clone('target') |
320 |
cloned = cloned_dir.open_workingtree() |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
321 |
self.assertEqual(cloned.get_parent_ids(), wt.get_parent_ids()) |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
322 |
|
6241.3.1
by Jelmer Vernooij
Support WorkingTree.clone() having its revision argument set to the NULL revision. |
323 |
def test_clone_empty(self): |
324 |
wt = self.make_branch_and_tree('source') |
|
325 |
cloned_dir = wt.bzrdir.clone('target', revision_id=_mod_revision.NULL_REVISION) |
|
326 |
cloned = cloned_dir.open_workingtree() |
|
327 |
self.assertEqual(cloned.get_parent_ids(), wt.get_parent_ids()) |
|
328 |
||
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
329 |
def test_last_revision(self): |
330 |
wt = self.make_branch_and_tree('source') |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
331 |
self.assertEqual([], wt.get_parent_ids()) |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
332 |
wt.commit('A', allow_pointless=True, rev_id='A') |
2249.5.7
by John Arbash Meinel
Make sure WorkingTree revision_ids are also returned as utf8 strings |
333 |
parent_ids = wt.get_parent_ids() |
334 |
self.assertEqual(['A'], parent_ids) |
|
335 |
for parent_id in parent_ids: |
|
336 |
self.assertIsInstance(parent_id, str) |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
337 |
|
338 |
def test_set_last_revision(self): |
|
339 |
wt = self.make_branch_and_tree('source') |
|
1908.1.1
by Robert Collins
Relax WorkingTree.set_last-revision to allow any revision to be set. |
340 |
# set last-revision to one not in the history
|
341 |
wt.set_last_revision('A') |
|
342 |
# set it back to None for an empty tree.
|
|
2598.5.3
by Aaron Bentley
Push NULL_REVISION deeper |
343 |
wt.set_last_revision('null:') |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
344 |
wt.commit('A', allow_pointless=True, rev_id='A') |
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
345 |
self.assertEqual(['A'], wt.get_parent_ids()) |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
346 |
# None is aways in the branch
|
2598.5.3
by Aaron Bentley
Push NULL_REVISION deeper |
347 |
wt.set_last_revision('null:') |
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
348 |
self.assertEqual([], wt.get_parent_ids()) |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
349 |
# and now we can set it to 'A'
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
350 |
# because some formats mutate the branch to set it on the tree
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
351 |
# we need to alter the branch to let this pass.
|
2230.3.27
by Aaron Bentley
Skip arbitrary revision-history test for Branch6 |
352 |
try: |
5718.8.9
by Jelmer Vernooij
Avoid using _set_revision_history as it's not present on older branch formats. |
353 |
self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)), |
354 |
wt.branch.set_revision_history, ['A', 'B']) |
|
2230.3.27
by Aaron Bentley
Skip arbitrary revision-history test for Branch6 |
355 |
except errors.NoSuchRevision, e: |
356 |
self.assertEqual('B', e.revision) |
|
357 |
raise TestSkipped("Branch format does not permit arbitrary" |
|
358 |
" history") |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
359 |
wt.set_last_revision('A') |
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
360 |
self.assertEqual(['A'], wt.get_parent_ids()) |
2229.2.1
by Aaron Bentley
Reject reserved ids in versiondfile, tree, branch and repository |
361 |
self.assertRaises(errors.ReservedId, wt.set_last_revision, 'A:') |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
362 |
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
363 |
def test_set_last_revision_different_to_branch(self): |
364 |
# working tree formats from the meta-dir format and newer support
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
365 |
# setting the last revision on a tree independently of that on the
|
366 |
# branch. Its concievable that some future formats may want to
|
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
367 |
# couple them again (i.e. because its really a smart server and
|
368 |
# the working tree will always match the branch). So we test
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
369 |
# that formats where initialising a branch does not initialise a
|
370 |
# tree - and thus have separable entities - support skewing the
|
|
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
371 |
# two things.
|
372 |
branch = self.make_branch('tree') |
|
373 |
try: |
|
374 |
# if there is a working tree now, this is not supported.
|
|
375 |
branch.bzrdir.open_workingtree() |
|
376 |
return
|
|
377 |
except errors.NoWorkingTree: |
|
378 |
pass
|
|
379 |
wt = branch.bzrdir.create_workingtree() |
|
380 |
wt.commit('A', allow_pointless=True, rev_id='A') |
|
381 |
wt.set_last_revision(None) |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
382 |
self.assertEqual([], wt.get_parent_ids()) |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
383 |
self.assertEqual('A', wt.branch.last_revision()) |
384 |
# and now we can set it back to 'A'
|
|
385 |
wt.set_last_revision('A') |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
386 |
self.assertEqual(['A'], wt.get_parent_ids()) |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
387 |
self.assertEqual('A', wt.branch.last_revision()) |
388 |
||
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
389 |
def test_clone_and_commit_preserves_last_revision(self): |
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
390 |
"""Doing a commit into a clone tree does not affect the source."""
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
391 |
wt = self.make_branch_and_tree('source') |
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
392 |
cloned_dir = wt.bzrdir.clone('target') |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
393 |
wt.commit('A', allow_pointless=True, rev_id='A') |
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
394 |
self.assertNotEqual(cloned_dir.open_workingtree().get_parent_ids(), |
395 |
wt.get_parent_ids()) |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
396 |
|
397 |
def test_clone_preserves_content(self): |
|
398 |
wt = self.make_branch_and_tree('source') |
|
2255.2.51
by John Arbash Meinel
simple rewrap for 79 char lines |
399 |
self.build_tree(['added', 'deleted', 'notadded'], |
400 |
transport=wt.bzrdir.transport.clone('..')) |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
401 |
wt.add('deleted', 'deleted') |
402 |
wt.commit('add deleted') |
|
403 |
wt.remove('deleted') |
|
404 |
wt.add('added', 'added') |
|
405 |
cloned_dir = wt.bzrdir.clone('target') |
|
406 |
cloned = cloned_dir.open_workingtree() |
|
407 |
cloned_transport = cloned.bzrdir.transport.clone('..') |
|
408 |
self.assertFalse(cloned_transport.has('deleted')) |
|
409 |
self.assertTrue(cloned_transport.has('added')) |
|
410 |
self.assertFalse(cloned_transport.has('notadded')) |
|
411 |
self.assertEqual('added', cloned.path2id('added')) |
|
412 |
self.assertEqual(None, cloned.path2id('deleted')) |
|
413 |
self.assertEqual(None, cloned.path2id('notadded')) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
414 |
|
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
415 |
def test_basis_tree_returns_last_revision(self): |
416 |
wt = self.make_branch_and_tree('.') |
|
417 |
self.build_tree(['foo']) |
|
418 |
wt.add('foo', 'foo-id') |
|
419 |
wt.commit('A', rev_id='A') |
|
420 |
wt.rename_one('foo', 'bar') |
|
421 |
wt.commit('B', rev_id='B') |
|
1908.6.3
by Robert Collins
Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis. |
422 |
wt.set_parent_ids(['B']) |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
423 |
tree = wt.basis_tree() |
2255.2.30
by Robert Collins
Some workingtree_implementations/test_workingtree.py test work - add DirStateRevisionTree.has_filename, locks around appropriate calls in tests. |
424 |
tree.lock_read() |
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
425 |
self.assertTrue(tree.has_filename('bar')) |
2255.2.30
by Robert Collins
Some workingtree_implementations/test_workingtree.py test work - add DirStateRevisionTree.has_filename, locks around appropriate calls in tests. |
426 |
tree.unlock() |
1908.6.3
by Robert Collins
Tidy up the last_revision_id and add_pending_merge conversion to use cleaner apis. |
427 |
wt.set_parent_ids(['A']) |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
428 |
tree = wt.basis_tree() |
2255.2.30
by Robert Collins
Some workingtree_implementations/test_workingtree.py test work - add DirStateRevisionTree.has_filename, locks around appropriate calls in tests. |
429 |
tree.lock_read() |
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
430 |
self.assertTrue(tree.has_filename('foo')) |
2255.2.30
by Robert Collins
Some workingtree_implementations/test_workingtree.py test work - add DirStateRevisionTree.has_filename, locks around appropriate calls in tests. |
431 |
tree.unlock() |
1534.4.46
by Robert Collins
Nearly complete .bzr/checkout splitout. |
432 |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
433 |
def test_clone_tree_revision(self): |
434 |
# make a tree with a last-revision,
|
|
435 |
# and clone it with a different last-revision, this should switch
|
|
436 |
# do it.
|
|
437 |
#
|
|
438 |
# also test that the content is merged
|
|
439 |
# and conflicts recorded.
|
|
440 |
# This should merge between the trees - local edits should be preserved
|
|
441 |
# but other changes occured.
|
|
442 |
# we test this by having one file that does
|
|
443 |
# not change between two revisions, and another that does -
|
|
444 |
# if the changed one is not changed, fail,
|
|
445 |
# if the one that did not change has lost a local change, fail.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
446 |
#
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
447 |
raise TestSkipped('revision limiting is not implemented yet.') |
1508.1.21
by Robert Collins
Implement -r limit for checkout command. |
448 |
|
449 |
def test_initialize_with_revision_id(self): |
|
450 |
# a bzrdir can construct a working tree for itself @ a specific revision.
|
|
451 |
source = self.make_branch_and_tree('source') |
|
452 |
source.commit('a', rev_id='a', allow_pointless=True) |
|
453 |
source.commit('b', rev_id='b', allow_pointless=True) |
|
454 |
self.build_tree(['new/']) |
|
455 |
made_control = self.bzrdir_format.initialize('new') |
|
456 |
source.branch.repository.clone(made_control) |
|
457 |
source.branch.clone(made_control) |
|
5051.3.10
by Jelmer Vernooij
Pass colocated branch name around in more places. |
458 |
made_tree = self.workingtree_format.initialize(made_control, |
459 |
revision_id='a') |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
460 |
self.assertEqual(['a'], made_tree.get_parent_ids()) |
1508.1.23
by Robert Collins
Test that the working tree last revision is indeed set during commit. |
461 |
|
6435.1.1
by Jelmer Vernooij
Add post_build_tree hook. |
462 |
def test_post_build_tree_hook(self): |
463 |
calls = [] |
|
464 |
def track_post_build_tree(tree): |
|
465 |
calls.append(tree.last_revision()) |
|
466 |
source = self.make_branch_and_tree('source') |
|
6435.1.2
by Jelmer Vernooij
Fix test against wt2. |
467 |
source.commit('a', rev_id='a', allow_pointless=True) |
468 |
source.commit('b', rev_id='b', allow_pointless=True) |
|
469 |
self.build_tree(['new/']) |
|
470 |
made_control = self.bzrdir_format.initialize('new') |
|
471 |
source.branch.repository.clone(made_control) |
|
472 |
source.branch.clone(made_control) |
|
6435.1.1
by Jelmer Vernooij
Add post_build_tree hook. |
473 |
MutableTree.hooks.install_named_hook("post_build_tree", |
474 |
track_post_build_tree, "Test") |
|
475 |
made_tree = self.workingtree_format.initialize(made_control, |
|
476 |
revision_id='a') |
|
477 |
self.assertEqual(['a'], calls) |
|
478 |
||
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
479 |
def test_update_sets_last_revision(self): |
480 |
# working tree formats from the meta-dir format and newer support
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
481 |
# setting the last revision on a tree independently of that on the
|
482 |
# branch. Its concievable that some future formats may want to
|
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
483 |
# couple them again (i.e. because its really a smart server and
|
484 |
# the working tree will always match the branch). So we test
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
485 |
# that formats where initialising a branch does not initialise a
|
486 |
# tree - and thus have separable entities - support skewing the
|
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
487 |
# two things.
|
488 |
main_branch = self.make_branch('tree') |
|
489 |
try: |
|
490 |
# if there is a working tree now, this is not supported.
|
|
491 |
main_branch.bzrdir.open_workingtree() |
|
492 |
return
|
|
493 |
except errors.NoWorkingTree: |
|
494 |
pass
|
|
495 |
wt = main_branch.bzrdir.create_workingtree() |
|
496 |
# create an out of date working tree by making a checkout in this
|
|
497 |
# current format
|
|
498 |
self.build_tree(['checkout/', 'tree/file']) |
|
499 |
checkout = bzrdir.BzrDirMetaFormat1().initialize('checkout') |
|
6437.7.3
by Jelmer Vernooij
Use ControlDir.set_branch_reference. |
500 |
checkout.set_branch_reference(main_branch) |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
501 |
old_tree = self.workingtree_format.initialize(checkout) |
502 |
# now commit to 'tree'
|
|
503 |
wt.add('file') |
|
504 |
wt.commit('A', rev_id='A') |
|
505 |
# and update old_tree
|
|
506 |
self.assertEqual(0, old_tree.update()) |
|
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
507 |
self.assertPathExists('checkout/file') |
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
508 |
self.assertEqual(['A'], old_tree.get_parent_ids()) |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
509 |
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
510 |
def test_update_sets_root_id(self): |
511 |
"""Ensure tree root is set properly by update.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
512 |
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
513 |
Since empty trees don't have root_ids, but workingtrees do,
|
514 |
an update of a checkout of revision 0 to a new revision, should set
|
|
515 |
the root id.
|
|
516 |
"""
|
|
517 |
wt = self.make_branch_and_tree('tree') |
|
518 |
main_branch = wt.branch |
|
519 |
# create an out of date working tree by making a checkout in this
|
|
520 |
# current format
|
|
521 |
self.build_tree(['checkout/', 'tree/file']) |
|
1731.1.43
by Aaron Bentley
Merge more checkout changes |
522 |
checkout = main_branch.create_checkout('checkout') |
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
523 |
# now commit to 'tree'
|
524 |
wt.add('file') |
|
525 |
wt.commit('A', rev_id='A') |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
526 |
# and update checkout
|
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
527 |
self.assertEqual(0, checkout.update()) |
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
528 |
self.assertPathExists('checkout/file') |
1731.1.33
by Aaron Bentley
Revert no-special-root changes |
529 |
self.assertEqual(wt.get_root_id(), checkout.get_root_id()) |
530 |
self.assertNotEqual(None, wt.get_root_id()) |
|
531 |
||
4634.123.1
by John Arbash Meinel
Add a failing test for 'update'. When this branch lands, update should work. |
532 |
def test_update_sets_updated_root_id(self): |
533 |
wt = self.make_branch_and_tree('tree') |
|
534 |
wt.set_root_id('first_root_id') |
|
535 |
self.assertEqual('first_root_id', wt.get_root_id()) |
|
536 |
self.build_tree(['tree/file']) |
|
537 |
wt.add(['file']) |
|
538 |
wt.commit('first') |
|
539 |
co = wt.branch.create_checkout('checkout') |
|
540 |
wt.set_root_id('second_root_id') |
|
541 |
wt.commit('second') |
|
542 |
self.assertEqual('second_root_id', wt.get_root_id()) |
|
543 |
self.assertEqual(0, co.update()) |
|
544 |
self.assertEqual('second_root_id', co.get_root_id()) |
|
545 |
||
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
546 |
def test_update_returns_conflict_count(self): |
547 |
# working tree formats from the meta-dir format and newer support
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
548 |
# setting the last revision on a tree independently of that on the
|
549 |
# branch. Its concievable that some future formats may want to
|
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
550 |
# couple them again (i.e. because its really a smart server and
|
551 |
# the working tree will always match the branch). So we test
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
552 |
# that formats where initialising a branch does not initialise a
|
553 |
# tree - and thus have separable entities - support skewing the
|
|
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
554 |
# two things.
|
555 |
main_branch = self.make_branch('tree') |
|
556 |
try: |
|
557 |
# if there is a working tree now, this is not supported.
|
|
558 |
main_branch.bzrdir.open_workingtree() |
|
559 |
return
|
|
560 |
except errors.NoWorkingTree: |
|
561 |
pass
|
|
562 |
wt = main_branch.bzrdir.create_workingtree() |
|
563 |
# create an out of date working tree by making a checkout in this
|
|
564 |
# current format
|
|
565 |
self.build_tree(['checkout/', 'tree/file']) |
|
566 |
checkout = bzrdir.BzrDirMetaFormat1().initialize('checkout') |
|
6437.7.3
by Jelmer Vernooij
Use ControlDir.set_branch_reference. |
567 |
checkout.set_branch_reference(main_branch) |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
568 |
old_tree = self.workingtree_format.initialize(checkout) |
569 |
# now commit to 'tree'
|
|
570 |
wt.add('file') |
|
571 |
wt.commit('A', rev_id='A') |
|
572 |
# and add a file file to the checkout
|
|
573 |
self.build_tree(['checkout/file']) |
|
574 |
old_tree.add('file') |
|
575 |
# and update old_tree
|
|
576 |
self.assertEqual(1, old_tree.update()) |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
577 |
self.assertEqual(['A'], old_tree.get_parent_ids()) |
1508.1.24
by Robert Collins
Add update command for use with checkouts. |
578 |
|
1534.7.199
by Aaron Bentley
Moved merge/revert tests into test_workingtree.py |
579 |
def test_merge_revert(self): |
580 |
from bzrlib.merge import merge_inner |
|
581 |
this = self.make_branch_and_tree('b1') |
|
4789.12.1
by John Arbash Meinel
Fix per_workingtree.test_workingtree.test_merge_revert |
582 |
self.build_tree_contents([('b1/a', 'a test\n'), ('b1/b', 'b test\n')]) |
583 |
this.add(['a', 'b']) |
|
1534.7.199
by Aaron Bentley
Moved merge/revert tests into test_workingtree.py |
584 |
this.commit(message='') |
585 |
base = this.bzrdir.clone('b2').open_workingtree() |
|
4789.12.1
by John Arbash Meinel
Fix per_workingtree.test_workingtree.test_merge_revert |
586 |
self.build_tree_contents([('b2/a', 'b test\n')]) |
1534.7.199
by Aaron Bentley
Moved merge/revert tests into test_workingtree.py |
587 |
other = this.bzrdir.clone('b3').open_workingtree() |
4789.12.1
by John Arbash Meinel
Fix per_workingtree.test_workingtree.test_merge_revert |
588 |
self.build_tree_contents([('b3/a', 'c test\n'), ('b3/c', 'c test\n')]) |
1534.7.199
by Aaron Bentley
Moved merge/revert tests into test_workingtree.py |
589 |
other.add('c') |
590 |
||
4789.12.1
by John Arbash Meinel
Fix per_workingtree.test_workingtree.test_merge_revert |
591 |
self.build_tree_contents([('b1/b', 'q test\n'), ('b1/d', 'd test\n')]) |
592 |
# Note: If we don't lock this before calling merge_inner, then we get a
|
|
593 |
# lock-contention failure. This probably indicates something
|
|
594 |
# weird going on inside merge_inner. Probably something about
|
|
595 |
# calling bt = this_tree.basis_tree() in one lock, and then
|
|
596 |
# locking both this_tree and bt separately, causing a dirstate
|
|
597 |
# locking race.
|
|
598 |
this.lock_write() |
|
599 |
self.addCleanup(this.unlock) |
|
1534.7.199
by Aaron Bentley
Moved merge/revert tests into test_workingtree.py |
600 |
merge_inner(this.branch, other, base, this_tree=this) |
4789.12.1
by John Arbash Meinel
Fix per_workingtree.test_workingtree.test_merge_revert |
601 |
a = open('b1/a', 'rb') |
602 |
try: |
|
603 |
self.assertNotEqual(a.read(), 'a test\n') |
|
604 |
finally: |
|
605 |
a.close() |
|
2748.3.2
by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified' |
606 |
this.revert() |
4789.12.1
by John Arbash Meinel
Fix per_workingtree.test_workingtree.test_merge_revert |
607 |
self.assertFileEqual('a test\n', 'b1/a') |
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
608 |
self.assertPathExists('b1/b.~1~') |
609 |
self.assertPathDoesNotExist('b1/c') |
|
610 |
self.assertPathDoesNotExist('b1/a.~1~') |
|
611 |
self.assertPathExists('b1/d') |
|
1534.7.200
by Aaron Bentley
Merge from mainline |
612 |
|
1587.1.10
by Robert Collins
update updates working tree and branch together. |
613 |
def test_update_updates_bound_branch_no_local_commits(self): |
614 |
# doing an update in a tree updates the branch its bound to too.
|
|
615 |
master_tree = self.make_branch_and_tree('master') |
|
616 |
tree = self.make_branch_and_tree('tree') |
|
617 |
try: |
|
618 |
tree.branch.bind(master_tree.branch) |
|
619 |
except errors.UpgradeRequired: |
|
620 |
# legacy branches cannot bind
|
|
621 |
return
|
|
622 |
master_tree.commit('foo', rev_id='foo', allow_pointless=True) |
|
623 |
tree.update() |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
624 |
self.assertEqual(['foo'], tree.get_parent_ids()) |
1587.1.10
by Robert Collins
update updates working tree and branch together. |
625 |
self.assertEqual('foo', tree.branch.last_revision()) |
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
626 |
|
627 |
def test_update_turns_local_commit_into_merge(self): |
|
628 |
# doing an update with a few local commits and no master commits
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
629 |
# makes pending-merges.
|
1587.1.13
by Robert Collins
Explain why update pivots more clearly in the relevant test. |
630 |
# this is done so that 'bzr update; bzr revert' will always produce
|
631 |
# an exact copy of the 'logical branch' - the referenced branch for
|
|
632 |
# a checkout, and the master for a bound branch.
|
|
633 |
# its possible that we should instead have 'bzr update' when there
|
|
634 |
# is nothing new on the master leave the current commits intact and
|
|
635 |
# alter 'revert' to revert to the master always. But for now, its
|
|
636 |
# good.
|
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
637 |
master_tree = self.make_branch_and_tree('master') |
1927.2.1
by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge. |
638 |
master_tip = master_tree.commit('first master commit') |
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
639 |
tree = self.make_branch_and_tree('tree') |
640 |
try: |
|
641 |
tree.branch.bind(master_tree.branch) |
|
642 |
except errors.UpgradeRequired: |
|
643 |
# legacy branches cannot bind
|
|
644 |
return
|
|
1927.2.1
by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge. |
645 |
# sync with master
|
646 |
tree.update() |
|
647 |
# work locally
|
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
648 |
tree.commit('foo', rev_id='foo', allow_pointless=True, local=True) |
649 |
tree.commit('bar', rev_id='bar', allow_pointless=True, local=True) |
|
1927.2.1
by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge. |
650 |
# sync with master prepatory to committing
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
651 |
tree.update() |
1927.2.1
by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge. |
652 |
# which should have pivoted the local tip into a merge
|
653 |
self.assertEqual([master_tip, 'bar'], tree.get_parent_ids()) |
|
1908.7.6
by Robert Collins
Deprecate WorkingTree.last_revision. |
654 |
# and the local branch history should match the masters now.
|
6165.4.4
by Jelmer Vernooij
Avoid .revision_history(). |
655 |
self.assertEqual(master_tree.branch.last_revision(), |
656 |
tree.branch.last_revision()) |
|
1587.1.11
by Robert Collins
Local commits appear to be working properly. |
657 |
|
4916.1.7
by Martin Pool
Add per_workingtree test you can update to arbitrary revisions |
658 |
def test_update_takes_revision_parameter(self): |
659 |
wt = self.make_branch_and_tree('wt') |
|
660 |
self.build_tree_contents([('wt/a', 'old content')]) |
|
661 |
wt.add(['a']) |
|
662 |
rev1 = wt.commit('first master commit') |
|
663 |
self.build_tree_contents([('wt/a', 'new content')]) |
|
664 |
rev2 = wt.commit('second master commit') |
|
5243.1.2
by Martin
Point launchpad links in comments at production server rather than edge |
665 |
# https://bugs.launchpad.net/bzr/+bug/45719/comments/20
|
4916.1.7
by Martin Pool
Add per_workingtree test you can update to arbitrary revisions |
666 |
# when adding 'update -r' we should make sure all wt formats support
|
667 |
# it
|
|
668 |
conflicts = wt.update(revision=rev1) |
|
669 |
self.assertFileEqual('old content', 'wt/a') |
|
670 |
self.assertEqual([rev1], wt.get_parent_ids()) |
|
671 |
||
2255.2.156
by Martin Pool
Merge WorkingTree implementation back from trunk |
672 |
def test_merge_modified_detects_corruption(self): |
673 |
# FIXME: This doesn't really test that it works; also this is not
|
|
674 |
# implementation-independent. mbp 20070226
|
|
1558.3.3
by Aaron Bentley
Fix error handling for merge_modified |
675 |
tree = self.make_branch_and_tree('master') |
6072.1.1
by Jelmer Vernooij
Various fixes for tests of foreign plugins. |
676 |
if not isinstance(tree, InventoryWorkingTree): |
677 |
raise TestNotApplicable("merge-hashes is specific to bzr " |
|
678 |
"working trees") |
|
3407.2.7
by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes. |
679 |
tree._transport.put_bytes('merge-hashes', 'asdfasdf') |
1558.3.3
by Aaron Bentley
Fix error handling for merge_modified |
680 |
self.assertRaises(errors.MergeModifiedFormatError, tree.merge_modified) |
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
681 |
|
2298.1.1
by Martin Pool
Add test for merge_modified |
682 |
def test_merge_modified(self): |
683 |
# merge_modified stores a map from file id to hash
|
|
684 |
tree = self.make_branch_and_tree('tree') |
|
685 |
d = {'file-id': osutils.sha_string('hello')} |
|
686 |
self.build_tree_contents([('tree/somefile', 'hello')]) |
|
687 |
tree.lock_write() |
|
688 |
try: |
|
689 |
tree.add(['somefile'], ['file-id']) |
|
690 |
tree.set_merge_modified(d) |
|
691 |
mm = tree.merge_modified() |
|
692 |
self.assertEquals(mm, d) |
|
693 |
finally: |
|
694 |
tree.unlock() |
|
695 |
mm = tree.merge_modified() |
|
696 |
self.assertEquals(mm, d) |
|
697 |
||
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
698 |
def test_conflicts(self): |
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
699 |
from bzrlib.tests.test_conflicts import example_conflicts |
700 |
tree = self.make_branch_and_tree('master') |
|
701 |
try: |
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
702 |
tree.set_conflicts(example_conflicts) |
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
703 |
except UnsupportedOperation: |
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
704 |
raise TestSkipped('set_conflicts not supported') |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
705 |
|
1534.10.8
by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree |
706 |
tree2 = WorkingTree.open('master') |
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
707 |
self.assertEqual(tree2.conflicts(), example_conflicts) |
3407.2.7
by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes. |
708 |
tree2._transport.put_bytes('conflicts', '') |
709 |
self.assertRaises(errors.ConflictFormatError, |
|
1955.3.14
by John Arbash Meinel
Correctly fix the workingtree put() test fixes |
710 |
tree2.conflicts) |
3407.2.7
by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes. |
711 |
tree2._transport.put_bytes('conflicts', 'a') |
712 |
self.assertRaises(errors.ConflictFormatError, |
|
1955.3.14
by John Arbash Meinel
Correctly fix the workingtree put() test fixes |
713 |
tree2.conflicts) |
1534.10.12
by Aaron Bentley
Merge produces new conflicts |
714 |
|
715 |
def make_merge_conflicts(self): |
|
2255.2.32
by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working |
716 |
from bzrlib.merge import merge_inner |
1534.10.12
by Aaron Bentley
Merge produces new conflicts |
717 |
tree = self.make_branch_and_tree('mine') |
6437.20.3
by Wouter van Heyst
mechanically replace file().write() pattern with a with-keyword version |
718 |
with file('mine/bloo', 'wb') as f: f.write('one') |
719 |
with file('mine/blo', 'wb') as f: f.write('on') |
|
2255.2.32
by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working |
720 |
tree.add(['bloo', 'blo']) |
1534.10.12
by Aaron Bentley
Merge produces new conflicts |
721 |
tree.commit("blah", allow_pointless=False) |
2255.5.3
by John Arbash Meinel
XXX Workaround the DirStateRevisionTree bug until we get a proper fix, tests pass again |
722 |
base = tree.branch.repository.revision_tree(tree.last_revision()) |
6472.2.2
by Jelmer Vernooij
Use controldir rather than bzrdir in a couple more places. |
723 |
controldir.ControlDir.open("mine").sprout("other") |
6437.20.3
by Wouter van Heyst
mechanically replace file().write() pattern with a with-keyword version |
724 |
with file('other/bloo', 'wb') as f: f.write('two') |
1534.10.12
by Aaron Bentley
Merge produces new conflicts |
725 |
othertree = WorkingTree.open('other') |
726 |
othertree.commit('blah', allow_pointless=False) |
|
6437.20.3
by Wouter van Heyst
mechanically replace file().write() pattern with a with-keyword version |
727 |
with file('mine/bloo', 'wb') as f: f.write('three') |
1534.10.12
by Aaron Bentley
Merge produces new conflicts |
728 |
tree.commit("blah", allow_pointless=False) |
729 |
merge_inner(tree.branch, othertree, base, this_tree=tree) |
|
730 |
return tree |
|
731 |
||
732 |
def test_merge_conflicts(self): |
|
733 |
tree = self.make_merge_conflicts() |
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
734 |
self.assertEqual(len(tree.conflicts()), 1) |
1534.10.12
by Aaron Bentley
Merge produces new conflicts |
735 |
|
736 |
def test_clear_merge_conflicts(self): |
|
737 |
tree = self.make_merge_conflicts() |
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
738 |
self.assertEqual(len(tree.conflicts()), 1) |
1534.10.12
by Aaron Bentley
Merge produces new conflicts |
739 |
try: |
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
740 |
tree.set_conflicts(ConflictList()) |
1534.10.12
by Aaron Bentley
Merge produces new conflicts |
741 |
except UnsupportedOperation: |
2949.5.1
by Alexander Belchenko
selftest: use SymlinkFeature instead of TestSkipped where appropriate |
742 |
raise TestSkipped('unsupported operation') |
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
743 |
self.assertEqual(tree.conflicts(), ConflictList()) |
1534.10.14
by Aaron Bentley
Made revert clear conflicts |
744 |
|
1551.7.11
by Aaron Bentley
Add WorkingTree.add_conflicts |
745 |
def test_add_conflicts(self): |
746 |
tree = self.make_branch_and_tree('tree') |
|
747 |
try: |
|
748 |
tree.add_conflicts([TextConflict('path_a')]) |
|
749 |
except UnsupportedOperation: |
|
2949.5.1
by Alexander Belchenko
selftest: use SymlinkFeature instead of TestSkipped where appropriate |
750 |
raise TestSkipped('unsupported operation') |
1551.7.13
by Aaron Bentley
Switched from actual, expected to expected, actual, for John. |
751 |
self.assertEqual(ConflictList([TextConflict('path_a')]), |
752 |
tree.conflicts()) |
|
1551.7.11
by Aaron Bentley
Add WorkingTree.add_conflicts |
753 |
tree.add_conflicts([TextConflict('path_a')]) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
754 |
self.assertEqual(ConflictList([TextConflict('path_a')]), |
1551.7.13
by Aaron Bentley
Switched from actual, expected to expected, actual, for John. |
755 |
tree.conflicts()) |
1551.7.11
by Aaron Bentley
Add WorkingTree.add_conflicts |
756 |
tree.add_conflicts([ContentsConflict('path_a')]) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
757 |
self.assertEqual(ConflictList([ContentsConflict('path_a'), |
1551.7.13
by Aaron Bentley
Switched from actual, expected to expected, actual, for John. |
758 |
TextConflict('path_a')]), |
759 |
tree.conflicts()) |
|
1551.7.11
by Aaron Bentley
Add WorkingTree.add_conflicts |
760 |
tree.add_conflicts([TextConflict('path_b')]) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
761 |
self.assertEqual(ConflictList([ContentsConflict('path_a'), |
1551.7.11
by Aaron Bentley
Add WorkingTree.add_conflicts |
762 |
TextConflict('path_a'), |
1551.7.13
by Aaron Bentley
Switched from actual, expected to expected, actual, for John. |
763 |
TextConflict('path_b')]), |
764 |
tree.conflicts()) |
|
1551.7.11
by Aaron Bentley
Add WorkingTree.add_conflicts |
765 |
|
1534.10.14
by Aaron Bentley
Made revert clear conflicts |
766 |
def test_revert_clear_conflicts(self): |
767 |
tree = self.make_merge_conflicts() |
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
768 |
self.assertEqual(len(tree.conflicts()), 1) |
1534.10.14
by Aaron Bentley
Made revert clear conflicts |
769 |
tree.revert(["blo"]) |
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
770 |
self.assertEqual(len(tree.conflicts()), 1) |
1534.10.14
by Aaron Bentley
Made revert clear conflicts |
771 |
tree.revert(["bloo"]) |
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
772 |
self.assertEqual(len(tree.conflicts()), 0) |
1534.10.14
by Aaron Bentley
Made revert clear conflicts |
773 |
|
774 |
def test_revert_clear_conflicts2(self): |
|
775 |
tree = self.make_merge_conflicts() |
|
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
776 |
self.assertEqual(len(tree.conflicts()), 1) |
2748.3.2
by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified' |
777 |
tree.revert() |
1534.10.22
by Aaron Bentley
Got ConflictList implemented |
778 |
self.assertEqual(len(tree.conflicts()), 0) |
1624.3.22
by Olaf Conradi
Merge bzr.dev |
779 |
|
1624.3.19
by Olaf Conradi
New call get_format_description to give a user-friendly description of a |
780 |
def test_format_description(self): |
781 |
tree = self.make_branch_and_tree('tree') |
|
782 |
text = tree._format.get_format_description() |
|
5784.1.1
by Martin Pool
Stop using failIf, failUnless, etc |
783 |
self.assertTrue(len(text)) |
1681.1.1
by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins) |
784 |
|
785 |
def test_branch_attribute_is_not_settable(self): |
|
786 |
# the branch attribute is an aspect of the working tree, not a
|
|
787 |
# configurable attribute
|
|
788 |
tree = self.make_branch_and_tree('tree') |
|
789 |
def set_branch(): |
|
790 |
tree.branch = tree.branch |
|
791 |
self.assertRaises(AttributeError, set_branch) |
|
792 |
||
1713.3.1
by Robert Collins
Smoke tests for tree.list_files and bzr ignored when a versioned file matches an ignore rule. |
793 |
def test_list_files_versioned_before_ignored(self): |
794 |
"""A versioned file matching an ignore rule should not be ignored."""
|
|
795 |
tree = self.make_branch_and_tree('.') |
|
796 |
self.build_tree(['foo.pyc']) |
|
797 |
# ensure that foo.pyc is ignored
|
|
798 |
self.build_tree_contents([('.bzrignore', 'foo.pyc')]) |
|
799 |
tree.add('foo.pyc', 'anid') |
|
2255.2.52
by Robert Collins
Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory. |
800 |
tree.lock_read() |
1713.3.1
by Robert Collins
Smoke tests for tree.list_files and bzr ignored when a versioned file matches an ignore rule. |
801 |
files = sorted(list(tree.list_files())) |
2255.2.52
by Robert Collins
Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory. |
802 |
tree.unlock() |
1713.3.1
by Robert Collins
Smoke tests for tree.list_files and bzr ignored when a versioned file matches an ignore rule. |
803 |
self.assertEqual((u'.bzrignore', '?', 'file', None), files[0][:-1]) |
804 |
self.assertEqual((u'foo.pyc', 'V', 'file', 'anid'), files[1][:-1]) |
|
805 |
self.assertEqual(2, len(files)) |
|
1711.8.2
by John Arbash Meinel
Test that WorkingTree locks Branch before self, and unlocks self before Branch |
806 |
|
1830.3.7
by John Arbash Meinel
Check that WorkingTree.add does the right thing. |
807 |
def test_non_normalized_add_accessible(self): |
808 |
try: |
|
809 |
self.build_tree([u'a\u030a']) |
|
810 |
except UnicodeError: |
|
811 |
raise TestSkipped('Filesystem does not support unicode filenames') |
|
812 |
tree = self.make_branch_and_tree('.') |
|
813 |
orig = osutils.normalized_filename |
|
814 |
osutils.normalized_filename = osutils._accessible_normalized_filename |
|
815 |
try: |
|
816 |
tree.add([u'a\u030a']) |
|
2255.2.58
by Robert Collins
Fix the way we used osutils.normalized_filename in dirstate to support overriding in tests - and document this in the original location it was used. |
817 |
tree.lock_read() |
1907.1.3
by Aaron Bentley
Fixed unicode test cases |
818 |
self.assertEqual([('', 'directory'), (u'\xe5', 'file')], |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
819 |
[(path, ie.kind) for path,ie in |
5807.1.2
by Jelmer Vernooij
Skip some inventory-specific tests for non-inventory working trees. |
820 |
tree.iter_entries_by_dir()]) |
2255.2.58
by Robert Collins
Fix the way we used osutils.normalized_filename in dirstate to support overriding in tests - and document this in the original location it was used. |
821 |
tree.unlock() |
1830.3.7
by John Arbash Meinel
Check that WorkingTree.add does the right thing. |
822 |
finally: |
823 |
osutils.normalized_filename = orig |
|
824 |
||
825 |
def test_non_normalized_add_inaccessible(self): |
|
826 |
try: |
|
827 |
self.build_tree([u'a\u030a']) |
|
828 |
except UnicodeError: |
|
829 |
raise TestSkipped('Filesystem does not support unicode filenames') |
|
830 |
tree = self.make_branch_and_tree('.') |
|
831 |
orig = osutils.normalized_filename |
|
832 |
osutils.normalized_filename = osutils._inaccessible_normalized_filename |
|
833 |
try: |
|
834 |
self.assertRaises(errors.InvalidNormalization, |
|
835 |
tree.add, [u'a\u030a']) |
|
836 |
finally: |
|
837 |
osutils.normalized_filename = orig |
|
2123.3.9
by Steffen Eichenberg
added tests for deprecated API workingtree.move |
838 |
|
1852.15.14
by Robert Collins
test that WorkingTree._write_inventory works as expected by the current code. |
839 |
def test__write_inventory(self): |
840 |
# The private interface _write_inventory is currently used by transform.
|
|
841 |
tree = self.make_branch_and_tree('.') |
|
5807.1.2
by Jelmer Vernooij
Skip some inventory-specific tests for non-inventory working trees. |
842 |
if not isinstance(tree, InventoryWorkingTree): |
843 |
raise TestNotApplicable("_write_inventory does not exist on " |
|
844 |
"non-inventory working trees") |
|
1852.15.14
by Robert Collins
test that WorkingTree._write_inventory works as expected by the current code. |
845 |
# if we write write an inventory then do a walkdirs we should get back
|
846 |
# missing entries, and actual, and unknowns as appropriate.
|
|
847 |
self.build_tree(['present', 'unknown']) |
|
2946.3.3
by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('') |
848 |
inventory = Inventory(tree.get_root_id()) |
1852.15.14
by Robert Collins
test that WorkingTree._write_inventory works as expected by the current code. |
849 |
inventory.add_path('missing', 'file', 'missing-id') |
850 |
inventory.add_path('present', 'file', 'present-id') |
|
2255.2.28
by Robert Collins
TestWorkingTree.test__write_inventory needs to lock the tree before calling _write_inventory for dirstate. |
851 |
# there is no point in being able to write an inventory to an unlocked
|
852 |
# tree object - its a low level api not a convenience api.
|
|
853 |
tree.lock_write() |
|
1852.15.14
by Robert Collins
test that WorkingTree._write_inventory works as expected by the current code. |
854 |
tree._write_inventory(inventory) |
2255.2.28
by Robert Collins
TestWorkingTree.test__write_inventory needs to lock the tree before calling _write_inventory for dirstate. |
855 |
tree.unlock() |
1852.15.14
by Robert Collins
test that WorkingTree._write_inventory works as expected by the current code. |
856 |
tree.lock_read() |
857 |
try: |
|
858 |
present_stat = os.lstat('present') |
|
859 |
unknown_stat = os.lstat('unknown') |
|
860 |
expected_results = [ |
|
2946.3.3
by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('') |
861 |
(('', tree.get_root_id()), |
1852.15.14
by Robert Collins
test that WorkingTree._write_inventory works as expected by the current code. |
862 |
[('missing', 'missing', 'unknown', None, 'missing-id', 'file'), |
863 |
('present', 'present', 'file', present_stat, 'present-id', 'file'), |
|
864 |
('unknown', 'unknown', 'file', unknown_stat, None, None), |
|
865 |
]
|
|
866 |
)]
|
|
867 |
self.assertEqual(expected_results, list(tree.walkdirs())) |
|
868 |
finally: |
|
869 |
tree.unlock() |
|
2255.7.56
by Robert Collins
Document behaviour of tree.path2id("path/"). |
870 |
|
871 |
def test_path2id(self): |
|
2255.7.62
by Robert Collins
Update the Tree.filter_unversioned_files docstring to reflect what the existing implementations actually do, and change the WorkingTree4 implementation to match a newly created test for it. |
872 |
# smoke test for path2id
|
2255.7.56
by Robert Collins
Document behaviour of tree.path2id("path/"). |
873 |
tree = self.make_branch_and_tree('.') |
874 |
self.build_tree(['foo']) |
|
875 |
tree.add(['foo'], ['foo-id']) |
|
876 |
self.assertEqual('foo-id', tree.path2id('foo')) |
|
877 |
# the next assertion is for backwards compatability with WorkingTree3,
|
|
878 |
# though its probably a bad idea, it makes things work. Perhaps
|
|
879 |
# it should raise a deprecation warning?
|
|
880 |
self.assertEqual('foo-id', tree.path2id('foo/')) |
|
2255.7.62
by Robert Collins
Update the Tree.filter_unversioned_files docstring to reflect what the existing implementations actually do, and change the WorkingTree4 implementation to match a newly created test for it. |
881 |
|
882 |
def test_filter_unversioned_files(self): |
|
883 |
# smoke test for filter_unversioned_files
|
|
884 |
tree = self.make_branch_and_tree('.') |
|
885 |
paths = ['here-and-versioned', 'here-and-not-versioned', |
|
886 |
'not-here-and-versioned', 'not-here-and-not-versioned'] |
|
887 |
tree.add(['here-and-versioned', 'not-here-and-versioned'], |
|
888 |
kinds=['file', 'file']) |
|
889 |
self.build_tree(['here-and-versioned', 'here-and-not-versioned']) |
|
890 |
tree.lock_read() |
|
891 |
self.addCleanup(tree.unlock) |
|
892 |
self.assertEqual( |
|
893 |
set(['not-here-and-not-versioned', 'here-and-not-versioned']), |
|
894 |
tree.filter_unversioned_files(paths)) |
|
2255.2.200
by Martin Pool
Add simple test for WorkingTree.kind |
895 |
|
896 |
def test_detect_real_kind(self): |
|
897 |
# working trees report the real kind of the file on disk, not the kind
|
|
898 |
# they had when they were first added
|
|
899 |
# create one file of every interesting type
|
|
900 |
tree = self.make_branch_and_tree('.') |
|
4100.2.2
by Aaron Bentley
Remove locking decorator |
901 |
tree.lock_write() |
902 |
self.addCleanup(tree.unlock) |
|
2255.2.200
by Martin Pool
Add simple test for WorkingTree.kind |
903 |
self.build_tree(['file', 'directory/']) |
904 |
names = ['file', 'directory'] |
|
905 |
if has_symlinks(): |
|
906 |
os.symlink('target', 'symlink') |
|
907 |
names.append('symlink') |
|
908 |
tree.add(names, [n + '-id' for n in names]) |
|
909 |
# now when we first look, we should see everything with the same kind
|
|
910 |
# with which they were initially added
|
|
911 |
for n in names: |
|
912 |
actual_kind = tree.kind(n + '-id') |
|
913 |
self.assertEqual(n, actual_kind) |
|
914 |
# move them around so the names no longer correspond to the types
|
|
915 |
os.rename(names[0], 'tmp') |
|
916 |
for i in range(1, len(names)): |
|
917 |
os.rename(names[i], names[i-1]) |
|
918 |
os.rename('tmp', names[-1]) |
|
2255.2.202
by Martin Pool
WorkingTree_4.kind should report tree-references if they're |
919 |
# now look and expect to see the correct types again
|
920 |
for i in range(len(names)): |
|
921 |
actual_kind = tree.kind(names[i-1] + '-id') |
|
922 |
expected_kind = names[i] |
|
923 |
self.assertEqual(expected_kind, actual_kind) |
|
2499.3.1
by Aaron Bentley
Fix Workingtree4.get_file_sha1 on missing files |
924 |
|
3146.8.4
by Aaron Bentley
Eliminate direct use of inventory from transform application |
925 |
def test_stored_kind_with_missing(self): |
926 |
tree = self.make_branch_and_tree('tree') |
|
927 |
tree.lock_write() |
|
928 |
self.addCleanup(tree.unlock) |
|
929 |
self.build_tree(['tree/a', 'tree/b/']) |
|
930 |
tree.add(['a', 'b'], ['a-id', 'b-id']) |
|
931 |
os.unlink('tree/a') |
|
932 |
os.rmdir('tree/b') |
|
933 |
self.assertEqual('file', tree.stored_kind('a-id')) |
|
934 |
self.assertEqual('directory', tree.stored_kind('b-id')) |
|
935 |
||
2499.3.1
by Aaron Bentley
Fix Workingtree4.get_file_sha1 on missing files |
936 |
def test_missing_file_sha1(self): |
937 |
"""If a file is missing, its sha1 should be reported as None."""
|
|
938 |
tree = self.make_branch_and_tree('.') |
|
939 |
tree.lock_write() |
|
940 |
self.addCleanup(tree.unlock) |
|
941 |
self.build_tree(['file']) |
|
942 |
tree.add('file', 'file-id') |
|
943 |
tree.commit('file added') |
|
944 |
os.unlink('file') |
|
945 |
self.assertIs(None, tree.get_file_sha1('file-id')) |
|
1551.15.56
by Aaron Bentley
Raise NoSuchId when get_file_sha1 is invoked with a baed file id |
946 |
|
947 |
def test_no_file_sha1(self): |
|
948 |
"""If a file is not present, get_file_sha1 should raise NoSuchId"""
|
|
949 |
tree = self.make_branch_and_tree('.') |
|
950 |
tree.lock_write() |
|
951 |
self.addCleanup(tree.unlock) |
|
952 |
self.assertRaises(errors.NoSuchId, tree.get_file_sha1, 'file-id') |
|
953 |
self.build_tree(['file']) |
|
954 |
tree.add('file', 'file-id') |
|
955 |
tree.commit('foo') |
|
956 |
tree.remove('file') |
|
957 |
self.assertRaises(errors.NoSuchId, tree.get_file_sha1, 'file-id') |
|
3034.4.5
by Aaron Bentley
Add workingtree test for case_insensitive var |
958 |
|
959 |
def test_case_sensitive(self): |
|
960 |
"""If filesystem is case-sensitive, tree should report this.
|
|
961 |
||
962 |
We check case-sensitivity by creating a file with a lowercase name,
|
|
963 |
then testing whether it exists with an uppercase name.
|
|
964 |
"""
|
|
3034.4.9
by Alexander Belchenko
skip test_workingtree.TestWorkingTree.test_case_sensitive for WT2 |
965 |
self.build_tree(['filename']) |
3034.4.5
by Aaron Bentley
Add workingtree test for case_insensitive var |
966 |
if os.path.exists('FILENAME'): |
967 |
case_sensitive = False |
|
968 |
else: |
|
969 |
case_sensitive = True |
|
970 |
tree = self.make_branch_and_tree('test') |
|
971 |
self.assertEqual(case_sensitive, tree.case_sensitive) |
|
6113.1.1
by Jelmer Vernooij
Skip some tests against foreign formats. |
972 |
if not isinstance(tree, InventoryWorkingTree): |
973 |
raise TestNotApplicable("get_format_string is only available " |
|
974 |
"on bzr working trees") |
|
5632.1.1
by John Arbash Meinel
Make case_sensitive_filename an attribute of the format. |
975 |
# now we cheat, and make a file that matches the case-sensitive name
|
976 |
t = tree.bzrdir.get_workingtree_transport(None) |
|
977 |
try: |
|
978 |
content = tree._format.get_format_string() |
|
979 |
except NotImplementedError: |
|
980 |
# All-in-one formats didn't have a separate format string.
|
|
981 |
content = tree.bzrdir._format.get_format_string() |
|
982 |
t.put_bytes(tree._format.case_sensitive_filename, content) |
|
983 |
tree = tree.bzrdir.open_workingtree() |
|
984 |
self.assertFalse(tree.case_sensitive) |
|
3146.8.2
by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case |
985 |
|
6379.7.1
by Jelmer Vernooij
Add and use WorkingTree._supports_executable. |
986 |
def test_supports_executable(self): |
987 |
self.build_tree(['filename']) |
|
988 |
tree = self.make_branch_and_tree('.') |
|
989 |
tree.add('filename') |
|
990 |
self.assertIsInstance(tree._supports_executable(), bool) |
|
991 |
if tree._supports_executable(): |
|
992 |
tree.lock_read() |
|
993 |
try: |
|
994 |
self.assertFalse(tree.is_executable(tree.path2id('filename'))) |
|
995 |
finally: |
|
996 |
tree.unlock() |
|
997 |
os.chmod('filename', 0755) |
|
998 |
self.addCleanup(tree.lock_read().unlock) |
|
999 |
self.assertTrue(tree.is_executable(tree.path2id('filename'))) |
|
1000 |
else: |
|
1001 |
self.addCleanup(tree.lock_read().unlock) |
|
1002 |
self.assertFalse(tree.is_executable(tree.path2id('filename'))) |
|
1003 |
||
3146.8.16
by Aaron Bentley
Updates from review |
1004 |
def test_all_file_ids_with_missing(self): |
3146.8.2
by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case |
1005 |
tree = self.make_branch_and_tree('tree') |
1006 |
tree.lock_write() |
|
1007 |
self.addCleanup(tree.unlock) |
|
1008 |
self.build_tree(['tree/a', 'tree/b']) |
|
1009 |
tree.add(['a', 'b'], ['a-id', 'b-id']) |
|
1010 |
os.unlink('tree/a') |
|
1011 |
self.assertEqual(set(['a-id', 'b-id', tree.get_root_id()]), |
|
3146.8.16
by Aaron Bentley
Updates from review |
1012 |
tree.all_file_ids()) |
3146.8.19
by Aaron Bentley
Merge with bzr.dev |
1013 |
|
3136.1.10
by Aaron Bentley
Clean error if filesystem does not support hard-links |
1014 |
def test_sprout_hardlink(self): |
3619.6.9
by Mark Hammond
Move check for os.link to the start of the test |
1015 |
real_os_link = getattr(os, 'link', None) |
1016 |
if real_os_link is None: |
|
1017 |
raise TestNotApplicable("This platform doesn't provide os.link") |
|
3136.1.10
by Aaron Bentley
Clean error if filesystem does not support hard-links |
1018 |
source = self.make_branch_and_tree('source') |
1019 |
self.build_tree(['source/file']) |
|
1020 |
source.add('file') |
|
1021 |
source.commit('added file') |
|
1022 |
def fake_link(source, target): |
|
1023 |
raise OSError(errno.EPERM, 'Operation not permitted') |
|
1024 |
os.link = fake_link |
|
1025 |
try: |
|
1026 |
# Hard-link support is optional, so supplying hardlink=True may
|
|
1027 |
# or may not raise an exception. But if it does, it must be
|
|
1028 |
# HardLinkNotSupported
|
|
1029 |
try: |
|
1030 |
source.bzrdir.sprout('target', accelerator_tree=source, |
|
1031 |
hardlink=True) |
|
1032 |
except errors.HardLinkNotSupported: |
|
1033 |
pass
|
|
1034 |
finally: |
|
1035 |
os.link = real_os_link |
|
3287.20.3
by John Arbash Meinel
Aaron recommended to make this a WT_impl test. |
1036 |
|
1037 |
||
4985.3.18
by Vincent Ladeuil
Start rewriting the test. |
1038 |
class TestWorkingTreeUpdate(TestCaseWithWorkingTree): |
1039 |
||
1040 |
def make_diverged_master_branch(self): |
|
1041 |
"""
|
|
1042 |
B: wt.branch.last_revision()
|
|
1043 |
M: wt.branch.get_master_branch().last_revision()
|
|
1044 |
W: wt.last_revision()
|
|
1045 |
||
1046 |
||
1047 |
1
|
|
1048 |
|\
|
|
1049 |
B-2 3
|
|
1050 |
| |
|
|
1051 |
4 5-M
|
|
1052 |
|
|
|
1053 |
W
|
|
6162.3.2
by Jelmer Vernooij
Add WorkingTreeFormat.get_controldir_for_branch(). |
1054 |
"""
|
1055 |
format = self.workingtree_format.get_controldir_for_branch() |
|
1056 |
builder = self.make_branch_builder(".", format=format) |
|
4985.3.18
by Vincent Ladeuil
Start rewriting the test. |
1057 |
builder.start_series() |
1058 |
# mainline
|
|
1059 |
builder.build_snapshot( |
|
1060 |
'1', None, |
|
1061 |
[('add', ('', 'root-id', 'directory', '')), |
|
1062 |
('add', ('file1', 'file1-id', 'file', 'file1 content\n'))]) |
|
1063 |
# branch
|
|
1064 |
builder.build_snapshot('2', ['1'], []) |
|
1065 |
builder.build_snapshot( |
|
1066 |
'4', ['2'], |
|
1067 |
[('add', ('file4', 'file4-id', 'file', 'file4 content\n'))]) |
|
1068 |
# master
|
|
1069 |
builder.build_snapshot('3', ['1'], []) |
|
1070 |
builder.build_snapshot( |
|
1071 |
'5', ['3'], |
|
1072 |
[('add', ('file5', 'file5-id', 'file', 'file5 content\n'))]) |
|
1073 |
builder.finish_series() |
|
1074 |
return builder, builder._branch.last_revision() |
|
1075 |
||
4985.3.21
by Vincent Ladeuil
Final cleanup. |
1076 |
def make_checkout_and_master(self, builder, wt_path, master_path, wt_revid, |
1077 |
master_revid=None, branch_revid=None): |
|
1078 |
"""Build a lightweight checkout and its master branch."""
|
|
1079 |
if master_revid is None: |
|
1080 |
master_revid = wt_revid |
|
1081 |
if branch_revid is None: |
|
1082 |
branch_revid = master_revid |
|
4985.3.18
by Vincent Ladeuil
Start rewriting the test. |
1083 |
final_branch = builder.get_branch() |
1084 |
# The master branch
|
|
4985.3.21
by Vincent Ladeuil
Final cleanup. |
1085 |
master = final_branch.bzrdir.sprout(master_path, |
1086 |
master_revid).open_branch() |
|
1087 |
# The checkout
|
|
1088 |
wt = self.make_branch_and_tree(wt_path) |
|
1089 |
wt.pull(final_branch, stop_revision=wt_revid) |
|
1090 |
wt.branch.pull(final_branch, stop_revision=branch_revid, overwrite=True) |
|
4985.3.18
by Vincent Ladeuil
Start rewriting the test. |
1091 |
try: |
4985.3.21
by Vincent Ladeuil
Final cleanup. |
1092 |
wt.branch.bind(master) |
4985.3.18
by Vincent Ladeuil
Start rewriting the test. |
1093 |
except errors.UpgradeRequired: |
4985.3.21
by Vincent Ladeuil
Final cleanup. |
1094 |
raise TestNotApplicable( |
1095 |
"Can't bind %s" % wt.branch._format.__class__) |
|
1096 |
return wt, master |
|
4985.3.18
by Vincent Ladeuil
Start rewriting the test. |
1097 |
|
1098 |
def test_update_remove_commit(self): |
|
1099 |
"""Update should remove revisions when the branch has removed
|
|
1100 |
some commits.
|
|
1101 |
||
1102 |
We want to revert 4, so that strating with the
|
|
1103 |
make_diverged_master_branch() graph the final result should be
|
|
1104 |
equivalent to:
|
|
1105 |
||
1106 |
1
|
|
1107 |
|\
|
|
1108 |
3 2
|
|
1109 |
| |\
|
|
1110 |
MB-5 | 4
|
|
1111 |
|/
|
|
1112 |
W
|
|
1113 |
||
1114 |
And the changes in 4 have been removed from the WT.
|
|
1115 |
"""
|
|
1116 |
builder, tip = self.make_diverged_master_branch() |
|
4985.3.21
by Vincent Ladeuil
Final cleanup. |
1117 |
wt, master = self.make_checkout_and_master( |
1118 |
builder, 'checkout', 'master', '4', |
|
1119 |
master_revid=tip, branch_revid='2') |
|
4985.3.19
by Vincent Ladeuil
Make the test more precise. |
1120 |
# First update the branch
|
1121 |
old_tip = wt.branch.update() |
|
4985.3.21
by Vincent Ladeuil
Final cleanup. |
1122 |
self.assertEqual('2', old_tip) |
4985.3.18
by Vincent Ladeuil
Start rewriting the test. |
1123 |
# No conflicts should occur
|
4985.3.21
by Vincent Ladeuil
Final cleanup. |
1124 |
self.assertEqual(0, wt.update(old_tip=old_tip)) |
4985.3.19
by Vincent Ladeuil
Make the test more precise. |
1125 |
# We are in sync with the master
|
1126 |
self.assertEqual(tip, wt.branch.last_revision()) |
|
4985.3.20
by Vincent Ladeuil
Remove the blackbox test and fix typo. |
1127 |
# We have the right parents ready to be committed
|
4985.3.19
by Vincent Ladeuil
Make the test more precise. |
1128 |
self.assertEqual(['5', '2'], wt.get_parent_ids()) |
4985.3.18
by Vincent Ladeuil
Start rewriting the test. |
1129 |
|
4985.3.21
by Vincent Ladeuil
Final cleanup. |
1130 |
def test_update_revision(self): |
1131 |
builder, tip = self.make_diverged_master_branch() |
|
1132 |
wt, master = self.make_checkout_and_master( |
|
1133 |
builder, 'checkout', 'master', '4', |
|
1134 |
master_revid=tip, branch_revid='2') |
|
1135 |
self.assertEqual(0, wt.update(revision='1')) |
|
1136 |
self.assertEqual('1', wt.last_revision()) |
|
1137 |
self.assertEqual(tip, wt.branch.last_revision()) |
|
5784.1.3
by Martin Pool
Switch away from using failUnlessExists and failIfExists |
1138 |
self.assertPathExists('checkout/file1') |
1139 |
self.assertPathDoesNotExist('checkout/file4') |
|
1140 |
self.assertPathDoesNotExist('checkout/file5') |
|
4985.3.21
by Vincent Ladeuil
Final cleanup. |
1141 |
|
4985.3.18
by Vincent Ladeuil
Start rewriting the test. |
1142 |
|
3287.20.3
by John Arbash Meinel
Aaron recommended to make this a WT_impl test. |
1143 |
class TestIllegalPaths(TestCaseWithWorkingTree): |
1144 |
||
1145 |
def test_bad_fs_path(self): |
|
3638.3.14
by Vincent Ladeuil
Make test_bad_fs_path not applicable on OSX. |
1146 |
if osutils.normalizes_filenames(): |
1147 |
# You *can't* create an illegal filename on OSX.
|
|
1148 |
raise tests.TestNotApplicable('OSX normalizes filenames') |
|
5967.12.1
by Martin Pool
Move all test features into bzrlib.tests.features |
1149 |
self.requireFeature(features.UTF8Filesystem) |
3287.20.3
by John Arbash Meinel
Aaron recommended to make this a WT_impl test. |
1150 |
# We require a UTF8 filesystem, because otherwise we would need to get
|
1151 |
# tricky to figure out how to create an illegal filename.
|
|
1152 |
# \xb5 is an illegal path because it should be \xc2\xb5 for UTF-8
|
|
1153 |
tree = self.make_branch_and_tree('tree') |
|
1154 |
self.build_tree(['tree/subdir/']) |
|
1155 |
tree.add('subdir') |
|
1156 |
||
1157 |
f = open('tree/subdir/m\xb5', 'wb') |
|
1158 |
try: |
|
1159 |
f.write('trivial\n') |
|
1160 |
finally: |
|
1161 |
f.close() |
|
1162 |
||
1163 |
tree.lock_read() |
|
1164 |
self.addCleanup(tree.unlock) |
|
1165 |
basis = tree.basis_tree() |
|
1166 |
basis.lock_read() |
|
1167 |
self.addCleanup(basis.unlock) |
|
1168 |
||
1169 |
e = self.assertListRaises(errors.BadFilenameEncoding, |
|
1170 |
tree.iter_changes, tree.basis_tree(), |
|
1171 |
want_unversioned=True) |
|
1172 |
# We should display the relative path
|
|
1173 |
self.assertEqual('subdir/m\xb5', e.filename) |
|
1174 |
self.assertEqual(osutils._fs_enc, e.fs_encoding) |
|
5158.6.5
by Martin Pool
Implement ControlComponent on WorkingTree |
1175 |
|
1176 |
||
1177 |
class TestControlComponent(TestCaseWithWorkingTree): |
|
1178 |
"""WorkingTree implementations adequately implement ControlComponent."""
|
|
6059.4.4
by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config. |
1179 |
|
5158.6.5
by Martin Pool
Implement ControlComponent on WorkingTree |
1180 |
def test_urls(self): |
1181 |
wt = self.make_branch_and_tree('wt') |
|
1182 |
self.assertIsInstance(wt.user_url, str) |
|
1183 |
self.assertEqual(wt.user_url, wt.user_transport.base) |
|
1184 |
# for all current bzrdir implementations the user dir must be
|
|
1185 |
# above the control dir but we might need to relax that?
|
|
1186 |
self.assertEqual(wt.control_url.find(wt.user_url), 0) |
|
1187 |
self.assertEqual(wt.control_url, wt.control_transport.base) |
|
5807.4.7
by John Arbash Meinel
Add a config setting. |
1188 |
|
1189 |
||
1190 |
class TestWorthSavingLimit(TestCaseWithWorkingTree): |
|
1191 |
||
1192 |
def make_wt_with_worth_saving_limit(self): |
|
1193 |
wt = self.make_branch_and_tree('wt') |
|
1194 |
if getattr(wt, '_worth_saving_limit', None) is None: |
|
1195 |
raise tests.TestNotApplicable('no _worth_saving_limit for' |
|
1196 |
' this tree type') |
|
1197 |
wt.lock_write() |
|
1198 |
self.addCleanup(wt.unlock) |
|
1199 |
return wt |
|
1200 |
||
1201 |
def test_not_set(self): |
|
1202 |
# Default should be 10
|
|
1203 |
wt = self.make_wt_with_worth_saving_limit() |
|
1204 |
self.assertEqual(10, wt._worth_saving_limit()) |
|
1205 |
ds = wt.current_dirstate() |
|
1206 |
self.assertEqual(10, ds._worth_saving_limit) |
|
1207 |
||
1208 |
def test_set_in_branch(self): |
|
1209 |
wt = self.make_wt_with_worth_saving_limit() |
|
6449.4.3
by Jelmer Vernooij
Use WorkingTree.get_config_stack. |
1210 |
conf = wt.get_config_stack() |
6059.4.4
by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config. |
1211 |
conf.set('bzr.workingtree.worth_saving_limit', '20') |
5807.4.7
by John Arbash Meinel
Add a config setting. |
1212 |
self.assertEqual(20, wt._worth_saving_limit()) |
1213 |
ds = wt.current_dirstate() |
|
1214 |
self.assertEqual(10, ds._worth_saving_limit) |
|
1215 |
||
1216 |
def test_invalid(self): |
|
1217 |
wt = self.make_wt_with_worth_saving_limit() |
|
6449.4.3
by Jelmer Vernooij
Use WorkingTree.get_config_stack. |
1218 |
conf = wt.get_config_stack() |
6059.4.4
by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config. |
1219 |
conf.set('bzr.workingtree.worth_saving_limit', 'a') |
5807.4.7
by John Arbash Meinel
Add a config setting. |
1220 |
# If the config entry is invalid, default to 10
|
6059.4.4
by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config. |
1221 |
warnings = [] |
1222 |
def warning(*args): |
|
1223 |
warnings.append(args[0] % args[1:]) |
|
1224 |
self.overrideAttr(trace, 'warning', warning) |
|
5807.4.7
by John Arbash Meinel
Add a config setting. |
1225 |
self.assertEqual(10, wt._worth_saving_limit()) |
6059.4.4
by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config. |
1226 |
self.assertLength(1, warnings) |
1227 |
self.assertEquals('Value "a" is not valid for' |
|
1228 |
' "bzr.workingtree.worth_saving_limit"', |
|
1229 |
warnings[0]) |
|
5993.3.1
by Jelmer Vernooij
Add WorkingTreeFormat.supports_versioned_directories attribute. |
1230 |
|
1231 |
||
1232 |
class TestFormatAttributes(TestCaseWithWorkingTree): |
|
1233 |
||
1234 |
def test_versioned_directories(self): |
|
1235 |
self.assertSubset( |
|
1236 |
[self.workingtree_format.supports_versioned_directories], |
|
1237 |
(True, False)) |