/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

Merge bzr.dev 5848, bringing the code up to date.

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