compat: use email in favor of mimetools

verify: fix scope issues with del statement

compat: use 'key' argument instead of 'cmp' when sorting a list

compat: use open() instead of file() everywhere

compat: can't compare two values of unequal datatypes

compat: use // for integer division

tests: add -3 switch to run-tests.py

keyword: remove unused import

merge with crew-stable

help: add #revision syntax to the example valid URLs.

context: improve arg-checking assert.

help: add #revision syntax to the example valid URLs.

merge wtih crew-stable

gendoc: fix localization of help topic When a topic provides a callable method for its text, most likely this text will be generated from different parts, so it does not make sense to apply gettext on the whole result, rather the method should provide translation by itself. This is the case with the extensions topic, which triggers a double gettext call, making the ASCII codec fail when it encounters 8 bit characters, and prevents the documentation from being built.

extensions: remove dead code enabled used to be a boolean, and somehow that bit of code inadvertently slipped through during a refactoring. Effectively dead code, as the condition can never be triggered.

merge with crew-stable

acl: read correct index into url for username (issue298) The index was inadvertedly off-by-one causing the username to be the remote host rather than the remote user when hosted in a http(s) session.

color: don't highlight the summary part of the qseries command

mq: align columns in verbose qseries output.

extensions: remove unused imports

test python hook configured with python:[file]:[hook] syntax Adds a test for python hooks configured with python:[file]:[hook] syntax in .hgrc. Increases the test coverage for mercurial/hook from 92% (79/85) to 96% (82/85).

keyword: break overlong line

bisect: fix format specifiers for integers

Added signature for changeset 196d40e7c885

Added tag 1.3 for changeset 196d40e7c885

Merge with i18n

i18n-pt_BR: synchronized with 59bb11a97fe5

i18n-jp: translation update for 09c6735e3880

i18n-fr: translation of part of the mq extension

i18n-fr: translation of the zeroconf extension

i18n-fr: translation of the purge extension

i18n-fr: translation of the parentrevspec extension

i18n-fr: synchronized with 7d39c76be4ee

i18n-da: synchronized with 09c6735e3880

Merge with mpm

i18n-da: use "lap" instead of "rettelse"

i18n-da: translated many one-liners

subrepo: audit subrepo paths

keyword: make repo.commit use a custom commitctx wrapper This avoids forcing the dirstate of overwritten files to normal during a commit. Thanks to Dan Villiom Podlaski Christiansen for the idea of a "double wrapper", so other extensions can still wrap repo.commitctx safely.

commit: lose some pointless 'nothing changed' messages Move message from localrepo to commands. This drops confusing messages in subrepo, import, and rebase.

commit: report modified subrepos in commit editor

verify: demote warning about nullid in copy to note

help: add more pointers to commit --close-branch

branches: add --closed flag for consistency with heads

addremove: build lists of already added and removed files too (issue1696)

addremove: pass unknown and deleted to findrenames directly again

addremove: normalize some variable names

findrenames: drop unused argument defaults