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