← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/medium.py

  • Committer: Jelmer Vernooij
  • Date: 2011-11-15 17:27:46 UTC
  • mfrom: (6260 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6263.
  • Revision ID: jelmer@samba.org-20111115172746-bznns2ohiexp2g5q
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/medium.py
953
953
            maybe_port = ''
954
954
        else:
955
955
            maybe_port = ':%s' % self._ssh_params.port
956
 
        return "%s(%s://%s@%s%s/)" % (
 
956
        if self._ssh_params.username is None:
 
957
            maybe_user = ''
 
958
        else:
 
959
            maybe_user = '%s@' % self._ssh_params.username
 
960
        return "%s(%s://%s%s%s/)" % (
957
961
            self.__class__.__name__,
958
962
            self._scheme,
959
 
            self._ssh_params.username,
 
963
            maybe_user,
960
964
            self._ssh_params.host,
961
965
            maybe_port)
962
966