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