[MERGE] Re: Traceback using "bzr log lp:bzr-email"

[Andrew Bennetts]

John Arbash Meinel wrote:
[...]
> It might also be a different bug. Since it seems that
> 
>   bzr log bzr+ssh://bazaar.launchpad.net/~bzr/bzr-email/trunk
> 
> Is giving a "Not A Branch" error, whil
> 
>   bzr log sftp://bazaar.launchpad.net/~bzr/bzr-email/trunk
> 
> seems to work just fine.

As discussed elsewhere in the thread, the fix is to not URL-escape the relpaths
in the remote protocol.  Here's a bundle that does that.  It includes a bonus
test for how unicode paths are handled, which isn't directly relevant to this
bug but it seemed like a good idea to add a test for.

-Andrew.

-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrew.bennetts at canonical.com-20071218225646-\
#   a4i5p1sntsd5tidq
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev
# testament_sha1: 541b94ce2c33e5e19864fe65a4ef0070d952bcef
# timestamp: 2007-12-19 10:02:36 +1100
# source_branch: http://people.ubuntu.com/~andrew/bzr/smart-break-\
#   lock-bug
# base_revision_id: pqm at pqm.ubuntu.com-20071215210020-m28kk1qmbcc9n6qs
# 
# Begin patch
=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2007-12-15 16:35:40 +0000
+++ bzrlib/builtins.py	2007-12-18 22:56:46 +0000
@@ -3720,6 +3720,7 @@
         ]
 
     def run(self, port=None, inet=False, directory=None, allow_writes=False):
+        from bzrlib import lockdir
         from bzrlib.smart import medium, server
         from bzrlib.transport import get_transport
         from bzrlib.transport.chroot import ChrootServer
@@ -3750,11 +3751,14 @@
         # be changed with care though, as we dont want to use bandwidth sending
         # progress over stderr to smart server clients!
         old_factory = ui.ui_factory
+        old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
         try:
             ui.ui_factory = ui.SilentUIFactory()
+            lockdir._DEFAULT_TIMEOUT_SECONDS = 0
             smart_server.serve()
         finally:
             ui.ui_factory = old_factory
+            lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
 
 
 class cmd_join(Command):

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcr61FsAAhvfgCRQUWP//3//
//C////wUAT7W80pFnpj1oB5cJKmk0DTSeTUwJhNGJphGE00NqYIDTTTINTUCNGmCekGgDQAAAAA
aNAAlJplDRpqaNU/U9Jkho0aAAADQBhND1BXqp6gaGmhpoAZGRkxAAMhppkAwgJJCAI02kaBpGE0
m1MjSe1Q9JoeoPSBo2iSEcL8YadnP5NX6bm6EzzyuD4Yy7lqOQRodiNcI4o6CbbVyWbTCc5UMEcA
yYHiek6Gdy5ERg5B1BoJKisxuOkDkRNBnXi7UV4JQ/j+E9QvsSFMD8S6N7d+eXa1Veytl41Dmyr5
2HGhvPUdx26z1mvGtSWrEAmPz2xFG0uNzAIPJXVVgMMoFxuA0Y+sybXuDD5TPl0bZV1oKOX/egMB
tWQMNR/NVGZ2zy/BE29hF0dwPzZglIAHee/dQE3U42djlDLIPQl+mJOIqX9PD5q7bZ/HUItqqQR4
m7EPHDxaC1BKmjceVtg6JKiM76fUXygUEnVPS5iJnO86/UHL6AUV6GtfPiDuAIBlhIhXmIBlYNQB
YxTxCZEsxMdK32KsCzNhTbSpKGQok7Nd4axrDZvrNiy+qhgO6wDzybiaUmzEh4bDQxITEQLIV3D2
5uO1Tp+JzBFxnuAzvJnESGvGaz6cAIgarkFsuTTlyP1AXW2VLcn7jwA54A46Z3JPio9iCVCkHgdY
aJRgKOSUPtZI1m/rCds8pigSIDjFkeuTF92Z1CdYYF11+WZgWSHnIdxyQzA+9lom2K6CiRCIWmhB
/QaeJ62F+THPWtuknLPXdEkGINR1dB7vB8zidnPcg7Qc+IqkRqUnex51DS1FvRQ3MUTTuGvxTaey
tTIFGmK+TXg68U1X/3bk9HCJfTim0X5VOdh0bY60cFTH9L/5ls7VesR1D3sHSzEC6JBolAo7GBPP
lOFLWqLCwnEIaUVyGCIX5IOtEqipwSr4+GzJ0weamCzFKsxiOgY74NuZms5d0apCGGnKOHsA0RzO
MpayfyPeU/g2T+cnI2wxoUHrRKBI3ZFe1pklBEcyTe7Myq+zZjMx8T9zA0Gw0jdlYcBF24bK3aF7
pksRWMNUZbwq3kUHogyhimaJfLBviBkpQm2b2t6iek3gVK6UHFYsORpqwMDgYmOk7UqQKkjZRmr1
WnkW3zjU2IddKgHWJAfDK1gi/HZUMFmoy6+xpOy8YBlFBwzhPUnTltr89YOiTkjXiKUgeF0L/Ybz
aMOMZy9l8pEJVHzdc7IWg4SxuXeupaZfGbeqHJtiLe95vFAKt2gO6ekuQOa7yRMB8mMCrUs6gjSu
9GJ6/z9NkJaBFKXYg4/xC7pNSbGE3OCVyPEJUE4UczcrtJLmNEV9Ss3xKVRUJegUAwRskTwtxqdf
focX1SbSCeHMGSicJZEfs5BIbhELXoG9oiRBBOUGTmLQGDOH6wDv4az36QNFvc7QJUDmAdziggPY
KEUg3jzHKNq9oDtT8ZhhgEhKDUX/APCVTzjfBcgJwNIfcGfYzMsiYsR42N1ypYu4usZPxiKptZUF
+ip8loTPIOHMmUs/HBSQGZBwbeMBIseeu+t5Fh1yTqwEaQcsgLwkJnhNbTBV7fZc2VbjEgU1JWZc
IFxqHR0ksJIXqEoEECtQTHSIKFGHB/+9AROgNYwVzWrbRZlsxQViDXvcI84XPCWvoTnPQOMkUJND
+LuSKcKEhlfWotg=