Bryan O'Sullivan <bos@serpentine.com> [Wed, 05 Mar 2008 09:20:57 -0800] rev 6207
fetch: make test reproducible, tiny code cleanup
Bryan O'Sullivan <bos@serpentine.com> [Wed, 05 Mar 2008 09:10:45 -0800] rev 6206
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.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 03 Mar 2008 21:48:43 +0100] rev 6205
mq: test for qclone of http repo+queue
tests f857eac30cd5 and 0c2b443fb3c3
Jesse Glick <jesse.glick@sun.com> [Mon, 03 Mar 2008 12:46:57 -0500] rev 6204
When failing to load an extension, show where Hg tried to load it from.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 Mar 2008 23:32:13 +0100] rev 6203
hgweb/annotate: handle binary files like hgweb/file
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 Mar 2008 20:54:00 +0100] rev 6202
test-status: Make assert function definition sh compatible.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 Mar 2008 13:52:34 +0100] rev 6201
Extend/correct acc40572da5b regarding -qA and ignored files.
hg status -qA will now hide untracked files as described in the doc string.
Zoran Bosnjak <zoran.bosnjak@via.si> [Sat, 01 Mar 2008 22:30:03 +0100] rev 6200
'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.
Brendan Cully <brendan@kublai.com> [Fri, 29 Feb 2008 14:48:21 -0800] rev 6199
highlight: forgot import
Brendan Cully <brendan@kublai.com> [Fri, 29 Feb 2008 14:47:07 -0800] rev 6198
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.
Brendan Cully <brendan@kublai.com> [Fri, 29 Feb 2008 14:21:15 -0800] rev 6197
highlight: make div trimmer work when lexer fails to identify text.
In this case, there is no initial <span> tag.
Brendan Cully <brendan@kublai.com> [Fri, 29 Feb 2008 11:13:50 -0800] rev 6196
highlight: use iter() instead of generator comprehension
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 29 Feb 2008 09:54:28 +0100] rev 6195
mq: remove unimplemented option -f for strip
Brendan Cully <brendan@kublai.com> [Thu, 28 Feb 2008 22:04:22 -0800] rev 6194
highlight: bail out if file is binary
Brendan Cully <brendan@kublai.com> [Thu, 28 Feb 2008 21:35:27 -0800] rev 6193
highlight: support annotate, and reduce layering violations.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 29 Feb 2008 02:45:12 +0100] rev 6192
Introduce templateopts and logopts to reduce duplicate option definitions.