convert: use field list instead of option list in help Use field list instead of option list in convert help, because the option list format used, with defaults and type of argument is not supported by docutils.

doc/Makefile: docs now also depend on extensions After 0d09991f91ee the hg(1) manpage contains a section with help extracted from the extensions, so we should depend on them too.

keyword: function to look up changectx for expansion Similarly rename variable in kwtemplater.overwrite().

localrepo: make heads use the keyword args of the sorted builtin

import: add another line feed to message join string Changeset descriptions are not guaranteed to have a trailing carriage return.

tests: unify test-no-symlinks

patch: remove unused applydiff() sourcefile argument

patch: remove unused gitworkdone variable from iterhunks()

test-import: use printf instead of echo

import: --no-commit should update .hg/last-message.txt The patch parser goes through all of that trouble extracting the commit message from the patch file. It seems such a waste not to use it.

merge with stable after 1.7 release

Added signature for changeset 333421b9e0f9

Added tag 1.7 for changeset 333421b9e0f9

merge with i18n

i18n-pt_BR: synchronized with b19b4c1df066

dirstate: skip optimization on case-folding FS (issue2440)