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

[John Arbash Meinel]

Andrew Bennetts wrote:
> John Arbash Meinel wrote:
>> Andrew Bennetts wrote:
>>> 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.
>> I think you attached the wrong patch. The one you have here is called 
>> "smart-break-lock-bug.bundle" and has code that changes the default lock 
>> timeout.
> 
> Oops, you're right.  Here's the right one.
> 
> -Andrew.
> 
> 

-        return urlutils.relative_url(medium_base, 
transport.base).encode('utf8')
+        rel_url = urlutils.relative_url(medium_base, transport.base)
+        return urlutils.unescape(rel_url).encode('utf8')

^- doing: urlutils.unescape(rel_url).encode('utf8')
seems like a whole lot of double handling. Why not do:

urllib.unquote(url)

instead. Alternatively you can add a helper function in urlutils in case 
you need the "url = str(url)" or any special exception handling.

BB:tweak

John
=:->