hgweb: add guid to rss items

hgweb: add atom error template

hgweb: add rss error template

hgk: added explanation to .hgk for background colour

hgk: added colour settings for different colours in diff view

hgk: added setting of foreground colour Added the fgcolor setting read by hgk to change the text colour in the diff output and the file list. The colours for diff highlighting remains unchanged.

transplant: wrapped long lines

commands: fix paths command docstring indention

hgweb: commit forgotten update to a3d7f99c23c0

hgweb: support custom http headers in ErrorResponse

hgweb: pass ErrorResponses directly into req.respond()

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).