extdiff: merge node and working dir snapshot modes

convert/p4: win32 fixes * cmd.exe does not know single quotes * win32 does not like trailing whitespace very much. Trade test coverage for maintenance time and drop the trailing whitespaces tests.

test-issue1438: make executable

context: fix workingctx.__contains__

run-tests: detect when hghave fails to check for a feature and fail test hghave exitcode != 0 might mean that hghave failed to check for feature avaibility. Detect those cases, and fail the test, instead of skipping it.

hghave: checking that all targets are Exception-free

Add Python 2.6 support to win32 installer With Python 2.6, win32 installer should try to package MSVC9.0 dlls instead of MSVC7.1 dlls

Bundle python dll in win32 installer if present in case hg.exe is generated with the py2exe '-b 2' option instead of '-b 1', python2?.dll is not included in library.zip file and must also be packaged. The file will be integrated in the installer only if it is present in the dist directory. Generating hg.exe with the '-b 2' option is mandatory to avoid a crash when pyreadline is installed.

Win32 installer: add hgrc.5.html and hgignore.5.html links to Start Menu folder

Merge with crew-stable

httprepo: hide password in debug traces too

hide passwords in httprepo error messages

convert/mtn: allow monotone database files as sources

Merge with crew-stable

convert/mtn: record changes from directory renames (issue1587) Bug report and initial path by Pavel Volkovitskiy <int@mtx.ru>

test-convert-svn-sink: rewrite output for svn compatibility Addition by Patrick Mezard <pmezard@gmail.com>: * drop 'kind=' lines from svn 1.6 output

convert/cvs: delay CVS log parsing after initialization (issue1581/2) Source and destination constructors should be fast so configurations issues are hit quickly, including authentication and filemap/authormap/splicemap issues. Delaying might be a problem if the remove side disconnects idle connections while the log is being read. It did not happen when converting openafs repository, where log retrieval took at least 10mn.

convert: better mapfile parsing errors (issue1581/1)

Merge with crew-stable

convert/bzr: fix file rename replaced by a dir case (issue1583) We were not checking entry types, and getting file content was working with directories instead of raising IOError.

purge: fix b777dd8f7836 (remove read-only files) - use try/except to avoid unnecessary work - edit only mode bits

purge: remove read-only files under Windows (issue583) Initial version by Benoit Boissinot <bboissin@gmail.com>

Merge with crew-stable

Fix manifest default rev doc when no rev is checked out (issue1603)

commands: more informative description of "!" files in status This makes the description more similar to the one used by Subversion. Suggestion by Dennis Brakhane.

commands: automatically word-wrap cmdline options Some of the descriptions of command line options were getting quite long, and when translated they are likely to grow even longer. This word-wraps them at 70 characters, just like the help texts. We could have opted to wrap them at the terminal width instead, but I think it looks better to have them be consistent with the help texts.

commands: removed bad linebreak in import help

Merge with crew-stable

test-convert-bzr: check renamed files are removed (issue1505)

convert: remove renamed source files (issue1505)

commands: lower-case --import-branch help text

commands: consistently write switches as -a/--abc

commands: use double quotes consistently in help texts

upper-case command line meta variables

i18n-da: synchronized

notify, commands: word-wrap help strings

expand "rev" to "revision" in help texts

expand "repo" to "repository" in help texts

expand "dir" to "directory" in help texts

patchbomb: Support initial in-reply-to header This allows follow-up/revised patches to appear properly threaded in mail readers and in the archives, reducing noise.

profiling: Adding support for kcachegrind output format, using lsprofcalltree

profiling: Adding a profiling.format config variable Allows defining other output formats for profiling. If an invalid format is given, output a warning and ignore it. For now, only the standard 'text' value is supported.

profiling: Adding profiling.output config variable If specified, outputs profiling data to the said file. Prints to stderr by default

profiling: dropping hotshot profiling. --profile as a unique profiling option hotshot was an experimental module, which is broken for Python < 2.5 And even for Python >= 2.5 users, hotshot usage is discouraged: cProfile (formerly lsprof) should be used instead.

log: fix broken multiple user search This fix also allows partial user matches so the full name and email does not have to be written out in verbatim.

i18n-da: updated, translated status help

commands: describe "!" files as "missing" in help for status

merge with -stable

raise RevlogError when parser can't parse the revlog index Initial patch and test thanks to Nicolas Dumazet.

templatefilters: strings are iterators, but shouldn't be joined anyway

templatefilters: split out jsonescape() function

cmdutil: prevent code repetition by abstraction in changeset_templater

tests: use unified diff in test-command-template for better error reports

util: don't overwrite os-specific functions with general ones

convert: align option types in help text

commands: fix typo on flag description

commands, i18n: avoid untranslated strings as message parameters

commands: enable 'hg help' translation of extensions

i18n-da: bring translations up-to-date This incorporates the word-wrap changes made to help strings, as well as new translations for the updated clone, push and pull help strings.

help: word-wrap help texts at 70 characters

commands: word-wrap help texts at 70 characters

zeroconf: word-wrap help texts at 70 characters

win32text: word-wrap help texts at 70 characters

win32mbcs: word-wrap help texts at 70 characters

transplant: word-wrap help texts at 70 characters

rebase: word-wrap help texts at 70 characters

purge: word-wrap help texts at 70 characters

patchbomb: word-wrap help texts at 70 characters

parentrevspec: word-wrap help texts at 70 characters

pager: word-wrap help texts at 70 characters

mq: word-wrap help texts at 70 characters

keyword: word-wrap help texts at 70 characters

hgk: word-wrap help texts at 70 characters

fetch: word-wrap help texts at 70 characters

extdiff: word-wrap help texts at 70 characters

convert: word-wrap help texts at 70 characters

color: word-wrap help texts at 70 characters

churn: word-wrap help texts at 70 characters

children: word-wrap help texts at 70 characters

bugzilla: word-wrap help texts at 70 characters

bookmarks: word-wrap help texts at 70 characters

Change double spaces to single spaces in help texts.

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