← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-07 01:06:26 UTC
  • mto: (6437.3.4 2.5)
  • mto: This revision was merged to the branch mainline in revision 6441.
  • Revision ID: jelmer@samba.org-20120107010626-vytp4nsgs8c3hnc3
Fix some tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
2038
2038
        :param name: Name of colocated branch to create, if any
2039
2039
        :return: a branch in this format
2040
2040
        """
 
2041
        if name is None:
 
2042
            name = a_bzrdir._get_selected_branch()
2041
2043
        mutter('creating branch %r in %s', self, a_bzrdir.user_url)
2042
2044
        branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2043
2045
        control_files = lockable_files.LockableFiles(branch_transport,
2060
2062
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
2061
2063
            found_repository=None, possible_transports=None):
2062
2064
        """See BranchFormat.open()."""
 
2065
        if name is None:
 
2066
            name = a_bzrdir._get_selected_branch()
2063
2067
        if not _found:
2064
2068
            format = BranchFormatMetadir.find_format(a_bzrdir, name=name)
2065
2069
            if format.__class__ != self.__class__: