Christian Ebert <blacktrash@gmx.net> [Fri, 30 Apr 2010 16:30:09 +0200] rev 742
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 22:04:05 -0500] rev 741
run-tests: add --view switch to use external diff viewer
[original upstream message ]
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 740
run-tests: sort options
[original upstream message ]
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 739
run-tests: add -l short option for --local
[original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 30 Apr 2010 15:21:59 +0200] rev 738
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:13 +0200] rev 737
Test recording
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:07 +0200] rev 736
Support (q)record
Monkeypatch hgext.dorecord to trigger keyword expansion.
Read data from working directory, not from filelog.
Prevent keyword expansion from within record's commitfunc,
thereby fixing a bug/inconsistency where files which are clean
after recording were overwritten twice.
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 03:54:18 +0200] rev 735
Remove mq commands from restricted list
Monkeypatching patch.diff takes care of this since 911f5be5d159.
Test mq more thoroughly by loosening [keywordmaps] and comparing
the output of hg cat with keyword expansion enabled and disabled.
Christian Ebert <blacktrash@gmx.net> [Fri, 16 Apr 2010 14:30:13 +0200] rev 734
Replace deprecated mq commands in test
Christian Ebert <blacktrash@gmx.net> [Fri, 23 Apr 2010 10:37:08 +0200] rev 733
Merge with stable
Martin Geisler <mg@aragost.com> [Thu, 22 Apr 2010 10:24:49 +0200] rev 732
Use hg role in help strings
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 20 Apr 2010 02:37:20 +0200] rev 731
Merge with stable
Augie Fackler <durin42@gmail.com> [Sat, 17 Apr 2010 13:38:42 -0500] rev 730
keyword: monkeypatch patch so that optional args can be passed as kwargs
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Thu, 15 Apr 2010 22:16:14 +0200] rev 729
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 20:25:07 +0200] rev 728
run-tests.py: can't remove from os.environ on solaris
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Apr 2010 15:23:22 +0200] rev 727
Merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 14 Apr 2010 17:58:10 +0900] rev 726
pylint, pyflakes: remove unused or duplicate imports
[ original upstream message ]
Ry4an Brase <ry4an-hg@ry4an.org> [Wed, 14 Apr 2010 00:24:47 -0500] rev 725
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.
[ original upstream message ]
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Apr 2010 09:08:47 +0200] rev 724
run-tests.py: reset env variables set by hooks
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:28:48 +0200] rev 723
Merge with stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 15:23:04 +0100] rev 722
run-tests: force to test pure on pypy as well
[ original upstream message ]
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 15:22:17 +0100] rev 721
Fix run-tests.py -jX after 2ed667a9dfcb
[ original upstream message ]
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 23 Mar 2010 11:37:31 +0100] rev 720
tests: adapt the test runner to work with jython
[ original upstream message ]
Brodie Rao <brodie@bitheap.org> [Mon, 22 Mar 2010 01:36:12 -0400] rev 719
run-tests: make sure GREP_OPTIONS isn't set
This can interfere with test output, especially for options like --color.
[ original upstream message ]
Dirkjan Ochtman <djc.ochtman@kentyde.com> [Thu, 11 Mar 2010 15:32:24 +0100] rev 718
tests: use external coverage, mandate newer version
This removes the option for including the stdlib in coverage reports.
[ original upstream message ]
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 05 Nov 2009 15:19:54 +0100] rev 717
templater: readable dates older than 24 months revert to ISO8601 (issue1006)
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:13:41 +0200] rev 716
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:13:06 +0200] rev 715
Add forgotten comment
Christian Ebert <blacktrash@gmx.net> [Mon, 12 Apr 2010 17:34:12 +0200] rev 714
Make the templater a local variable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:05:51 +0200] rev 713
Merge with stable