Rev 2445: (robertc) Update doc/server.txt and the port the smart server listens on. (Robert Collins, #107125, #98918) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Apr 23 08:08:12 BST 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 2445
revision-id: pqm at pqm.ubuntu.com-20070423070809-7imm5hgj6g0n78s5
parent: pqm at pqm.ubuntu.com-20070423041629-v7moohhajrjbc2xw
parent: robertc at robertcollins.net-20070423063616-t7d6fihs0zb93s5u
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-04-23 08:08:09 +0100
message:
(robertc) Update doc/server.txt and the port the smart server listens on. (Robert Collins, #107125, #98918)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
doc/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
------------------------------------------------------------
revno: 2443.1.3
merged: robertc at robertcollins.net-20070423063616-t7d6fihs0zb93s5u
parent: robertc at robertcollins.net-20070423043850-syh9c5j0evr48gam
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-defaultport
timestamp: Mon 2007-04-23 16:36:16 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 2443.1.2
merged: robertc at robertcollins.net-20070423043850-syh9c5j0evr48gam
parent: robertc at robertcollins.net-20070423042856-5ehxo2patgw2h4nj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-defaultport
timestamp: Mon 2007-04-23 14:38:50 +1000
message:
``bzr serve`` now listens on interface 0.0.0.0 by default, making it serve
out to the local LAN and fixing bug 98918. (Robert Collins)
------------------------------------------------------------
revno: 2443.1.1
merged: robertc at robertcollins.net-20070423042856-5ehxo2patgw2h4nj
parent: pqm at pqm.ubuntu.com-20070423033245-wg3hadlut6sohka2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-defaultport
timestamp: Mon 2007-04-23 14:28:56 +1000
message:
Document the default bzr:// port (fixes #107125).
=== modified file 'NEWS'
--- a/NEWS 2007-04-23 03:41:48 +0000
+++ b/NEWS 2007-04-23 07:08:09 +0000
@@ -39,6 +39,14 @@
* New help topic ``urlspec`` which lists the availables transports.
(Goffredo Baroncelli)
+ * doc/server.txt updated to document the default bzr:// port (fixes
+ #107125) and also update the blurb about the hpss' current status.
+ (Robert Collins).
+
+ * ``bzr serve`` now listens on interface 0.0.0.0 by default, making it
+ serve out to the local LAN (and anyone in the world that can reach the
+ machine running ``bzr serve``. (Robert Collins, #98918)
+
INTERNALS:
* bzrlib API compatability with 0.8 has been dropped, cleaning up some
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2007-04-21 14:15:08 +0000
+++ b/bzrlib/builtins.py 2007-04-23 04:38:50 +0000
@@ -3291,7 +3291,7 @@
from bzrlib.smart import medium, server
from bzrlib.transport import get_transport
from bzrlib.transport.chroot import ChrootServer
- from bzrlib.transport.remote import BZR_DEFAULT_PORT
+ from bzrlib.transport.remote import BZR_DEFAULT_PORT, BZR_DEFAULT_INTERFACE
if directory is None:
directory = os.getcwd()
url = urlutils.local_path_to_url(directory)
@@ -3304,14 +3304,12 @@
smart_server = medium.SmartServerPipeStreamMedium(
sys.stdin, sys.stdout, t)
else:
+ host = BZR_DEFAULT_INTERFACE
if port is None:
port = BZR_DEFAULT_PORT
- host = '127.0.0.1'
else:
if ':' in port:
host, port = port.split(':')
- else:
- host = '127.0.0.1'
port = int(port)
smart_server = server.SmartTCPServer(t, host=host, port=port)
print 'listening on port: ', smart_server.port
=== modified file 'bzrlib/transport/remote.py'
--- a/bzrlib/transport/remote.py 2007-04-16 17:49:35 +0000
+++ b/bzrlib/transport/remote.py 2007-04-23 04:38:50 +0000
@@ -39,6 +39,7 @@
# Port 4155 is the default port for bzr://, registered with IANA.
+BZR_DEFAULT_INTERFACE = '0.0.0.0'
BZR_DEFAULT_PORT = 4155
=== modified file 'doc/server.txt'
--- a/doc/server.txt 2007-03-02 12:40:45 +0000
+++ b/doc/server.txt 2007-04-23 06:36:16 +0000
@@ -16,17 +16,16 @@
bzr log http://bazaar-vcs.org/bzr/bzr.dev
-Bazaar supports writing over FTP, SFTP and via a plugin over HTTP-WebDAV.
+Bazaar supports writing over FTP, SFTP and (via a plugin) over HTTP-WebDAV.
High-performance server
=======================
-**In development**
-
-The high-performance server is currently in development. The version of Bazaar
-that accompanies this documentation is able to use the servers underlying
-protocol as a dumb server. This is the first stage high-performance server
-functionality to be delivered.
+The high-performance server is currently in development. It provides a dumb
+server facility as well as additional capabilities which allow the version of
+bzr that accompanies this documentation to perform some operations much faster
+than via dumb servers. In future releases of bzr the range of operations that
+are improved by using the high-performance server will increase.
To maintain the highest security possible, the current
high-performance server provides read-only access by default. To
@@ -49,7 +48,8 @@
The ``bzr+ssh://`` URL scheme only supports absolute paths from the
root of the filesystem. Future versions are expected to support ``~``
-in the same way as ``sftp://`` URLs.
+in the same way as ``sftp://`` URLs
+(https://bugs.launchpad.net/bzr/+bug/109143).
inetd
-----
@@ -60,12 +60,12 @@
Running a Bazaar server from inetd requires an inetd.conf entry::
- 1234 stream tcp nowait bzruser /usr/bin/bzr serve --inet --directory=/srv/bzr/repo
+ 4155 stream tcp nowait bzruser /usr/bin/bzr serve --inet --directory=/srv/bzr/repo
When running client commands, the URL you supply is a `bzr://` URL relative to
the ``--directory`` option given in inetd.conf::
- bzr log bzr://host:1234/branchname
+ bzr log bzr://host/branchname
Dedicated
---------
@@ -82,3 +82,9 @@
bzr log bzr://host:1234/branchname
+This example runs bzr on its official port number of `4155` and listens on all
+interfaces. This allows connections from anywhere in the world that can reach
+your machine on port `4155`.
+
+server::
+ bzr serve --directory=/srv/bzr/repo
More information about the bazaar-commits
mailing list