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