← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

  • Committer: Martin Packman
  • Date: 2011-11-28 19:07:58 UTC
  • mfrom: (6318 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6319.
  • Revision ID: martin.packman@canonical.com-20111128190758-5gj44o5uzwz5sjfq
Merge bzr.dev to resolve conflicts with updated registry help strings

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/controldir.py
222
222
        return None
223
223
 
224
224
    def open_branch(self, name=None, unsupported=False,
225
 
                    ignore_fallbacks=False):
 
225
                    ignore_fallbacks=False, possible_transports=None):
226
226
        """Open the branch object at this ControlDir if one is present.
227
227
 
228
 
        If unsupported is True, then no longer supported branch formats can
229
 
        still be opened.
230
 
 
231
 
        TODO: static convenience version of this?
 
228
        :param unsupported: if True, then no longer supported branch formats can
 
229
            still be opened.
 
230
        :param ignore_fallbacks: Whether to open fallback repositories
 
231
        :param possible_transports: Transports to use for opening e.g.
 
232
            fallback repositories.
232
233
        """
233
234
        raise NotImplementedError(self.open_branch)
234
235
 
240
241
        get at a repository.
241
242
 
242
243
        :param _unsupported: a private parameter, not part of the api.
243
 
 
244
 
        TODO: static convenience version of this?
245
244
        """
246
245
        raise NotImplementedError(self.open_repository)
247
246
 
275
274
        branch and discards it, and that's somewhat expensive.)
276
275
        """
277
276
        try:
278
 
            self.open_branch(name)
 
277
            self.open_branch(name, ignore_fallbacks=True)
279
278
            return True
280
279
        except errors.NotBranchError:
281
280
            return False