← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-18 10:42:07 UTC
  • mfrom: (6437.3.6 2.5)
  • mto: (6437.3.7 2.5)
  • mto: This revision was merged to the branch mainline in revision 6441.
  • Revision ID: jelmer@vernstok.nl-20120118104207-yc5fhsaz4mupjcam
Merge 2.5 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/branch.py
138
138
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
139
139
            found_repository=None, possible_transports=None):
140
140
        """See BranchFormat.open()."""
141
 
        if name is not None:
 
141
        if name is None:
 
142
            name = a_bzrdir._get_selected_branch()
 
143
        if name != "":
142
144
            raise errors.NoColocatedBranchSupport(self)
143
145
        if not _found:
144
146
            # we are being called directly and must probe.