← 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: Canonical.com Patch Queue Manager
  • Date: 2010-09-29 22:03:03 UTC
  • mfrom: (5416.2.6 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100929220303-cr95h8iwtggco721
(mbp) Add 'break-lock --force'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
1
 
# Copyright (C) 2008 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 2010 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
    controldir,
23
25
    errors,
24
26
    foreign,
25
27
    lockable_files,
26
28
    lockdir,
 
29
    revision,
 
30
    tests,
27
31
    trace,
28
32
    )
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
 
    )
45
33
 
46
34
# This is the dummy foreign revision control system, used 
47
35
# mainly here in the testsuite to test the foreign VCS infrastructure.
87
75
        self.mapping_registry = DummyForeignVcsMappingRegistry()
88
76
        self.mapping_registry.register("v1", DummyForeignVcsMapping(self),
89
77
                                       "Version 1")
 
78
        self.abbreviation = "dummy"
90
79
 
91
80
    def show_foreign_revid(self, foreign_revid):
92
81
        return { "dummy ding": "%s/%s\\%s" % foreign_revid }
93
82
 
 
83
    def serialize_foreign_revid(self, foreign_revid):
 
84
        return "%s|%s|%s" % foreign_revid
 
85
 
94
86
 
95
87
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
96
88
    """A Dummy VCS Branch."""
99
91
        self._format = _format
100
92
        self._base = a_bzrdir.transport.base
101
93
        self._ignore_fallbacks = False
 
94
        self.bzrdir = a_bzrdir
102
95
        foreign.ForeignBranch.__init__(self, 
103
96
            DummyForeignVcsMapping(DummyForeignVcs()))
104
97
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir, 
112
105
    def is_compatible(source, target):
113
106
        return isinstance(target, DummyForeignVcsBranch)
114
107
 
 
108
    def push(self, overwrite=False, stop_revision=None):
 
109
        raise errors.NoRoundtrippingSupport(self.source, self.target)
 
110
 
115
111
    def lossy_push(self, stop_revision=None):
116
112
        result = branch.BranchPushResult()
117
113
        result.source_branch = self.source
136
132
                    (str(rev.timestamp), str(rev.timezone), 
137
133
                        str(self.target.revno())))
138
134
                parent_revno, parent_revid= self.target.last_revision_info()
139
 
                if parent_revid == NULL_REVISION:
 
135
                if parent_revid == revision.NULL_REVISION:
140
136
                    parent_revids = []
141
137
                else:
142
138
                    parent_revids = [parent_revid]
177
173
        super(DummyForeignVcsBranchFormat, self).__init__()
178
174
        self._matchingbzrdir = DummyForeignVcsDirFormat()
179
175
 
180
 
    def open(self, a_bzrdir, _found=False):
 
176
    def open(self, a_bzrdir, name=None, _found=False):
181
177
        if not _found:
182
178
            raise NotImplementedError
183
179
        try:
184
 
            transport = a_bzrdir.get_branch_transport(None)
 
180
            transport = a_bzrdir.get_branch_transport(None, name=name)
185
181
            control_files = lockable_files.LockableFiles(transport, 'lock',
186
182
                                                         lockdir.LockDir)
187
183
            return DummyForeignVcsBranch(_format=self,
192
188
            raise errors.NotBranchError(path=transport.base)
193
189
 
194
190
 
195
 
class DummyForeignVcsDirFormat(BzrDirMetaFormat1):
 
191
class DummyForeignVcsDirFormat(bzrdir.BzrDirMetaFormat1):
196
192
    """BzrDirFormat for the dummy foreign VCS."""
197
193
 
198
194
    @classmethod
210
206
    def get_branch_format(self):
211
207
        return DummyForeignVcsBranchFormat()
212
208
 
213
 
    @classmethod
214
 
    def probe_transport(klass, transport):
215
 
        """Return the .bzrdir style format present in a directory."""
216
 
        if not transport.has('.dummy'):
217
 
            raise errors.NotBranchError(path=transport.base)
218
 
        return klass()
219
 
 
220
209
    def initialize_on_transport(self, transport):
221
210
        """Initialize a new bzrdir in the base directory of a Transport."""
222
211
        # Since we don't have a .bzr directory, inherit the
239
228
        return DummyForeignVcsDir(transport, self)
240
229
 
241
230
 
242
 
class DummyForeignVcsDir(BzrDirMeta1):
 
231
class DummyForeignVcsDir(bzrdir.BzrDirMeta1):
243
232
 
244
233
    def __init__(self, _transport, _format):
245
234
        self._format = _format
249
238
        self._control_files = lockable_files.LockableFiles(self.transport,
250
239
            "lock", lockable_files.TransportLock)
251
240
 
252
 
    def open_branch(self, ignore_fallbacks=True):
 
241
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True):
 
242
        if name is not None:
 
243
            raise errors.NoColocatedBranchSupport(self)
253
244
        return self._format.get_branch_format().open(self, _found=True)
254
245
 
255
246
    def cloning_metadir(self, stacked=False):
256
247
        """Produce a metadir suitable for cloning with."""
257
 
        return format_registry.make_bzrdir("default")
 
248
        return bzrdir.format_registry.make_bzrdir("default")
258
249
 
259
250
    def sprout(self, url, revision_id=None, force_new_repo=False,
260
251
               recurse='down', possible_transports=None,
268
259
                hardlink=hardlink, stacked=stacked, source_branch=source_branch)
269
260
 
270
261
 
271
 
class ForeignVcsRegistryTests(TestCase):
 
262
def register_dummy_foreign_for_test(testcase):
 
263
    controldir.ControlDirFormat.register_format(DummyForeignVcsDirFormat)
 
264
    testcase.addCleanup(controldir.ControlDirFormat.unregister_format,
 
265
                        DummyForeignVcsDirFormat)
 
266
    controldir.ControlDirFormat.register_prober(DummyForeignProber)
 
267
    testcase.addCleanup(controldir.ControlDirFormat.unregister_prober,
 
268
        DummyForeignProber)
 
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 DummyForeignProber(controldir.Prober):
 
277
 
 
278
    @classmethod
 
279
    def probe_transport(klass, transport):
 
280
        """Return the .bzrdir style format present in a directory."""
 
281
        if not transport.has('.dummy'):
 
282
            raise errors.NotBranchError(path=transport.base)
 
283
        return DummyForeignVcsDirFormat()
 
284
 
 
285
 
 
286
class ForeignVcsRegistryTests(tests.TestCase):
272
287
    """Tests for the ForeignVcsRegistry class."""
273
288
 
274
289
    def test_parse_revision_id_no_dash(self):
289
304
                          reg.parse_revision_id("dummy-v1:some-foreign-revid"))
290
305
 
291
306
 
292
 
class ForeignRevisionTests(TestCase):
 
307
class ForeignRevisionTests(tests.TestCase):
293
308
    """Tests for the ForeignRevision class."""
294
309
 
295
310
    def test_create(self):
301
316
        self.assertEquals(mapp, rev.mapping)
302
317
 
303
318
 
304
 
class WorkingTreeFileUpdateTests(TestCaseWithTransport):
 
319
class WorkingTreeFileUpdateTests(tests.TestCaseWithTransport):
305
320
    """Tests for update_workingtree_fileids()."""
306
321
 
307
322
    def test_update_workingtree(self):
309
324
        self.build_tree_contents([('br1/bla', 'original contents\n')])
310
325
        wt.add('bla', 'bla-a')
311
326
        wt.commit('bla-a')
 
327
        root_id = wt.get_root_id()
312
328
        target = wt.bzrdir.sprout('br2').open_workingtree()
313
329
        target.unversion(['bla-a'])
314
330
        target.add('bla', 'bla-b')
319
335
        foreign.update_workingtree_fileids(wt, target_basis)
320
336
        wt.lock_read()
321
337
        try:
322
 
            self.assertEquals(["TREE_ROOT", "bla-b"], list(wt.inventory))
 
338
            self.assertEquals(set([root_id, "bla-b"]), set(wt.inventory))
323
339
        finally:
324
340
            wt.unlock()
325
341
 
326
342
 
327
 
class DummyForeignVcsTests(TestCaseWithTransport):
 
343
class DummyForeignVcsTests(tests.TestCaseWithTransport):
328
344
    """Very basic test for DummyForeignVcs."""
329
345
 
330
346
    def setUp(self):
331
 
        BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
332
 
        branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
333
 
        self.addCleanup(self.unregister)
334
347
        super(DummyForeignVcsTests, self).setUp()
335
 
 
336
 
    def unregister(self):
337
 
        try:
338
 
            BzrDirFormat.unregister_control_format(DummyForeignVcsDirFormat)
339
 
        except ValueError:
340
 
            pass
341
 
        branch.InterBranch.unregister_optimiser(InterToDummyVcsBranch)
 
348
        register_dummy_foreign_for_test(self)
342
349
 
343
350
    def test_create(self):
344
351
        """Test we can create dummies."""
345
352
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
346
 
        dir = BzrDir.open("d")
 
353
        dir = bzrdir.BzrDir.open("d")
347
354
        self.assertEquals("A Dummy VCS Dir", dir._format.get_format_string())
348
355
        dir.open_repository()
349
356
        dir.open_branch()
352
359
    def test_sprout(self):
353
360
        """Test we can clone dummies and that the format is not preserved."""
354
361
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
355
 
        dir = BzrDir.open("d")
 
362
        dir = bzrdir.BzrDir.open("d")
356
363
        newdir = dir.sprout("e")
357
 
        self.assertNotEquals("A Dummy VCS Dir", newdir._format.get_format_string())
 
364
        self.assertNotEquals("A Dummy VCS Dir",
 
365
                             newdir._format.get_format_string())
 
366
 
 
367
    def test_push_not_supported(self):
 
368
        source_tree = self.make_branch_and_tree("source")
 
369
        target_tree = self.make_branch_and_tree("target", 
 
370
            format=DummyForeignVcsDirFormat())
 
371
        self.assertRaises(errors.NoRoundtrippingSupport, 
 
372
            source_tree.branch.push, target_tree.branch)
358
373
 
359
374
    def test_lossy_push_empty(self):
360
375
        source_tree = self.make_branch_and_tree("source")
361
376
        target_tree = self.make_branch_and_tree("target", 
362
377
            format=DummyForeignVcsDirFormat())
363
378
        pushresult = source_tree.branch.lossy_push(target_tree.branch)
364
 
        self.assertEquals(NULL_REVISION, pushresult.old_revid)
365
 
        self.assertEquals(NULL_REVISION, pushresult.new_revid)
 
379
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
 
380
        self.assertEquals(revision.NULL_REVISION, pushresult.new_revid)
366
381
        self.assertEquals({}, pushresult.revidmap)
367
382
 
368
383
    def test_lossy_push_simple(self):
377
392
            pushresult = source_tree.branch.lossy_push(target_tree.branch)
378
393
        finally:
379
394
            target_tree.branch.unlock()
380
 
        self.assertEquals(NULL_REVISION, pushresult.old_revid)
 
395
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
381
396
        self.assertEquals({revid1:target_tree.branch.last_revision()}, 
382
397
                           pushresult.revidmap)
383
398
        self.assertEquals(pushresult.revidmap[revid1], pushresult.new_revid)