Merge with crew-stable

mq: Parse commit message after we find start of changeset patch patch.extract extracts just the message below HG changeset patch. So to not parse comments above the patch, we reset the message if we find a changeset patch as we know the commit message comes after the changeset patch data. This is similar to the behavior of patch.extract. The drawback of this approach, after a qref -e the comment above HG changeset patch is gone. Without this patch the message would become part of the commit message in the HG changset patch part.

doc: fix quotes mismatches affecting rst

Merge with crew-stable

test-repair-strip: Don't rely on cat error message

test-gpg: suppress secure memory warning Some platforms (Solaris for one) does not support secure memory and would give a warning.

Merge with main

keyword: refactor kwdemo and make output translatable Better reflect the actual behaviour of the extension: - Make map arguments and -f/--rcfile not mutually exclusive but extend the current configuration - Map arguments and -f/--rcfile both override the defaults even when -d/--default is specified - -d/--default only overrides the current configuration Inform the user about extending/overriding behaviour, but only at the beginning; the following messages become terser, making the output translatable without too much code clutter. Rephrase help (use "short/long" option notation etc.).

commands: Check if helptext contains a newline before we split

Merge with crew-stable

Makefile: remove non-default wrapping of hg.pot strings

help: wrap help strings at 70 characters

zeroconf: wrap docstrings at 70 characters

win32mbcs: wrap docstrings at 70 characters

transplant: wrap docstrings at 70 characters

share: wrap docstrings at 70 characters

record: wrap docstrings at 70 characters

rebase: wrap docstrings at 70 characters

purge: wrap docstrings at 70 characters

patchbomb: wrap docstrings at 70 characters

parentrevspec: wrap docstrings at 70 characters

pager: wrap docstrings at 70 characters

notify: wrap docstrings at 70 characters

mq: wrap docstrings at 70 characters

keyword: wrap docstrings at 70 characters

interhg: wrap docstrings at 70 characters

highlight: wrap docstrings at 70 characters

hgk: wrap docstrings at 70 characters

hgcia: wrap docstrings at 70 characters

graphlog: wrap docstrings at 70 characters

fetch: wrap docstrings at 70 characters

extdiff: wrap docstrings at 70 characters

convert: wrap docstrings at 70 characters

color: wrap docstrings at 70 characters

churn: wrap docstrings at 70 characters

children: wrap docstrings at 70 characters

bugzilla: wrap docstrings at 70 characters

bookmarks: wrap docstrings at 70 characters

acl: wrap docstrings at 70 characters

commands: wrap docstrings at 70 characters It is no longer necessary to wrap the docstrings at 70 characters in the source -- with the reST parser, they are re-formatted to fit the terminal when shown. However, wrapping the docstrings at 78 characters makes life harder for translators because it marks a lot of strings as fuzzy for no good reason. When un-marking them, the translators would have to examine each string again and determine if it is merely re-wrapped or if the content was also changed. The long lines also introduce very ugly linebreaks in the .po files if they are processed using the standard Gettext tools without using something like '--width 85' all the time.

Merge with crew

Merge with stable

email: Catch exceptions during send. Catch SMTPlib exceptions to avoid mercurial showing a backtrace during an e.g. authentication error.

update: make a naked except more specific (issue1766)

tests/hghave: bzr114 checks for bzr >= 1.14 Everything but the implementation indicated that bzr114 also should be true for "or higher".

fix issue 1763: strip chars from end of line when parsing gitpatch lines

issue1251: bail if darcs version is too old

Merge with crew-stable