[MERGE] Warn when setting push location is masked by locations.conf (#122286)

[Aaron Bentley]

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

Ian Clatworthy wrote:
> === modified file bzrlib/branch.py
> --- bzrlib/branch.py
> +++ bzrlib/branch.py
> 
> This only set_user_option call missed in this module is the one on line
> 1636. It isn't needed there right, because it's explicitly being put
> into locations.conf?

Yes.  That call is the cause of this patch, because the value it sets
overrides everything.  So it definitely doesn't need this.

> Minor gripe - the first trace.warning() separates the substitution
> variables with commas while the second one generates the final string

Oops.  Will fix.

> my leaning is usually
> towards the first form, i.e. pushing substitution into the lower UI layers.

I agree.  Normal strings and format strings aren't really
interchangeable.  Since warning's first argument is a format string, we
should treat it that way.

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

iD8DBQFGjEZg0F+nu1YWqI0RAr+2AJ4zkr/L+8bY94EqaVscaN6BY2eX+ACbBgoQ
HXqdCFZu7blwkXSaLiCJ20w=
=ifr0
-----END PGP SIGNATURE-----