If pqm_branch is not configured for branch path, check if it is configured for the repository path

[James Henstridge]

In bzr 0.8, only one section from ~/.bazaar/branches.conf will be read for a branches configuration.

This can lead to the pqm_branch and pqm_email configuration items being shadowed if they are set in the section for the repository but there is a section for the branch (as might be created by "bzr push").

The problem would be reduced if pqm-submit would check for pqm_branch and pqm_email in the repository's configuration if they haven't been configured for the branch.

[James Henstridge (jamesh)]

Fix committed as revision 22 on the bzr-0.8 branch of bzr-pqm

[Aaron Bentley (abentley)]

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

James Henstridge wrote:
> Fix committed as revision 22 on the bzr-0.8 branch of bzr-pqm

setting pqm_branch to a repository location sounds questionable, but
more generally, the masking described is a bug in bzr: 33430

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

iD8DBQFE51mj0F+nu1YWqI0RAlCoAJ4iEjxu9Zgw0MdsnR+4OXX3jgB2BgCfQrqF
YujxikaVGbynPlkcWU+4vJY=
=1rxE
-----END PGP SIGNATURE-----

[James Henstridge (jamesh)]

Aaron: this is a work around intended specifically for the 0.8 compatibility branch of bzr-pqm. It was agreed on after a discussion with John about how to fix a few bugs Launchpad developers were running into repeatedly.

I agree that the shadowing problem should really be fixed in bzr itself, which is why the fix has only been made to the 0.8 compatibility branch (I wouldn't expect bugs such as that to get backported).

[Aaron Bentley (abentley)]

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

James Henstridge wrote:
> Aaron: this is a work around intended specifically for the 0.8
> compatibility branch of bzr-pqm. It was agreed on after a discussion
> with John about how to fix a few bugs Launchpad developers were running
> into repeatedly.
> I agree that the shadowing problem should really be fixed in bzr itself,
> which is why the fix has only been made to the 0.8 compatibility branch
> (I wouldn't expect bugs such as that to get backported).

Ah. I believe this problem also applies to bzr 0.9 and 0.10.

I think a version of LocationConfig that did cascade would solve the
problem better, because a pqm_branch may be set on a subtree of a
repository, rather than the whole repository. For example, the
repository I use for bzr also has copies of bzrtools, bzr-gtk, bzr-svn
and others in it.

But if what you've got is good enough, it's good enough.

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

iD8DBQFE6erH0F+nu1YWqI0RApecAJ9scoUS14tck/ya8iNI+vBP2dh/jgCaAzRp
Jxh8mSj4m07P8n+FzGCbXiw=
=TzQi
-----END PGP SIGNATURE-----