Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 22:57:55 +0100] rev 694
Merge with stable
Mads Kiilerich <mads@kiilerich.com> [Tue, 09 Feb 2010 01:12:29 +0100] rev 693
run-tests.py: skipped tests shouldn't change working directory
[ original upstream message ]
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 29 Dec 2009 19:02:26 -0200] rev 692
run-tests.py: clears http_proxy for all tests
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 22:48:01 +0100] rev 691
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 21:50:36 +0100] rev 690
(0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown
Switch long option name from --untracked to --unknown.
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 21:09:04 +0100] rev 689
(0.9.2compat) use status' names for readability
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 20:59:43 +0100] rev 688
Remove spurious locks, improve handling of wlock
- kwcommitctx is inside the wlock of repo.commit: no lock
- _kwfwrite only needs wlock
wlock outside try block, so we don't need to import lock.release
_kwfwrite should even be safer that way, as we moved the status
call inside the try-except block.
Thanks to Benoit Boissinot for help.
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 19:56:37 +0100] rev 687
Use status' names instead of index
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 21:57:52 +0100] rev 686
(stable) merge
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 21:56:15 +0100] rev 685
Do not postpone commit hooks
With 0e64d814d7d0 in place, this hack is not needed any more.
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 11:15:18 +0100] rev 684
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 09 Feb 2010 14:12:22 -0600] rev 683
fix up a bunch of check-code warnings
[ original upstream message ]
Brendan Cully <brendan@kublai.com> [Sat, 06 Feb 2010 15:18:36 +0100] rev 682
run-tests: kill daemons on ^C with -j.
This is not perfect, but the problem is fundamentally racy.
[ original upstream message ]
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 10 Dec 2009 17:21:31 +0900] rev 681
run-tests: split tests/blacklist in tests/blacklists/*
Following discussions with Gilles Morris [1], it seems that it is preferable to
use several blacklist files in a blacklists/ directory. It is easier to add an
unversioned file for experiments than modifying a tracked file.
Also fall back to a simpler syntax, giving up ConfigParser, now that section
names are not needed anymore.
And allow --blacklist parameter to be a complete path, instead of only one
of the filenames contained in tests/blacklists/
[1] http://www.selenic.com/pipermail/mercurial-devel/2009-December/017317.html
[ original upstream message ]