cmdutil: refactor handling of templating in show_changeset()

templater: move stylemap function from hgweb to templater

i18n-de: translated record

i18n-de: translated archival.py, bundlerepo.py, changegroup.py and changelog.py

i18n-de: docu for resolve

convert: fix authormap handling of lines without '=' Unpacking the result from str.split raises ValueError, not IndexError, if the line does not contain a '='.

convert: Add testcase for convert authormap.

extensions loading: don't fail if path to extension ends with a '/'

tests: guess lexer by filename for recent pygments Recent pygments guess AntlrJavaLexer for the isolatin text, converted to ascii by util.tolocal, which yields class="err". Guess lexer by extension instead.

Fix how setup.py identifies the Mercurial version. There is a problem with setup.py where it will not identify the Mercurial version properly when not being ran in within a repository even if mercurial/__version__.py exists. To fix, use mercurial.__version__.version when available before defaulting to "unknown". (Using mercurial.util.version() is not an option due to a dependency issue where osutil can be referenced before it is built.)

right way to check if file was in renamed directory, fixes import monotone repos with renamed directories

convert: added cvsnt mergepoint support

rebase: keep original mq patch format (Issue1574) Rebase now doesn't make assumptions about which format has been used for a mq patch (git or normal). Before finalizing a patch it keeps track of the original format, by reading its header, and then restores the format when reimporting it. This way it also allows for having mixed styles. Note: this version corrects a failure in the test

rebase: don't lose rename/copy data (Issue1423)

Correct a bug on date formats with '>' or '<' accompanied by space characters.

rebase: store/restore arguments correctly Keep and keepbranches were lost after an interruption

rebase: correct help text Show the correct parameters in help text

issue1578: fix crash: do not use synthetic changesets as merge parents.

windows: get Abort from error

move encoding bits from util to encoding In addition to cleaning up util, this gets rid of some circular dependencies.

move util.Abort to error.py

setup: remove spurious posix import

pure/parsers: fix circular imports, import mercurial modules properly

pure/bdiff: fix circular import

posix: kill some trailing newlines

mention default branch in branch and clone help

i18n: update italian translation

i18n-de: Commands (push and pull) + typos

i18n-de: translated global options of commands

i18n-de: removed fuzzy translations after update of POT file

i18n-de: translated ui.py, url.py and util.py

i18n-de: translated 'help multirevs'

on clone failure, only remove directories we created If the user created the clone target directory before running the clone command, only cleanup the .hg/ repository when errors occur. Leave the empty target directory in place.

windows: break import cycle with util

windows: fix missing import of util.Abort

windows: fix import of win32.py (was util_win32.py)

issue1582: improve description of splicemap syntax in help.

merge with -stable

error: import LockError from correct module

hgweb: better English in IPv6 error message

allow clone into existing but empty directories

verify, i18n: fix unmarked strings

i18n: updated zh_CN instructions

i18n: rename zh.po to zh_CN.po This is the name used by at least Debian and RedHat for the Simplified Chinese translations. Furthermore, it is my understanding that a Simplified Chinese translation is a poor fallback for users in Taiwan, who need a Traditional Chinese translation instead.

httprepo: lowercase debug output

merge with -stable

hgweb: fix undefined name RepoError

merge with backout

Backed out changeset 490e40816cbd The difference came from a configuration difference (network unreachable vs. connection refused), not from an OS change.

Change wording in example hook

diffstat hook example

ability to load hooks from arbitrary python module

merge with crew

windows: add various missing import

windows: hoist expand_glob() back into util.py The windows version of expand_glob() requires patkind(). To avoid a circular dependency, move function back into util.py.

i18n-de: Several updates * translated 'hg help revisions' * updated translation from hg.pot * completed translation of rebase

record: fix indentation

record: Give user a hint about chunk selection progress It greatly improves usability when one roughly knows where the chunks of interest are.

coal/paper: Turn <img> into <img/> where missing

add missing +x flag to test-inotify-issue1542