← 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-04-09 19:25:42 UTC
  • mto: (5777.5.1 inventoryworkingtree)
  • mto: This revision was merged to the branch mainline in revision 5781.
  • Revision ID: jelmer@samba.org-20110409192542-8bbedp36s7nj928e
Split InventoryTree out of Tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
22
22
    symbol_versioning,
23
23
    transport,
24
24
    workingtree,
25
 
    workingtree_3,
26
 
    workingtree_4,
27
25
    )
28
26
from bzrlib.lockdir import LockDir
29
27
from bzrlib.mutabletree import needs_tree_write_lock
64
62
 
65
63
    def test_get_set_default_format(self):
66
64
        old_format = workingtree.format_registry.get_default()
67
 
        # default is 6
68
 
        self.assertTrue(isinstance(old_format, workingtree_4.WorkingTreeFormat6))
 
65
        # default is 3
 
66
        self.assertTrue(isinstance(old_format, workingtree.WorkingTreeFormat3))
69
67
        workingtree.format_registry.set_default(SampleTreeFormat())
70
68
        try:
71
69
            # the default branch format is used by the meta dir format
79
77
            workingtree.format_registry.set_default(old_format)
80
78
        self.assertEqual(old_format, workingtree.format_registry.get_default())
81
79
 
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())
102
 
 
103
80
    def test_open(self):
104
81
        tree = self.make_branch_and_tree('.')
105
82
        open_direct = workingtree.WorkingTree.open('.')
168
145
class TestWorkingTreeFormat(TestCaseWithTransport):
169
146
    """Tests for the WorkingTreeFormat facility."""
170
147
 
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
148
    def test_find_format(self):
185
149
        # is the right format object found for a working tree?
186
150
        # create a branch with a few known format objects.
192
156
            format.initialize(dir)
193
157
            t = transport.get_transport(url)
194
158
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
195
 
            self.assertIsInstance(found_format, format.__class__)
196
 
        check_format(workingtree_3.WorkingTreeFormat3(), "bar")
 
159
            self.failUnless(isinstance(found_format, format.__class__))
 
160
        check_format(workingtree.WorkingTreeFormat3(), "bar")
197
161
 
198
162
    def test_find_format_no_tree(self):
199
163
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
236
200
                workingtree.WorkingTreeFormat.get_formats))
237
201
 
238
202
 
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
203
class TestWorkingTreeFormatRegistry(TestCase):
281
204
 
282
205
    def setUp(self):
318
241
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
319
242
        control.create_repository()
320
243
        control.create_branch()
321
 
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
 
244
        tree = workingtree.WorkingTreeFormat3().initialize(control)
322
245
        # we want:
323
246
        # format 'Bazaar-NG Working Tree format 3'
324
247
        # inventory = blank inventory
352
275
        repo = dir.create_repository()
353
276
        branch = dir.create_branch()
354
277
        try:
355
 
            tree = workingtree_3.WorkingTreeFormat3().initialize(dir)
 
278
            tree = workingtree.WorkingTreeFormat3().initialize(dir)
356
279
        except errors.NotLocalUrl:
357
280
            raise TestSkipped('Not a local URL')
358
281
        self.assertIsDirectory('.bzr', t)
369
292
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
370
293
        control.create_repository()
371
294
        control.create_branch()
372
 
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
 
295
        tree = workingtree.WorkingTreeFormat3().initialize(control)
373
296
        tree._transport.delete("pending-merges")
374
297
        self.assertEqual([], tree.get_parent_ids())
375
298
 
450
373
        self.build_tree_contents([('other/hello', 'hELLO')])
451
374
        other.commit('Case switch')
452
375
        this = base.bzrdir.sprout('this').open_workingtree()
453
 
        self.assertPathExists('this/hello')
 
376
        self.failUnlessExists('this/hello')
454
377
        self.build_tree_contents([('this/hello', 'Hello World')])
455
378
        this.commit('Add World')
456
379
        this.merge_from_branch(other.branch)
477
400
        self.assertEqual([], this.conflicts())
478
401
        self.assertEqual([conflicts.TextConflict('hello', 'hello_id')],
479
402
                         resolved)
480
 
        self.assertPathDoesNotExist('this/hello.BASE')
 
403
        self.failIfExists('this/hello.BASE')
481
404
 
482
405
    def test_auto_resolve_dir(self):
483
406
        tree = self.make_branch_and_tree('tree')