← 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: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
171
171
        super(DummyForeignVcsBranchFormat, self).__init__()
172
172
        self._matchingbzrdir = DummyForeignVcsDirFormat()
173
173
 
174
 
    def open(self, a_bzrdir, _found=False):
 
174
    def open(self, a_bzrdir, name=None, _found=False):
175
175
        if not _found:
176
176
            raise NotImplementedError
177
177
        try:
178
 
            transport = a_bzrdir.get_branch_transport(None)
 
178
            transport = a_bzrdir.get_branch_transport(None, name=name)
179
179
            control_files = lockable_files.LockableFiles(transport, 'lock',
180
180
                                                         lockdir.LockDir)
181
181
            return DummyForeignVcsBranch(_format=self,
243
243
        self._control_files = lockable_files.LockableFiles(self.transport,
244
244
            "lock", lockable_files.TransportLock)
245
245
 
246
 
    def open_branch(self, ignore_fallbacks=True):
 
246
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True):
 
247
        if name is not None:
 
248
            raise errors.NoColocatedBranchSupport(self)
247
249
        return self._format.get_branch_format().open(self, _found=True)
248
250
 
249
251
    def cloning_metadir(self, stacked=False):