i18n: extract strings with xgettext The xgettext program knows about Python string formatting and will mark messages with a special "#, python-format" comment in the hg.pot file. When msgfmt compiles the file, it can check these messages to ensure that the translated string uses the same conversion specifiers as the original string. The pygettext program is still used to extract the docstrings.

Merge with stable

wire protocol: avoid infinite loop (issue1483)

fix up tests for paths and urls help

use PURE option in Makefile

notify: remove subfunctions that are called only once

move mercurial.osutil to mercurial.pure.osutil

pure Python implementation of bdiff.c

pure Python implementation of diffhelpers.c

Pure python base85 fallback Encoding takes about 100x longer than native on a large binary.

pure Python implementation of parsers.c

pure Python implementation of mpatch.c

i18n: sort Danish translation by file

i18n: strip string locations from Danish translation

simplify colwidth a bit

Also find correct column width of wide characters. Use unicodedata.east_asian_width() to determine wide/full width characters if available. Otherwise, return character count as before.

added information to patchbomb help pointing users to hgrc(5) to configure the [smtp] section in order to send patchbombs

consolidated url help into urls help topic and added information about path aliases

i18n: updated Danish translation This fixes a crash due to a bad string interpolation, fixes a bunch of typos and adds more translated strings.

Clarified 'hg paths' command help

Merge with crew-stable

Fix a corner case when committing a rename after a merge (issue1476)

i18n: Starting Chinese Translation of Mercurial

i18n: sort by file when generating hg.pot This will make the order more stable and give smaller patches when translations merge in new and deleted strings from the hg.pot file.

Do not install executable man pages Default mode of install might be 755, therefore specify 644.

patchbomb: respect diff settings

status: make options optional (issue1481)

Retrieve Beyond Compare's path from registry Switch from a hardcoded path to registry key to find Beyond Compare's executable. Calling BCompare.exe works fine with version 3.0.14.

templater: fix age filter to state the obvious on future timestamps

tests: fix issue in test-audit-path with HGTMP on OS X

tests: eliminate use of sed -i (which fails on NetBSD)

tests: fix up tests to cope with 6a0bc2dc9da6

help: some improvements for the templating topic

help: add a topic about some of the templating features

Merge with stable

verify: don't trip over binary files starting with 01 0a

Merge with stable

notify: fix neglect of custom headers set via template e981725da3fe introduced a bug that discarded all custom headers. Add custom header to test template.

Give a useful message about PYTHONPATH if startup fails

hgweb: simplify parents/children generation code

kill some trailing whitespace

merge with crew-stable

coal/paper: add missing spaces in changeset child formatting

cmdutil.logmessage: options should be optional

bookmarks: work around missing posixfile_nt.readline()

Update win32 merge tools configuration Add WinMerge and Beyond Compare 3 to default merge tools configuration. Fix TortoiseMerge configuration.

diffstat: don't fail on merges First version by Alexander Solovyov <piranha@piranha.org.ua>

Package hgk Tcl/Tk script in win32 installer hgk script will be copied to Contrib/hgk.tcl