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