← 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-28 00:56:56 UTC
  • mto: (6437.3.28 2.5)
  • mto: This revision was merged to the branch mainline in revision 6451.
  • Revision ID: jelmer@samba.org-20120128005656-06mds3447hpzhv8i
actually run per_controldir_colo tests against RemoteBzrDir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
778
778
 
779
779
    def open_branch(self, name=None, unsupported=False,
780
780
                    ignore_fallbacks=False, possible_transports=None):
 
781
        if name is None:
 
782
            name = self._get_selected_branch()
 
783
        if name != "":
 
784
            raise errors.NoColocatedBranchSupport(self)
781
785
        if unsupported:
782
786
            raise NotImplementedError('unsupported flag support not implemented yet.')
783
787
        if self._next_open_branch_result is not None:
786
790
            self._next_open_branch_result = None
787
791
            return result
788
792
        response = self._get_branch_reference()
789
 
        if name is None:
790
 
            name = self._get_selected_branch()
791
793
        return self._open_branch(name, response[0], response[1],
792
794
            possible_transports=possible_transports,
793
795
            ignore_fallbacks=ignore_fallbacks)