← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
1722
1722
register_transport_proto('aftp://', help="Access using active FTP.")
1723
1723
register_lazy_transport('aftp://', 'bzrlib.transport.ftp', 'FtpTransport')
1724
1724
 
 
1725
# Default to trying GSSAPI authentication (if the kerberos module is available)
 
1726
register_transport_proto('ftp+gssapi://', register_netloc=True)
 
1727
register_lazy_transport('ftp+gssapi://', 'bzrlib.transport.ftp._gssapi', 
 
1728
                        'GSSAPIFtpTransport')
 
1729
register_transport_proto('aftp+gssapi://', register_netloc=True)
 
1730
register_lazy_transport('aftp+gssapi://', 'bzrlib.transport.ftp._gssapi', 
 
1731
                        'GSSAPIFtpTransport')
 
1732
register_transport_proto('ftp+nogssapi://', register_netloc=True)
 
1733
register_transport_proto('aftp+nogssapi://', register_netloc=True)
 
1734
 
 
1735
register_lazy_transport('ftp://', 'bzrlib.transport.ftp._gssapi', 
 
1736
                        'GSSAPIFtpTransport')
 
1737
register_lazy_transport('aftp://', 'bzrlib.transport.ftp._gssapi', 
 
1738
                        'GSSAPIFtpTransport')
 
1739
register_lazy_transport('ftp+nogssapi://', 'bzrlib.transport.ftp', 
 
1740
                        'FtpTransport')
 
1741
register_lazy_transport('aftp+nogssapi://', 'bzrlib.transport.ftp', 
 
1742
                        'FtpTransport')
 
1743
 
1725
1744
register_transport_proto('memory://')
1726
1745
register_lazy_transport('memory://', 'bzrlib.transport.memory',
1727
1746
                        'MemoryTransport')