/brz/remove-bazaar

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