/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/remote.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-19 12:08:42 UTC
  • mfrom: (6437.3.8 2.5)
  • mto: (6437.3.14 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120119120842-xlq5ru2cqfcurnk9
Merge lp:bzr/2.5.

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,
766
768
            self._next_open_branch_result = None
767
769
            return result
768
770
        response = self._get_branch_reference()
 
771
        if name is None:
 
772
            name = self._get_selected_branch()
769
773
        return self._open_branch(name, response[0], response[1],
770
774
            possible_transports=possible_transports,
771
775
            ignore_fallbacks=ignore_fallbacks)
3126
3130
 
3127
3131
    def initialize(self, a_bzrdir, name=None, repository=None,
3128
3132
                   append_revisions_only=None):
 
3133
        if name is None:
 
3134
            name = a_bzrdir._get_selected_branch()
3129
3135
        # 1) get the network name to use.
3130
3136
        if self._custom_format:
3131
3137
            network_name = self._custom_format.network_name()
3146
3152
        # Creating on a remote bzr dir.
3147
3153
        # 2) try direct creation via RPC
3148
3154
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
3149
 
        if name is not None:
 
3155
        if name != "":
3150
3156
            # XXX JRV20100304: Support creating colocated branches
3151
3157
            raise errors.NoColocatedBranchSupport(self)
3152
3158
        verb = 'BzrDir.create_branch'