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

[Aaron Bentley]

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

John Arbash Meinel wrote:
> 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.)

I like the idea, though I'm not sure that it's useful to be able to
specify a file:// location for a locations.conf section.


- -from bzrlib import branch, bzrdir, errors, gpg, transactions, repository
+from bzrlib import (
+    branch,
+    bzrdir,
+    errors,
+    gpg,
+    urlutils,
+    transactions,
+    repository,
+    )

Shouldn't this be indented to the first parenthesis?  It looks like K&R
C style to me.

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

iD8DBQFEwT1F0F+nu1YWqI0RApo5AJ4tinF6k/iB7u2e7aQawEEg+UWrHACfVlww
XAab1AMyZ+6qi1yr/88AWWg=
=k2vJ
-----END PGP SIGNATURE-----