Push location hiding

[John Arbash Meinel]

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

Aaron Bentley wrote:
| John Arbash Meinel wrote:
|> Everything thinks it is okay. However the push location is saved to
|> .bzr/branch/branch.conf. And 'locations.conf' overrides branch.conf,
|> even though one is achieved recursively, and the other is explicitly for
|> that branch.
|
| The rationale for making locations.conf trump branch.conf was because
| locations.conf is unambiguously under the user's control and can be
| changed without affecting others.
|
| The rationale for making recursive locations.conf rules trump
| branch.conf values was avoiding extra complexity in the user model.
|
|> I don't have any way to force the remember, other than manually hacking
|> locations.conf for that branch.
|
|> Is there something better that we could be doing?
|
| We could set it in BOTH branch.conf and locations.conf, I suppose...
|
|> Some way that we could
|> get --remember to actually --remember? (Certainly we should probably at
|> least be warning if we don't)
|
| We are doing set_user_option(.., warn_masked=True).  That ought to
| produce a warning.
|
| Aaron


It does warn, it is just that I get:
$ bzr push --remember lp:~jameinel/+junk/bzr-per-file-remerge
Enter passphrase for key '/home/jameinel/.ssh/id_rsa':
Server does not understand Bazaar network protocol 3, reconnecting.
(Upgrade the server to avoid this.)
Enter passphrase for key '/home/jameinel/.ssh/id_rsa':
Value
"bzr+ssh://jameinel@bazaar.launchpad.net/%7Ejameinel/%2Bjunk/bzr-per-file-remerge/"
is masked
by "bzr+ssh://juju/srv/bzr/public/branches/bzr/plugins/per_file_remerge"
from locations.conf
Pushed up to revision 7.

With all the stipple, I didn't notice the warning.

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

iEYEARECAAYFAkhZMakACgkQJdeBCYSNAAPXJgCgreP9tSJhcmsE6h4vGg6Fj+3u
y5EAoI2akFGNbzebhw6OPsx6jj/6oSX6
=cQL3
-----END PGP SIGNATURE-----