fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.

mq: test for qclone of http repo+queue tests f857eac30cd5 and 0c2b443fb3c3

When failing to load an extension, show where Hg tried to load it from.

hgweb/annotate: handle binary files like hgweb/file

test-status: Make assert function definition sh compatible.

Extend/correct acc40572da5b regarding -qA and ignored files. hg status -qA will now hide untracked files as described in the doc string.

'hg status -q' output skips non-tracked files. The '-q' flag was ignored in status command. But this flag can be used to hide non-tracked files in hg status output. This small correction makes status command more general, similar to 'svn status', where '-q' flag has the same effect. The '-u' and '-A' flags have priority over '-q'. A testcase and doc-string for status was extended to cover '-q' flag.

highlight: forgot import

highlight: guess by text when path name is ambiguous Although the docs claim that guess_lexer_for_filename will fall back to using file data, my ubuntu 7.10 pygments library seems to ignore the text argument. So call guess_lexer explicitly on failure.

highlight: make div trimmer work when lexer fails to identify text. In this case, there is no initial <span> tag.