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

[Aaron Bentley]

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

Hi all,

This patch brings branch.conf into the same family as locations.conf and
bazaar.conf.  It can provide any option that locations.conf or
bazaar.conf can provide, except for security-sensitive ones.

Similarly, locations.conf can now provide a branch nick.

The order of precedence is
1. locations.conf
2. branch.conf
3. bazaar.conf

locations.conf has the highest priority, because it is local data, so it
can be used to override inappropriate branch.conf options.

Unfortunately, branch.conf may be more specific than locations.conf.  I
think an ideal precedence might be
1. locations.conf exact match
2. branch.conf
3. locations.conf recusive match
4. locations.conf recursive match #2
5. locations.conf recursive match #3
...
10. bazaar.conf

But I won'be be implementing that today.

I've moved the fall-through behaviour from LocationConfig into BranchConfig.

By default, options are set in branch.conf, so that they are visible to
all users of the branch, but it is easy to set them in locations.conf if
desired.

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

iD8DBQFEmEOu0F+nu1YWqI0RAqFVAJ4gxBUMlkeGyarzfmNOGX1cW29aRACfUft6
zIfRmtvRb0++zSFNsRLgfSs=
=8GQS
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: inibranches.conf
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20060620/3f7729aa/attachment.diff