/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-01-30 14:12:36 UTC
  • mfrom: (6437.3.28 2.5)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120130141236-66k8qj1he6q2nq3r
Merge 2.5 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/branch.py
16
16
 
17
17
"""Weave-era branch implementations."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from bzrlib import (
20
22
    errors,
21
23
    lockable_files,
134
136
        return "Branch format 4"
135
137
 
136
138
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
137
 
            found_repository=None):
 
139
            found_repository=None, possible_transports=None):
138
140
        """See BranchFormat.open()."""
139
 
        if name is not None:
 
141
        if name is None:
 
142
            name = a_bzrdir._get_selected_branch()
 
143
        if name != "":
140
144
            raise errors.NoColocatedBranchSupport(self)
141
145
        if not _found:
142
146
            # we are being called directly and must probe.
147
151
                         _control_files=a_bzrdir._control_files,
148
152
                         a_bzrdir=a_bzrdir,
149
153
                         name=name,
150
 
                         _repository=found_repository)
 
154
                         _repository=found_repository,
 
155
                         possible_transports=possible_transports)
151
156
 
152
157
    def __str__(self):
153
158
        return "Bazaar-NG branch format 4"