i18n: updated fuzzy Danish translations

i18n: merged new strings into Danish translation

i18n: update Japanese translation to follow bd8f44638847

merge with -stable

Merge with main

Optimization of pure.base85.b85encode This makes pure python base85 encoding 3x faster than before. Now it is only 40x slower than the C version.

Merge with crew-stable

verify: find correct first corrupted cset for missing/corrupted revlogs

verify: do not abort on fully corrupted revlog

hgweb: fix allow_read permissions when a user is specified Thanks to Juan Pablo Aroztegi for reporting and debugging it.

test-identify: require no-outer-repo The test expects "There is no Mercurial repository here (.hg not found)"

update copyright date in version information

Typo fix

update copyright in ReadMe.html

setup.py: fix version detection for tarball - don't do version detection if there's no .hg directory - shrink try: clause - don't write __version__.py if version is unknown (we might overwrite the real version)

Added signature for changeset 11efa41037e2

Added tag 1.2 for changeset 11efa41037e2

convert: Perforce source for conversion to Mercurial

remove tests for long-gone imerge extension

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.

audit: be even pickier (issue1450)

dispatch: extract command execution block into method This pulls the pre-command hook/command/post-command hook workflow out of the method it is in and puts it into its own method so that it potentially could be exposed for extensions to wrap.

bookmarks: change NAME to REV

bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set

bookmarks: Set current bookmark if we create a new one on the tip If track.current is enabled we set the newly created bookmark as the current tracked bookmark. We do not do this if a revision is specified.

convert: change hg.saverev default to False This needlessly breaks changeset identifiers for the common case (cleaning history), which is sad.

tag: force load of tag cache

run-tests.py: avoid using popen2.Popen4 - use subprocess instead Use subprocess to emulate Popen4 if available - similar to how it is done in util.py. Using popen2 under python 2.6 gives DeprecationWarning: The popen2 module is deprecated. Use the subprocess module.

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.

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)