David Soria Parra <dsp@php.net> [Sun, 13 Mar 2011 14:35:17 +0100] rev 13645
tests: add tests for bookmarks support in hg identify
Nils Adermann <naderman@naderman.de> [Sat, 12 Mar 2011 18:15:14 +0100] rev 13644
identify: list bookmarks for remote repositories
Craig Leres <leres@ee.lbl.gov> [Mon, 14 Mar 2011 12:42:05 -0400] rev 13643
hgignore: ignore dll files generated under cygwin
Brodie Rao <brodie@bitheap.org> [Tue, 04 Jan 2011 00:24:34 +1100] rev 13642
pager: don't page stderr if it's being redirected (
issue2541)
Adrian Buehlmann <adrian@cadifra.com> [Fri, 11 Mar 2011 11:14:21 +0100] rev 13641
color: port to using ctypes (
issue2687)
replacing usage of pywin32, which was removed for Mercurial 1.8
Matt Mackall <mpm@selenic.com> [Mon, 14 Mar 2011 15:28:56 -0500] rev 13640
hgweb: drop use of super() for Exception base class
In Python 2.4, Exception is an old-style class and doesn't work with super.
Steve Borho <steve@borho.org> [Mon, 14 Mar 2011 13:11:26 -0500] rev 13639
diff: make diff -c aware of revision sets
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 15:19:58 +0100] rev 13638
color: wrap lines in docstring
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 14:05:19 +0100] rev 13637
merge with stable
Jon M. Dugan <jdugan@x1024.net> [Sun, 13 Mar 2011 17:39:33 -0500] rev 13636
setup: fix mac build broken by
e42d18538e1d
Sometimes xcodebuild prints warnings to stderr, but runcmd() assumes anything
printed to stderr implies failure. Since runcmd() was originally only
intended to run hg, this was fine until it was pressed into service for
running xcodebuild. Thus: split runcmd() into two parts: runcmd(), which does
the minimal amount of work to run a subprocess, and runhg(), which calls
runcmd().
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 13:54:25 +0100] rev 13635
color: don't mention internal function in docstring
The render_text function actually never existed, the docstring
probably meant the render_effects function instead.
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Mar 2011 12:26:50 +0100] rev 13634
keyword: offer additional datefilters when the extension is enabled
Before the additional datefilters (utcdate, svnisodate, svnutcdate)
were used when kwtemplater was initialized. Now they always be used
once the extension is enabled.
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Mar 2011 12:19:59 +0100] rev 13633
keyword: docstrings for additional date filters
Martin Geisler <mg@lazybytes.net> [Sun, 13 Mar 2011 16:18:46 +0100] rev 13632
mq: do not let qrefresh write bad patch
Klaus Koch <kuk42@gmx.net> [Sun, 13 Mar 2011 15:04:13 +0100] rev 13631
graphlog: give meaningful error if more than one file is given
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 09:20:21 +0100] rev 13630
merge with stable
Martin Geisler <mg@aragost.com> [Mon, 14 Mar 2011 09:20:05 +0100] rev 13629
test-https: update to match output from
3f6a4579f803
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 00:10:43 +0100] rev 13628
tests: respect new hg clone listkey queries in http-proxy test
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 14:36:47 +0100] rev 13627
bookmarks: discard current bookmark if absent from the bookmarks (
issue2692)
After a rollback, the current bookmark might be absent from the bookmarks
file. In that case we discard it instead of displaying a traceback during
commit.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 16:13:25 +0100] rev 13626
fix test-highlight after bookmark support change for hgweb
Steve Borho <steve@borho.org> [Sun, 13 Mar 2011 10:09:30 -0500] rev 13625
merge with stable
Steve Borho <steve@borho.org> [Sun, 13 Mar 2011 10:03:06 -0500] rev 13624
eol: do not abort when win32text is found, only warn
The win32text extension does not break eol or vice-versa, so it is not a fatal
error to have both of them enabled. It's just folly. So spewing warnings in
this condition is preferrable to aborting. When both extensions are enabled,
the user now sees:
% hg st
the eol extension is incompatible with the win32text extension
win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension
M hgext/eol.py
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 15:59:50 +0100] rev 13623
merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 13 Mar 2011 15:59:24 +0100] rev 13622
tests: fix failures introduced in
7359cb753a54
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Mar 2011 11:06:40 +0100] rev 13621
tests: fix permission issue trying to remove test directory
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 13 Mar 2011 15:42:24 +0100] rev 13620
bookmarks: fix update of the current bookmark during rename
We need to get rid of the previous bookmark after changing current bookmark.
Steve Borho <steve@borho.org> [Sun, 13 Mar 2011 08:50:06 -0500] rev 13619
setup: remove unnecessary code for win32com (pywin32)
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:10:01 +0100] rev 13618
test-highlight: fix test output (introduced by
2151703e7f84)
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13617
eol: rename hook into checkheadshook, add checkallhook (
issue2665)
"hook" is still an alias for "checkheadshook".
Patrick Mezard <pmezard@gmail.com> [Sun, 13 Mar 2011 15:07:44 +0100] rev 13616
eol: make the hook check all new heads, not only tip (
issue2666)
Report and test by Antoine Pitrou <solipsis@pitrou.net>