← Back to branch summary

~bzr/ubuntu/lucid/bzr/beta-ppa

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_foreign.py

  • Committer: Martin Pool
  • Date: 2010-08-18 04:26:39 UTC
  • mfrom: (129.1.8 packaging-karmic)
  • Revision ID: mbp@sourcefrog.net-20100818042639-mjoxtngyjwiu05fo
* PPA rebuild for lucid.
* PPA rebuild for karmic.
* PPA rebuild onto jaunty.
* New upstream release.

Show diffs side-by-side

added added

removed removed

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