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.

audit: check for casefolding of .hg (issue1450)

patch: teach selectfile about symlinks (issue1438)

mq: handle empty patches more gracefully (issue1501)

keepalive: borrow code from newer httplib to patch ValueError (issue1088)

rename: simplify forced renaming This should help work around virus scanner issues with rename on Windows.

log: ignore --removed if no files specified (issue1166) Otherwise we filter out merge changesets with no changed files

Don't fail on clone on win98 (issue1492)

zeroconf: don't allow ipv6 addresses

hgk: select first changeset at startup (issue1382)

pure/mpatch: use StringIO instead of mmap (issue1493) This is more portable than memory mapping /dev/zero: Windows obviously does not have /dev/zero and mapping /dev/zero failed on Mac OS X.

Handle when the slicemap option is an empty string In the cmdtable for the convert extension, the default value for splicefile is empty string, while mapfile (the class that reads splicemaps) expects either a real path or None. This patch changes mapfile to expect a real path or logical false (False, None, empty string, etc.)

test suite: saver check if bzr is installed Test if bzrlib.__doc__ is not empty. Ignores an empty lib.