← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_foreign.py

  • Committer: Martin Pool
  • Date: 2009-07-10 08:18:28 UTC
  • mto: This revision was merged to the branch mainline in revision 4566.
  • Revision ID: mbp@sourcefrog.net-20090710081828-3zqukazl1b62m05h
Additional test for stacking from absolute URL

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
 
21
21
from bzrlib import (
22
22
    branch,
23
 
    bzrdir,
24
23
    errors,
25
24
    foreign,
26
25
    lockable_files,
27
26
    lockdir,
28
 
    revision,
29
 
    tests,
30
27
    trace,
31
28
    )
 
29
from bzrlib.bzrdir import (
 
30
    BzrDir,
 
31
    BzrDirFormat,
 
32
    BzrDirMeta1,
 
33
    BzrDirMetaFormat1,
 
34
    format_registry,
 
35
    )
 
36
from bzrlib.inventory import Inventory
 
37
from bzrlib.revision import (
 
38
    NULL_REVISION,
 
39
    Revision,
 
40
    )
 
41
from bzrlib.tests import (
 
42
    TestCase,
 
43
    TestCaseWithTransport,
 
44
    )
32
45
 
33
46
# This is the dummy foreign revision control system, used 
34
47
# mainly here in the testsuite to test the foreign VCS infrastructure.
74
87
        self.mapping_registry = DummyForeignVcsMappingRegistry()
75
88
        self.mapping_registry.register("v1", DummyForeignVcsMapping(self),
76
89
                                       "Version 1")
77
 
        self.abbreviation = "dummy"
78
90
 
79
91
    def show_foreign_revid(self, foreign_revid):
80
92
        return { "dummy ding": "%s/%s\\%s" % foreign_revid }
81
93
 
82
 
    def serialize_foreign_revid(self, foreign_revid):
83
 
        return "%s|%s|%s" % foreign_revid
84
 
 
85
94
 
86
95
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
87
96
    """A Dummy VCS Branch."""
103
112
    def is_compatible(source, target):
104
113
        return isinstance(target, DummyForeignVcsBranch)
105
114
 
106
 
    def push(self, overwrite=False, stop_revision=None):
107
 
        raise errors.NoRoundtrippingSupport(self.source, self.target)
108
 
 
109
115
    def lossy_push(self, stop_revision=None):
110
116
        result = branch.BranchPushResult()
111
117
        result.source_branch = self.source
130
136
                    (str(rev.timestamp), str(rev.timezone), 
131
137
                        str(self.target.revno())))
132
138
                parent_revno, parent_revid= self.target.last_revision_info()
133
 
                if parent_revid == revision.NULL_REVISION:
 
139
                if parent_revid == NULL_REVISION:
134
140
                    parent_revids = []
135
141
                else:
136
142
                    parent_revids = [parent_revid]
186
192
            raise errors.NotBranchError(path=transport.base)
187
193
 
188
194
 
189
 
class DummyForeignVcsDirFormat(bzrdir.BzrDirMetaFormat1):
 
195
class DummyForeignVcsDirFormat(BzrDirMetaFormat1):
190
196
    """BzrDirFormat for the dummy foreign VCS."""
191
197
 
192
198
    @classmethod
233
239
        return DummyForeignVcsDir(transport, self)
234
240
 
235
241
 
236
 
class DummyForeignVcsDir(bzrdir.BzrDirMeta1):
 
242
class DummyForeignVcsDir(BzrDirMeta1):
237
243
 
238
244
    def __init__(self, _transport, _format):
239
245
        self._format = _format
248
254
 
249
255
    def cloning_metadir(self, stacked=False):
250
256
        """Produce a metadir suitable for cloning with."""
251
 
        return bzrdir.format_registry.make_bzrdir("default")
 
257
        return format_registry.make_bzrdir("default")
252
258
 
253
259
    def sprout(self, url, revision_id=None, force_new_repo=False,
254
260
               recurse='down', possible_transports=None,
262
268
                hardlink=hardlink, stacked=stacked, source_branch=source_branch)
263
269
 
264
270
 
265
 
def register_dummy_foreign_for_test(testcase):
266
 
    bzrdir.BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
267
 
    testcase.addCleanup(bzrdir.BzrDirFormat.unregister_control_format,
268
 
                        DummyForeignVcsDirFormat)
269
 
    # We need to register the optimiser to make the dummy appears really
270
 
    # different from a regular bzr repository.
271
 
    branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
272
 
    testcase.addCleanup(branch.InterBranch.unregister_optimiser,
273
 
                        InterToDummyVcsBranch)
274
 
 
275
 
 
276
 
class ForeignVcsRegistryTests(tests.TestCase):
 
271
class ForeignVcsRegistryTests(TestCase):
277
272
    """Tests for the ForeignVcsRegistry class."""
278
273
 
279
274
    def test_parse_revision_id_no_dash(self):
294
289
                          reg.parse_revision_id("dummy-v1:some-foreign-revid"))
295
290
 
296
291
 
297
 
class ForeignRevisionTests(tests.TestCase):
 
292
class ForeignRevisionTests(TestCase):
298
293
    """Tests for the ForeignRevision class."""
299
294
 
300
295
    def test_create(self):
306
301
        self.assertEquals(mapp, rev.mapping)
307
302
 
308
303
 
309
 
class WorkingTreeFileUpdateTests(tests.TestCaseWithTransport):
 
304
class WorkingTreeFileUpdateTests(TestCaseWithTransport):
310
305
    """Tests for update_workingtree_fileids()."""
311
306
 
312
307
    def test_update_workingtree(self):
314
309
        self.build_tree_contents([('br1/bla', 'original contents\n')])
315
310
        wt.add('bla', 'bla-a')
316
311
        wt.commit('bla-a')
317
 
        root_id = wt.get_root_id()
318
312
        target = wt.bzrdir.sprout('br2').open_workingtree()
319
313
        target.unversion(['bla-a'])
320
314
        target.add('bla', 'bla-b')
325
319
        foreign.update_workingtree_fileids(wt, target_basis)
326
320
        wt.lock_read()
327
321
        try:
328
 
            self.assertEquals(set([root_id, "bla-b"]), set(wt.inventory))
 
322
            self.assertEquals(["TREE_ROOT", "bla-b"], list(wt.inventory))
329
323
        finally:
330
324
            wt.unlock()
331
325
 
332
326
 
333
 
class DummyForeignVcsTests(tests.TestCaseWithTransport):
 
327
class DummyForeignVcsTests(TestCaseWithTransport):
334
328
    """Very basic test for DummyForeignVcs."""
335
329
 
336
330
    def setUp(self):
 
331
        BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
 
332
        branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
 
333
        self.addCleanup(self.unregister)
337
334
        super(DummyForeignVcsTests, self).setUp()
338
 
        register_dummy_foreign_for_test(self)
 
335
 
 
336
    def unregister(self):
 
337
        try:
 
338
            BzrDirFormat.unregister_control_format(DummyForeignVcsDirFormat)
 
339
        except ValueError:
 
340
            pass
 
341
        branch.InterBranch.unregister_optimiser(InterToDummyVcsBranch)
339
342
 
340
343
    def test_create(self):
341
344
        """Test we can create dummies."""
342
345
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
343
 
        dir = bzrdir.BzrDir.open("d")
 
346
        dir = BzrDir.open("d")
344
347
        self.assertEquals("A Dummy VCS Dir", dir._format.get_format_string())
345
348
        dir.open_repository()
346
349
        dir.open_branch()
349
352
    def test_sprout(self):
350
353
        """Test we can clone dummies and that the format is not preserved."""
351
354
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
352
 
        dir = bzrdir.BzrDir.open("d")
 
355
        dir = BzrDir.open("d")
353
356
        newdir = dir.sprout("e")
354
 
        self.assertNotEquals("A Dummy VCS Dir",
355
 
                             newdir._format.get_format_string())
356
 
 
357
 
    def test_push_not_supported(self):
358
 
        source_tree = self.make_branch_and_tree("source")
359
 
        target_tree = self.make_branch_and_tree("target", 
360
 
            format=DummyForeignVcsDirFormat())
361
 
        self.assertRaises(errors.NoRoundtrippingSupport, 
362
 
            source_tree.branch.push, target_tree.branch)
 
357
        self.assertNotEquals("A Dummy VCS Dir", newdir._format.get_format_string())
363
358
 
364
359
    def test_lossy_push_empty(self):
365
360
        source_tree = self.make_branch_and_tree("source")
366
361
        target_tree = self.make_branch_and_tree("target", 
367
362
            format=DummyForeignVcsDirFormat())
368
363
        pushresult = source_tree.branch.lossy_push(target_tree.branch)
369
 
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
370
 
        self.assertEquals(revision.NULL_REVISION, pushresult.new_revid)
 
364
        self.assertEquals(NULL_REVISION, pushresult.old_revid)
 
365
        self.assertEquals(NULL_REVISION, pushresult.new_revid)
371
366
        self.assertEquals({}, pushresult.revidmap)
372
367
 
373
368
    def test_lossy_push_simple(self):
382
377
            pushresult = source_tree.branch.lossy_push(target_tree.branch)
383
378
        finally:
384
379
            target_tree.branch.unlock()
385
 
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
 
380
        self.assertEquals(NULL_REVISION, pushresult.old_revid)
386
381
        self.assertEquals({revid1:target_tree.branch.last_revision()}, 
387
382
                           pushresult.revidmap)
388
383
        self.assertEquals(pushresult.revidmap[revid1], pushresult.new_revid)