[MERGE] Harmonize branch.conf with locations.conf and bazaar.conf

[Aaron Bentley]

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

John Arbash Meinel wrote:
> It seems like it would be better to refactor these calls into:
> 
> config = branch.get_config()

> I didn't see a clear test that makes sure about bazaar.conf vs
> branch.conf vs locations.conf

I've added branch.get_config and updated all callers.  I've also
included a precedence test.  Here are the changes.

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

iD8DBQFEmahq0F+nu1YWqI0RAlmxAJ9XZD4IY1xTrR1u+XK1tSIbX8tS+ACfWona
OoCfKdD2jhs7jG5dLnI5Te0=
=KqxO
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: config-update.patch
Type: text/x-patch
Size: 7926 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060621/e204c082/attachment.bin