/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/smart/medium.py

  • Committer: Martin Packman
  • Date: 2011-11-24 12:11:56 UTC
  • mfrom: (6285 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6287.
  • Revision ID: martin.packman@canonical.com-20111124121156-s5b055v8gig16b02
Merge bzr.dev to resolve conflict in bb.test_rmbranch

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