keyword: turn regexes and escaped keywords into a propertycache

commands: add revset support to most commands

convert: better ReST markup in docstring

convert: split docstring lists for easier translation

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)

url: fix https client authentication through proxy There is no tests for this, but the parameter order was obviously wrong.

merge with i18n

i18n-sv: synchronize with 13fb555677fe

i18n-zh_TW: synchronize with 15ca4bfecfe3

i18n-ja: strip extra spaces next to punctuation mark at line ending

i18n-pt_BR: synchronized with 15ca4bfecfe3

commit: handle missing newline on last commit comment

localrepo: do not modify ctx.remove() list in-place

test-rename: test with absolute paths

test-rename: fix \" -> " in comments

rebase: improve resolve failure message

run-tests: use regex when searching for $HGPORT in test output This prevents spurious errors when a changeset hash happens to match the port number. Before, this invocation gave a test failure: $ ./run-tests.py test-log.t --port 24427 ERROR: /home/mg/src/mercurial-crew/tests/test-log.t output changed --- /home/mg/src/mercurial-crew/tests/test-log.t +++ /home/mg/src/mercurial-crew/tests/test-log.t.err @@ -626,12 +626,12 @@ $ hg log -b default changeset: 2:c3a4f03cc9a7 - parent: 0:24427303d56f + parent: 0:$HGPORT303d56f user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: commit on default ...