← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.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/remote.py
625
625
 
626
626
    def create_branch(self, name=None, repository=None,
627
627
                      append_revisions_only=None):
 
628
        if name is None:
 
629
            name = self._get_selected_branch()
628
630
        # as per meta1 formats - just delegate to the format object which may
629
631
        # be parameterised.
630
632
        real_branch = self._format.get_branch_format().initialize(self,
724
726
 
725
727
    def open_branch(self, name=None, unsupported=False,
726
728
                    ignore_fallbacks=False, possible_transports=None):
 
729
        if name is None:
 
730
            name = self._get_selected_branch()
727
731
        if unsupported:
728
732
            raise NotImplementedError('unsupported flag support not implemented yet.')
729
733
        if self._next_open_branch_result is not None:
3102
3106
 
3103
3107
    def initialize(self, a_bzrdir, name=None, repository=None,
3104
3108
                   append_revisions_only=None):
 
3109
        if name is None:
 
3110
            name = a_bzrdir._get_selected_branch()
3105
3111
        # 1) get the network name to use.
3106
3112
        if self._custom_format:
3107
3113
            network_name = self._custom_format.network_name()
3122
3128
        # Creating on a remote bzr dir.
3123
3129
        # 2) try direct creation via RPC
3124
3130
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
3125
 
        if name is not None:
 
3131
        if name != "":
3126
3132
            # XXX JRV20100304: Support creating colocated branches
3127
3133
            raise errors.NoColocatedBranchSupport(self)
3128
3134
        verb = 'BzrDir.create_branch'