cleanup: "not x in y" -> "x not in y"

cleanup: replace hasattr() usage with getattr() in hghave

cleanup: "x != None" -> "x is not None"

cleanup: eradicate long lines

merge with i18n

mq: qimport need wlock for --push - do that after releasing lock qimport locking was introduced for phases in 29ea059be33c.

tag: run commit hook when lock is released (issue3344)

parsers: strictly check for 20-byte hashes where they're required

templater: handle SyntaxError when parsing ui.logtemplate Before, Mercurial would crash with a traceback ending with SyntaxError: unmatched quotes if you configured [ui] logtemplate = {rev}\n The SyntaxError is now catched and the string is re-parsed without requiring quotes.

i18n-pt_BR: synchronized with 95ca6c8b38da

progress: fix indentation

test-progress: fix whitespace typo

merge with stable

tests: unify the last sh tests This requires a slightly smarter check-code check for sed output filtering.

tests: run most check-code sh checks on continued lines too Some false errors are degraded to warnings and whitelisted.

merge with main

children: use hg reST role for example

fetch: mark extension as deprecated

children: mark extension as deprecated

extensions: don't suggest commands from deprecated extensions

extensions: fix documentation of disabledcmd return value

revlog: speed up prefix matching against nodes The radix tree already contains all the information we need to determine whether a short string is an unambiguous node identifier. We now make use of this information. In a kernel tree, this improves the performance of "hg log -q -r24bf01de75" from 0.27 seconds to 0.06.

parsers: ensure that nullid is always present in the radix tree

parsers: allow hex keys

merge with stable

revset: add function for matching extra data (issue2767)

graft: implement --log (issue3438)

phase: make if abort on nullid for the good reason The good reason being you cannot call retractboundary() on nullid, not revset.set() cannot resolve '-1'.

phases: make advance/retractboundary() atomic Before this, if advanceboundary() failed after updating some roots but before calling retractboundary(), the phase cache would be left in an invalid state, marked dirty, and written as such. This patch approach is to turn advance/retractboundary() into phasecache methods, then operate on copies and merge them back on success. With the same technique, we can ensure the atomicity of combinations of advance/retractboundary() calls, like those performed in changegroup handling code.

phases: introduce phasecache The original motivation was changectx.phase() had special logic to correctly lookup in repo._phaserev, including invalidating it when necessary. And at other places, repo._phaserev was accessed directly. This led to the discovery that phases state including _phaseroots, _phaserev and _dirtyphase was manipulated in localrepository.py, phases.py, repair.py, etc. phasecache helps encapsulating that. This patch replaces all phase state in localrepo with phasecache and adjust related code except for advance/retractboundary() in phases. These still access to phasecache internals directly. This will be addressed in a followup.

mq: introduce mq.check setting When: [mq] check = True is set, qpush, qpop and qgoto behave as if -c/--check were passed. If incompatible options like -f/--force or --exact are set, this setting is ignored. This setting enables what many users expect mq default behaviour to be.

mq: introduce qgoto --check