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

[John Arbash Meinel]

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

Aaron Bentley wrote:
> 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

I consider this bug to be a blocker for 0.9 (since it effects
compatibility with 0.8 and bzr.dev).

Any chance I can get more feedback? I would hate to bike shed on the
indentation rules. I'll start another thread for that, and wait a day or
two for more feedback.

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

iD8DBQFExMnhJdeBCYSNAAMRAgM6AKCuDwQjEKIwRFZV6P7Qa3BYJ5NN4gCgmC3i
P5XNn6gjyeCzmDCy5eC7oCA=
=L/+5
-----END PGP SIGNATURE-----