← 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: Martin Pool
  • Date: 2011-03-28 01:28:09 UTC
  • mto: (5425.4.19 220464-stale-locks)
  • mto: This revision was merged to the branch mainline in revision 5970.
  • Revision ID: mbp@canonical.com-20110328012809-frw003r09tcrxkiz
Represent lock held info as an object, not just a dict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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
 
18
21
from bzrlib import (
19
22
    bzrdir,
20
23
    conflicts,
21
24
    errors,
22
 
    symbol_versioning,
23
25
    transport,
24
26
    workingtree,
25
 
    workingtree_3,
26
 
    workingtree_4,
27
27
    )
 
28
from bzrlib.branch import Branch
 
29
from bzrlib.bzrdir import BzrDir
28
30
from bzrlib.lockdir import LockDir
29
31
from bzrlib.mutabletree import needs_tree_write_lock
30
32
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
63
65
class TestDefaultFormat(TestCaseWithTransport):
64
66
 
65
67
    def test_get_set_default_format(self):
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_get_set_default_format_by_key(self):
83
 
        old_format = workingtree.format_registry.get_default()
84
 
        # default is 6
85
 
        format = SampleTreeFormat()
86
 
        workingtree.format_registry.register(format)
87
 
        self.addCleanup(workingtree.format_registry.remove, format)
88
 
        self.assertTrue(isinstance(old_format, workingtree_4.WorkingTreeFormat6))
89
 
        workingtree.format_registry.set_default_key(format.get_format_string())
90
 
        try:
91
 
            # the default branch format is used by the meta dir format
92
 
            # which is not the default bzrdir format at this point
93
 
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
94
 
            dir.create_repository()
95
 
            dir.create_branch()
96
 
            result = dir.create_workingtree()
97
 
            self.assertEqual(result, 'A tree')
98
 
        finally:
99
 
            workingtree.format_registry.set_default_key(
100
 
                old_format.get_format_string())
101
 
        self.assertEqual(old_format, workingtree.format_registry.get_default())
 
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())
102
83
 
103
84
    def test_open(self):
104
85
        tree = self.make_branch_and_tree('.')
145
126
        return "opened tree."
146
127
 
147
128
 
148
 
class SampleExtraTreeFormat(workingtree.WorkingTreeFormat):
149
 
    """A sample format that does not support use in a metadir.
150
 
 
151
 
    """
152
 
 
153
 
    def get_format_string(self):
154
 
        # Not usable in a metadir, so no format string
155
 
        return None
156
 
 
157
 
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
158
 
                   accelerator_tree=None, hardlink=False):
159
 
        raise NotImplementedError(self.initialize)
160
 
 
161
 
    def is_supported(self):
162
 
        return False
163
 
 
164
 
    def open(self, transport, _found=False):
165
 
        raise NotImplementedError(self.open)
166
 
 
167
 
 
168
129
class TestWorkingTreeFormat(TestCaseWithTransport):
169
130
    """Tests for the WorkingTreeFormat facility."""
170
131
 
171
 
    def test_find_format_string(self):
172
 
        # is the right format object found for a working tree?
173
 
        branch = self.make_branch('branch')
174
 
        self.assertRaises(errors.NoWorkingTree,
175
 
            workingtree.WorkingTreeFormat.find_format_string, branch.bzrdir)
176
 
        transport = branch.bzrdir.get_workingtree_transport(None)
177
 
        transport.mkdir('.')
178
 
        transport.put_bytes("format", "some format name")
179
 
        # The format does not have to be known by Bazaar,
180
 
        # find_format_string just retrieves the name
181
 
        self.assertEquals("some format name",
182
 
            workingtree.WorkingTreeFormat.find_format_string(branch.bzrdir))
183
 
 
184
132
    def test_find_format(self):
185
133
        # is the right format object found for a working tree?
186
134
        # create a branch with a few known format objects.
192
140
            format.initialize(dir)
193
141
            t = transport.get_transport(url)
194
142
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
195
 
            self.assertIsInstance(found_format, format.__class__)
196
 
        check_format(workingtree_3.WorkingTreeFormat3(), "bar")
 
143
            self.failUnless(isinstance(found_format, format.__class__))
 
144
        check_format(workingtree.WorkingTreeFormat3(), "bar")
197
145
 
198
146
    def test_find_format_no_tree(self):
199
147
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
219
167
        # make a branch
220
168
        format.initialize(dir)
221
169
        # register a format for it.
222
 
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
223
 
            workingtree.WorkingTreeFormat.register_format, format)
224
 
        self.assertTrue(format in 
225
 
            self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
226
 
                workingtree.WorkingTreeFormat.get_formats))
 
170
        workingtree.WorkingTreeFormat.register_format(format)
227
171
        # which branch.Open will refuse (not supported)
228
172
        self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree.open, '.')
229
173
        # but open_downlevel will work
230
174
        self.assertEqual(format.open(dir), workingtree.WorkingTree.open_downlevel('.'))
231
175
        # unregister the format
232
 
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
233
 
            workingtree.WorkingTreeFormat.unregister_format, format)
234
 
        self.assertFalse(format in
235
 
            self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
236
 
                workingtree.WorkingTreeFormat.get_formats))
237
 
 
238
 
 
239
 
class TestWorkingTreeIterEntriesByDir_wSubtrees(TestCaseWithTransport):
240
 
 
241
 
    def make_simple_tree(self):
242
 
        tree = self.make_branch_and_tree('tree', format='development-subtree')
243
 
        self.build_tree(['tree/a/', 'tree/a/b/', 'tree/a/b/c'])
244
 
        tree.set_root_id('root-id')
245
 
        tree.add(['a', 'a/b', 'a/b/c'], ['a-id', 'b-id', 'c-id'])
246
 
        tree.commit('initial')
247
 
        return tree
248
 
 
249
 
    def test_just_directory(self):
250
 
        tree = self.make_simple_tree()
251
 
        self.assertEqual([('directory', 'root-id'),
252
 
                          ('directory', 'a-id'),
253
 
                          ('directory', 'b-id'),
254
 
                          ('file', 'c-id')],
255
 
                         [(ie.kind, ie.file_id)
256
 
                          for path, ie in tree.iter_entries_by_dir()])
257
 
        subtree = self.make_branch_and_tree('tree/a/b')
258
 
        self.assertEqual([('tree-reference', 'b-id')],
259
 
                         [(ie.kind, ie.file_id)
260
 
                          for path, ie in tree.iter_entries_by_dir(['b-id'])])
261
 
 
262
 
    def test_direct_subtree(self):
263
 
        tree = self.make_simple_tree()
264
 
        subtree = self.make_branch_and_tree('tree/a/b')
265
 
        self.assertEqual([('directory', 'root-id'),
266
 
                          ('directory', 'a-id'),
267
 
                          ('tree-reference', 'b-id')],
268
 
                         [(ie.kind, ie.file_id)
269
 
                          for path, ie in tree.iter_entries_by_dir()])
270
 
 
271
 
    def test_indirect_subtree(self):
272
 
        tree = self.make_simple_tree()
273
 
        subtree = self.make_branch_and_tree('tree/a')
274
 
        self.assertEqual([('directory', 'root-id'),
275
 
                          ('tree-reference', 'a-id')],
276
 
                         [(ie.kind, ie.file_id)
277
 
                          for path, ie in tree.iter_entries_by_dir()])
278
 
 
279
 
 
280
 
class TestWorkingTreeFormatRegistry(TestCase):
281
 
 
282
 
    def setUp(self):
283
 
        super(TestWorkingTreeFormatRegistry, self).setUp()
284
 
        self.registry = workingtree.WorkingTreeFormatRegistry()
285
 
 
286
 
    def test_register_unregister_format(self):
287
 
        format = SampleTreeFormat()
288
 
        self.registry.register(format)
289
 
        self.assertEquals(format, self.registry.get("Sample tree format."))
290
 
        self.registry.remove(format)
291
 
        self.assertRaises(KeyError, self.registry.get, "Sample tree format.")
292
 
 
293
 
    def test_get_all(self):
294
 
        format = SampleTreeFormat()
295
 
        self.assertEquals([], self.registry._get_all())
296
 
        self.registry.register(format)
297
 
        self.assertEquals([format], self.registry._get_all())
298
 
 
299
 
    def test_register_extra(self):
300
 
        format = SampleExtraTreeFormat()
301
 
        self.assertEquals([], self.registry._get_all())
302
 
        self.registry.register_extra(format)
303
 
        self.assertEquals([format], self.registry._get_all())
304
 
 
305
 
    def test_register_extra_lazy(self):
306
 
        self.assertEquals([], self.registry._get_all())
307
 
        self.registry.register_extra_lazy("bzrlib.tests.test_workingtree",
308
 
            "SampleExtraTreeFormat")
309
 
        formats = self.registry._get_all()
310
 
        self.assertEquals(1, len(formats))
311
 
        self.assertIsInstance(formats[0], SampleExtraTreeFormat)
 
176
        workingtree.WorkingTreeFormat.unregister_format(format)
312
177
 
313
178
 
314
179
class TestWorkingTreeFormat3(TestCaseWithTransport):
318
183
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
319
184
        control.create_repository()
320
185
        control.create_branch()
321
 
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
 
186
        tree = workingtree.WorkingTreeFormat3().initialize(control)
322
187
        # we want:
323
188
        # format 'Bazaar-NG Working Tree format 3'
324
189
        # inventory = blank inventory
352
217
        repo = dir.create_repository()
353
218
        branch = dir.create_branch()
354
219
        try:
355
 
            tree = workingtree_3.WorkingTreeFormat3().initialize(dir)
 
220
            tree = workingtree.WorkingTreeFormat3().initialize(dir)
356
221
        except errors.NotLocalUrl:
357
222
            raise TestSkipped('Not a local URL')
358
223
        self.assertIsDirectory('.bzr', t)
369
234
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
370
235
        control.create_repository()
371
236
        control.create_branch()
372
 
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
 
237
        tree = workingtree.WorkingTreeFormat3().initialize(control)
373
238
        tree._transport.delete("pending-merges")
374
239
        self.assertEqual([], tree.get_parent_ids())
375
240
 
376
241
 
 
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
 
377
272
class InstrumentedTree(object):
378
273
    """A instrumented tree to check the needs_tree_write_lock decorator."""
379
274
 
450
345
        self.build_tree_contents([('other/hello', 'hELLO')])
451
346
        other.commit('Case switch')
452
347
        this = base.bzrdir.sprout('this').open_workingtree()
453
 
        self.assertPathExists('this/hello')
 
348
        self.failUnlessExists('this/hello')
454
349
        self.build_tree_contents([('this/hello', 'Hello World')])
455
350
        this.commit('Add World')
456
351
        this.merge_from_branch(other.branch)
457
 
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
 
352
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
458
353
                         this.conflicts())
459
354
        this.auto_resolve()
460
 
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
 
355
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
461
356
                         this.conflicts())
462
357
        self.build_tree_contents([('this/hello', '<<<<<<<')])
463
358
        this.auto_resolve()
464
 
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
 
359
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
465
360
                         this.conflicts())
466
361
        self.build_tree_contents([('this/hello', '=======')])
467
362
        this.auto_resolve()
468
 
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
 
363
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
469
364
                         this.conflicts())
470
365
        self.build_tree_contents([('this/hello', '\n>>>>>>>')])
471
366
        remaining, resolved = this.auto_resolve()
472
 
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
 
367
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
473
368
                         this.conflicts())
474
369
        self.assertEqual([], resolved)
475
370
        self.build_tree_contents([('this/hello', 'hELLO wORLD')])
476
371
        remaining, resolved = this.auto_resolve()
477
372
        self.assertEqual([], this.conflicts())
478
 
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
 
373
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
479
374
                         resolved)
480
 
        self.assertPathDoesNotExist('this/hello.BASE')
 
375
        self.failIfExists('this/hello.BASE')
481
376
 
482
377
    def test_auto_resolve_dir(self):
483
378
        tree = self.make_branch_and_tree('tree')
484
379
        self.build_tree(['tree/hello/'])
485
380
        tree.add('hello', 'hello-id')
486
 
        file_conflict = conflicts.TextConflict('file', 'hello-id')
 
381
        file_conflict = conflicts.TextConflict('file', None, 'hello-id')
487
382
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
488
383
        tree.auto_resolve()
489
384