test-convert-cvs*: mute output from "cvs up" Apparently some versions of cvs outputs more than other versions. That is however not relevant for these tests.

i18n: update italian translation

merge with crew-stable

include i18n files in the win32 installer The .mo files for translations should be included in the Windows installer.

help: get rid of double spaces

help: miscellaneous language fixes

help: better explanations for some of the template filters In particular, provide some example data for some of the common filters. Thanks go to timeless again for pointing out where we were lacking.

help: better explanation for some of the environment variables In particular, the precedence for usernames is explained in more detail. Thanks to timeless for pointing out the deficiencies here.

help: some language fixes for help topics

Merge with stable

merge with stable

setup: run hg with empty HGRCPATH for robustness. Otherwise a bad hgrc file can make the version detection fail.

contrib: add hgwebdir.wsgi, to serve as a better example

contrib: bring hgwebdir.fcgi up-to-date with current WSGI practices

catch CTRL-D at password prompt We caught this exception in ui.prompt(), but not here. Without this, hitting CTRL-D at the password prompt gives a long traceback.

Update Beyond Compare's configuration If there is already a Beyond Compare's instance running when performing a merge from Mercurial, BCompare.exe will exit immediately and the merge will fail. Use the /solo switch to make it always wait (it will open each comparison in it's own window instead of in tabs)

merge with crew

bookmarks: add force option to command syntax description

i18n: updates to the Danish translation

i18n: update Japanese translation this finished translation for: - online help for all core commands - all other help topics, except of "templating"

tests: use same popen strategy for jython as for nt

Makefile: remove locale folder during clean

setup: use sys.executable to call hg Executing ".\hg" does not work on Windows, but we can instead ask Python to execute hg.

bookmarks: escape literal backslashes in docstring

i18n: updated Chinese translation

Introduce HG_PREPEND to solve pretxn races - add writepending to flush delayed writes to separate file - add support in hooks for lazy evaluation of callable parameters - add HG_PENDING to pretxn hooks - call writepending if hook is used - pass repo root to hook environment - if HG_PENDING = repo root, we're in pretxn hook - read pending data to make pending changesets visible - filter HG_PENDING in tests/printenv.py

rebase: pull --rebase updates if there is nothing to rebase

test-merge-tool: Make sure no hgmerge can be found in $PATH The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH before it falls back to use internal merge. This fixes the test for this fallback to be tolerant to existing hgmerges.