templater: ability to display diffstat for log-like commands

templater: use contexts consistently throughout changeset_templater

cleanup: whitespace cleanup

cleanup: drop enumerate() when index is not used

cleanup: drop unused assignments

cleanup: drop variables for unused return values They are unnecessary. I did leave them in localrepo.py where there is something like: _junk = foo() _junk = None to free memory early. I don't know if just `foo()` will free the return value as early.

cleanup: drop unused imports

contrib: add perflog and perftemplating commands to perf extension

merge with crew-stable

Returns lines changed for paths specified as arguments correctly. This fixes issue 1569. hg churn <path> now returns only the number of lines changed in the path, if the path is specified by filtering files through a match filter at the changeset level. test-churn has been updated to take care of this issue.

cleanup: remove all trailing whitespace

keepalive: fix reference to IncompleteRead

merge tools: fix typo in Beyond Compare's 3 command line Fix a typo error preventing 'base' to be displayed properly.

Merge with -stable

Fix new CVS test output

Added signature for changeset 02981000012e

Added tag 1.2.1 for changeset 02981000012e

cvsps: recognize and eliminate CVS' synthetic "file added" revisions.

demandimport: blacklist pythoncom win32com.shell would segfault at import time if pythoncom was demand loaded.

diffstat: use width 80 by default and avoid division by zero

Fix for merge changes introduced in rev 9fe7e6acf525

merge with crew-stable

convert: honor 2.3 compatibility (rsplit)

Merge with stable

regression test for issue1552 Ensures that fetch correctly infers what to merge when pulling a repository with inactive branches.

fetch: do not count inactive branches when inferring a merge The fetch extension would erroneously consider inactive branches when inferring which branches to merge. It now considers only active branches.

bundlerepo: reintroduce dirstate

exporting patch: Fixed behavior of revsplit for branch names including the @-symbol.

imported patch issue1546-hg-bisect-command-doesn-t-work-with-shell-scripts.patch

bisect: fix --command for me.

atom: fix URLs used in entry GUIDs

resolve: move reset to localrepo.commit This way rebase doesn't leave a stale resolve state

resolve: keep .orig files

test-merge-tools: test ui.merge functionality and selection of internal tools

zeroconf: advertise repositories with hostname

Merge with crew

i18n: better Danish word for "working directory"

i18n: add Danish translation for "commit"

i18n: translated help for all basic commands into Danish

i18n: updated fuzzy Danish translations

i18n: merged new strings into Danish translation

i18n: update Japanese translation to follow bd8f44638847

merge with -stable

Merge with main

Optimization of pure.base85.b85encode This makes pure python base85 encoding 3x faster than before. Now it is only 40x slower than the C version.

Merge with crew-stable

verify: find correct first corrupted cset for missing/corrupted revlogs

verify: do not abort on fully corrupted revlog

hgweb: fix allow_read permissions when a user is specified Thanks to Juan Pablo Aroztegi for reporting and debugging it.

test-identify: require no-outer-repo The test expects "There is no Mercurial repository here (.hg not found)"

update copyright date in version information

Typo fix

update copyright in ReadMe.html

setup.py: fix version detection for tarball - don't do version detection if there's no .hg directory - shrink try: clause - don't write __version__.py if version is unknown (we might overwrite the real version)

Added signature for changeset 11efa41037e2

Added tag 1.2 for changeset 11efa41037e2

convert: Perforce source for conversion to Mercurial

remove tests for long-gone imerge extension

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.

audit: be even pickier (issue1450)