Merge with crew

Merge -stable heads

Makefile: update "make clean" target after f91e5630ce7e

Merge with crew-stable

convert/svn: better handling of hg recursive call failure

schemes: url parts are counted from 1

Merge with -stable

subrepo: add default path to new clones

win32mbcs: fix typos and reST syntax

help/templates: use hanging indent for field list Now that the field list indentation is computed automatically, we no longer need to align all fields the same. Using a simple hanging indent makes it easy to edit the text in an editor like Emacs, which will automatically recognized the hang and keep it. The fields are still output with no blank lines between them.

minirst: improve layout of field lists Before, we used the padding following the key to compute where to wrap the text. Long keys would thus give a big indentation. It also required careful alignment of the source text, making it cumbersome to items to the list. We now compute the maximum key length and use that for all items in the list. We also put a cap on the indentation: keys longer than 10 characters are put on their own line. This is similar to how rst2html handles large keys: it uses 14 as the cutoff point, but I felt that 10 was better for monospaced text in the console.

minirst: don't test regexps twice We know the regexps match since splitparagraphs used them too.

minirst: run inlineliterals too in debug mode

test-share: handle sed/GNU-sed discrepancies

Make {file_copies} usable as a --template key Before this, to display file copies in templates, you had to write something like {file_copies%filecopy}. For some reason, the {file_copy} subtemplate was used by default but not defined by default in changeset_templater, while styles were already using it. Here we define {file_copy} in changeset_templater, and change the templater to handle formatting strings like {file_copies%filecopy} with already expanded keys (in this case {file_copies}), for backward compatibility.

templatekw: change {file_copies} behaviour, add {file_copies_switch} {file_copies} template now displays file copies with or without the --copies switch being set. A new {file_copies_switch} template implements the former behaviour.

test-command-template: test 'file_copies' keyword

cmdutil: extract file copies closure into templatekw

cmdutil: extract latest tags closures in templatekw

cmdutil: extract file changes closures into templatekw

cmdutil: extract repo dependent closures in templatekw

cmdutil: extract ctx dependent closures into templatekw

cmdutil: replace showlist() closure with a function

Merge with crew-stable

convert/svn: make sink recover gracefully from empty changeset Otherwise when processing a changeset that in fact changes no files (perhaps due to bug in import from CVS) can get something like: unexpected svn output: abort: unable to cope with svn output Bug report and patch draft by Jesse Glick <jesse.glick@sun.com>

win32mbcs: Add configuration to specify path encoding Add win32mbcs.encoding configuration option to specify the encoding to use instead of encoding.encoding. This option is useful for the users who want to write UTF-8 log message on non UTF-8 path encoding environment.

Merge with stable

mq: qpop: remove added files before re-adding removed files We need to do this to avoid file/directories conflicts. This causes patches removing a committed file and replacing it with a directory to be "unpoppable".

revlog: rewrite several method docstrings - methods: findmissing(), nodesbetween(), descendants(), ancestors() - the goal is precise, concise, accurate, grammatical, understandable, consistently formatted docstrings

color: Add support for bookmarks