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.

fancyopts: Parse options that occur after arguments. This changes the behavior of qguard in the case of setting negative guards, as -- will now always be required. Fixes issue1402. Doc fixes for mq by mpm.

tests: Add a test for the behavior of 'hg export -- -2'

fix disappearing symlinks [issue1509]

test-merge-tools: Don't use tac "tac" was a bad tool - is not available on all platforms. The test now only uses the "tools" true, false, head, echo, cat and /bin/cat

merge: mark kept local files as readded on linear update (issue539)

Use shutil.copystat in copyfile().

Update tcsh completion scripts with new commands and for new help output. Also make the build script executable.

resolve: accepts walkopts (-I and -X)

help: better formatting in "Date Formats" section

log-like commands now use -G for --graph, -g for --git

add --git option to commands supporting --patch (log, incoming, history, tip) No short -g form, since it would conflict with -g from the graphlog extension.

i18n: add python-format comments to Japanese translation

i18n: add Japanese translation

tests: fix for test-identify returning 255

extdiff: add --change option to display single changeset diff This is the counterpart for extdiff of 9c6ae2e09e11.

identify: have consistent output for local repositories Also, add some extensive testing for it (hardly any in the suite so far).

i18n: wrapped long lines in Italian translation

i18n: add Italian translation

record: minimize number of status calls

patch: no need to instantiate a match catch-all in diff()

close sockets on httprepository deletion (issue1487) With this destructor in place, I no longer see tracebacks on the server after using win32 clients for pull, push, etc.

i18n: updated Chinese translation

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.