Martin Geisler <mg@lazybytes.net> [Wed, 16 Mar 2011 13:25:12 +0100] rev 13655
test-relink: remove unnecessary ui.username setting
David Soria Parra <dsp@php.net> [Wed, 16 Mar 2011 09:05:59 +0100] rev 13654
test-https: match output from
31eac42d9123
Matt Mackall <mpm@selenic.com> [Tue, 15 Mar 2011 16:53:46 -0500] rev 13653
merge with stable
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 22:37:50 +0100] rev 13652
merge with crew
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 21:35:31 +0100] rev 13651
convert/svn: fix _iterfiles() output in root dir case (
issue2647)
When converting directory additions/replacement with project directory set to
root, _iterfiles() sometimes returned paths starting with a slash making
following svn calls to fail.
I could not reproduce the issue with hand-crafted repositories.
Report and first analysis by Clinton Chau <clinton@clearcanvas.ca>
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 21:31:54 +0100] rev 13650
eol: no need to accumulate files when checking all changesets
Just check the files touched by the changesets.
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Mar 2011 21:08:18 +0100] rev 13649
eol: improve hook failure output
Before, only the first failure was reported:
abort: b.txt should not have CRLF line endings
while now all of them are listed:
abort: end-of-line check failed:
d.txt in
a7040e68714f should not have CRLF line endings
b.txt in
fbcf9b1025f5 should not have CRLF line endings
As first suggested by Antoine Pitrou <solipsis@pitrou.net>
Matt Mackall <mpm@selenic.com> [Mon, 14 Mar 2011 15:59:44 -0500] rev 13648
merge with stable
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 09:36:17 +0100] rev 13647
bookmarks: remove API limitation in setcurrent
setcurrent refuses to set a new current bookmark if the current bookmark
points to the current dirstate. This restriction is not needed. A current
bookmark can point to a different bookmark.
David Soria Parra <dsp@php.net> [Mon, 14 Mar 2011 00:10:43 +0100] rev 13646
bookmarks: separate bookmarks update code from localrepo's pull.
We explicitly want to update bookmarks from a remote. This will avoid
duplicate calls to listkeys if we clone (which calls pull) and keep
bookmark related code together.
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