/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) 2005-2011 Canonical Ltd
1399.1.12 by Robert Collins
add new test script
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
#
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1399.1.12 by Robert Collins
add new test script
17
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
18
from bzrlib import (
19
    bzrdir,
20
    conflicts,
21
    errors,
5662.3.3 by Jelmer Vernooij
add tests
22
    symbol_versioning,
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
23
    transport,
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
24
    workingtree,
5816.5.1 by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3.
25
    workingtree_3,
5816.5.7 by Jelmer Vernooij
Fix more imports.
26
    workingtree_4,
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
27
    )
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
28
from bzrlib.lockdir import LockDir
1986.1.8 by Robert Collins
Update to bzr.dev, which involves adding lock_tree_write to MutableTree and MemoryTree.
29
from bzrlib.mutabletree import needs_tree_write_lock
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
30
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
31
from bzrlib.workingtree import (
32
    TreeEntry,
33
    TreeDirectory,
34
    TreeFile,
35
    TreeLink,
36
    )
1399.1.12 by Robert Collins
add new test script
37
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
38
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
39
class TestTreeDirectory(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
40
41
    def test_kind_character(self):
42
        self.assertEqual(TreeDirectory().kind_character(), '/')
43
44
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
45
class TestTreeEntry(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
46
47
    def test_kind_character(self):
48
        self.assertEqual(TreeEntry().kind_character(), '???')
49
50
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
51
class TestTreeFile(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
52
53
    def test_kind_character(self):
54
        self.assertEqual(TreeFile().kind_character(), '')
55
56
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
57
class TestTreeLink(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
58
59
    def test_kind_character(self):
60
        self.assertEqual(TreeLink().kind_character(), '')
61
62
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
63
class TestDefaultFormat(TestCaseWithTransport):
64
65
    def test_get_set_default_format(self):
5662.3.3 by Jelmer Vernooij
add tests
66
        old_format = workingtree.format_registry.get_default()
5816.5.2 by Jelmer Vernooij
Fix comment - default wt format is 6.
67
        # default is 6
5816.5.7 by Jelmer Vernooij
Fix more imports.
68
        self.assertTrue(isinstance(old_format, workingtree_4.WorkingTreeFormat6))
5662.3.3 by Jelmer Vernooij
add tests
69
        workingtree.format_registry.set_default(SampleTreeFormat())
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
70
        try:
71
            # the default branch format is used by the meta dir format
72
            # which is not the default bzrdir format at this point
73
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
74
            dir.create_repository()
75
            dir.create_branch()
76
            result = dir.create_workingtree()
77
            self.assertEqual(result, 'A tree')
78
        finally:
5662.3.3 by Jelmer Vernooij
add tests
79
            workingtree.format_registry.set_default(old_format)
80
        self.assertEqual(old_format, workingtree.format_registry.get_default())
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
81
6349.2.4 by Jelmer Vernooij
Add test for WorkingTreeFormat.from_string.
82
    def test_from_string(self):
83
        self.assertIsInstance(
84
            SampleTreeFormat.from_string("Sample tree format."),
85
            SampleTreeFormat)
6213.1.54 by Jelmer Vernooij
Fix tests.
86
        self.assertRaises(AssertionError,
6349.2.4 by Jelmer Vernooij
Add test for WorkingTreeFormat.from_string.
87
            SampleTreeFormat.from_string, "Different format string.")
88
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
89
    def test_get_set_default_format_by_key(self):
90
        old_format = workingtree.format_registry.get_default()
5816.5.7 by Jelmer Vernooij
Fix more imports.
91
        # default is 6
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
92
        format = SampleTreeFormat()
93
        workingtree.format_registry.register(format)
94
        self.addCleanup(workingtree.format_registry.remove, format)
5816.5.7 by Jelmer Vernooij
Fix more imports.
95
        self.assertTrue(isinstance(old_format, workingtree_4.WorkingTreeFormat6))
5816.2.1 by Jelmer Vernooij
Allow lazily setting default for working trees.
96
        workingtree.format_registry.set_default_key(format.get_format_string())
97
        try:
98
            # the default branch format is used by the meta dir format
99
            # which is not the default bzrdir format at this point
100
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
101
            dir.create_repository()
102
            dir.create_branch()
103
            result = dir.create_workingtree()
104
            self.assertEqual(result, 'A tree')
105
        finally:
106
            workingtree.format_registry.set_default_key(
107
                old_format.get_format_string())
108
        self.assertEqual(old_format, workingtree.format_registry.get_default())
109
3753.1.1 by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing.
110
    def test_open(self):
111
        tree = self.make_branch_and_tree('.')
3753.1.2 by John Arbash Meinel
Switch to using the class attribute, rather than the instance
112
        open_direct = workingtree.WorkingTree.open('.')
3753.1.1 by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing.
113
        self.assertEqual(tree.basedir, open_direct.basedir)
3753.1.2 by John Arbash Meinel
Switch to using the class attribute, rather than the instance
114
        open_no_args = workingtree.WorkingTree.open()
3753.1.1 by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing.
115
        self.assertEqual(tree.basedir, open_no_args.basedir)
116
117
    def test_open_containing(self):
118
        tree = self.make_branch_and_tree('.')
3753.1.2 by John Arbash Meinel
Switch to using the class attribute, rather than the instance
119
        open_direct, relpath = workingtree.WorkingTree.open_containing('.')
3753.1.1 by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing.
120
        self.assertEqual(tree.basedir, open_direct.basedir)
121
        self.assertEqual('', relpath)
3753.1.2 by John Arbash Meinel
Switch to using the class attribute, rather than the instance
122
        open_no_args, relpath = workingtree.WorkingTree.open_containing()
3753.1.1 by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing.
123
        self.assertEqual(tree.basedir, open_no_args.basedir)
124
        self.assertEqual('', relpath)
3753.1.2 by John Arbash Meinel
Switch to using the class attribute, rather than the instance
125
        open_subdir, relpath = workingtree.WorkingTree.open_containing('subdir')
3753.1.1 by John Arbash Meinel
Add some simple direct tests for WT.open and WT.open_containing.
126
        self.assertEqual(tree.basedir, open_subdir.basedir)
127
        self.assertEqual('subdir', relpath)
128
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
129
6349.2.4 by Jelmer Vernooij
Add test for WorkingTreeFormat.from_string.
130
class SampleTreeFormat(workingtree.WorkingTreeFormatMetaDir):
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
131
    """A sample format
132
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
133
    this format is initializable, unsupported to aid in testing the
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
134
    open and open_downlevel routines.
135
    """
136
6349.2.4 by Jelmer Vernooij
Add test for WorkingTreeFormat.from_string.
137
    @classmethod
138
    def get_format_string(cls):
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
139
        """See WorkingTreeFormat.get_format_string()."""
140
        return "Sample tree format."
141
3123.5.3 by Aaron Bentley
Get tests passing with accelerator_tree
142
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
3136.1.5 by Aaron Bentley
Fix sample workingtree format
143
                   accelerator_tree=None, hardlink=False):
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
144
        """Sample branches cannot be created."""
145
        t = a_bzrdir.get_workingtree_transport(self)
1955.3.13 by John Arbash Meinel
Run the full test suite, and fix up any deprecation warnings.
146
        t.put_bytes('format', self.get_format_string())
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
147
        return 'A tree'
148
149
    def is_supported(self):
150
        return False
151
152
    def open(self, transport, _found=False):
153
        return "opened tree."
154
155
5642.2.4 by Jelmer Vernooij
add tests.
156
class SampleExtraTreeFormat(workingtree.WorkingTreeFormat):
157
    """A sample format that does not support use in a metadir.
158
159
    """
160
161
    def get_format_string(self):
162
        # Not usable in a metadir, so no format string
163
        return None
164
165
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
166
                   accelerator_tree=None, hardlink=False):
167
        raise NotImplementedError(self.initialize)
168
169
    def is_supported(self):
170
        return False
171
172
    def open(self, transport, _found=False):
173
        raise NotImplementedError(self.open)
174
175
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
176
class TestWorkingTreeFormat(TestCaseWithTransport):
177
    """Tests for the WorkingTreeFormat facility."""
178
5816.3.3 by Jelmer Vernooij
Add tariff test to make sure working tree isn't opened by 'bzr serve'
179
    def test_find_format_string(self):
180
        # is the right format object found for a working tree?
181
        branch = self.make_branch('branch')
182
        self.assertRaises(errors.NoWorkingTree,
6349.2.2 by Jelmer Vernooij
Fix remaining tests.
183
            workingtree.WorkingTreeFormatMetaDir.find_format_string, branch.bzrdir)
5816.3.3 by Jelmer Vernooij
Add tariff test to make sure working tree isn't opened by 'bzr serve'
184
        transport = branch.bzrdir.get_workingtree_transport(None)
185
        transport.mkdir('.')
186
        transport.put_bytes("format", "some format name")
187
        # The format does not have to be known by Bazaar,
188
        # find_format_string just retrieves the name
189
        self.assertEquals("some format name",
6349.2.2 by Jelmer Vernooij
Fix remaining tests.
190
            workingtree.WorkingTreeFormatMetaDir.find_format_string(branch.bzrdir))
5816.3.3 by Jelmer Vernooij
Add tariff test to make sure working tree isn't opened by 'bzr serve'
191
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
192
    def test_find_format(self):
193
        # is the right format object found for a working tree?
194
        # create a branch with a few known format objects.
195
        self.build_tree(["foo/", "bar/"])
196
        def check_format(format, url):
197
            dir = format._matchingbzrdir.initialize(url)
198
            dir.create_repository()
199
            dir.create_branch()
200
            format.initialize(dir)
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
201
            t = transport.get_transport(url)
6349.2.2 by Jelmer Vernooij
Fix remaining tests.
202
            found_format = workingtree.WorkingTreeFormatMetaDir.find_format(dir)
5784.1.1 by Martin Pool
Stop using failIf, failUnless, etc
203
            self.assertIsInstance(found_format, format.__class__)
5816.5.1 by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3.
204
        check_format(workingtree_3.WorkingTreeFormat3(), "bar")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
205
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
206
    def test_find_format_no_tree(self):
207
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
208
        self.assertRaises(errors.NoWorkingTree,
6349.2.2 by Jelmer Vernooij
Fix remaining tests.
209
                          workingtree.WorkingTreeFormatMetaDir.find_format,
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
210
                          dir)
211
212
    def test_find_format_unknown_format(self):
213
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
214
        dir.create_repository()
215
        dir.create_branch()
216
        SampleTreeFormat().initialize(dir)
217
        self.assertRaises(errors.UnknownFormatError,
6349.2.2 by Jelmer Vernooij
Fix remaining tests.
218
                          workingtree.WorkingTreeFormatMetaDir.find_format,
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
219
                          dir)
220
221
    def test_register_unregister_format(self):
222
        format = SampleTreeFormat()
223
        # make a control dir
224
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
225
        dir.create_repository()
226
        dir.create_branch()
227
        # make a branch
228
        format.initialize(dir)
229
        # register a format for it.
5662.3.3 by Jelmer Vernooij
add tests
230
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
231
            workingtree.WorkingTreeFormat.register_format, format)
232
        self.assertTrue(format in 
233
            self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
234
                workingtree.WorkingTreeFormat.get_formats))
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
235
        # which branch.Open will refuse (not supported)
236
        self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree.open, '.')
237
        # but open_downlevel will work
238
        self.assertEqual(format.open(dir), workingtree.WorkingTree.open_downlevel('.'))
239
        # unregister the format
5662.3.3 by Jelmer Vernooij
add tests
240
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
241
            workingtree.WorkingTreeFormat.unregister_format, format)
242
        self.assertFalse(format in
243
            self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
244
                workingtree.WorkingTreeFormat.get_formats))
245
6213.1.36 by Jelmer Vernooij
Add news entry, test for working tree features.
246
    def test_find_format_with_features(self):
247
        tree = self.make_branch_and_tree('.', format='2a')
6213.1.58 by Jelmer Vernooij
Use update_feature_flags everywhere.
248
        tree.update_feature_flags({"name": "necessity"})
6213.1.36 by Jelmer Vernooij
Add news entry, test for working tree features.
249
        found_format = workingtree.WorkingTreeFormatMetaDir.find_format(
250
            tree.bzrdir)
251
        self.assertIsInstance(found_format, workingtree.WorkingTreeFormat)
252
        self.assertEquals(found_format.features.get("name"), "necessity")
253
        self.assertRaises(errors.MissingFeature, found_format.check_support_status,
254
            True)
255
        self.addCleanup(workingtree.WorkingTreeFormatMetaDir.unregister_feature,
256
            "name")
257
        workingtree.WorkingTreeFormatMetaDir.register_feature("name")
258
        found_format.check_support_status(True)
259
5662.3.3 by Jelmer Vernooij
add tests
260
5786.1.5 by John Arbash Meinel
Move the logic about InventoryDirectory => TreeReference into iter_entries
261
class TestWorkingTreeIterEntriesByDir_wSubtrees(TestCaseWithTransport):
262
263
    def make_simple_tree(self):
264
        tree = self.make_branch_and_tree('tree', format='development-subtree')
265
        self.build_tree(['tree/a/', 'tree/a/b/', 'tree/a/b/c'])
266
        tree.set_root_id('root-id')
267
        tree.add(['a', 'a/b', 'a/b/c'], ['a-id', 'b-id', 'c-id'])
268
        tree.commit('initial')
269
        return tree
270
271
    def test_just_directory(self):
272
        tree = self.make_simple_tree()
273
        self.assertEqual([('directory', 'root-id'),
274
                          ('directory', 'a-id'),
275
                          ('directory', 'b-id'),
276
                          ('file', 'c-id')],
277
                         [(ie.kind, ie.file_id)
278
                          for path, ie in tree.iter_entries_by_dir()])
279
        subtree = self.make_branch_and_tree('tree/a/b')
280
        self.assertEqual([('tree-reference', 'b-id')],
281
                         [(ie.kind, ie.file_id)
282
                          for path, ie in tree.iter_entries_by_dir(['b-id'])])
283
284
    def test_direct_subtree(self):
285
        tree = self.make_simple_tree()
286
        subtree = self.make_branch_and_tree('tree/a/b')
287
        self.assertEqual([('directory', 'root-id'),
288
                          ('directory', 'a-id'),
289
                          ('tree-reference', 'b-id')],
290
                         [(ie.kind, ie.file_id)
291
                          for path, ie in tree.iter_entries_by_dir()])
292
293
    def test_indirect_subtree(self):
294
        tree = self.make_simple_tree()
295
        subtree = self.make_branch_and_tree('tree/a')
296
        self.assertEqual([('directory', 'root-id'),
297
                          ('tree-reference', 'a-id')],
298
                         [(ie.kind, ie.file_id)
299
                          for path, ie in tree.iter_entries_by_dir()])
300
301
5662.3.3 by Jelmer Vernooij
add tests
302
class TestWorkingTreeFormatRegistry(TestCase):
303
304
    def setUp(self):
305
        super(TestWorkingTreeFormatRegistry, self).setUp()
306
        self.registry = workingtree.WorkingTreeFormatRegistry()
307
308
    def test_register_unregister_format(self):
309
        format = SampleTreeFormat()
310
        self.registry.register(format)
311
        self.assertEquals(format, self.registry.get("Sample tree format."))
312
        self.registry.remove(format)
313
        self.assertRaises(KeyError, self.registry.get, "Sample tree format.")
314
315
    def test_get_all(self):
316
        format = SampleTreeFormat()
317
        self.assertEquals([], self.registry._get_all())
318
        self.registry.register(format)
319
        self.assertEquals([format], self.registry._get_all())
320
321
    def test_register_extra(self):
5642.2.4 by Jelmer Vernooij
add tests.
322
        format = SampleExtraTreeFormat()
5662.3.3 by Jelmer Vernooij
add tests
323
        self.assertEquals([], self.registry._get_all())
324
        self.registry.register_extra(format)
325
        self.assertEquals([format], self.registry._get_all())
326
327
    def test_register_extra_lazy(self):
328
        self.assertEquals([], self.registry._get_all())
329
        self.registry.register_extra_lazy("bzrlib.tests.test_workingtree",
330
            "SampleExtraTreeFormat")
331
        formats = self.registry._get_all()
332
        self.assertEquals(1, len(formats))
333
        self.assertIsInstance(formats[0], SampleExtraTreeFormat)
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
334
335
336
class TestWorkingTreeFormat3(TestCaseWithTransport):
337
    """Tests specific to WorkingTreeFormat3."""
338
339
    def test_disk_layout(self):
340
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
341
        control.create_repository()
342
        control.create_branch()
5816.5.1 by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3.
343
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
344
        # we want:
345
        # format 'Bazaar-NG Working Tree format 3'
346
        # inventory = blank inventory
347
        # pending-merges = ''
348
        # stat-cache = ??
349
        # no inventory.basis yet
350
        t = control.get_workingtree_transport(None)
1553.5.81 by Martin Pool
Revert change to WorkingTreeFormat3 format string; too many things want it the old way
351
        self.assertEqualDiff('Bazaar-NG Working Tree format 3',
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
352
                             t.get('format').read())
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
353
        self.assertEqualDiff(t.get('inventory').read(),
2100.3.12 by Aaron Bentley
Stop generating unique roots for WorkingTree3
354
                              '<inventory format="5">\n'
1731.1.33 by Aaron Bentley
Revert no-special-root changes
355
                              '</inventory>\n',
356
                             )
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
357
        self.assertEqualDiff('### bzr hashcache v5\n',
358
                             t.get('stat-cache').read())
359
        self.assertFalse(t.has('inventory.basis'))
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
360
        # no last-revision file means 'None' or 'NULLREVISION'
361
        self.assertFalse(t.has('last-revision'))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
362
        # TODO RBC 20060210 do a commit, check the inventory.basis is created
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
363
        # correctly and last-revision file becomes present.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
364
365
    def test_uses_lockdir(self):
366
        """WorkingTreeFormat3 uses its own LockDir:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
367
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
368
            - lock is a directory
369
            - when the WorkingTree is locked, LockDir can see that
370
        """
371
        t = self.get_transport()
372
        url = self.get_url()
373
        dir = bzrdir.BzrDirMetaFormat1().initialize(url)
374
        repo = dir.create_repository()
375
        branch = dir.create_branch()
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
376
        try:
5816.5.1 by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3.
377
            tree = workingtree_3.WorkingTreeFormat3().initialize(dir)
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
378
        except errors.NotLocalUrl:
379
            raise TestSkipped('Not a local URL')
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
380
        self.assertIsDirectory('.bzr', t)
381
        self.assertIsDirectory('.bzr/checkout', t)
382
        self.assertIsDirectory('.bzr/checkout/lock', t)
383
        our_lock = LockDir(t, '.bzr/checkout/lock')
384
        self.assertEquals(our_lock.peek(), None)
1553.5.75 by Martin Pool
Additional WorkingTree LockDir test
385
        tree.lock_write()
386
        self.assertTrue(our_lock.peek())
387
        tree.unlock()
388
        self.assertEquals(our_lock.peek(), None)
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
389
1815.2.2 by Jelmer Vernooij
Move missing_pending_merges test to WorkingTreeFormat3-specific tests.
390
    def test_missing_pending_merges(self):
391
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
392
        control.create_repository()
393
        control.create_branch()
5816.5.1 by Jelmer Vernooij
Move WorkingTree3 to bzrlib.workingtree_3.
394
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
395
        tree._transport.delete("pending-merges")
1908.6.11 by Robert Collins
Remove usage of tree.pending_merges().
396
        self.assertEqual([], tree.get_parent_ids())
1815.2.2 by Jelmer Vernooij
Move missing_pending_merges test to WorkingTreeFormat3-specific tests.
397
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
398
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
399
class InstrumentedTree(object):
400
    """A instrumented tree to check the needs_tree_write_lock decorator."""
401
402
    def __init__(self):
403
        self._locks = []
404
405
    def lock_tree_write(self):
406
        self._locks.append('t')
407
408
    @needs_tree_write_lock
409
    def method_with_tree_write_lock(self, *args, **kwargs):
410
        """A lock_tree_write decorated method that returns its arguments."""
411
        return args, kwargs
412
413
    @needs_tree_write_lock
414
    def method_that_raises(self):
415
        """This method causes an exception when called with parameters.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
416
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
417
        This allows the decorator code to be checked - it should still call
418
        unlock.
419
        """
420
421
    def unlock(self):
422
        self._locks.append('u')
423
424
425
class TestInstrumentedTree(TestCase):
426
427
    def test_needs_tree_write_lock(self):
428
        """@needs_tree_write_lock should be semantically transparent."""
429
        tree = InstrumentedTree()
430
        self.assertEqual(
431
            'method_with_tree_write_lock',
432
            tree.method_with_tree_write_lock.__name__)
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
433
        self.assertDocstring(
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
434
            "A lock_tree_write decorated method that returns its arguments.",
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
435
            tree.method_with_tree_write_lock)
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
436
        args = (1, 2, 3)
437
        kwargs = {'a':'b'}
438
        result = tree.method_with_tree_write_lock(1,2,3, a='b')
439
        self.assertEqual((args, kwargs), result)
440
        self.assertEqual(['t', 'u'], tree._locks)
441
        self.assertRaises(TypeError, tree.method_that_raises, 'foo')
442
        self.assertEqual(['t', 'u', 't', 'u'], tree._locks)
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
443
444
3017.2.1 by Aaron Bentley
Revert now resolves conflicts recursively (#102739)
445
class TestRevert(TestCaseWithTransport):
446
447
    def test_revert_conflicts_recursive(self):
448
        this_tree = self.make_branch_and_tree('this-tree')
449
        self.build_tree_contents([('this-tree/foo/',),
450
                                  ('this-tree/foo/bar', 'bar')])
451
        this_tree.add(['foo', 'foo/bar'])
452
        this_tree.commit('created foo/bar')
453
        other_tree = this_tree.bzrdir.sprout('other-tree').open_workingtree()
454
        self.build_tree_contents([('other-tree/foo/bar', 'baz')])
455
        other_tree.commit('changed bar')
456
        self.build_tree_contents([('this-tree/foo/bar', 'qux')])
457
        this_tree.commit('changed qux')
458
        this_tree.merge_from_branch(other_tree.branch)
459
        self.assertEqual(1, len(this_tree.conflicts()))
460
        this_tree.revert(['foo'])
461
        self.assertEqual(0, len(this_tree.conflicts()))
462
463
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
464
class TestAutoResolve(TestCaseWithTransport):
465
466
    def test_auto_resolve(self):
467
        base = self.make_branch_and_tree('base')
468
        self.build_tree_contents([('base/hello', 'Hello')])
469
        base.add('hello', 'hello_id')
470
        base.commit('Hello')
471
        other = base.bzrdir.sprout('other').open_workingtree()
472
        self.build_tree_contents([('other/hello', 'hELLO')])
473
        other.commit('Case switch')
474
        this = base.bzrdir.sprout('this').open_workingtree()
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
475
        self.assertPathExists('this/hello')
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
476
        self.build_tree_contents([('this/hello', 'Hello World')])
477
        this.commit('Add World')
478
        this.merge_from_branch(other.branch)
5050.51.3 by Vincent Ladeuil
Fix test failing on pqm.
479
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
480
                         this.conflicts())
481
        this.auto_resolve()
5050.51.3 by Vincent Ladeuil
Fix test failing on pqm.
482
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
483
                         this.conflicts())
484
        self.build_tree_contents([('this/hello', '<<<<<<<')])
485
        this.auto_resolve()
5050.51.3 by Vincent Ladeuil
Fix test failing on pqm.
486
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
487
                         this.conflicts())
488
        self.build_tree_contents([('this/hello', '=======')])
489
        this.auto_resolve()
5050.51.3 by Vincent Ladeuil
Fix test failing on pqm.
490
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
491
                         this.conflicts())
492
        self.build_tree_contents([('this/hello', '\n>>>>>>>')])
493
        remaining, resolved = this.auto_resolve()
5050.51.3 by Vincent Ladeuil
Fix test failing on pqm.
494
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
495
                         this.conflicts())
496
        self.assertEqual([], resolved)
497
        self.build_tree_contents([('this/hello', 'hELLO wORLD')])
498
        remaining, resolved = this.auto_resolve()
499
        self.assertEqual([], this.conflicts())
5050.51.3 by Vincent Ladeuil
Fix test failing on pqm.
500
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
501
                         resolved)
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
502
        self.assertPathDoesNotExist('this/hello.BASE')
2120.7.3 by Aaron Bentley
Update resolve command to automatically mark conflicts as resolved
503
504
    def test_auto_resolve_dir(self):
505
        tree = self.make_branch_and_tree('tree')
506
        self.build_tree(['tree/hello/'])
507
        tree.add('hello', 'hello-id')
5050.51.3 by Vincent Ladeuil
Fix test failing on pqm.
508
        file_conflict = conflicts.TextConflict('file', 'hello-id')
2120.7.3 by Aaron Bentley
Update resolve command to automatically mark conflicts as resolved
509
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
510
        tree.auto_resolve()
3140.1.4 by Aaron Bentley
Add WorkingTree.find_trees
511
512
513
class TestFindTrees(TestCaseWithTransport):
514
515
    def test_find_trees(self):
516
        self.make_branch_and_tree('foo')
517
        self.make_branch_and_tree('foo/bar')
518
        # Sticking a tree inside a control dir is heinous, so let's skip it
519
        self.make_branch_and_tree('foo/.bzr/baz')
520
        self.make_branch('qux')
521
        trees = workingtree.WorkingTree.find_trees('.')
522
        self.assertEqual(2, len(list(trees)))