← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-30 12:52:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6418.
  • Revision ID: jelmer@samba.org-20111230125254-igy1abnixsvulfqd
Simplify code a bit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
 
from cStringIO import StringIO
19
 
import os
20
 
 
21
18
from bzrlib import (
22
19
    bzrdir,
23
20
    conflicts,
24
21
    errors,
 
22
    symbol_versioning,
 
23
    transport,
25
24
    workingtree,
 
25
    workingtree_3,
 
26
    workingtree_4,
26
27
    )
27
 
from bzrlib.branch import Branch
28
 
from bzrlib.bzrdir import BzrDir
29
28
from bzrlib.lockdir import LockDir
30
29
from bzrlib.mutabletree import needs_tree_write_lock
31
30
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
32
 
from bzrlib.transport import get_transport
33
31
from bzrlib.workingtree import (
34
32
    TreeEntry,
35
33
    TreeDirectory,
65
63
class TestDefaultFormat(TestCaseWithTransport):
66
64
 
67
65
    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())
 
66
        old_format = workingtree.format_registry.get_default()
 
67
        # default is 6
 
68
        self.assertTrue(isinstance(old_format, workingtree_4.WorkingTreeFormat6))
 
69
        workingtree.format_registry.set_default(SampleTreeFormat())
 
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:
 
79
            workingtree.format_registry.set_default(old_format)
 
80
        self.assertEqual(old_format, workingtree.format_registry.get_default())
 
81
 
 
82
    def test_from_string(self):
 
83
        self.assertIsInstance(
 
84
            SampleTreeFormat.from_string("Sample tree format."),
 
85
            SampleTreeFormat)
 
86
        self.assertRaises(AssertionError,
 
87
            SampleTreeFormat.from_string, "Different format string.")
 
88
 
 
89
    def test_get_set_default_format_by_key(self):
 
90
        old_format = workingtree.format_registry.get_default()
 
91
        # default is 6
 
92
        format = SampleTreeFormat()
 
93
        workingtree.format_registry.register(format)
 
94
        self.addCleanup(workingtree.format_registry.remove, format)
 
95
        self.assertTrue(isinstance(old_format, workingtree_4.WorkingTreeFormat6))
 
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())
83
109
 
84
110
    def test_open(self):
85
111
        tree = self.make_branch_and_tree('.')
101
127
        self.assertEqual('subdir', relpath)
102
128
 
103
129
 
104
 
class SampleTreeFormat(workingtree.WorkingTreeFormat):
 
130
class SampleTreeFormat(workingtree.WorkingTreeFormatMetaDir):
105
131
    """A sample format
106
132
 
107
133
    this format is initializable, unsupported to aid in testing the
108
134
    open and open_downlevel routines.
109
135
    """
110
136
 
111
 
    def get_format_string(self):
 
137
    @classmethod
 
138
    def get_format_string(cls):
112
139
        """See WorkingTreeFormat.get_format_string()."""
113
140
        return "Sample tree format."
114
141
 
126
153
        return "opened tree."
127
154
 
128
155
 
 
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
 
129
176
class TestWorkingTreeFormat(TestCaseWithTransport):
130
177
    """Tests for the WorkingTreeFormat facility."""
131
178
 
 
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,
 
183
            workingtree.WorkingTreeFormatMetaDir.find_format_string, branch.bzrdir)
 
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",
 
190
            workingtree.WorkingTreeFormatMetaDir.find_format_string(branch.bzrdir))
 
191
 
132
192
    def test_find_format(self):
133
193
        # is the right format object found for a working tree?
134
194
        # create a branch with a few known format objects.
138
198
            dir.create_repository()
139
199
            dir.create_branch()
140
200
            format.initialize(dir)
141
 
            t = get_transport(url)
142
 
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
143
 
            self.failUnless(isinstance(found_format, format.__class__))
144
 
        check_format(workingtree.WorkingTreeFormat3(), "bar")
 
201
            t = transport.get_transport(url)
 
202
            found_format = workingtree.WorkingTreeFormatMetaDir.find_format(dir)
 
203
            self.assertIsInstance(found_format, format.__class__)
 
204
        check_format(workingtree_3.WorkingTreeFormat3(), "bar")
145
205
 
146
206
    def test_find_format_no_tree(self):
147
207
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
148
208
        self.assertRaises(errors.NoWorkingTree,
149
 
                          workingtree.WorkingTreeFormat.find_format,
 
209
                          workingtree.WorkingTreeFormatMetaDir.find_format,
150
210
                          dir)
151
211
 
152
212
    def test_find_format_unknown_format(self):
155
215
        dir.create_branch()
156
216
        SampleTreeFormat().initialize(dir)
157
217
        self.assertRaises(errors.UnknownFormatError,
158
 
                          workingtree.WorkingTreeFormat.find_format,
 
218
                          workingtree.WorkingTreeFormatMetaDir.find_format,
159
219
                          dir)
160
220
 
161
221
    def test_register_unregister_format(self):
167
227
        # make a branch
168
228
        format.initialize(dir)
169
229
        # register a format for it.
170
 
        workingtree.WorkingTreeFormat.register_format(format)
 
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))
171
235
        # which branch.Open will refuse (not supported)
172
236
        self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree.open, '.')
173
237
        # but open_downlevel will work
174
238
        self.assertEqual(format.open(dir), workingtree.WorkingTree.open_downlevel('.'))
175
239
        # unregister the format
176
 
        workingtree.WorkingTreeFormat.unregister_format(format)
 
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
 
 
246
    def test_find_format_with_features(self):
 
247
        tree = self.make_branch_and_tree('.', format='2a')
 
248
        tree.control_transport.put_bytes('format',
 
249
            tree._format.get_format_string() + "necessity name\n")
 
250
        found_format = workingtree.WorkingTreeFormatMetaDir.find_format(
 
251
            tree.bzrdir)
 
252
        self.assertIsInstance(found_format, workingtree.WorkingTreeFormat)
 
253
        self.assertEquals(found_format.features.get("name"), "necessity")
 
254
        self.assertRaises(errors.MissingFeature, found_format.check_support_status,
 
255
            True)
 
256
        self.addCleanup(workingtree.WorkingTreeFormatMetaDir.unregister_feature,
 
257
            "name")
 
258
        workingtree.WorkingTreeFormatMetaDir.register_feature("name")
 
259
        found_format.check_support_status(True)
 
260
 
 
261
 
 
262
class TestWorkingTreeIterEntriesByDir_wSubtrees(TestCaseWithTransport):
 
263
 
 
264
    def make_simple_tree(self):
 
265
        tree = self.make_branch_and_tree('tree', format='development-subtree')
 
266
        self.build_tree(['tree/a/', 'tree/a/b/', 'tree/a/b/c'])
 
267
        tree.set_root_id('root-id')
 
268
        tree.add(['a', 'a/b', 'a/b/c'], ['a-id', 'b-id', 'c-id'])
 
269
        tree.commit('initial')
 
270
        return tree
 
271
 
 
272
    def test_just_directory(self):
 
273
        tree = self.make_simple_tree()
 
274
        self.assertEqual([('directory', 'root-id'),
 
275
                          ('directory', 'a-id'),
 
276
                          ('directory', 'b-id'),
 
277
                          ('file', 'c-id')],
 
278
                         [(ie.kind, ie.file_id)
 
279
                          for path, ie in tree.iter_entries_by_dir()])
 
280
        subtree = self.make_branch_and_tree('tree/a/b')
 
281
        self.assertEqual([('tree-reference', 'b-id')],
 
282
                         [(ie.kind, ie.file_id)
 
283
                          for path, ie in tree.iter_entries_by_dir(['b-id'])])
 
284
 
 
285
    def test_direct_subtree(self):
 
286
        tree = self.make_simple_tree()
 
287
        subtree = self.make_branch_and_tree('tree/a/b')
 
288
        self.assertEqual([('directory', 'root-id'),
 
289
                          ('directory', 'a-id'),
 
290
                          ('tree-reference', 'b-id')],
 
291
                         [(ie.kind, ie.file_id)
 
292
                          for path, ie in tree.iter_entries_by_dir()])
 
293
 
 
294
    def test_indirect_subtree(self):
 
295
        tree = self.make_simple_tree()
 
296
        subtree = self.make_branch_and_tree('tree/a')
 
297
        self.assertEqual([('directory', 'root-id'),
 
298
                          ('tree-reference', 'a-id')],
 
299
                         [(ie.kind, ie.file_id)
 
300
                          for path, ie in tree.iter_entries_by_dir()])
 
301
 
 
302
 
 
303
class TestWorkingTreeFormatRegistry(TestCase):
 
304
 
 
305
    def setUp(self):
 
306
        super(TestWorkingTreeFormatRegistry, self).setUp()
 
307
        self.registry = workingtree.WorkingTreeFormatRegistry()
 
308
 
 
309
    def test_register_unregister_format(self):
 
310
        format = SampleTreeFormat()
 
311
        self.registry.register(format)
 
312
        self.assertEquals(format, self.registry.get("Sample tree format."))
 
313
        self.registry.remove(format)
 
314
        self.assertRaises(KeyError, self.registry.get, "Sample tree format.")
 
315
 
 
316
    def test_get_all(self):
 
317
        format = SampleTreeFormat()
 
318
        self.assertEquals([], self.registry._get_all())
 
319
        self.registry.register(format)
 
320
        self.assertEquals([format], self.registry._get_all())
 
321
 
 
322
    def test_register_extra(self):
 
323
        format = SampleExtraTreeFormat()
 
324
        self.assertEquals([], self.registry._get_all())
 
325
        self.registry.register_extra(format)
 
326
        self.assertEquals([format], self.registry._get_all())
 
327
 
 
328
    def test_register_extra_lazy(self):
 
329
        self.assertEquals([], self.registry._get_all())
 
330
        self.registry.register_extra_lazy("bzrlib.tests.test_workingtree",
 
331
            "SampleExtraTreeFormat")
 
332
        formats = self.registry._get_all()
 
333
        self.assertEquals(1, len(formats))
 
334
        self.assertIsInstance(formats[0], SampleExtraTreeFormat)
177
335
 
178
336
 
179
337
class TestWorkingTreeFormat3(TestCaseWithTransport):
183
341
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
184
342
        control.create_repository()
185
343
        control.create_branch()
186
 
        tree = workingtree.WorkingTreeFormat3().initialize(control)
 
344
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
187
345
        # we want:
188
346
        # format 'Bazaar-NG Working Tree format 3'
189
347
        # inventory = blank inventory
217
375
        repo = dir.create_repository()
218
376
        branch = dir.create_branch()
219
377
        try:
220
 
            tree = workingtree.WorkingTreeFormat3().initialize(dir)
 
378
            tree = workingtree_3.WorkingTreeFormat3().initialize(dir)
221
379
        except errors.NotLocalUrl:
222
380
            raise TestSkipped('Not a local URL')
223
381
        self.assertIsDirectory('.bzr', t)
234
392
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
235
393
        control.create_repository()
236
394
        control.create_branch()
237
 
        tree = workingtree.WorkingTreeFormat3().initialize(control)
 
395
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
238
396
        tree._transport.delete("pending-merges")
239
397
        self.assertEqual([], tree.get_parent_ids())
240
398
 
241
399
 
242
 
class TestFormat2WorkingTree(TestCaseWithTransport):
243
 
    """Tests that are specific to format 2 trees."""
244
 
 
245
 
    def create_format2_tree(self, url):
246
 
        return self.make_branch_and_tree(
247
 
            url, format=bzrdir.BzrDirFormat6())
248
 
 
249
 
    def test_conflicts(self):
250
 
        # test backwards compatability
251
 
        tree = self.create_format2_tree('.')
252
 
        self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
253
 
                          None)
254
 
        file('lala.BASE', 'wb').write('labase')
255
 
        expected = conflicts.ContentsConflict('lala')
256
 
        self.assertEqual(list(tree.conflicts()), [expected])
257
 
        file('lala', 'wb').write('la')
258
 
        tree.add('lala', 'lala-id')
259
 
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
260
 
        self.assertEqual(list(tree.conflicts()), [expected])
261
 
        file('lala.THIS', 'wb').write('lathis')
262
 
        file('lala.OTHER', 'wb').write('laother')
263
 
        # When "text conflict"s happen, stem, THIS and OTHER are text
264
 
        expected = conflicts.TextConflict('lala', file_id='lala-id')
265
 
        self.assertEqual(list(tree.conflicts()), [expected])
266
 
        os.unlink('lala.OTHER')
267
 
        os.mkdir('lala.OTHER')
268
 
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
269
 
        self.assertEqual(list(tree.conflicts()), [expected])
270
 
 
271
 
 
272
400
class InstrumentedTree(object):
273
401
    """A instrumented tree to check the needs_tree_write_lock decorator."""
274
402
 
303
431
        self.assertEqual(
304
432
            'method_with_tree_write_lock',
305
433
            tree.method_with_tree_write_lock.__name__)
306
 
        self.assertEqual(
 
434
        self.assertDocstring(
307
435
            "A lock_tree_write decorated method that returns its arguments.",
308
 
            tree.method_with_tree_write_lock.__doc__)
 
436
            tree.method_with_tree_write_lock)
309
437
        args = (1, 2, 3)
310
438
        kwargs = {'a':'b'}
311
439
        result = tree.method_with_tree_write_lock(1,2,3, a='b')
345
473
        self.build_tree_contents([('other/hello', 'hELLO')])
346
474
        other.commit('Case switch')
347
475
        this = base.bzrdir.sprout('this').open_workingtree()
348
 
        self.failUnlessExists('this/hello')
 
476
        self.assertPathExists('this/hello')
349
477
        self.build_tree_contents([('this/hello', 'Hello World')])
350
478
        this.commit('Add World')
351
479
        this.merge_from_branch(other.branch)
352
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
480
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
353
481
                         this.conflicts())
354
482
        this.auto_resolve()
355
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
483
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
356
484
                         this.conflicts())
357
485
        self.build_tree_contents([('this/hello', '<<<<<<<')])
358
486
        this.auto_resolve()
359
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
487
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
360
488
                         this.conflicts())
361
489
        self.build_tree_contents([('this/hello', '=======')])
362
490
        this.auto_resolve()
363
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
491
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
364
492
                         this.conflicts())
365
493
        self.build_tree_contents([('this/hello', '\n>>>>>>>')])
366
494
        remaining, resolved = this.auto_resolve()
367
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
495
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
368
496
                         this.conflicts())
369
497
        self.assertEqual([], resolved)
370
498
        self.build_tree_contents([('this/hello', 'hELLO wORLD')])
371
499
        remaining, resolved = this.auto_resolve()
372
500
        self.assertEqual([], this.conflicts())
373
 
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
 
501
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
374
502
                         resolved)
375
 
        self.failIfExists('this/hello.BASE')
 
503
        self.assertPathDoesNotExist('this/hello.BASE')
376
504
 
377
505
    def test_auto_resolve_dir(self):
378
506
        tree = self.make_branch_and_tree('tree')
379
507
        self.build_tree(['tree/hello/'])
380
508
        tree.add('hello', 'hello-id')
381
 
        file_conflict = conflicts.TextConflict('file', None, 'hello-id')
 
509
        file_conflict = conflicts.TextConflict('file', 'hello-id')
382
510
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
383
511
        tree.auto_resolve()
384
512