← 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: John Arbash Meinel
  • Date: 2010-01-13 16:23:07 UTC
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: john@arbash-meinel.com-20100113162307-0bs82td16gzih827
Update the MANIFEST.in file.

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, 2006 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
 
    transport,
24
25
    workingtree,
25
 
    workingtree_3,
26
 
    workingtree_4,
27
26
    )
 
27
from bzrlib.branch import Branch
 
28
from bzrlib.bzrdir import BzrDir
28
29
from bzrlib.lockdir import LockDir
29
30
from bzrlib.mutabletree import needs_tree_write_lock
30
31
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
 
32
from bzrlib.transport import get_transport
31
33
from bzrlib.workingtree import (
32
34
    TreeEntry,
33
35
    TreeDirectory,
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_from_string(self):
83
 
        self.assertIsInstance(
84
 
            SampleTreeFormat.from_string("Sample tree format."),
85
 
            SampleTreeFormat)
86
 
        self.assertRaises(ValueError,
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())
 
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())
109
83
 
110
84
    def test_open(self):
111
85
        tree = self.make_branch_and_tree('.')
127
101
        self.assertEqual('subdir', relpath)
128
102
 
129
103
 
130
 
class SampleTreeFormat(workingtree.WorkingTreeFormatMetaDir):
 
104
class SampleTreeFormat(workingtree.WorkingTreeFormat):
131
105
    """A sample format
132
106
 
133
107
    this format is initializable, unsupported to aid in testing the
134
108
    open and open_downlevel routines.
135
109
    """
136
110
 
137
 
    @classmethod
138
 
    def get_format_string(cls):
 
111
    def get_format_string(self):
139
112
        """See WorkingTreeFormat.get_format_string()."""
140
113
        return "Sample tree format."
141
114
 
153
126
        return "opened tree."
154
127
 
155
128
 
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
 
 
176
129
class TestWorkingTreeFormat(TestCaseWithTransport):
177
130
    """Tests for the WorkingTreeFormat facility."""
178
131
 
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
 
 
192
132
    def test_find_format(self):
193
133
        # is the right format object found for a working tree?
194
134
        # create a branch with a few known format objects.
198
138
            dir.create_repository()
199
139
            dir.create_branch()
200
140
            format.initialize(dir)
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")
 
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")
205
145
 
206
146
    def test_find_format_no_tree(self):
207
147
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
208
148
        self.assertRaises(errors.NoWorkingTree,
209
 
                          workingtree.WorkingTreeFormatMetaDir.find_format,
 
149
                          workingtree.WorkingTreeFormat.find_format,
210
150
                          dir)
211
151
 
212
152
    def test_find_format_unknown_format(self):
215
155
        dir.create_branch()
216
156
        SampleTreeFormat().initialize(dir)
217
157
        self.assertRaises(errors.UnknownFormatError,
218
 
                          workingtree.WorkingTreeFormatMetaDir.find_format,
 
158
                          workingtree.WorkingTreeFormat.find_format,
219
159
                          dir)
220
160
 
221
161
    def test_register_unregister_format(self):
227
167
        # make a branch
228
168
        format.initialize(dir)
229
169
        # register a format for it.
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))
 
170
        workingtree.WorkingTreeFormat.register_format(format)
235
171
        # which branch.Open will refuse (not supported)
236
172
        self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree.open, '.')
237
173
        # but open_downlevel will work
238
174
        self.assertEqual(format.open(dir), workingtree.WorkingTree.open_downlevel('.'))
239
175
        # unregister the 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
 
 
247
 
class TestWorkingTreeIterEntriesByDir_wSubtrees(TestCaseWithTransport):
248
 
 
249
 
    def make_simple_tree(self):
250
 
        tree = self.make_branch_and_tree('tree', format='development-subtree')
251
 
        self.build_tree(['tree/a/', 'tree/a/b/', 'tree/a/b/c'])
252
 
        tree.set_root_id('root-id')
253
 
        tree.add(['a', 'a/b', 'a/b/c'], ['a-id', 'b-id', 'c-id'])
254
 
        tree.commit('initial')
255
 
        return tree
256
 
 
257
 
    def test_just_directory(self):
258
 
        tree = self.make_simple_tree()
259
 
        self.assertEqual([('directory', 'root-id'),
260
 
                          ('directory', 'a-id'),
261
 
                          ('directory', 'b-id'),
262
 
                          ('file', 'c-id')],
263
 
                         [(ie.kind, ie.file_id)
264
 
                          for path, ie in tree.iter_entries_by_dir()])
265
 
        subtree = self.make_branch_and_tree('tree/a/b')
266
 
        self.assertEqual([('tree-reference', 'b-id')],
267
 
                         [(ie.kind, ie.file_id)
268
 
                          for path, ie in tree.iter_entries_by_dir(['b-id'])])
269
 
 
270
 
    def test_direct_subtree(self):
271
 
        tree = self.make_simple_tree()
272
 
        subtree = self.make_branch_and_tree('tree/a/b')
273
 
        self.assertEqual([('directory', 'root-id'),
274
 
                          ('directory', 'a-id'),
275
 
                          ('tree-reference', 'b-id')],
276
 
                         [(ie.kind, ie.file_id)
277
 
                          for path, ie in tree.iter_entries_by_dir()])
278
 
 
279
 
    def test_indirect_subtree(self):
280
 
        tree = self.make_simple_tree()
281
 
        subtree = self.make_branch_and_tree('tree/a')
282
 
        self.assertEqual([('directory', 'root-id'),
283
 
                          ('tree-reference', 'a-id')],
284
 
                         [(ie.kind, ie.file_id)
285
 
                          for path, ie in tree.iter_entries_by_dir()])
286
 
 
287
 
 
288
 
class TestWorkingTreeFormatRegistry(TestCase):
289
 
 
290
 
    def setUp(self):
291
 
        super(TestWorkingTreeFormatRegistry, self).setUp()
292
 
        self.registry = workingtree.WorkingTreeFormatRegistry()
293
 
 
294
 
    def test_register_unregister_format(self):
295
 
        format = SampleTreeFormat()
296
 
        self.registry.register(format)
297
 
        self.assertEquals(format, self.registry.get("Sample tree format."))
298
 
        self.registry.remove(format)
299
 
        self.assertRaises(KeyError, self.registry.get, "Sample tree format.")
300
 
 
301
 
    def test_get_all(self):
302
 
        format = SampleTreeFormat()
303
 
        self.assertEquals([], self.registry._get_all())
304
 
        self.registry.register(format)
305
 
        self.assertEquals([format], self.registry._get_all())
306
 
 
307
 
    def test_register_extra(self):
308
 
        format = SampleExtraTreeFormat()
309
 
        self.assertEquals([], self.registry._get_all())
310
 
        self.registry.register_extra(format)
311
 
        self.assertEquals([format], self.registry._get_all())
312
 
 
313
 
    def test_register_extra_lazy(self):
314
 
        self.assertEquals([], self.registry._get_all())
315
 
        self.registry.register_extra_lazy("bzrlib.tests.test_workingtree",
316
 
            "SampleExtraTreeFormat")
317
 
        formats = self.registry._get_all()
318
 
        self.assertEquals(1, len(formats))
319
 
        self.assertIsInstance(formats[0], SampleExtraTreeFormat)
 
176
        workingtree.WorkingTreeFormat.unregister_format(format)
320
177
 
321
178
 
322
179
class TestWorkingTreeFormat3(TestCaseWithTransport):
326
183
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
327
184
        control.create_repository()
328
185
        control.create_branch()
329
 
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
 
186
        tree = workingtree.WorkingTreeFormat3().initialize(control)
330
187
        # we want:
331
188
        # format 'Bazaar-NG Working Tree format 3'
332
189
        # inventory = blank inventory
360
217
        repo = dir.create_repository()
361
218
        branch = dir.create_branch()
362
219
        try:
363
 
            tree = workingtree_3.WorkingTreeFormat3().initialize(dir)
 
220
            tree = workingtree.WorkingTreeFormat3().initialize(dir)
364
221
        except errors.NotLocalUrl:
365
222
            raise TestSkipped('Not a local URL')
366
223
        self.assertIsDirectory('.bzr', t)
377
234
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
378
235
        control.create_repository()
379
236
        control.create_branch()
380
 
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
 
237
        tree = workingtree.WorkingTreeFormat3().initialize(control)
381
238
        tree._transport.delete("pending-merges")
382
239
        self.assertEqual([], tree.get_parent_ids())
383
240
 
384
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
 
385
272
class InstrumentedTree(object):
386
273
    """A instrumented tree to check the needs_tree_write_lock decorator."""
387
274
 
416
303
        self.assertEqual(
417
304
            'method_with_tree_write_lock',
418
305
            tree.method_with_tree_write_lock.__name__)
419
 
        self.assertDocstring(
 
306
        self.assertEqual(
420
307
            "A lock_tree_write decorated method that returns its arguments.",
421
 
            tree.method_with_tree_write_lock)
 
308
            tree.method_with_tree_write_lock.__doc__)
422
309
        args = (1, 2, 3)
423
310
        kwargs = {'a':'b'}
424
311
        result = tree.method_with_tree_write_lock(1,2,3, a='b')
458
345
        self.build_tree_contents([('other/hello', 'hELLO')])
459
346
        other.commit('Case switch')
460
347
        this = base.bzrdir.sprout('this').open_workingtree()
461
 
        self.assertPathExists('this/hello')
 
348
        self.failUnlessExists('this/hello')
462
349
        self.build_tree_contents([('this/hello', 'Hello World')])
463
350
        this.commit('Add World')
464
351
        this.merge_from_branch(other.branch)
465
 
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
 
352
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
466
353
                         this.conflicts())
467
354
        this.auto_resolve()
468
 
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
 
355
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
469
356
                         this.conflicts())
470
357
        self.build_tree_contents([('this/hello', '<<<<<<<')])
471
358
        this.auto_resolve()
472
 
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
 
359
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
473
360
                         this.conflicts())
474
361
        self.build_tree_contents([('this/hello', '=======')])
475
362
        this.auto_resolve()
476
 
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
 
363
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
477
364
                         this.conflicts())
478
365
        self.build_tree_contents([('this/hello', '\n>>>>>>>')])
479
366
        remaining, resolved = this.auto_resolve()
480
 
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
 
367
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
481
368
                         this.conflicts())
482
369
        self.assertEqual([], resolved)
483
370
        self.build_tree_contents([('this/hello', 'hELLO wORLD')])
484
371
        remaining, resolved = this.auto_resolve()
485
372
        self.assertEqual([], this.conflicts())
486
 
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
 
373
        self.assertEqual([conflicts.TextConflict('hello', None, 'hello_id')],
487
374
                         resolved)
488
 
        self.assertPathDoesNotExist('this/hello.BASE')
 
375
        self.failIfExists('this/hello.BASE')
489
376
 
490
377
    def test_auto_resolve_dir(self):
491
378
        tree = self.make_branch_and_tree('tree')
492
379
        self.build_tree(['tree/hello/'])
493
380
        tree.add('hello', 'hello-id')
494
 
        file_conflict = conflicts.TextConflict('file', 'hello-id')
 
381
        file_conflict = conflicts.TextConflict('file', None, 'hello-id')
495
382
        tree.set_conflicts(conflicts.ConflictList([file_conflict]))
496
383
        tree.auto_resolve()
497
384