~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Vincent Ladeuil
  • Date: 2007-11-19 13:44:25 UTC
  • mto: (3018.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3019.
  • Revision ID: v.ladeuil+lp@free.fr-20071119134425-y74t0vh9ctpo8j9f
Fix 150860 by leaving port as user specified it.

* transport/remote.py:
(BZR_DEFAULT_INTERFACE, BZR_DEFAULT_PORT): Moved to
smart/medium.py.

* transport/__init__.py:
(TransportListRegistry.register_transport): Delete default_port.
(TransportListRegistry.get_default_port): Deleted.
(ConnectedTransport._split_url, ConnectedTransport._unsplit_url):
Leave port untouched.

* tests/test_transport.py: 
Transports kept port as user specified it.
(TestRemoteTCPTransport, SSHPortTestMixin, SFTPTransportPortTest,
BzrSSHTransportPortTest): Deleted. Default port is set just before
connection.

* smart/medium.py:
(SmartTCPClientMedium._ensure_connection): Set port to default
*just* before connection.

* builtins.py:
(cmd_serve.run): Get interface and port default values from medium.

Show diffs side-by-side

added added

removed removed

Lines of Context:
3652
3652
        from bzrlib.smart import medium, server
3653
3653
        from bzrlib.transport import get_transport
3654
3654
        from bzrlib.transport.chroot import ChrootServer
3655
 
        from bzrlib.transport.remote import BZR_DEFAULT_PORT, BZR_DEFAULT_INTERFACE
3656
3655
        if directory is None:
3657
3656
            directory = os.getcwd()
3658
3657
        url = urlutils.local_path_to_url(directory)
3665
3664
            smart_server = medium.SmartServerPipeStreamMedium(
3666
3665
                sys.stdin, sys.stdout, t)
3667
3666
        else:
3668
 
            host = BZR_DEFAULT_INTERFACE
 
3667
            host = medium.BZR_DEFAULT_INTERFACE
3669
3668
            if port is None:
3670
 
                port = BZR_DEFAULT_PORT
 
3669
                port = medium.BZR_DEFAULT_PORT
3671
3670
            else:
3672
3671
                if ':' in port:
3673
3672
                    host, port = port.split(':')