~bzr-pqm/bzr/bzr.dev

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
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
21
from bzrlib import (
22
    bzrdir,
23
    conflicts,
24
    errors,
25
    workingtree,
26
    )
1399.1.12 by Robert Collins
add new test script
27
from bzrlib.branch import Branch
1534.4.41 by Robert Collins
Branch now uses BzrDir reasonably sanely.
28
from bzrlib.bzrdir import BzrDir
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
29
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.
30
from bzrlib.mutabletree import needs_tree_write_lock
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
31
from bzrlib.symbol_versioning import zero_thirteen
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
32
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
33
from bzrlib.transport import get_transport
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
34
from bzrlib.workingtree import (
35
    TreeEntry,
36
    TreeDirectory,
37
    TreeFile,
38
    TreeLink,
39
    )
1399.1.12 by Robert Collins
add new test script
40
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
41
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
42
class TestTreeDirectory(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
43
44
    def test_kind_character(self):
45
        self.assertEqual(TreeDirectory().kind_character(), '/')
46
47
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
48
class TestTreeEntry(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
49
50
    def test_kind_character(self):
51
        self.assertEqual(TreeEntry().kind_character(), '???')
52
53
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
54
class TestTreeFile(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
55
56
    def test_kind_character(self):
57
        self.assertEqual(TreeFile().kind_character(), '')
58
59
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
60
class TestTreeLink(TestCaseWithTransport):
1399.1.12 by Robert Collins
add new test script
61
62
    def test_kind_character(self):
63
        self.assertEqual(TreeLink().kind_character(), '')
64
65
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
66
class TestDefaultFormat(TestCaseWithTransport):
67
68
    def test_get_set_default_format(self):
69
        old_format = workingtree.WorkingTreeFormat.get_default_format()
70
        # default is 3
71
        self.assertTrue(isinstance(old_format, workingtree.WorkingTreeFormat3))
72
        workingtree.WorkingTreeFormat.set_default_format(SampleTreeFormat())
73
        try:
74
            # the default branch format is used by the meta dir format
75
            # which is not the default bzrdir format at this point
76
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
77
            dir.create_repository()
78
            dir.create_branch()
79
            result = dir.create_workingtree()
80
            self.assertEqual(result, 'A tree')
81
        finally:
82
            workingtree.WorkingTreeFormat.set_default_format(old_format)
83
        self.assertEqual(old_format, workingtree.WorkingTreeFormat.get_default_format())
84
85
86
class SampleTreeFormat(workingtree.WorkingTreeFormat):
87
    """A sample format
88
89
    this format is initializable, unsupported to aid in testing the 
90
    open and open_downlevel routines.
91
    """
92
93
    def get_format_string(self):
94
        """See WorkingTreeFormat.get_format_string()."""
95
        return "Sample tree format."
96
3123.5.3 by Aaron Bentley
Get tests passing with accelerator_tree
97
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
3136.1.5 by Aaron Bentley
Fix sample workingtree format
98
                   accelerator_tree=None, hardlink=False):
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
99
        """Sample branches cannot be created."""
100
        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.
101
        t.put_bytes('format', self.get_format_string())
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
102
        return 'A tree'
103
104
    def is_supported(self):
105
        return False
106
107
    def open(self, transport, _found=False):
108
        return "opened tree."
109
110
111
class TestWorkingTreeFormat(TestCaseWithTransport):
112
    """Tests for the WorkingTreeFormat facility."""
113
114
    def test_find_format(self):
115
        # is the right format object found for a working tree?
116
        # create a branch with a few known format objects.
117
        self.build_tree(["foo/", "bar/"])
118
        def check_format(format, url):
119
            dir = format._matchingbzrdir.initialize(url)
120
            dir.create_repository()
121
            dir.create_branch()
122
            format.initialize(dir)
123
            t = get_transport(url)
124
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
125
            self.failUnless(isinstance(found_format, format.__class__))
126
        check_format(workingtree.WorkingTreeFormat3(), "bar")
127
        
128
    def test_find_format_no_tree(self):
129
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
130
        self.assertRaises(errors.NoWorkingTree,
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
131
                          workingtree.WorkingTreeFormat.find_format,
132
                          dir)
133
134
    def test_find_format_unknown_format(self):
135
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
136
        dir.create_repository()
137
        dir.create_branch()
138
        SampleTreeFormat().initialize(dir)
139
        self.assertRaises(errors.UnknownFormatError,
140
                          workingtree.WorkingTreeFormat.find_format,
141
                          dir)
142
143
    def test_register_unregister_format(self):
144
        format = SampleTreeFormat()
145
        # make a control dir
146
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
147
        dir.create_repository()
148
        dir.create_branch()
149
        # make a branch
150
        format.initialize(dir)
151
        # register a format for it.
152
        workingtree.WorkingTreeFormat.register_format(format)
153
        # which branch.Open will refuse (not supported)
154
        self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree.open, '.')
155
        # but open_downlevel will work
156
        self.assertEqual(format.open(dir), workingtree.WorkingTree.open_downlevel('.'))
157
        # unregister the format
158
        workingtree.WorkingTreeFormat.unregister_format(format)
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
159
160
161
class TestWorkingTreeFormat3(TestCaseWithTransport):
162
    """Tests specific to WorkingTreeFormat3."""
163
164
    def test_disk_layout(self):
165
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
166
        control.create_repository()
167
        control.create_branch()
168
        tree = workingtree.WorkingTreeFormat3().initialize(control)
169
        # we want:
170
        # format 'Bazaar-NG Working Tree format 3'
171
        # inventory = blank inventory
172
        # pending-merges = ''
173
        # stat-cache = ??
174
        # no inventory.basis yet
175
        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
176
        self.assertEqualDiff('Bazaar-NG Working Tree format 3',
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
177
                             t.get('format').read())
2100.3.12 by Aaron Bentley
Stop generating unique roots for WorkingTree3
178
        self.assertEqualDiff(t.get('inventory').read(), 
179
                              '<inventory format="5">\n'
1731.1.33 by Aaron Bentley
Revert no-special-root changes
180
                              '</inventory>\n',
181
                             )
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
182
        self.assertEqualDiff('### bzr hashcache v5\n',
183
                             t.get('stat-cache').read())
184
        self.assertFalse(t.has('inventory.basis'))
1508.1.19 by Robert Collins
Give format3 working trees their own last-revision marker.
185
        # no last-revision file means 'None' or 'NULLREVISION'
186
        self.assertFalse(t.has('last-revision'))
1534.4.51 by Robert Collins
Test the disk layout of format3 working trees.
187
        # 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.
188
        # correctly and last-revision file becomes present.
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
189
190
    def test_uses_lockdir(self):
191
        """WorkingTreeFormat3 uses its own LockDir:
192
            
193
            - lock is a directory
194
            - when the WorkingTree is locked, LockDir can see that
195
        """
196
        t = self.get_transport()
197
        url = self.get_url()
198
        dir = bzrdir.BzrDirMetaFormat1().initialize(url)
199
        repo = dir.create_repository()
200
        branch = dir.create_branch()
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
201
        try:
202
            tree = workingtree.WorkingTreeFormat3().initialize(dir)
203
        except errors.NotLocalUrl:
204
            raise TestSkipped('Not a local URL')
1553.5.74 by Martin Pool
Convert WorkingTree format3 to use LockDirs
205
        self.assertIsDirectory('.bzr', t)
206
        self.assertIsDirectory('.bzr/checkout', t)
207
        self.assertIsDirectory('.bzr/checkout/lock', t)
208
        our_lock = LockDir(t, '.bzr/checkout/lock')
209
        self.assertEquals(our_lock.peek(), None)
1553.5.75 by Martin Pool
Additional WorkingTree LockDir test
210
        tree.lock_write()
211
        self.assertTrue(our_lock.peek())
212
        tree.unlock()
213
        self.assertEquals(our_lock.peek(), None)
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
214
1815.2.2 by Jelmer Vernooij
Move missing_pending_merges test to WorkingTreeFormat3-specific tests.
215
    def test_missing_pending_merges(self):
216
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
217
        control.create_repository()
218
        control.create_branch()
219
        tree = workingtree.WorkingTreeFormat3().initialize(control)
220
        tree._control_files._transport.delete("pending-merges")
1908.6.11 by Robert Collins
Remove usage of tree.pending_merges().
221
        self.assertEqual([], tree.get_parent_ids())
1815.2.2 by Jelmer Vernooij
Move missing_pending_merges test to WorkingTreeFormat3-specific tests.
222
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
223
224
class TestFormat2WorkingTree(TestCaseWithTransport):
225
    """Tests that are specific to format 2 trees."""
226
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
227
    def create_format2_tree(self, url):
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
228
        return self.make_branch_and_tree(
2255.2.121 by John Arbash Meinel
split out the WorkingTreeFormat4 tests into a separate test file
229
            url, format=bzrdir.BzrDirFormat6())
1534.10.6 by Aaron Bentley
Conflict serialization working for WorkingTree3
230
1666.1.4 by Robert Collins
* 'Metadir' is now the default disk format. This improves behaviour in
231
    def test_conflicts(self):
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
232
        # test backwards compatability
233
        tree = self.create_format2_tree('.')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
234
        self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
235
                          None)
236
        file('lala.BASE', 'wb').write('labase')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
237
        expected = conflicts.ContentsConflict('lala')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
238
        self.assertEqual(list(tree.conflicts()), [expected])
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
239
        file('lala', 'wb').write('la')
240
        tree.add('lala', 'lala-id')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
241
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
242
        self.assertEqual(list(tree.conflicts()), [expected])
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
243
        file('lala.THIS', 'wb').write('lathis')
244
        file('lala.OTHER', 'wb').write('laother')
245
        # When "text conflict"s happen, stem, THIS and OTHER are text
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
246
        expected = conflicts.TextConflict('lala', file_id='lala-id')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
247
        self.assertEqual(list(tree.conflicts()), [expected])
1534.10.8 by Aaron Bentley
Implemented conflict_lines in terms of old system on WorkingTree
248
        os.unlink('lala.OTHER')
249
        os.mkdir('lala.OTHER')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
250
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
1534.10.22 by Aaron Bentley
Got ConflictList implemented
251
        self.assertEqual(list(tree.conflicts()), [expected])
1713.2.3 by Robert Collins
Combine ignore rules into a single regex preventing pathological behaviour during add.
252
253
254
class TestNonFormatSpecificCode(TestCaseWithTransport):
255
    """This class contains tests of workingtree that are not format specific."""
256
1713.1.6 by Robert Collins
Move file id random data selection out of the inner loop for 'bzr add'.
257
    def test_gen_file_id(self):
2116.4.1 by John Arbash Meinel
Update file and revision id generators.
258
        file_id = self.applyDeprecated(zero_thirteen, workingtree.gen_file_id,
259
                                      'filename')
260
        self.assertStartsWith(file_id, 'filename-')
261
262
    def test_gen_root_id(self):
263
        file_id = self.applyDeprecated(zero_thirteen, workingtree.gen_root_id)
264
        self.assertStartsWith(file_id, 'tree_root-')
1864.4.1 by John Arbash Meinel
Fix bug #43801 by squashing file ids a little bit more.
265
        
1997.1.1 by Robert Collins
Add WorkingTree.lock_tree_write.
266
267
class InstrumentedTree(object):
268
    """A instrumented tree to check the needs_tree_write_lock decorator."""
269
270
    def __init__(self):
271
        self._locks = []
272
273
    def lock_tree_write(self):
274
        self._locks.append('t')
275
276
    @needs_tree_write_lock
277
    def method_with_tree_write_lock(self, *args, **kwargs):
278
        """A lock_tree_write decorated method that returns its arguments."""
279
        return args, kwargs
280
281
    @needs_tree_write_lock
282
    def method_that_raises(self):
283
        """This method causes an exception when called with parameters.
284
        
285
        This allows the decorator code to be checked - it should still call
286
        unlock.
287
        """
288
289
    def unlock(self):
290
        self._locks.append('u')
291
292
293
class TestInstrumentedTree(TestCase):
294
295
    def test_needs_tree_write_lock(self):
296
        """@needs_tree_write_lock should be semantically transparent."""
297
        tree = InstrumentedTree()
298
        self.assertEqual(
299
            'method_with_tree_write_lock',
300
            tree.method_with_tree_write_lock.__name__)
301
        self.assertEqual(
302
            "A lock_tree_write decorated method that returns its arguments.",
303
            tree.method_with_tree_write_lock.__doc__)
304
        args = (1, 2, 3)
305
        kwargs = {'a':'b'}
306
        result = tree.method_with_tree_write_lock(1,2,3, a='b')
307
        self.assertEqual((args, kwargs), result)
308
        self.assertEqual(['t', 'u'], tree._locks)
309
        self.assertRaises(TypeError, tree.method_that_raises, 'foo')
310
        self.assertEqual(['t', 'u', 't', 'u'], tree._locks)
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
311
312
3017.2.1 by Aaron Bentley
Revert now resolves conflicts recursively (#102739)
313
class TestRevert(TestCaseWithTransport):
314
315
    def test_revert_conflicts_recursive(self):
316
        this_tree = self.make_branch_and_tree('this-tree')
317
        self.build_tree_contents([('this-tree/foo/',),
318
                                  ('this-tree/foo/bar', 'bar')])
319
        this_tree.add(['foo', 'foo/bar'])
320
        this_tree.commit('created foo/bar')
321
        other_tree = this_tree.bzrdir.sprout('other-tree').open_workingtree()
322
        self.build_tree_contents([('other-tree/foo/bar', 'baz')])
323
        other_tree.commit('changed bar')
324
        self.build_tree_contents([('this-tree/foo/bar', 'qux')])
325
        this_tree.commit('changed qux')
326
        this_tree.merge_from_branch(other_tree.branch)
327
        self.assertEqual(1, len(this_tree.conflicts()))
328
        this_tree.revert(['foo'])
329
        self.assertEqual(0, len(this_tree.conflicts()))
330
331
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
332
class TestAutoResolve(TestCaseWithTransport):
333
334
    def test_auto_resolve(self):
335
        base = self.make_branch_and_tree('base')
336
        self.build_tree_contents([('base/hello', 'Hello')])
337
        base.add('hello', 'hello_id')
338
        base.commit('Hello')
339
        other = base.bzrdir.sprout('other').open_workingtree()
340
        self.build_tree_contents([('other/hello', 'hELLO')])
341
        other.commit('Case switch')
342
        this = base.bzrdir.sprout('this').open_workingtree()
343
        self.failUnlessExists('this/hello')
344
        self.build_tree_contents([('this/hello', 'Hello World')])
345
        this.commit('Add World')
346
        this.merge_from_branch(other.branch)
347
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
348
                         this.conflicts())
349
        this.auto_resolve()
350
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
351
                         this.conflicts())
352
        self.build_tree_contents([('this/hello', '<<<<<<<')])
353
        this.auto_resolve()
354
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
355
                         this.conflicts())
356
        self.build_tree_contents([('this/hello', '=======')])
357
        this.auto_resolve()
358
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
359
                         this.conflicts())
360
        self.build_tree_contents([('this/hello', '\n>>>>>>>')])
361
        remaining, resolved = this.auto_resolve()
362
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
363
                         this.conflicts())
364
        self.assertEqual([], resolved)
365
        self.build_tree_contents([('this/hello', 'hELLO wORLD')])
366
        remaining, resolved = this.auto_resolve()
367
        self.assertEqual([], this.conflicts())
368
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
369
                         resolved)
370
        self.failIfExists('this/hello.BASE')
2120.7.3 by Aaron Bentley
Update resolve command to automatically mark conflicts as resolved
371
372
    def test_auto_resolve_dir(self):
373
        tree = self.make_branch_and_tree('tree')
374
        self.build_tree(['tree/hello/'])
375
        tree.add('hello', 'hello-id')
2255.2.234 by Robert Collins
Merge bzr.dev.
376
        file_conflict = conflicts.TextConflict('file', None, 'hello-id')
2120.7.3 by Aaron Bentley
Update resolve command to automatically mark conflicts as resolved
377
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
378
        tree.auto_resolve()
3140.1.4 by Aaron Bentley
Add WorkingTree.find_trees
379
380
381
class TestFindTrees(TestCaseWithTransport):
382
383
    def test_find_trees(self):
384
        self.make_branch_and_tree('foo')
385
        self.make_branch_and_tree('foo/bar')
386
        # Sticking a tree inside a control dir is heinous, so let's skip it
387
        self.make_branch_and_tree('foo/.bzr/baz')
388
        self.make_branch('qux')
389
        trees = workingtree.WorkingTree.find_trees('.')
390
        self.assertEqual(2, len(list(trees)))