/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

  • Committer: Vincent Ladeuil
  • Date: 2011-07-06 09:22:00 UTC
  • mfrom: (6008 +trunk)
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110706092200-7iai2mwzc0sqdsvf
Merging in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
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
 
import os
19
 
 
20
18
from bzrlib import (
21
19
    bzrdir,
22
20
    conflicts,
23
21
    errors,
 
22
    symbol_versioning,
24
23
    transport,
25
24
    workingtree,
 
25
    workingtree_3,
 
26
    workingtree_4,
26
27
    )
27
28
from bzrlib.lockdir import LockDir
28
29
from bzrlib.mutabletree import needs_tree_write_lock
62
63
class TestDefaultFormat(TestCaseWithTransport):
63
64
 
64
65
    def test_get_set_default_format(self):
65
 
        old_format = workingtree.WorkingTreeFormat.get_default_format()
66
 
        # default is 3
67
 
        self.assertTrue(isinstance(old_format, workingtree.WorkingTreeFormat3))
68
 
        workingtree.WorkingTreeFormat.set_default_format(SampleTreeFormat())
69
 
        try:
70
 
            # the default branch format is used by the meta dir format
71
 
            # which is not the default bzrdir format at this point
72
 
            dir = bzrdir.BzrDirMetaFormat1().initialize('.')
73
 
            dir.create_repository()
74
 
            dir.create_branch()
75
 
            result = dir.create_workingtree()
76
 
            self.assertEqual(result, 'A tree')
77
 
        finally:
78
 
            workingtree.WorkingTreeFormat.set_default_format(old_format)
79
 
        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_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())
80
102
 
81
103
    def test_open(self):
82
104
        tree = self.make_branch_and_tree('.')
123
145
        return "opened tree."
124
146
 
125
147
 
 
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
 
126
168
class TestWorkingTreeFormat(TestCaseWithTransport):
127
169
    """Tests for the WorkingTreeFormat facility."""
128
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
 
129
184
    def test_find_format(self):
130
185
        # is the right format object found for a working tree?
131
186
        # create a branch with a few known format objects.
138
193
            t = transport.get_transport(url)
139
194
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
140
195
            self.assertIsInstance(found_format, format.__class__)
141
 
        check_format(workingtree.WorkingTreeFormat3(), "bar")
 
196
        check_format(workingtree_3.WorkingTreeFormat3(), "bar")
142
197
 
143
198
    def test_find_format_no_tree(self):
144
199
        dir = bzrdir.BzrDirMetaFormat1().initialize('.')
164
219
        # make a branch
165
220
        format.initialize(dir)
166
221
        # register a format for it.
167
 
        workingtree.WorkingTreeFormat.register_format(format)
 
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))
168
227
        # which branch.Open will refuse (not supported)
169
228
        self.assertRaises(errors.UnsupportedFormatError, workingtree.WorkingTree.open, '.')
170
229
        # but open_downlevel will work
171
230
        self.assertEqual(format.open(dir), workingtree.WorkingTree.open_downlevel('.'))
172
231
        # unregister the format
173
 
        workingtree.WorkingTreeFormat.unregister_format(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)
174
312
 
175
313
 
176
314
class TestWorkingTreeFormat3(TestCaseWithTransport):
180
318
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
181
319
        control.create_repository()
182
320
        control.create_branch()
183
 
        tree = workingtree.WorkingTreeFormat3().initialize(control)
 
321
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
184
322
        # we want:
185
323
        # format 'Bazaar-NG Working Tree format 3'
186
324
        # inventory = blank inventory
214
352
        repo = dir.create_repository()
215
353
        branch = dir.create_branch()
216
354
        try:
217
 
            tree = workingtree.WorkingTreeFormat3().initialize(dir)
 
355
            tree = workingtree_3.WorkingTreeFormat3().initialize(dir)
218
356
        except errors.NotLocalUrl:
219
357
            raise TestSkipped('Not a local URL')
220
358
        self.assertIsDirectory('.bzr', t)
231
369
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
232
370
        control.create_repository()
233
371
        control.create_branch()
234
 
        tree = workingtree.WorkingTreeFormat3().initialize(control)
 
372
        tree = workingtree_3.WorkingTreeFormat3().initialize(control)
235
373
        tree._transport.delete("pending-merges")
236
374
        self.assertEqual([], tree.get_parent_ids())
237
375
 
238
376
 
239
 
class TestFormat2WorkingTree(TestCaseWithTransport):
240
 
    """Tests that are specific to format 2 trees."""
241
 
 
242
 
    def create_format2_tree(self, url):
243
 
        return self.make_branch_and_tree(
244
 
            url, format=bzrdir.BzrDirFormat6())
245
 
 
246
 
    def test_conflicts(self):
247
 
        # test backwards compatability
248
 
        tree = self.create_format2_tree('.')
249
 
        self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
250
 
                          None)
251
 
        file('lala.BASE', 'wb').write('labase')
252
 
        expected = conflicts.ContentsConflict('lala')
253
 
        self.assertEqual(list(tree.conflicts()), [expected])
254
 
        file('lala', 'wb').write('la')
255
 
        tree.add('lala', 'lala-id')
256
 
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
257
 
        self.assertEqual(list(tree.conflicts()), [expected])
258
 
        file('lala.THIS', 'wb').write('lathis')
259
 
        file('lala.OTHER', 'wb').write('laother')
260
 
        # When "text conflict"s happen, stem, THIS and OTHER are text
261
 
        expected = conflicts.TextConflict('lala', file_id='lala-id')
262
 
        self.assertEqual(list(tree.conflicts()), [expected])
263
 
        os.unlink('lala.OTHER')
264
 
        os.mkdir('lala.OTHER')
265
 
        expected = conflicts.ContentsConflict('lala', file_id='lala-id')
266
 
        self.assertEqual(list(tree.conflicts()), [expected])
267
 
 
268
 
 
269
377
class InstrumentedTree(object):
270
378
    """A instrumented tree to check the needs_tree_write_lock decorator."""
271
379