Rev 3375: resolve NEWS conflict in http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/log_bug_209948
John Arbash Meinel
john at arbash-meinel.com
Mon Apr 21 17:11:58 BST 2008
At http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/log_bug_209948
------------------------------------------------------------
revno: 3375
revision-id: john at arbash-meinel.com-20080421160533-abpkc2ahl7h5m3nl
parent: john at arbash-meinel.com-20080418175434-t91cnuokuwovt1s6
parent: pqm at pqm.ubuntu.com-20080421032507-zw44l9w8k1riva6y
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: log_bug_209948
timestamp: Mon 2008-04-21 11:05:33 -0500
message:
resolve NEWS conflict
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
------------------------------------------------------------
revno: 3373.2.2
revision-id: pqm at pqm.ubuntu.com-20080421032507-zw44l9w8k1riva6y
parent: pqm at pqm.ubuntu.com-20080419002305-25ayhxp3m0b95e9c
parent: mbp at sourcefrog.net-20080421010717-iji0e7xjwd1i6x2p
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-04-21 04:25:07 +0100
message:
(mbp) Set SO_REUSEADDR on server sockets (#164288)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
------------------------------------------------------------
revno: 3373.3.1
revision-id: mbp at sourcefrog.net-20080421010717-iji0e7xjwd1i6x2p
parent: pqm at pqm.ubuntu.com-20080419002305-25ayhxp3m0b95e9c
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 164288-reuseaddr
timestamp: Mon 2008-04-21 11:07:17 +1000
message:
Set SO_REUSEADDR on server sockets (#164288)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
------------------------------------------------------------
revno: 3373.2.1
revision-id: pqm at pqm.ubuntu.com-20080419002305-25ayhxp3m0b95e9c
parent: pqm at pqm.ubuntu.com-20080417155359-m3nxwwr442bgmsne
parent: john at arbash-meinel.com-20080418220716-6nznomxj9gem1imi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-04-19 01:23:05 +0100
message:
(jam) Trivial update to warning message when a user has not run
lp-login
modified:
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
------------------------------------------------------------
revno: 3373.1.1
revision-id: john at arbash-meinel.com-20080418220716-6nznomxj9gem1imi
parent: pqm at pqm.ubuntu.com-20080417155359-m3nxwwr442bgmsne
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2008-04-18 17:07:16 -0500
message:
Trivial warning message update when user has not run lp-login
modified:
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2008-04-18 17:54:34 +0000
+++ b/NEWS 2008-04-21 16:05:33 +0000
@@ -26,8 +26,9 @@
* Avoid muttering every time a child update does not cause a progress bar
update. (John Arbash Meinel, #213771)
- * When logging the changes to a particular file, there was a bug if there
- were ghosts in the revision ancestry. (John Arbash Meinel, #209948)
+ * Set SO_REUSEADDR on server sockets of ``bzr serve`` to avoid problems
+ rebinding the socket when starting the server a second time.
+ (John Arbash Meinel, Martin Pool, #164288)
* Severe performance degradation in fetching from knit repositories to
knits and packs due to parsing the entire revisions.kndx on every graph
@@ -36,6 +37,9 @@
every revision each side had in common.
(Robert Collins, John Arbash Meinel)
+ * When logging the changes to a particular file, there was a bug if there
+ were ghosts in the revision ancestry. (John Arbash Meinel, #209948)
+
DOCUMENTATION:
* Document outlining strategies for TortoiseBzr. (Mark Hammond)
=== modified file 'bzrlib/plugins/launchpad/lp_directory.py'
--- a/bzrlib/plugins/launchpad/lp_directory.py 2008-04-02 03:11:19 +0000
+++ b/bzrlib/plugins/launchpad/lp_directory.py 2008-04-18 22:07:16 +0000
@@ -93,10 +93,9 @@
if _lp_login is None:
if not _warned_login:
trace.warning('You have not informed bzr of your '
- 'launchpad login. If you are attempting a '
- 'write operation it may fail. If it does, '
- 'run "bzr launchpad-login YOUR_ID" to '
- 'set your login and try again.')
+ 'launchpad login. If you are attempting a\n'
+ 'write operation and it fails, run '
+ '"bzr launchpad-login YOUR_ID" and try again.')
_warned_login = True
continue
url = urlunsplit((scheme, '%s@%s' % (_lp_login, netloc),
=== modified file 'bzrlib/smart/server.py'
--- a/bzrlib/smart/server.py 2007-12-13 22:22:58 +0000
+++ b/bzrlib/smart/server.py 2008-04-21 01:07:17 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007 Canonical Ltd
+# Copyright (C) 2006, 2007, 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
import errno
import socket
+import sys
import threading
from bzrlib.hooks import Hooks
@@ -59,6 +60,10 @@
self._socket_error = socket_error
self._socket_timeout = socket_timeout
self._server_socket = socket.socket()
+ # SO_REUSERADDR has a different meaning on Windows
+ if sys.platform != 'win32':
+ self._server_socket.setsockopt(socket.SOL_SOCKET,
+ socket.SO_REUSEADDR, 1)
self._server_socket.bind((host, port))
self._sockname = self._server_socket.getsockname()
self.port = self._sockname[1]
More information about the bazaar-commits
mailing list