i18n: mark strings for translation in interhg extension

i18n: mark strings for translation in inotify extension

i18n: mark strings for translation in mq extension

i18n: mark strings for translation in imerge extension

i18n: mark strings for translation in hgk extension

i18n: mark strings for translation in extdiff extension

i18n: mark strings for translation in convert extension

i18n: mark strings for translation in churn extension

i18n: mark strings for translation in alias extension

i18n: mark strings for translation in Mercurial

i18n: avoid naive plural tricks

merge with crew-stable

record: catch PatchErrors from internalpatch and display error message This resulted in big ugly tracebacks in issue1282, for example.

record: take diff lines for lack of trailing newlines into account (issue1282) The record extension incorrectly re-calculated the size lines for unified diff hunks. It counted a '\\ No newline at end of file\n' line towards the number of lines of trailing context, while it's not actually part of the context (and certainly isn't added as a line to the resulting output). Use the local name of a variable that was access through the nonlocal scope while we're at it. Seeing the variable was a little bewildering.

fix double indentation and trailing whitespace

increase code coverage of test-clone * add a non-inlined filelog to the test repo * add 'clone --pull' test case

coal/paper: Add link to raw changeset as other styles have it, too

hgweb: return content iterator instead of using write() callable This is a new version of 4879468fa28f (which was backed out in 943f066c0d58), with an extra line removed to fix problems with hg serve. hg's internal web server contains checking if the app isn't trying to write more bytes than specified by the Content-Length header. The first try still contained an old line that wrote the response, so the response was sent twice.

fix regression on empty repo cloning introduced by 0642d9d7ec80 The store directory wasn't copied. Unconditionally create the directories instead.

doc/Makefile: rephrase comment (typo)

contrib: remove deprecated darcs2hg.py script We've have support for darcs in the convert extension for a while now.

fetch: linearize code by eliminating nested functions

qimport: report filename in case of IOError The old behaviour was to say "abort: unable to read" since the patchname variable was always None.

Fix wrong redirection in test-rebase-parameters

highlight: split code to improve startup times

qfinish: document --applied instead of --all

Merge with Gilles Moris

Have verbose and debug flag print the changeset rev and hash when committing. Besides updating the tests output, I had to push back at the end the test for issue1193 in test-commit, solved by cset 4386a7706828, because it was using the current date for commit and was randomizing the subsequent hash.

Backed out changeset d557749c627a Replace this change with a better one.

keyword: avoid additional conflicts during merge/resolve Make merge and resolve trigger kwtemplater.restricted to compare data without keyword expansion. The keyword stays outside the conflict: $Keyword$ <<<<<<< local bar ======= foo >>>>>>> other and will again be expanded on commit. Demonstrate in test case.