~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-02-11 04:02:41 UTC
  • mfrom: (5017.2.2 tariff)
  • Revision ID: pqm@pqm.ubuntu.com-20100211040241-w6n021dz0uus341n
(mbp) add import-tariff tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
90
90
        self._format = _format
91
91
        self._base = a_bzrdir.transport.base
92
92
        self._ignore_fallbacks = False
93
 
        self.bzrdir = a_bzrdir
94
93
        foreign.ForeignBranch.__init__(self, 
95
94
            DummyForeignVcsMapping(DummyForeignVcs()))
96
95
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir, 
172
171
        super(DummyForeignVcsBranchFormat, self).__init__()
173
172
        self._matchingbzrdir = DummyForeignVcsDirFormat()
174
173
 
175
 
    def open(self, a_bzrdir, name=None, _found=False):
 
174
    def open(self, a_bzrdir, _found=False):
176
175
        if not _found:
177
176
            raise NotImplementedError
178
177
        try:
179
 
            transport = a_bzrdir.get_branch_transport(None, name=name)
 
178
            transport = a_bzrdir.get_branch_transport(None)
180
179
            control_files = lockable_files.LockableFiles(transport, 'lock',
181
180
                                                         lockdir.LockDir)
182
181
            return DummyForeignVcsBranch(_format=self,
244
243
        self._control_files = lockable_files.LockableFiles(self.transport,
245
244
            "lock", lockable_files.TransportLock)
246
245
 
247
 
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True):
248
 
        if name is not None:
249
 
            raise errors.NoColocatedBranchSupport(self)
 
246
    def open_branch(self, ignore_fallbacks=True):
250
247
        return self._format.get_branch_format().open(self, _found=True)
251
248
 
252
249
    def cloning_metadir(self, stacked=False):