[MERGE] use local paths in ~/.bazaar/locations.conf

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

https://launchpad.net/products/bzr/+bug/53653

When my encoding branch landed, Branch.base changed from being a local
path to being a URL. Since config locations are looked up by
Branch.base, this meant we no longer found existing entries. (And new
entries are created with a 'file:///' url.)

However, ~/.bazaar/locations.conf is a file we might expect users to
edit. So we really should use the local path, rather than a url.

The attached patch makes locations.conf compatible with both urls and
local paths, but prefers local paths.

I'd like to get this into 0.9, since it restores compatibility with 0.8.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEwTG3JdeBCYSNAAMRAha6AJ0aLdOQ/Pn5Jo2ljprBRqnXH1tPFgCgjIO/
9Pu3AI4ib3IocxwJ78Am5Zs=
=21Lx
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix-53653.patch
Type: text/x-patch
Size: 13365 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060721/224e6ab7/attachment.bin