/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'])
6973.7.5 by Jelmer Vernooij
s/file/open.
226
        with open('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
6973.10.4 by Jelmer Vernooij
Update python3.passing.
233
        self.check_file_contents('hello.txt', b'initial hello')
6973.7.5 by Jelmer Vernooij
s/file/open.
234
        with open('hello.txt', 'w') as f: f.write('new hello')
6973.10.4 by Jelmer Vernooij
Update python3.passing.
235
        self.check_file_contents('hello.txt', b'new hello')
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
236
237
        # revert file modified since last revision
238
        tree.revert(['hello.txt'])
6973.10.4 by Jelmer Vernooij
Update python3.passing.
239
        self.check_file_contents('hello.txt', b'initial hello')
240
        self.check_file_contents('hello.txt.~1~', b'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'])
6973.10.4 by Jelmer Vernooij
Update python3.passing.
244
        self.check_file_contents('hello.txt', b'initial hello')
245
        self.check_file_contents('hello.txt.~1~', b'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
6973.7.5 by Jelmer Vernooij
s/file/open.
248
        with open('hello.txt', 'w') as f: f.write('new hello2')
1534.10.28 by Aaron Bentley
Use numbered backup files
249
        tree.revert(['hello.txt'])
6973.10.4 by Jelmer Vernooij
Update python3.passing.
250
        self.check_file_contents('hello.txt', b'initial hello')
251
        self.check_file_contents('hello.txt.~1~', b'new hello')
252
        self.check_file_contents('hello.txt.~2~', b'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('.')
6973.7.5 by Jelmer Vernooij
s/file/open.
257
        with open('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~'])
6855.4.1 by Jelmer Vernooij
Yet more bees.
276
        self.build_tree_contents([('.bzrignore', b'*.~*\n')])
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
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:
7018.3.2 by Jelmer Vernooij
Fix some git tests.
377
            self.assertIsInstance(parent_id, bytes)
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:
6973.10.6 by Jelmer Vernooij
Fix tests.
383
            wt.set_last_revision(b'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.
6973.10.6 by Jelmer Vernooij
Fix tests.
385
        wt.set_last_revision(b'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
6973.10.6 by Jelmer Vernooij
Fix tests.
389
        wt.set_last_revision(b'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")
6973.10.6 by Jelmer Vernooij
Fix tests.
397
        wt.branch._set_revision_history([a, b'B'])
6747.2.2 by Jelmer Vernooij
Fix tests.
398
        wt.set_last_revision(a)
399
        self.assertEqual([a], wt.get_parent_ids())
6973.10.6 by Jelmer Vernooij
Fix tests.
400
        self.assertRaises(errors.ReservedId, wt.set_last_revision, b'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
6855.4.1 by Jelmer Vernooij
Yet more bees.
565
        wt.set_root_id(b'first_root_id')
4634.123.1 by John Arbash Meinel
Add a failing test for 'update'. When this branch lands, update should work.
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')
6855.4.1 by Jelmer Vernooij
Yet more bees.
571
        wt.set_root_id(b'second_root_id')
4634.123.1 by John Arbash Meinel
Add a failing test for 'update'. When this branch lands, update should work.
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')
6855.4.1 by Jelmer Vernooij
Yet more bees.
607
        self.build_tree_contents([('b1/a', b'a test\n'), ('b1/b', b'b test\n')])
4789.12.1 by John Arbash Meinel
Fix per_workingtree.test_workingtree.test_merge_revert
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()
6855.4.1 by Jelmer Vernooij
Yet more bees.
611
        self.build_tree_contents([('b2/a', b'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()
6855.4.1 by Jelmer Vernooij
Yet more bees.
613
        self.build_tree_contents([('b3/a', b'c test\n'), ('b3/c', b'c test\n')])
1534.7.199 by Aaron Bentley
Moved merge/revert tests into test_workingtree.py
614
        other.add('c')
615
6855.4.1 by Jelmer Vernooij
Yet more bees.
616
        self.build_tree_contents([('b1/b', b'q test\n'), ('b1/d', b'd test\n')])
4789.12.1 by John Arbash Meinel
Fix per_workingtree.test_workingtree.test_merge_revert
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)
7029.4.2 by Jelmer Vernooij
Fix more merge tests.
626
        with open('b1/a', 'rb') as a:
4789.12.1 by John Arbash Meinel
Fix per_workingtree.test_workingtree.test_merge_revert
627
            self.assertNotEqual(a.read(), 'a test\n')
2748.3.2 by Aaron Bentley
Fix revert, remove-tree, and various tests to use None for 'no files specified'
628
        this.revert()
7029.4.2 by Jelmer Vernooij
Fix more merge tests.
629
        self.assertFileEqual(b'a test\n', 'b1/a')
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
630
        self.assertPathExists('b1/b.~1~')
6947.2.1 by Jelmer Vernooij
Don't expect unmodified files to be removed when a merge is reverted on working trees that don't support merge_modified.
631
        if this.supports_merge_modified():
632
            self.assertPathDoesNotExist('b1/c')
633
            self.assertPathDoesNotExist('b1/a.~1~')
634
        else:
635
            self.assertPathExists('b1/c')
636
            self.assertPathExists('b1/a.~1~')
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
637
        self.assertPathExists('b1/d')
1534.7.200 by Aaron Bentley
Merge from mainline
638
1587.1.10 by Robert Collins
update updates working tree and branch together.
639
    def test_update_updates_bound_branch_no_local_commits(self):
640
        # doing an update in a tree updates the branch its bound to too.
641
        master_tree = self.make_branch_and_tree('master')
642
        tree = self.make_branch_and_tree('tree')
643
        try:
644
            tree.branch.bind(master_tree.branch)
645
        except errors.UpgradeRequired:
646
            # legacy branches cannot bind
647
            return
6747.2.1 by Jelmer Vernooij
Avoid setting revision_ids.
648
        foo = master_tree.commit('foo', allow_pointless=True)
1587.1.10 by Robert Collins
update updates working tree and branch together.
649
        tree.update()
6747.2.1 by Jelmer Vernooij
Avoid setting revision_ids.
650
        self.assertEqual([foo], tree.get_parent_ids())
651
        self.assertEqual(foo, tree.branch.last_revision())
1587.1.11 by Robert Collins
Local commits appear to be working properly.
652
653
    def test_update_turns_local_commit_into_merge(self):
654
        # 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
655
        # makes pending-merges.
1587.1.13 by Robert Collins
Explain why update pivots more clearly in the relevant test.
656
        # this is done so that 'bzr update; bzr revert' will always produce
657
        # an exact copy of the 'logical branch' - the referenced branch for
658
        # a checkout, and the master for a bound branch.
659
        # its possible that we should instead have 'bzr update' when there
660
        # is nothing new on the master leave the current commits intact and
661
        # alter 'revert' to revert to the master always. But for now, its
662
        # good.
1587.1.11 by Robert Collins
Local commits appear to be working properly.
663
        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.
664
        master_tip = master_tree.commit('first master commit')
1587.1.11 by Robert Collins
Local commits appear to be working properly.
665
        tree = self.make_branch_and_tree('tree')
666
        try:
667
            tree.branch.bind(master_tree.branch)
668
        except errors.UpgradeRequired:
669
            # legacy branches cannot bind
670
            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.
671
        # sync with master
672
        tree.update()
673
        # work locally
6747.2.1 by Jelmer Vernooij
Avoid setting revision_ids.
674
        tree.commit('foo', allow_pointless=True, local=True)
675
        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.
676
        # sync with master prepatory to committing
1587.1.11 by Robert Collins
Local commits appear to be working properly.
677
        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.
678
        # which should have pivoted the local tip into a merge
6747.2.1 by Jelmer Vernooij
Avoid setting revision_ids.
679
        self.assertEqual([master_tip, bar], tree.get_parent_ids())
1908.7.6 by Robert Collins
Deprecate WorkingTree.last_revision.
680
        # and the local branch history should match the masters now.
6165.4.4 by Jelmer Vernooij
Avoid .revision_history().
681
        self.assertEqual(master_tree.branch.last_revision(),
6747.2.1 by Jelmer Vernooij
Avoid setting revision_ids.
682
                         tree.branch.last_revision())
1587.1.11 by Robert Collins
Local commits appear to be working properly.
683
4916.1.7 by Martin Pool
Add per_workingtree test you can update to arbitrary revisions
684
    def test_update_takes_revision_parameter(self):
685
        wt = self.make_branch_and_tree('wt')
6855.4.1 by Jelmer Vernooij
Yet more bees.
686
        self.build_tree_contents([('wt/a', b'old content')])
4916.1.7 by Martin Pool
Add per_workingtree test you can update to arbitrary revisions
687
        wt.add(['a'])
688
        rev1 = wt.commit('first master commit')
6855.4.1 by Jelmer Vernooij
Yet more bees.
689
        self.build_tree_contents([('wt/a', b'new content')])
4916.1.7 by Martin Pool
Add per_workingtree test you can update to arbitrary revisions
690
        rev2 = wt.commit('second master commit')
5243.1.2 by Martin
Point launchpad links in comments at production server rather than edge
691
        # 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
692
        # when adding 'update -r' we should make sure all wt formats support
693
        # it
694
        conflicts = wt.update(revision=rev1)
7029.4.2 by Jelmer Vernooij
Fix more merge tests.
695
        self.assertFileEqual(b'old content', 'wt/a')
4916.1.7 by Martin Pool
Add per_workingtree test you can update to arbitrary revisions
696
        self.assertEqual([rev1], wt.get_parent_ids())
697
2255.2.156 by Martin Pool
Merge WorkingTree implementation back from trunk
698
    def test_merge_modified_detects_corruption(self):
699
        # FIXME: This doesn't really test that it works; also this is not
700
        # implementation-independent. mbp 20070226
1558.3.3 by Aaron Bentley
Fix error handling for merge_modified
701
        tree = self.make_branch_and_tree('master')
6072.1.1 by Jelmer Vernooij
Various fixes for tests of foreign plugins.
702
        if not isinstance(tree, InventoryWorkingTree):
703
            raise TestNotApplicable("merge-hashes is specific to bzr "
704
                "working trees")
7029.4.2 by Jelmer Vernooij
Fix more merge tests.
705
        tree._transport.put_bytes('merge-hashes', b'asdfasdf')
1558.3.3 by Aaron Bentley
Fix error handling for merge_modified
706
        self.assertRaises(errors.MergeModifiedFormatError, tree.merge_modified)
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
707
2298.1.1 by Martin Pool
Add test for merge_modified
708
    def test_merge_modified(self):
709
        # merge_modified stores a map from file id to hash
710
        tree = self.make_branch_and_tree('tree')
6855.4.1 by Jelmer Vernooij
Yet more bees.
711
        self.build_tree_contents([('tree/somefile', b'hello')])
6852.3.1 by Jelmer Vernooij
add Tree.is_versioned.
712
        with tree.lock_write():
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
713
            tree.add(['somefile'])
6855.4.3 by Jelmer Vernooij
Merge trink.
714
            d = {tree.path2id('somefile'): osutils.sha_string(b'hello')}
6885.2.1 by Jelmer Vernooij
Add WorkingTree.supports_merge_modified.
715
            if tree.supports_merge_modified():
6862.6.1 by Jelmer Vernooij
Allow working trees to not implement set_merge_modified.
716
                tree.set_merge_modified(d)
6885.2.1 by Jelmer Vernooij
Add WorkingTree.supports_merge_modified.
717
                mm = tree.merge_modified()
718
                self.assertEqual(mm, d)
719
            else:
720
                self.assertRaises(
721
                    errors.UnsupportedOperation,
722
                    tree.set_merge_modified, d)
6862.6.1 by Jelmer Vernooij
Allow working trees to not implement set_merge_modified.
723
                mm = tree.merge_modified()
724
                self.assertEqual(mm, {})
6885.2.1 by Jelmer Vernooij
Add WorkingTree.supports_merge_modified.
725
        if tree.supports_merge_modified():
2298.1.1 by Martin Pool
Add test for merge_modified
726
            mm = tree.merge_modified()
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
727
            self.assertEqual(mm, d)
6862.6.1 by Jelmer Vernooij
Allow working trees to not implement set_merge_modified.
728
        else:
729
            mm = tree.merge_modified()
730
            self.assertEqual(mm, {})
2298.1.1 by Martin Pool
Add test for merge_modified
731
1534.10.22 by Aaron Bentley
Got ConflictList implemented
732
    def test_conflicts(self):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
733
        from breezy.tests.test_conflicts import example_conflicts
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
734
        tree = self.make_branch_and_tree('master')
735
        try:
1534.10.22 by Aaron Bentley
Got ConflictList implemented
736
            tree.set_conflicts(example_conflicts)
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
737
        except UnsupportedOperation:
1534.10.22 by Aaron Bentley
Got ConflictList implemented
738
            raise TestSkipped('set_conflicts not supported')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
739
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
740
        tree2 = WorkingTree.open('master')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
741
        self.assertEqual(tree2.conflicts(), example_conflicts)
7029.4.2 by Jelmer Vernooij
Fix more merge tests.
742
        tree2._transport.put_bytes('conflicts', b'')
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
743
        self.assertRaises(errors.ConflictFormatError,
1955.3.14 by John Arbash Meinel
Correctly fix the workingtree put() test fixes
744
                          tree2.conflicts)
7029.4.2 by Jelmer Vernooij
Fix more merge tests.
745
        tree2._transport.put_bytes('conflicts', b'a')
3407.2.7 by Martin Pool
Deprecate LockableFiles.put_utf8 and put_bytes.
746
        self.assertRaises(errors.ConflictFormatError,
1955.3.14 by John Arbash Meinel
Correctly fix the workingtree put() test fixes
747
                          tree2.conflicts)
1534.10.12 by Aaron Bentley
Merge produces new conflicts
748
749
    def make_merge_conflicts(self):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
750
        from breezy.merge import merge_inner
1534.10.12 by Aaron Bentley
Merge produces new conflicts
751
        tree = self.make_branch_and_tree('mine')
6973.7.5 by Jelmer Vernooij
s/file/open.
752
        with open('mine/bloo', 'wb') as f: f.write(b'one')
753
        with open('mine/blo', 'wb') as f: f.write(b'on')
2255.2.32 by Robert Collins
Make test_clear_merge_conflicts pass for dirstate. This involved working
754
        tree.add(['bloo', 'blo'])
1534.10.12 by Aaron Bentley
Merge produces new conflicts
755
        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
756
        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.
757
        controldir.ControlDir.open("mine").sprout("other")
6973.7.5 by Jelmer Vernooij
s/file/open.
758
        with open('other/bloo', 'wb') as f: f.write(b'two')
1534.10.12 by Aaron Bentley
Merge produces new conflicts
759
        othertree = WorkingTree.open('other')
760
        othertree.commit('blah', allow_pointless=False)
6973.7.5 by Jelmer Vernooij
s/file/open.
761
        with open('mine/bloo', 'wb') as f: f.write(b'three')
1534.10.12 by Aaron Bentley
Merge produces new conflicts
762
        tree.commit("blah", allow_pointless=False)
763
        merge_inner(tree.branch, othertree, base, this_tree=tree)
764
        return tree
765
766
    def test_merge_conflicts(self):
767
        tree = self.make_merge_conflicts()
1534.10.22 by Aaron Bentley
Got ConflictList implemented
768
        self.assertEqual(len(tree.conflicts()), 1)
1534.10.12 by Aaron Bentley
Merge produces new conflicts
769
770
    def test_clear_merge_conflicts(self):
771
        tree = self.make_merge_conflicts()
1534.10.22 by Aaron Bentley
Got ConflictList implemented
772
        self.assertEqual(len(tree.conflicts()), 1)
1534.10.12 by Aaron Bentley
Merge produces new conflicts
773
        try:
1534.10.22 by Aaron Bentley
Got ConflictList implemented
774
            tree.set_conflicts(ConflictList())
1534.10.12 by Aaron Bentley
Merge produces new conflicts
775
        except UnsupportedOperation:
2949.5.1 by Alexander Belchenko
selftest: use SymlinkFeature instead of TestSkipped where appropriate
776
            raise TestSkipped('unsupported operation')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
777
        self.assertEqual(tree.conflicts(), ConflictList())
1534.10.14 by Aaron Bentley
Made revert clear conflicts
778
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
779
    def test_add_conflicts(self):
780
        tree = self.make_branch_and_tree('tree')
781
        try:
782
            tree.add_conflicts([TextConflict('path_a')])
783
        except UnsupportedOperation:
2949.5.1 by Alexander Belchenko
selftest: use SymlinkFeature instead of TestSkipped where appropriate
784
            raise TestSkipped('unsupported operation')
1551.7.13 by Aaron Bentley
Switched from actual, expected to expected, actual, for John.
785
        self.assertEqual(ConflictList([TextConflict('path_a')]),
786
                         tree.conflicts())
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
787
        tree.add_conflicts([TextConflict('path_a')])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
788
        self.assertEqual(ConflictList([TextConflict('path_a')]),
1551.7.13 by Aaron Bentley
Switched from actual, expected to expected, actual, for John.
789
                         tree.conflicts())
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
790
        tree.add_conflicts([ContentsConflict('path_a')])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
791
        self.assertEqual(ConflictList([ContentsConflict('path_a'),
1551.7.13 by Aaron Bentley
Switched from actual, expected to expected, actual, for John.
792
                                       TextConflict('path_a')]),
793
                         tree.conflicts())
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
794
        tree.add_conflicts([TextConflict('path_b')])
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
795
        self.assertEqual(ConflictList([ContentsConflict('path_a'),
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
796
                                       TextConflict('path_a'),
1551.7.13 by Aaron Bentley
Switched from actual, expected to expected, actual, for John.
797
                                       TextConflict('path_b')]),
798
                         tree.conflicts())
1551.7.11 by Aaron Bentley
Add WorkingTree.add_conflicts
799
1534.10.14 by Aaron Bentley
Made revert clear conflicts
800
    def test_revert_clear_conflicts(self):
801
        tree = self.make_merge_conflicts()
1534.10.22 by Aaron Bentley
Got ConflictList implemented
802
        self.assertEqual(len(tree.conflicts()), 1)
1534.10.14 by Aaron Bentley
Made revert clear conflicts
803
        tree.revert(["blo"])
1534.10.22 by Aaron Bentley
Got ConflictList implemented
804
        self.assertEqual(len(tree.conflicts()), 1)
1534.10.14 by Aaron Bentley
Made revert clear conflicts
805
        tree.revert(["bloo"])
1534.10.22 by Aaron Bentley
Got ConflictList implemented
806
        self.assertEqual(len(tree.conflicts()), 0)
1534.10.14 by Aaron Bentley
Made revert clear conflicts
807
808
    def test_revert_clear_conflicts2(self):
809
        tree = self.make_merge_conflicts()
1534.10.22 by Aaron Bentley
Got ConflictList implemented
810
        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'
811
        tree.revert()
1534.10.22 by Aaron Bentley
Got ConflictList implemented
812
        self.assertEqual(len(tree.conflicts()), 0)
1624.3.22 by Olaf Conradi
Merge bzr.dev
813
1624.3.19 by Olaf Conradi
New call get_format_description to give a user-friendly description of a
814
    def test_format_description(self):
815
        tree = self.make_branch_and_tree('tree')
816
        text = tree._format.get_format_description()
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
817
        self.assertTrue(len(text))
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
818
6844.1.2 by Jelmer Vernooij
Add supports_leftmost_parent_id_as_ghost.
819
    def test_format_leftmost_parent_id_as_ghost(self):
820
        tree = self.make_branch_and_tree('tree')
821
        self.assertIn(
822
                tree._format.supports_leftmost_parent_id_as_ghost, (True, False))
823
1681.1.1 by Robert Collins
Make WorkingTree.branch a read only property. (Robert Collins)
824
    def test_branch_attribute_is_not_settable(self):
825
        # the branch attribute is an aspect of the working tree, not a
826
        # configurable attribute
827
        tree = self.make_branch_and_tree('tree')
828
        def set_branch():
829
            tree.branch = tree.branch
830
        self.assertRaises(AttributeError, set_branch)
831
1713.3.1 by Robert Collins
Smoke tests for tree.list_files and bzr ignored when a versioned file matches an ignore rule.
832
    def test_list_files_versioned_before_ignored(self):
833
        """A versioned file matching an ignore rule should not be ignored."""
834
        tree = self.make_branch_and_tree('.')
835
        self.build_tree(['foo.pyc'])
836
        # ensure that foo.pyc is ignored
6855.4.1 by Jelmer Vernooij
Yet more bees.
837
        self.build_tree_contents([('.bzrignore', b'foo.pyc')])
6829.2.1 by Jelmer Vernooij
Avoid passing in file_ids/revision_ids in a few more places.
838
        tree.add('foo.pyc')
839
        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.
840
        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.
841
        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.
842
        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.
843
        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.
844
        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.
845
        self.assertEqual(2, len(files))
1711.8.2 by John Arbash Meinel
Test that WorkingTree locks Branch before self, and unlocks self before Branch
846
1830.3.7 by John Arbash Meinel
Check that WorkingTree.add does the right thing.
847
    def test_non_normalized_add_accessible(self):
848
        try:
849
            self.build_tree([u'a\u030a'])
850
        except UnicodeError:
851
            raise TestSkipped('Filesystem does not support unicode filenames')
852
        tree = self.make_branch_and_tree('.')
853
        orig = osutils.normalized_filename
854
        osutils.normalized_filename = osutils._accessible_normalized_filename
855
        try:
856
            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.
857
            tree.lock_read()
1907.1.3 by Aaron Bentley
Fixed unicode test cases
858
            self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
6809.1.1 by Martin
Apply 2to3 ws_comma fixer
859
                    [(path, ie.kind) for path, ie in
5807.1.2 by Jelmer Vernooij
Skip some inventory-specific tests for non-inventory working trees.
860
                                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.
861
            tree.unlock()
1830.3.7 by John Arbash Meinel
Check that WorkingTree.add does the right thing.
862
        finally:
863
            osutils.normalized_filename = orig
864
865
    def test_non_normalized_add_inaccessible(self):
866
        try:
867
            self.build_tree([u'a\u030a'])
868
        except UnicodeError:
869
            raise TestSkipped('Filesystem does not support unicode filenames')
870
        tree = self.make_branch_and_tree('.')
871
        orig = osutils.normalized_filename
872
        osutils.normalized_filename = osutils._inaccessible_normalized_filename
873
        try:
874
            self.assertRaises(errors.InvalidNormalization,
875
                tree.add, [u'a\u030a'])
876
        finally:
877
            osutils.normalized_filename = orig
2123.3.9 by Steffen Eichenberg
added tests for deprecated API workingtree.move
878
1852.15.14 by Robert Collins
test that WorkingTree._write_inventory works as expected by the current code.
879
    def test__write_inventory(self):
880
        # The private interface _write_inventory is currently used by transform.
881
        tree = self.make_branch_and_tree('.')
5807.1.2 by Jelmer Vernooij
Skip some inventory-specific tests for non-inventory working trees.
882
        if not isinstance(tree, InventoryWorkingTree):
883
            raise TestNotApplicable("_write_inventory does not exist on "
884
                "non-inventory working trees")
1852.15.14 by Robert Collins
test that WorkingTree._write_inventory works as expected by the current code.
885
        # if we write write an inventory then do a walkdirs we should get back
886
        # missing entries, and actual, and unknowns as appropriate.
887
        self.build_tree(['present', 'unknown'])
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
888
        inventory = Inventory(tree.get_root_id())
6973.13.2 by Jelmer Vernooij
Fix some more tests.
889
        inventory.add_path('missing', 'file', b'missing-id')
890
        inventory.add_path('present', 'file', b'present-id')
2255.2.28 by Robert Collins
TestWorkingTree.test__write_inventory needs to lock the tree before calling _write_inventory for dirstate.
891
        # there is no point in being able to write an inventory to an unlocked
892
        # tree object - its a low level api not a convenience api.
893
        tree.lock_write()
1852.15.14 by Robert Collins
test that WorkingTree._write_inventory works as expected by the current code.
894
        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.
895
        tree.unlock()
1852.15.14 by Robert Collins
test that WorkingTree._write_inventory works as expected by the current code.
896
        tree.lock_read()
897
        try:
898
            present_stat = os.lstat('present')
899
            unknown_stat = os.lstat('unknown')
900
            expected_results = [
2946.3.3 by John Arbash Meinel
Prefer tree.get_root_id() as more explicit than tree.path2id('')
901
                (('', tree.get_root_id()),
6973.13.2 by Jelmer Vernooij
Fix some more tests.
902
                 [('missing', 'missing', 'unknown', None, b'missing-id', 'file'),
903
                  ('present', 'present', 'file', present_stat, b'present-id', 'file'),
1852.15.14 by Robert Collins
test that WorkingTree._write_inventory works as expected by the current code.
904
                  ('unknown', 'unknown', 'file', unknown_stat, None, None),
905
                 ]
906
                )]
907
            self.assertEqual(expected_results, list(tree.walkdirs()))
908
        finally:
909
            tree.unlock()
2255.7.56 by Robert Collins
Document behaviour of tree.path2id("path/").
910
911
    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.
912
        # smoke test for path2id
2255.7.56 by Robert Collins
Document behaviour of tree.path2id("path/").
913
        tree = self.make_branch_and_tree('.')
914
        self.build_tree(['foo'])
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
915
        if tree.supports_setting_file_ids():
6855.4.1 by Jelmer Vernooij
Yet more bees.
916
            tree.add(['foo'], [b'foo-id'])
917
            self.assertEqual(b'foo-id', tree.path2id('foo'))
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
918
            # the next assertion is for backwards compatability with
919
            # WorkingTree3, though its probably a bad idea, it makes things
920
            # work. Perhaps it should raise a deprecation warning?
6855.4.1 by Jelmer Vernooij
Yet more bees.
921
            self.assertEqual(b'foo-id', tree.path2id('foo/'))
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
922
        else:
923
            tree.add(['foo'])
6821.2.2 by Jelmer Vernooij
More foreign fixes.
924
            if tree.branch.repository._format.supports_versioned_directories:
925
                self.assertIsInstance(str, tree.path2id('foo'))
926
            else:
927
                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.
928
929
    def test_filter_unversioned_files(self):
930
        # smoke test for filter_unversioned_files
931
        tree = self.make_branch_and_tree('.')
932
        paths = ['here-and-versioned', 'here-and-not-versioned',
933
            'not-here-and-versioned', 'not-here-and-not-versioned']
934
        tree.add(['here-and-versioned', 'not-here-and-versioned'],
935
            kinds=['file', 'file'])
936
        self.build_tree(['here-and-versioned', 'here-and-not-versioned'])
937
        tree.lock_read()
938
        self.addCleanup(tree.unlock)
939
        self.assertEqual(
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
940
            {'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.
941
            tree.filter_unversioned_files(paths))
2255.2.200 by Martin Pool
Add simple test for WorkingTree.kind
942
943
    def test_detect_real_kind(self):
944
        # working trees report the real kind of the file on disk, not the kind
945
        # they had when they were first added
946
        # create one file of every interesting type
947
        tree = self.make_branch_and_tree('.')
4100.2.2 by Aaron Bentley
Remove locking decorator
948
        tree.lock_write()
949
        self.addCleanup(tree.unlock)
2255.2.200 by Martin Pool
Add simple test for WorkingTree.kind
950
        self.build_tree(['file', 'directory/'])
951
        names = ['file', 'directory']
952
        if has_symlinks():
953
            os.symlink('target', 'symlink')
954
            names.append('symlink')
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
955
        tree.add(names)
2255.2.200 by Martin Pool
Add simple test for WorkingTree.kind
956
        # now when we first look, we should see everything with the same kind
957
        # with which they were initially added
958
        for n in names:
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
959
            actual_kind = tree.kind(n)
2255.2.200 by Martin Pool
Add simple test for WorkingTree.kind
960
            self.assertEqual(n, actual_kind)
961
        # move them around so the names no longer correspond to the types
962
        os.rename(names[0], 'tmp')
963
        for i in range(1, len(names)):
964
            os.rename(names[i], names[i-1])
965
        os.rename('tmp', names[-1])
2255.2.202 by Martin Pool
WorkingTree_4.kind should report tree-references if they're
966
        # now look and expect to see the correct types again
967
        for i in range(len(names)):
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
968
            actual_kind = tree.kind(names[i-1])
2255.2.202 by Martin Pool
WorkingTree_4.kind should report tree-references if they're
969
            expected_kind = names[i]
970
            self.assertEqual(expected_kind, actual_kind)
2499.3.1 by Aaron Bentley
Fix Workingtree4.get_file_sha1 on missing files
971
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
972
    def test_stored_kind_with_missing(self):
973
        tree = self.make_branch_and_tree('tree')
974
        tree.lock_write()
975
        self.addCleanup(tree.unlock)
976
        self.build_tree(['tree/a', 'tree/b/'])
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
977
        tree.add(['a', 'b'])
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
978
        os.unlink('tree/a')
979
        os.rmdir('tree/b')
6809.4.7 by Jelmer Vernooij
Swap arguments for get_symlink_target and kind/stored_kind.
980
        self.assertEqual('file', tree.stored_kind('a'))
6816.1.1 by Jelmer Vernooij
Avoid passing in file ids.
981
        if tree.branch.repository._format.supports_versioned_directories:
6809.4.26 by Jelmer Vernooij
Merge trunk.
982
            self.assertEqual('directory', tree.stored_kind('b'))
3146.8.4 by Aaron Bentley
Eliminate direct use of inventory from transform application
983
2499.3.1 by Aaron Bentley
Fix Workingtree4.get_file_sha1 on missing files
984
    def test_missing_file_sha1(self):
985
        """If a file is missing, its sha1 should be reported as None."""
986
        tree = self.make_branch_and_tree('.')
987
        tree.lock_write()
988
        self.addCleanup(tree.unlock)
989
        self.build_tree(['file'])
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
990
        tree.add('file')
2499.3.1 by Aaron Bentley
Fix Workingtree4.get_file_sha1 on missing files
991
        tree.commit('file added')
992
        os.unlink('file')
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
993
        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
994
995
    def test_no_file_sha1(self):
6809.4.13 by Jelmer Vernooij
Fix tests.
996
        """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
997
        tree = self.make_branch_and_tree('.')
998
        tree.lock_write()
999
        self.addCleanup(tree.unlock)
6809.4.13 by Jelmer Vernooij
Fix tests.
1000
        self.assertRaises(errors.NoSuchFile, tree.get_file_sha1,
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
1001
                          'nonexistant')
1551.15.56 by Aaron Bentley
Raise NoSuchId when get_file_sha1 is invoked with a baed file id
1002
        self.build_tree(['file'])
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
1003
        tree.add('file')
1551.15.56 by Aaron Bentley
Raise NoSuchId when get_file_sha1 is invoked with a baed file id
1004
        tree.commit('foo')
1005
        tree.remove('file')
6809.4.13 by Jelmer Vernooij
Fix tests.
1006
        self.assertRaises(errors.NoSuchFile, tree.get_file_sha1,
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
1007
                          'file')
3034.4.5 by Aaron Bentley
Add workingtree test for case_insensitive var
1008
1009
    def test_case_sensitive(self):
1010
        """If filesystem is case-sensitive, tree should report this.
1011
1012
        We check case-sensitivity by creating a file with a lowercase name,
1013
        then testing whether it exists with an uppercase name.
1014
        """
3034.4.9 by Alexander Belchenko
skip test_workingtree.TestWorkingTree.test_case_sensitive for WT2
1015
        self.build_tree(['filename'])
3034.4.5 by Aaron Bentley
Add workingtree test for case_insensitive var
1016
        if os.path.exists('FILENAME'):
1017
            case_sensitive = False
1018
        else:
1019
            case_sensitive = True
1020
        tree = self.make_branch_and_tree('test')
1021
        self.assertEqual(case_sensitive, tree.case_sensitive)
6113.1.1 by Jelmer Vernooij
Skip some tests against foreign formats.
1022
        if not isinstance(tree, InventoryWorkingTree):
1023
            raise TestNotApplicable("get_format_string is only available "
1024
                                    "on bzr working trees")
5632.1.1 by John Arbash Meinel
Make case_sensitive_filename an attribute of the format.
1025
        # 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.
1026
        t = tree.controldir.get_workingtree_transport(None)
5632.1.1 by John Arbash Meinel
Make case_sensitive_filename an attribute of the format.
1027
        try:
1028
            content = tree._format.get_format_string()
1029
        except NotImplementedError:
1030
            # 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.
1031
            content = tree.controldir._format.get_format_string()
5632.1.1 by John Arbash Meinel
Make case_sensitive_filename an attribute of the format.
1032
        t.put_bytes(tree._format.case_sensitive_filename, content)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
1033
        tree = tree.controldir.open_workingtree()
5632.1.1 by John Arbash Meinel
Make case_sensitive_filename an attribute of the format.
1034
        self.assertFalse(tree.case_sensitive)
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
1035
6379.7.1 by Jelmer Vernooij
Add and use WorkingTree._supports_executable.
1036
    def test_supports_executable(self):
1037
        self.build_tree(['filename'])
1038
        tree = self.make_branch_and_tree('.')
1039
        tree.add('filename')
1040
        self.assertIsInstance(tree._supports_executable(), bool)
1041
        if tree._supports_executable():
1042
            tree.lock_read()
1043
            try:
6809.4.4 by Jelmer Vernooij
Swap arguments for Tree.is_executable.
1044
                self.assertFalse(tree.is_executable('filename'))
6379.7.1 by Jelmer Vernooij
Add and use WorkingTree._supports_executable.
1045
            finally:
1046
                tree.unlock()
6619.3.14 by Jelmer Vernooij
Convert some octal numbers to new notations.
1047
            os.chmod('filename', 0o755)
6379.7.1 by Jelmer Vernooij
Add and use WorkingTree._supports_executable.
1048
            self.addCleanup(tree.lock_read().unlock)
6809.4.4 by Jelmer Vernooij
Swap arguments for Tree.is_executable.
1049
            self.assertTrue(tree.is_executable('filename'))
6379.7.1 by Jelmer Vernooij
Add and use WorkingTree._supports_executable.
1050
        else:
1051
            self.addCleanup(tree.lock_read().unlock)
6809.4.4 by Jelmer Vernooij
Swap arguments for Tree.is_executable.
1052
            self.assertFalse(tree.is_executable('filename'))
6379.7.1 by Jelmer Vernooij
Add and use WorkingTree._supports_executable.
1053
3146.8.16 by Aaron Bentley
Updates from review
1054
    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
1055
        tree = self.make_branch_and_tree('tree')
1056
        tree.lock_write()
1057
        self.addCleanup(tree.unlock)
1058
        self.build_tree(['tree/a', 'tree/b'])
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
1059
        tree.add(['a', 'b'])
3146.8.2 by Aaron Bentley
Introduce iter_all_file_ids, to avoid hitting Inventory for this case
1060
        os.unlink('tree/a')
6745.1.1 by Jelmer Vernooij
Avoid explicitly setting file ids or guard it by checking
1061
        self.assertEqual(
6825.5.1 by Jelmer Vernooij
Implement Tree.all_versioned_paths.
1062
                {'a', 'b', ''},
1063
                set(tree.all_versioned_paths()))
3146.8.19 by Aaron Bentley
Merge with bzr.dev
1064
3136.1.10 by Aaron Bentley
Clean error if filesystem does not support hard-links
1065
    def test_sprout_hardlink(self):
3619.6.9 by Mark Hammond
Move check for os.link to the start of the test
1066
        real_os_link = getattr(os, 'link', None)
1067
        if real_os_link is None:
1068
            raise TestNotApplicable("This platform doesn't provide os.link")
3136.1.10 by Aaron Bentley
Clean error if filesystem does not support hard-links
1069
        source = self.make_branch_and_tree('source')
1070
        self.build_tree(['source/file'])
1071
        source.add('file')
1072
        source.commit('added file')
1073
        def fake_link(source, target):
1074
            raise OSError(errno.EPERM, 'Operation not permitted')
1075
        os.link = fake_link
1076
        try:
1077
            # Hard-link support is optional, so supplying hardlink=True may
1078
            # or may not raise an exception.  But if it does, it must be
1079
            # HardLinkNotSupported
1080
            try:
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
1081
                source.controldir.sprout('target', accelerator_tree=source,
3136.1.10 by Aaron Bentley
Clean error if filesystem does not support hard-links
1082
                                     hardlink=True)
1083
            except errors.HardLinkNotSupported:
1084
                pass
1085
        finally:
1086
            os.link = real_os_link
3287.20.3 by John Arbash Meinel
Aaron recommended to make this a WT_impl test.
1087
1088
4985.3.18 by Vincent Ladeuil
Start rewriting the test.
1089
class TestWorkingTreeUpdate(TestCaseWithWorkingTree):
1090
1091
    def make_diverged_master_branch(self):
1092
        """
1093
        B: wt.branch.last_revision()
1094
        M: wt.branch.get_master_branch().last_revision()
1095
        W: wt.last_revision()
1096
1097
1098
            1
1099
            |\
1100
          B-2 3
1101
            | |
1102
            4 5-M
1103
            |
1104
            W
6162.3.2 by Jelmer Vernooij
Add WorkingTreeFormat.get_controldir_for_branch().
1105
        """
1106
        format = self.workingtree_format.get_controldir_for_branch()
1107
        builder = self.make_branch_builder(".", format=format)
4985.3.18 by Vincent Ladeuil
Start rewriting the test.
1108
        builder.start_series()
6821.2.2 by Jelmer Vernooij
More foreign fixes.
1109
        revids = {}
4985.3.18 by Vincent Ladeuil
Start rewriting the test.
1110
        # mainline
6821.2.2 by Jelmer Vernooij
More foreign fixes.
1111
        revids['1'] = builder.build_snapshot(
6816.2.1 by Jelmer Vernooij
Migrate some build_snapshot code over to having revision_id as keyword argument.
1112
            None,
6883.22.13 by Jelmer Vernooij
Actually pass in None file-ids to BranchBuilder.
1113
            [('add', ('', None, 'directory', '')),
7045.1.13 by Jelmer Vernooij
Fix a few more tests.
1114
             ('add', ('file1', None, 'file', b'file1 content\n'))])
4985.3.18 by Vincent Ladeuil
Start rewriting the test.
1115
        # branch
6821.2.2 by Jelmer Vernooij
More foreign fixes.
1116
        revids['2'] = builder.build_snapshot([revids['1']], [])
1117
        revids['4'] = builder.build_snapshot(
1118
            [revids['1']],
7045.1.13 by Jelmer Vernooij
Fix a few more tests.
1119
            [('add', ('file4', None, 'file', b'file4 content\n'))])
4985.3.18 by Vincent Ladeuil
Start rewriting the test.
1120
        # master
6821.2.2 by Jelmer Vernooij
More foreign fixes.
1121
        revids['3'] = builder.build_snapshot([revids['1']], [])
1122
        revids['5'] = builder.build_snapshot(
1123
            [revids['3']],
7045.1.13 by Jelmer Vernooij
Fix a few more tests.
1124
            [('add', ('file5', None, 'file', b'file5 content\n'))])
4985.3.18 by Vincent Ladeuil
Start rewriting the test.
1125
        builder.finish_series()
6821.2.2 by Jelmer Vernooij
More foreign fixes.
1126
        return (builder, builder._branch.last_revision(), revids)
4985.3.18 by Vincent Ladeuil
Start rewriting the test.
1127
4985.3.21 by Vincent Ladeuil
Final cleanup.
1128
    def make_checkout_and_master(self, builder, wt_path, master_path, wt_revid,
1129
                                 master_revid=None, branch_revid=None):
1130
        """Build a lightweight checkout and its master branch."""
1131
        if master_revid is None:
1132
            master_revid = wt_revid
1133
        if branch_revid is None:
1134
            branch_revid = master_revid
4985.3.18 by Vincent Ladeuil
Start rewriting the test.
1135
        final_branch = builder.get_branch()
1136
        # The master branch
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
1137
        master = final_branch.controldir.sprout(master_path,
4985.3.21 by Vincent Ladeuil
Final cleanup.
1138
                                            master_revid).open_branch()
1139
        # The checkout
1140
        wt = self.make_branch_and_tree(wt_path)
1141
        wt.pull(final_branch, stop_revision=wt_revid)
1142
        wt.branch.pull(final_branch, stop_revision=branch_revid, overwrite=True)
4985.3.18 by Vincent Ladeuil
Start rewriting the test.
1143
        try:
4985.3.21 by Vincent Ladeuil
Final cleanup.
1144
            wt.branch.bind(master)
4985.3.18 by Vincent Ladeuil
Start rewriting the test.
1145
        except errors.UpgradeRequired:
4985.3.21 by Vincent Ladeuil
Final cleanup.
1146
            raise TestNotApplicable(
1147
                "Can't bind %s" % wt.branch._format.__class__)
1148
        return wt, master
4985.3.18 by Vincent Ladeuil
Start rewriting the test.
1149
1150
    def test_update_remove_commit(self):
1151
        """Update should remove revisions when the branch has removed
1152
        some commits.
1153
1154
        We want to revert 4, so that strating with the
1155
        make_diverged_master_branch() graph the final result should be
1156
        equivalent to:
1157
1158
           1
1159
           |\
1160
           3 2
1161
           | |\
1162
        MB-5 | 4
1163
           |/
1164
           W
1165
1166
        And the changes in 4 have been removed from the WT.
1167
        """
6821.2.2 by Jelmer Vernooij
More foreign fixes.
1168
        builder, tip, revids = self.make_diverged_master_branch()
4985.3.21 by Vincent Ladeuil
Final cleanup.
1169
        wt, master = self.make_checkout_and_master(
6821.2.2 by Jelmer Vernooij
More foreign fixes.
1170
            builder, 'checkout', 'master', revids['4'],
1171
            master_revid=tip, branch_revid=revids['2'])
4985.3.19 by Vincent Ladeuil
Make the test more precise.
1172
        # First update the branch
1173
        old_tip = wt.branch.update()
6821.2.2 by Jelmer Vernooij
More foreign fixes.
1174
        self.assertEqual(revids['2'], old_tip)
4985.3.18 by Vincent Ladeuil
Start rewriting the test.
1175
        # No conflicts should occur
4985.3.21 by Vincent Ladeuil
Final cleanup.
1176
        self.assertEqual(0, wt.update(old_tip=old_tip))
4985.3.19 by Vincent Ladeuil
Make the test more precise.
1177
        # We are in sync with the master
1178
        self.assertEqual(tip, wt.branch.last_revision())
4985.3.20 by Vincent Ladeuil
Remove the blackbox test and fix typo.
1179
        # We have the right parents ready to be committed
6821.2.2 by Jelmer Vernooij
More foreign fixes.
1180
        self.assertEqual([revids['5'], revids['2']],
1181
                         wt.get_parent_ids())
4985.3.18 by Vincent Ladeuil
Start rewriting the test.
1182
4985.3.21 by Vincent Ladeuil
Final cleanup.
1183
    def test_update_revision(self):
6821.2.2 by Jelmer Vernooij
More foreign fixes.
1184
        builder, tip, revids = self.make_diverged_master_branch()
4985.3.21 by Vincent Ladeuil
Final cleanup.
1185
        wt, master = self.make_checkout_and_master(
6821.2.2 by Jelmer Vernooij
More foreign fixes.
1186
            builder, 'checkout', 'master', revids['4'],
1187
            master_revid=tip, branch_revid=revids['2'])
1188
        self.assertEqual(0, wt.update(revision=revids['1']))
1189
        self.assertEqual(revids['1'], wt.last_revision())
4985.3.21 by Vincent Ladeuil
Final cleanup.
1190
        self.assertEqual(tip, wt.branch.last_revision())
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
1191
        self.assertPathExists('checkout/file1')
1192
        self.assertPathDoesNotExist('checkout/file4')
1193
        self.assertPathDoesNotExist('checkout/file5')
4985.3.21 by Vincent Ladeuil
Final cleanup.
1194
4985.3.18 by Vincent Ladeuil
Start rewriting the test.
1195
3287.20.3 by John Arbash Meinel
Aaron recommended to make this a WT_impl test.
1196
class TestIllegalPaths(TestCaseWithWorkingTree):
1197
1198
    def test_bad_fs_path(self):
3638.3.14 by Vincent Ladeuil
Make test_bad_fs_path not applicable on OSX.
1199
        if osutils.normalizes_filenames():
1200
            # You *can't* create an illegal filename on OSX.
1201
            raise tests.TestNotApplicable('OSX normalizes filenames')
5967.12.1 by Martin Pool
Move all test features into bzrlib.tests.features
1202
        self.requireFeature(features.UTF8Filesystem)
3287.20.3 by John Arbash Meinel
Aaron recommended to make this a WT_impl test.
1203
        # We require a UTF8 filesystem, because otherwise we would need to get
1204
        # tricky to figure out how to create an illegal filename.
1205
        # \xb5 is an illegal path because it should be \xc2\xb5 for UTF-8
1206
        tree = self.make_branch_and_tree('tree')
6883.14.3 by Jelmer Vernooij
Merge badfs test fix.
1207
        self.build_tree(['tree/subdir/', 'tree/subdir/somefile'])
1208
        tree.add(['subdir', 'subdir/somefile'])
3287.20.3 by John Arbash Meinel
Aaron recommended to make this a WT_impl test.
1209
6973.7.5 by Jelmer Vernooij
s/file/open.
1210
        with open('tree/subdir/m\xb5', 'wb') as f:
1211
            f.write(b'trivial\n')
3287.20.3 by John Arbash Meinel
Aaron recommended to make this a WT_impl test.
1212
1213
        tree.lock_read()
1214
        self.addCleanup(tree.unlock)
1215
        basis = tree.basis_tree()
1216
        basis.lock_read()
1217
        self.addCleanup(basis.unlock)
1218
1219
        e = self.assertListRaises(errors.BadFilenameEncoding,
1220
                                  tree.iter_changes, tree.basis_tree(),
6883.14.3 by Jelmer Vernooij
Merge badfs test fix.
1221
                                  want_unversioned=True)
3287.20.3 by John Arbash Meinel
Aaron recommended to make this a WT_impl test.
1222
        # We should display the relative path
1223
        self.assertEqual('subdir/m\xb5', e.filename)
1224
        self.assertEqual(osutils._fs_enc, e.fs_encoding)
5158.6.5 by Martin Pool
Implement ControlComponent on WorkingTree
1225
1226
1227
class TestControlComponent(TestCaseWithWorkingTree):
1228
    """WorkingTree implementations adequately implement ControlComponent."""
6059.4.4 by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config.
1229
5158.6.5 by Martin Pool
Implement ControlComponent on WorkingTree
1230
    def test_urls(self):
1231
        wt = self.make_branch_and_tree('wt')
1232
        self.assertIsInstance(wt.user_url, str)
1233
        self.assertEqual(wt.user_url, wt.user_transport.base)
1234
        self.assertEqual(wt.control_url, wt.control_transport.base)
5807.4.7 by John Arbash Meinel
Add a config setting.
1235
1236
1237
class TestWorthSavingLimit(TestCaseWithWorkingTree):
1238
1239
    def make_wt_with_worth_saving_limit(self):
1240
        wt = self.make_branch_and_tree('wt')
1241
        if getattr(wt, '_worth_saving_limit', None) is None:
1242
            raise tests.TestNotApplicable('no _worth_saving_limit for'
1243
                                          ' this tree type')
1244
        wt.lock_write()
1245
        self.addCleanup(wt.unlock)
1246
        return wt
1247
1248
    def test_not_set(self):
1249
        # Default should be 10
1250
        wt = self.make_wt_with_worth_saving_limit()
1251
        self.assertEqual(10, wt._worth_saving_limit())
1252
        ds = wt.current_dirstate()
1253
        self.assertEqual(10, ds._worth_saving_limit)
1254
1255
    def test_set_in_branch(self):
1256
        wt = self.make_wt_with_worth_saving_limit()
6449.4.3 by Jelmer Vernooij
Use WorkingTree.get_config_stack.
1257
        conf = wt.get_config_stack()
6059.4.4 by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config.
1258
        conf.set('bzr.workingtree.worth_saving_limit', '20')
5807.4.7 by John Arbash Meinel
Add a config setting.
1259
        self.assertEqual(20, wt._worth_saving_limit())
1260
        ds = wt.current_dirstate()
1261
        self.assertEqual(10, ds._worth_saving_limit)
1262
1263
    def test_invalid(self):
1264
        wt = self.make_wt_with_worth_saving_limit()
6449.4.3 by Jelmer Vernooij
Use WorkingTree.get_config_stack.
1265
        conf = wt.get_config_stack()
6059.4.4 by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config.
1266
        conf.set('bzr.workingtree.worth_saving_limit', 'a')
5807.4.7 by John Arbash Meinel
Add a config setting.
1267
        # 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.
1268
        warnings = []
1269
        def warning(*args):
1270
            warnings.append(args[0] % args[1:])
1271
        self.overrideAttr(trace, 'warning', warning)
5807.4.7 by John Arbash Meinel
Add a config setting.
1272
        self.assertEqual(10, wt._worth_saving_limit())
6059.4.4 by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config.
1273
        self.assertLength(1, warnings)
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
1274
        self.assertEqual('Value "a" is not valid for'
6059.4.4 by Vincent Ladeuil
Migrate bzr.workingtree.worth_saving_limit to stack-based config.
1275
                          ' "bzr.workingtree.worth_saving_limit"',
1276
                          warnings[0])
5993.3.1 by Jelmer Vernooij
Add WorkingTreeFormat.supports_versioned_directories attribute.
1277
1278
1279
class TestFormatAttributes(TestCaseWithWorkingTree):
1280
1281
    def test_versioned_directories(self):
1282
        self.assertSubset(
1283
            [self.workingtree_format.supports_versioned_directories],
1284
            (True, False))
6741.1.1 by Jelmer Vernooij
Add WorkingTreeFormat.supports_setting_file_ids.
1285
1286
    def test_supports_setting_file_ids(self):
1287
        self.assertSubset(
1288
            [self.workingtree_format.supports_setting_file_ids],
1289
            (True, False))
6772.3.2 by Jelmer Vernooij
Add flag for store uncommitted in working tree formats.
1290
1291
    def test_supports_store_uncommitted(self):
1292
        self.assertSubset(
1293
            [self.workingtree_format.supports_store_uncommitted],
1294
            (True, False))