[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.

Mostly I have that for compatibility with bzr.dev, which has been
creating them for quite some time.

> 
> 
> -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 suppose we should have a discussion about how we want to do indenting.
I personally prefer:
from bzrlib import (
    branch,
    bzrdir,
    errors,
    gpg,
    urlutils,
    transactions,
    repository,
    )

Because I think this:
from bzrlib import (
                    branch,
                    bzrdir,
                    errors,
                    gpg,
                    urlutils,
                    transactions,
                    repository,
                   )

wastes a lot of whitespace, it also makes you want to do:
from bzrlib import (branch,

But that messes up the point of putting each one on their own line,
because now if you want to insert one at the beginning, you have to
change 2 lines.

I'll play by whatever rules we decide. I'm just starting with my
preferences since nothing was determined yet.

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

iD8DBQFEwT7FJdeBCYSNAAMRArx1AKCXC/VSmkza7vHxp+mCw4jSToH8BgCeMVtr
c6xJfJP2pU12lK4SQzFuLyU=
=hWHZ
-----END PGP SIGNATURE-----