Ry4an Brase <ry4an-hg@ry4an.org> [Wed, 14 Apr 2010 00:24:47 -0500] rev 10904
Fix --blacklist when --jobs > 1 in run_tests.py.
The options parsing logic replaces the options.blacklist initial value,
a list of filenames, with a dict of test names to filenames. When
runchildren rebuilds the command line to launch child processes the dict
is flattened and provided as a malformed argument when a filename is
expected.
Fix is to remove the blacklist option from child invocations since the
filtering is handled in the parent anyway.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Apr 2010 09:09:43 +0200] rev 10903
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Apr 2010 09:08:47 +0200] rev 10902
run-tests.py: reset env variables set by hooks
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Apr 2010 08:48:26 +0200] rev 10901
checklink: use an explicit prefix for the temporary file
Greg Ward <greg-hg@gerg.ca> [Tue, 13 Apr 2010 17:58:38 -0400] rev 10900
revlog: factor out _maxinline global.
This lets us change the threshold at which a *.d file will be split
out, which should make it much easier to construct test cases that
probe revlogs with a separate data file.
(issue2137)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 13 Apr 2010 23:04:46 +0200] rev 10899
fix test-pull after 468876bc3885
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 13 Apr 2010 22:10:24 +0200] rev 10898
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 13 Apr 2010 22:06:17 +0200] rev 10897
revlog: put graph related functions together
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 13 Apr 2010 21:54:59 +0200] rev 10896
checkexec: use an explicit prefix for the temporary file
Matt Mackall <mpm@selenic.com> [Mon, 12 Apr 2010 17:41:32 -0700] rev 10895
check-code: add a warnings level
- demote "unwrapped ui message"
Christian Ebert <blacktrash@gmx.net> [Mon, 12 Apr 2010 17:34:12 +0200] rev 10894
keyword: make the templater a local variable
After 6722ba3bf80b a class attribute makes no sense.
Matt Mackall <mpm@selenic.com> [Mon, 12 Apr 2010 17:21:30 -0700] rev 10893
rollback: improve message
Matt Mackall <mpm@selenic.com> [Mon, 12 Apr 2010 17:11:14 -0700] rev 10892
transaction: use newlines to separate description elements
Augie Fackler <durin42@gmail.com> [Thu, 08 Apr 2010 15:04:00 -0500] rev 10891
progress: fall back to indeterminate progress if position is >= total
Matt Mackall <mpm@selenic.com> [Sun, 11 Apr 2010 14:25:02 -0500] rev 10890
mq: promote qnew, demote qinit in short help
Matt Mackall <mpm@selenic.com> [Sun, 11 Apr 2010 14:24:19 -0500] rev 10889
commands: improve some command summaries
Matt Mackall <mpm@selenic.com> [Sat, 10 Apr 2010 17:20:43 -0500] rev 10888
progress: show approximate progress info for pull
Patrick Mezard <pmezard@gmail.com> [Mon, 12 Apr 2010 21:55:34 +0200] rev 10887
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Mon, 12 Apr 2010 21:37:21 +0200] rev 10886
localrepo: do not store URL password in undo.desc
Patrick Mezard <pmezard@gmail.com> [Mon, 12 Apr 2010 21:19:53 +0200] rev 10885
convert/subversion: fix default URL checker prototype
Brendan Cully <brendan@kublai.com> [Sun, 11 Apr 2010 20:59:55 -0700] rev 10884
Merge with stable
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 09 Apr 2010 20:34:05 +0200] rev 10883
patch: don't look for headers in diff lines
If you have a diff line that matches a header line, the patch splitter
currently breaks your patch at this line. For example a line like:
+key: value
This can lead to "malformed patch" exceptions. Now fixed.
Steve Borho <steve@borho.org> [Fri, 09 Apr 2010 17:23:37 -0500] rev 10882
rollback: add dry-run argument, emit transaction description
Steve Borho <steve@borho.org> [Fri, 09 Apr 2010 17:23:35 -0500] rev 10881
localrepo: add desc parameter to transaction
All callers to localrepo.transaction() must supply a transaction description.
The description and the existing repository tip are then stored
(transactionally) into .hg/undo.desc; where rollback can later find it.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Apr 2010 15:16:52 +0200] rev 10880
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Apr 2010 15:16:31 +0200] rev 10879
merge default
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Apr 2010 15:14:43 +0200] rev 10878
test-hgwebdir: correctly include '-' in sed expression.
'\' can't be used to escape '-' from being interpreted as a range,
so put it at the end.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Thu, 08 Apr 2010 17:21:42 +0200] rev 10877
localrepo: refactor prepush logic
Simplifies the prepush check logic and makes it a lot more direct and
comprehensible. Instead of comparing the total local vs. remote head count, it
compares the number of new vs. removed heads.
Sune Foldager <cryo@cyanite.org> [Fri, 09 Apr 2010 10:35:53 +0200] rev 10876
merge with stable
Sune Foldager <cryo@cyanite.org> [Thu, 08 Apr 2010 19:46:47 +0200] rev 10875
partial backout of 1e819576e926 and add tests (issue2131)
The tests are due to Peter Arrenbrecht