commands: explain when to use resolve -m

commands: clarify push help text

commands: make pull help point to the incoming command

commands, help: consistently write 'URL' in upper-case

help: expand command names in 'Url Paths' help text

commands: better merge help text

commands: removed redundant text in manifest help

commands: stress that commit is a local operation

commands: use single-quotes for 'hg help ...' hints

convert: attempt to check repo type before checking for tool

merge with crew-stable

Fix issue1495, corner case of adding empty files via patching

Merge with crew-stable

convert: simple fix for non-existent synthetic/mergepoint attributes

convert: handle comments starting with '#' in authormap files

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.