/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
1
# Copyright (C) 2005, 2006 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
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
18
from cStringIO import StringIO
1399.1.12 by Robert Collins
add new test script
19
import os
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
20
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
21
from bzrlib import ignores
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
22
import bzrlib
1399.1.12 by Robert Collins
add new test script
23
from bzrlib.branch import Branch
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
24
from bzrlib import bzrdir, conflicts, errors, workingtree
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
25
from bzrlib.bzrdir import BzrDir
1508.1.3 by Robert Collins
Do not consider urls to be relative paths within working trees.
26
from bzrlib.errors import NotBranchError, NotVersionedError
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
27
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.
28
from bzrlib.mutabletree import needs_tree_write_lock
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
29
from bzrlib.osutils import pathjoin, getcwd, has_symlinks
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
30
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
1399.1.12 by Robert Collins
add new test script
31
from bzrlib.trace import mutter
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
32
from bzrlib.transport import get_transport
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
33
from bzrlib.workingtree import (
34
    TreeEntry,
35
    TreeDirectory,
36
    TreeFile,
37
    TreeLink,
38
    WorkingTree,
39
    )
1399.1.12 by Robert Collins
add new test script
40
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
41
class TestTreeDirectory(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
42
43
    def test_kind_character(self):
44
        self.assertEqual(TreeDirectory().kind_character(), '/')
45
46
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
47
class TestTreeEntry(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
48
49
    def test_kind_character(self):
50
        self.assertEqual(TreeEntry().kind_character(), '???')
51
52
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
53
class TestTreeFile(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
54
55
    def test_kind_character(self):
56
        self.assertEqual(TreeFile().kind_character(), '')
57
58
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
59
class TestTreeLink(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
60
61
    def test_kind_character(self):
62
        self.assertEqual(TreeLink().kind_character(), '')
63
64
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
65
class TestDefaultFormat(TestCaseWithTransport):
66
67
    def test_get_set_default_format(self):
68
        old_format = workingtree.WorkingTreeFormat.get_default_format()
69
        # default is 3
70
        self.assertTrue(isinstance(old_format, workingtree.WorkingTreeFormat3))
71
        workingtree.WorkingTreeFormat.set_default_format(SampleTreeFormat())
72
        try:
73
            # the default branch format is used by the meta dir format
74
            # which is not the default bzrdir format at this point
75
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
76
            dir.create_repository()
77
            dir.create_branch()
78
            result = dir.create_workingtree()
79
            self.assertEqual(result, 'A tree')
80
        finally:
81
            workingtree.WorkingTreeFormat.set_default_format(old_format)
82
        self.assertEqual(old_format, workingtree.WorkingTreeFormat.get_default_format())
83
84
85
class SampleTreeFormat(workingtree.WorkingTreeFormat):
86
    """A sample format
87
88
    this format is initializable, unsupported to aid in testing the 
89
    open and open_downlevel routines.
90
    """
91
92
    def get_format_string(self):
93
        """See WorkingTreeFormat.get_format_string()."""
94
        return "Sample tree format."
95
1508.1.24 by Robert Collins
Add update command for use with checkouts.
96
    def initialize(self, a_bzrdir, revision_id=None):
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
97
        """Sample branches cannot be created."""
98
        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.
99
        t.put_bytes('format', self.get_format_string())
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
100
        return 'A tree'
101
102
    def is_supported(self):
103
        return False
104
105
    def open(self, transport, _found=False):
106
        return "opened tree."
107
108
109
class TestWorkingTreeFormat(TestCaseWithTransport):
110
    """Tests for the WorkingTreeFormat facility."""
111
112
    def test_find_format(self):
113
        # is the right format object found for a working tree?
114
        # create a branch with a few known format objects.
115
        self.build_tree(["foo/", "bar/"])
116
        def check_format(format, url):
117
            dir = format._matchingbzrdir.initialize(url)
118
            dir.create_repository()
119
            dir.create_branch()
120
            format.initialize(dir)
121
            t = get_transport(url)
122
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
123
            self.failUnless(isinstance(found_format, format.__class__))
124
        check_format(workingtree.WorkingTreeFormat3(), "bar")
125
        
126
    def test_find_format_no_tree(self):
127
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
128
        self.assertRaises(errors.NoWorkingTree,
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
129
                          workingtree.WorkingTreeFormat.find_format,
130
                          dir)
131
132
    def test_find_format_unknown_format(self):
133
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
134
        dir.create_repository()
135
        dir.create_branch()
136
        SampleTreeFormat().initialize(dir)
137
        self.assertRaises(errors.UnknownFormatError,
138
                          workingtree.WorkingTreeFormat.find_format,
139
                          dir)
140
141
    def test_register_unregister_format(self):
142
        format = SampleTreeFormat()
143
        # make a control dir
144
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
145
        dir.create_repository()
146
        dir.create_branch()
147
        # make a branch
148
        format.initialize(dir)
149
        # register a format for it.
150
        workingtree.WorkingTreeFormat.register_format(format)
151
        # which branch.Open will refuse (not supported)
152
        self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree.open, '.')
153
        # but open_downlevel will work
154
        self.assertEqual(format.open(dir), workingtree.WorkingTree.open_downlevel('.'))
155
        # unregister the format
156
        workingtree.WorkingTreeFormat.unregister_format(format)
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
157
158
159
class TestWorkingTreeFormat3(TestCaseWithTransport):
160
    """Tests specific to WorkingTreeFormat3."""
161
162
    def test_disk_layout(self):
163
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
164
        control.create_repository()
165
        control.create_branch()
166
        tree = workingtree.WorkingTreeFormat3().initialize(control)
167
        # we want:
168
        # format 'Bazaar-NG Working Tree format 3'
169
        # inventory = blank inventory
170
        # pending-merges = ''
171
        # stat-cache = ??
172
        # no inventory.basis yet
173
        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
174
        self.assertEqualDiff('Bazaar-NG Working Tree format 3',
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
175
                             t.get('format').read())
1731.1.33 by Aaron Bentley
Revert no-special-root changes
176
        self.assertContainsRe(t.get('inventory').read(), 
177
                              '<inventory file_id="[^"]*" format="5">\n'
178
                              '</inventory>\n',
179
                             )
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
180
        self.assertEqualDiff('### bzr hashcache v5\n',
181
                             t.get('stat-cache').read())
182
        self.assertFalse(t.has('inventory.basis'))
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
183
        # no last-revision file means 'None' or 'NULLREVISION'
184
        self.assertFalse(t.has('last-revision'))
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
185
        # 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.
186
        # correctly and last-revision file becomes present.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
187
188
    def test_uses_lockdir(self):
189
        """WorkingTreeFormat3 uses its own LockDir:
190
            
191
            - lock is a directory
192
            - when the WorkingTree is locked, LockDir can see that
193
        """
194
        t = self.get_transport()
195
        url = self.get_url()
196
        dir = bzrdir.BzrDirMetaFormat1().initialize(url)
197
        repo = dir.create_repository()
198
        branch = dir.create_branch()
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
199
        try:
200
            tree = workingtree.WorkingTreeFormat3().initialize(dir)
201
        except errors.NotLocalUrl:
202
            raise TestSkipped('Not a local URL')
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
203
        self.assertIsDirectory('.bzr', t)
204
        self.assertIsDirectory('.bzr/checkout', t)
205
        self.assertIsDirectory('.bzr/checkout/lock', t)
206
        our_lock = LockDir(t, '.bzr/checkout/lock')
207
        self.assertEquals(our_lock.peek(), None)
1553.5.75 by Martin Pool
Additional WorkingTree LockDir test
208
        tree.lock_write()
209
        self.assertTrue(our_lock.peek())
210
        tree.unlock()
211
        self.assertEquals(our_lock.peek(), None)
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
212
1815.2.2 by Jelmer Vernooij
Move missing_pending_merges test to WorkingTreeFormat3-specific tests.
213
    def test_missing_pending_merges(self):
214
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
215
        control.create_repository()
216
        control.create_branch()
217
        tree = workingtree.WorkingTreeFormat3().initialize(control)
218
        tree._control_files._transport.delete("pending-merges")
1908.6.11 by Robert Collins
Remove usage of tree.pending_merges().
219
        self.assertEqual([], tree.get_parent_ids())
1815.2.2 by Jelmer Vernooij
Move missing_pending_merges test to WorkingTreeFormat3-specific tests.
220
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
221
222
class TestFormat2WorkingTree(TestCaseWithTransport):
223
    """Tests that are specific to format 2 trees."""
224
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
225
    def create_format2_tree(self, url):
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
226
        return self.make_branch_and_tree(
227
            url, format=bzrlib.bzrdir.BzrDirFormat6())
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
228
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
229
    def test_conflicts(self):
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
230
        # test backwards compatability
231
        tree = self.create_format2_tree('.')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
232
        self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
233
                          None)
234
        file('lala.BASE', 'wb').write('labase')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
235
        expected = conflicts.ContentsConflict('lala')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
236
        self.assertEqual(list(tree.conflicts()), [expected])
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
237
        file('lala', 'wb').write('la')
238
        tree.add('lala', 'lala-id')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
239
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
240
        self.assertEqual(list(tree.conflicts()), [expected])
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
241
        file('lala.THIS', 'wb').write('lathis')
242
        file('lala.OTHER', 'wb').write('laother')
243
        # When "text conflict"s happen, stem, THIS and OTHER are text
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
244
        expected = conflicts.TextConflict('lala', file_id='lala-id')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
245
        self.assertEqual(list(tree.conflicts()), [expected])
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
246
        os.unlink('lala.OTHER')
247
        os.mkdir('lala.OTHER')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
248
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
249
        self.assertEqual(list(tree.conflicts()), [expected])
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
250
251
252
class TestNonFormatSpecificCode(TestCaseWithTransport):
253
    """This class contains tests of workingtree that are not format specific."""
254
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
255
    
256
    def test_gen_file_id(self):
1864.4.1 by John Arbash Meinel
Fix bug #43801 by squashing file ids a little bit more.
257
        gen_file_id = bzrlib.workingtree.gen_file_id
258
259
        # We try to use the filename if possible
260
        self.assertStartsWith(gen_file_id('bar'), 'bar-')
261
262
        # but we squash capitalization, and remove non word characters
263
        self.assertStartsWith(gen_file_id('Mwoo oof\t m'), 'mwoooofm-')
264
265
        # We also remove leading '.' characters to prevent hidden file-ids
266
        self.assertStartsWith(gen_file_id('..gam.py'), 'gam.py-')
267
        self.assertStartsWith(gen_file_id('..Mwoo oof\t m'), 'mwoooofm-')
268
269
        # we remove unicode characters, and still don't end up with a 
270
        # hidden file id
271
        self.assertStartsWith(gen_file_id(u'\xe5\xb5.txt'), 'txt-')
272
        
1864.4.2 by John Arbash Meinel
Update the tests to verify the length of the file id, as suggested by mbp
273
        # Our current method of generating unique ids adds 33 characters
274
        # plus an serial number (log10(N) characters)
275
        # to the end of the filename. We now restrict the filename portion to
276
        # be <= 20 characters, so the maximum length should now be approx < 60
277
278
        # Test both case squashing and length restriction
1864.4.1 by John Arbash Meinel
Fix bug #43801 by squashing file ids a little bit more.
279
        fid = gen_file_id('A'*50 + '.txt')
280
        self.assertStartsWith(fid, 'a'*20 + '-')
1864.4.2 by John Arbash Meinel
Update the tests to verify the length of the file id, as suggested by mbp
281
        self.failUnless(len(fid) < 60)
1864.4.1 by John Arbash Meinel
Fix bug #43801 by squashing file ids a little bit more.
282
283
        # restricting length happens after the other actions, so
1864.4.2 by John Arbash Meinel
Update the tests to verify the length of the file id, as suggested by mbp
284
        # we preserve as much as possible
1864.4.1 by John Arbash Meinel
Fix bug #43801 by squashing file ids a little bit more.
285
        fid = gen_file_id('\xe5\xb5..aBcd\tefGhijKLMnop\tqrstuvwxyz')
286
        self.assertStartsWith(fid, 'abcdefghijklmnopqrst-')
1864.4.2 by John Arbash Meinel
Update the tests to verify the length of the file id, as suggested by mbp
287
        self.failUnless(len(fid) < 60)
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
288
289
    def test_next_id_suffix(self):
290
        bzrlib.workingtree._gen_id_suffix = None
291
        bzrlib.workingtree._next_id_suffix()
292
        self.assertNotEqual(None, bzrlib.workingtree._gen_id_suffix)
293
        bzrlib.workingtree._gen_id_suffix = "foo-"
294
        bzrlib.workingtree._gen_id_serial = 1
295
        self.assertEqual("foo-2", bzrlib.workingtree._next_id_suffix())
296
        self.assertEqual("foo-3", bzrlib.workingtree._next_id_suffix())
297
        self.assertEqual("foo-4", bzrlib.workingtree._next_id_suffix())
298
        self.assertEqual("foo-5", bzrlib.workingtree._next_id_suffix())
299
        self.assertEqual("foo-6", bzrlib.workingtree._next_id_suffix())
300
        self.assertEqual("foo-7", bzrlib.workingtree._next_id_suffix())
301
        self.assertEqual("foo-8", bzrlib.workingtree._next_id_suffix())
302
        self.assertEqual("foo-9", bzrlib.workingtree._next_id_suffix())
303
        self.assertEqual("foo-10", bzrlib.workingtree._next_id_suffix())
1714.1.2 by Robert Collins
Combine the ignore rules into a single regex rather than looping over them
304
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
305
    def test__translate_ignore_rule(self):
306
        tree = self.make_branch_and_tree('.')
307
        # translation should return the regex, the number of groups in it,
308
        # and the original rule in a tuple.
309
        # there are three sorts of ignore rules:
310
        # root only - regex is the rule itself without the leading ./
311
        self.assertEqual(
312
            "(rootdirrule$)", 
313
            tree._translate_ignore_rule("./rootdirrule"))
314
        # full path - regex is the rule itself
315
        self.assertEqual(
316
            "(path\\/to\\/file$)",
317
            tree._translate_ignore_rule("path/to/file"))
318
        # basename only rule - regex is a rule that ignores everything up
319
        # to the last / in the filename
320
        self.assertEqual(
321
            "((?:.*/)?(?!.*/)basenamerule$)",
322
            tree._translate_ignore_rule("basenamerule"))
323
324
    def test__combine_ignore_rules(self):
325
        tree = self.make_branch_and_tree('.')
326
        # the combined ignore regexs need the outer group indices
327
        # placed in a dictionary with the rules that were combined.
328
        # an empty set of rules
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
329
        # this is returned as a list of combined regex,rule sets, because
330
        # python has a limit of 100 combined regexes.
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
331
        compiled_rules = tree._combine_ignore_rules([])
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
332
        self.assertEqual([], compiled_rules)
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
333
        # one of each type of rule.
334
        compiled_rules = tree._combine_ignore_rules(
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
335
            ["rule1", "rule/two", "./three"])[0]
336
        # what type *is* the compiled regex to do an isinstance of ?
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
337
        self.assertEqual(3, compiled_rules[0].groups)
338
        self.assertEqual(
339
            {0:"rule1",1:"rule/two",2:"./three"},
340
            compiled_rules[1])
341
1713.2.5 by Robert Collins
Support more than 100 ignore rules.
342
    def test__combine_ignore_rules_grouping(self):
343
        tree = self.make_branch_and_tree('.')
344
        # when there are too many rules, the output is split into groups of 100
345
        rules = []
346
        for index in range(198):
347
            rules.append('foo')
348
        self.assertEqual(2, len(tree._combine_ignore_rules(rules)))
349
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
350
    def test__get_ignore_rules_as_regex(self):
351
        tree = self.make_branch_and_tree('.')
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
352
        # Setup the default ignore list to be empty
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
353
        ignores._set_user_ignores([])
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
354
1836.1.23 by John Arbash Meinel
Workaround plugins modifying the DEFAULT_IGNORE list when testing exact results.
355
        # some plugins (shelf) modifies the DEFAULT_IGNORE list in memory
356
        # which causes this test to fail so force the DEFAULT_IGNORE
357
        # list to be empty
358
        orig_default = bzrlib.DEFAULT_IGNORE
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
359
        # Also make sure the runtime ignore list is empty
360
        orig_runtime = ignores._runtime_ignores
1836.1.23 by John Arbash Meinel
Workaround plugins modifying the DEFAULT_IGNORE list when testing exact results.
361
        try:
362
            bzrlib.DEFAULT_IGNORE = []
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
363
            ignores._runtime_ignores = set()
364
1836.1.23 by John Arbash Meinel
Workaround plugins modifying the DEFAULT_IGNORE list when testing exact results.
365
            self.build_tree_contents([('.bzrignore', 'CVS\n.hg\n')])
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
366
            reference_output = tree._combine_ignore_rules(
367
                                    set(['CVS', '.hg']))[0]
1836.1.23 by John Arbash Meinel
Workaround plugins modifying the DEFAULT_IGNORE list when testing exact results.
368
            regex_rules = tree._get_ignore_rules_as_regex()[0]
369
            self.assertEqual(len(reference_output[1]), regex_rules[0].groups)
370
            self.assertEqual(reference_output[1], regex_rules[1])
371
        finally:
372
            bzrlib.DEFAULT_IGNORE = orig_default
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
373
            ignores._runtime_ignores = orig_runtime
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
374
375
376
class InstrumentedTree(object):
377
    """A instrumented tree to check the needs_tree_write_lock decorator."""
378
379
    def __init__(self):
380
        self._locks = []
381
382
    def lock_tree_write(self):
383
        self._locks.append('t')
384
385
    @needs_tree_write_lock
386
    def method_with_tree_write_lock(self, *args, **kwargs):
387
        """A lock_tree_write decorated method that returns its arguments."""
388
        return args, kwargs
389
390
    @needs_tree_write_lock
391
    def method_that_raises(self):
392
        """This method causes an exception when called with parameters.
393
        
394
        This allows the decorator code to be checked - it should still call
395
        unlock.
396
        """
397
398
    def unlock(self):
399
        self._locks.append('u')
400
401
402
class TestInstrumentedTree(TestCase):
403
404
    def test_needs_tree_write_lock(self):
405
        """@needs_tree_write_lock should be semantically transparent."""
406
        tree = InstrumentedTree()
407
        self.assertEqual(
408
            'method_with_tree_write_lock',
409
            tree.method_with_tree_write_lock.__name__)
410
        self.assertEqual(
411
            "A lock_tree_write decorated method that returns its arguments.",
412
            tree.method_with_tree_write_lock.__doc__)
413
        args = (1, 2, 3)
414
        kwargs = {'a':'b'}
415
        result = tree.method_with_tree_write_lock(1,2,3, a='b')
416
        self.assertEqual((args, kwargs), result)
417
        self.assertEqual(['t', 'u'], tree._locks)
418
        self.assertRaises(TypeError, tree.method_that_raises, 'foo')
419
        self.assertEqual(['t', 'u', 't', 'u'], tree._locks)