merge with mpm

hgk: Add background colour setting Adds the bgcolor config variable, that sets the background colour of the text and canvas frames.

commands: removed unnecessary string concatenation

patch: turned strings with backslashes into raw strings In Python, the backslash in an unrecognized escape sequence is left behind, which makes '\.' the same as r'\.'. Relying on this feature is quite brittle, IMHO. Removed unnecessary string concatenation as well.

convert: marked string for translation

reset mergestate after commit

warn if --repository provided for norepo commands

Make util.find_exe alway returns existing file, fixing issue1459 It seems like the old behaviour with different handling for commands with and without path was intended, but I think this behaviour of util.find_exe is better: * Always returns existing file * or None if command not found - no default * Windows: Returned file thus always ends with extension from PATHEXT This fixes http://www.selenic.com/mercurial/bts/issue1459. The change might fix other unintended behaviour too.

test-merge-tools Some tests of merge-tools configuration and selection, mostly excercising filemerge.py

Account for symlinks when setting up HGTMP. On Mac OS X, several top-level directories are actually symlinks into /private. When setting up HGTMP, expand the symlinks so that later comparisons to or substituations with the actual path work as expected.

mq: allow qclone's -p option to use path alias Add support for running 'hg qclone -p foo bar' where foo is a path alias defined in the [paths] section of an hgrc file.

branch closing: permit closing the default branch There was no good reason to special case the 'default' branch. Allow the 'default' branch to be closed if the user wants it. If you're uncomfortable about mistakenly closing the default branch, you can always reopen the branch by commiting a "normal" changeset onto the closed branch.

demandimport: patch __builtin__ instead of __builtins__ This helps on implementations other than CPython, where __builtins__ isn't necessarily defined (as it's an implementation detail for CPython).

notify: use contexts more pervasively

coal/paper: switch to XHTML 1.1

i18n: updated Danish translation Now with 379 translated and 1396 untranslated messages.

run-tests: add --pure flag for using pure Python modules

add --pure flag to setup.py This flag will make the build_py step install the pure Python modules in mercurial/pure/ into mercurial/ and furthermore prevent building the C extensions.

setup: get version number using pure Python modules

setup: do not use -c with msgfmt on Solaris (issue1489)

merge with crew

record: do not lose permission changes on commit

hgweb: expose sibling branches to templater

graphlog: extract large parts of repeated code from incoming/outgoing

graphlog: reuse cmdutil.loglimit() instead of redefining

graphlog: some testing for incoming and outgoing graphs

graphlog: import util module rather than selected functions

i18n: check format strings when building xx.mo files