/brz/remove-bazaar

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