mq: refactor the pop code to be more readable and allow more changes

merge with crew-stable

Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. During 2.17, Bugzilla ditched the old 'processmail' script. With 2.18 contrib/sendbugmail.pl arrived in its place. For notification emails to work properly, sendbugmail.pl requires as its second parameter the Bugzilla user who made the commit. Otherwise the user will not be recognised as the committer, and will receive notification emails about the commit regardless of their preference about being notified on their own commits. This parameter should be given to processmail also, but wasn't for historical reasons. Add new config with the local Bugzilla install directory, and provide defaults for the notify string which should work for most setups. Still permit notify string to be specified, and for backwards compatibility with any extant notify strings try first interpolating notify string with old-style single bug ID argument. Add new 2.18 support version to introduce sendbugmail.pl. In other words, this update should be backwards-compatible with existing installations, but offers simplified setup in most cases. And as a bonus Bugzilla notification emails will be dispatched correctly; notifiers will not receive an email unless configured to do so.

merge with -stable

use enumerate instead of zip

patch: export shouldn't close files received as a parameter We rely on __del__ to close the fd instead. Patchbomb was relying on this behaviour, fix it. Thanks to Manuel Barkhau for reporting it.

mq: make qnew patch format consistent with qrefresh (issue1457)

monoblue: fix child revision display in file diff page

web: use the correct filectx in filelog

convert: display child command output if --debug (fix 878466138b57)

convert: print darcs error messages iff --debug

convert: check for darcs-2-compatible path

merge with -stable

merge with crew-stable

zeroconf: add extension documentation

1 file changed, 7 insertions(+), 9 deletions(-) hgext/purge.py | 16 +++++++--------- purge: clarify behavior with regard to ignored files The purge documentation previously said that purge would delete ignored files. This is only true if purge is passed the --all option, which is now stated explicitly. A few trivial grammar errors were also fixed.

tests: shrink wait interval for test-convert-bzr-merges

Merge with crew-stable

tests: try to prevent different ordering in test-convert-bzr-merges

merge with crew

lowercase prompts The prompts are interactive and not meant for scripts.

lowercase ui.debug and assert output This does not effect the log or status commands and should be okay according to the compatibility rules.

lowercase help output Changes docstrings to begin with a lowercase word. Only docstrings used in help output is changed. Scripts are not expected to grep the output of 'hg help' so this change should pose no problem with regard to the compatibility rules.

mq, i18n: mark strings for translation