Mon, 26 Apr 2010 04:01:13 +0200 Test recording
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Apr 2010 04:01:13 +0200] rev 737
Test recording
Mon, 26 Apr 2010 04:01:07 +0200 Support (q)record
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.
Mon, 26 Apr 2010 03:54:18 +0200 Remove mq commands from restricted list
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.
Fri, 16 Apr 2010 14:30:13 +0200 Replace deprecated mq commands in test
Christian Ebert <blacktrash@gmx.net> [Fri, 16 Apr 2010 14:30:13 +0200] rev 734
Replace deprecated mq commands in test
Fri, 23 Apr 2010 10:37:08 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 23 Apr 2010 10:37:08 +0200] rev 733
Merge with stable
Thu, 22 Apr 2010 10:24:49 +0200 Use hg role in help strings 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 ]
Tue, 20 Apr 2010 02:37:20 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 20 Apr 2010 02:37:20 +0200] rev 731
Merge with stable
Sat, 17 Apr 2010 13:38:42 -0500 keyword: monkeypatch patch so that optional args can be passed as kwargs 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 ]
Thu, 15 Apr 2010 22:16:14 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 15 Apr 2010 22:16:14 +0200] rev 729
Merge with stable
Thu, 15 Apr 2010 20:25:07 +0200 run-tests.py: can't remove from os.environ on solaris 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 ]
Wed, 14 Apr 2010 15:23:22 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Apr 2010 15:23:22 +0200] rev 727
Merge with stable
Wed, 14 Apr 2010 17:58:10 +0900 pylint, pyflakes: remove unused or duplicate imports 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 ]
Wed, 14 Apr 2010 00:24:47 -0500 Fix --blacklist when --jobs > 1 in run_tests.py. stable
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 ]
Wed, 14 Apr 2010 09:08:47 +0200 run-tests.py: reset env variables set by hooks stable
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 ]
Tue, 13 Apr 2010 10:28:48 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:28:48 +0200] rev 723
Merge with stable
Tue, 23 Mar 2010 15:23:04 +0100 run-tests: force to test pure on pypy as well 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 ]
Tue, 23 Mar 2010 15:22:17 +0100 Fix run-tests.py -jX after 2ed667a9dfcb stable
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 ]
Tue, 23 Mar 2010 11:37:31 +0100 tests: adapt the test runner to work with jython stable
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 ]
Mon, 22 Mar 2010 01:36:12 -0400 run-tests: make sure GREP_OPTIONS isn't set stable
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 ]
Thu, 11 Mar 2010 15:32:24 +0100 tests: use external coverage, mandate newer version stable
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 ]
Thu, 05 Nov 2009 15:19:54 +0100 templater: readable dates older than 24 months revert to ISO8601 (issue1006) stable
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 ]
Tue, 13 Apr 2010 10:13:41 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:13:41 +0200] rev 716
(stable) merge
Tue, 13 Apr 2010 10:13:06 +0200 Add forgotten comment
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:13:06 +0200] rev 715
Add forgotten comment
Mon, 12 Apr 2010 17:34:12 +0200 Make the templater a local variable
Christian Ebert <blacktrash@gmx.net> [Mon, 12 Apr 2010 17:34:12 +0200] rev 714
Make the templater a local variable
Tue, 13 Apr 2010 10:05:51 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Apr 2010 10:05:51 +0200] rev 713
Merge with stable
Mon, 12 Apr 2010 17:21:30 -0700 rollback: improve message stable
Matt Mackall <mpm@selenic.com> [Mon, 12 Apr 2010 17:21:30 -0700] rev 712
rollback: improve message [ original upstream message ]
Fri, 09 Apr 2010 17:23:37 -0500 rollback: add dry-run argument, emit transaction description stable
Steve Borho <steve@borho.org> [Fri, 09 Apr 2010 17:23:37 -0500] rev 711
rollback: add dry-run argument, emit transaction description [ original upstream message ]
Tue, 16 Mar 2010 22:29:16 +0100 Do not bother about detecting extension path in demo
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:29:16 +0100] rev 710
Do not bother about detecting extension path in demo Detecting and showing the path to a keyword extension in a non-standard place only made sense while keyword.py was not shipped with Mercurial. The test output has changed because we do not have a spurious space at eol anymore.
Mon, 12 Apr 2010 14:12:56 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 12 Apr 2010 14:12:56 +0200] rev 709
Merge with stable
Mon, 05 Apr 2010 15:25:08 -0500 keywords: build a new templater to work around caching interaction stable
Matt Mackall <mpm@selenic.com> [Mon, 05 Apr 2010 15:25:08 -0500] rev 708
keywords: build a new templater to work around caching interaction
Tue, 30 Mar 2010 11:12:09 +0100 (0.9.2compat) improve quoting of environment variable in test 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Tue, 30 Mar 2010 11:12:09 +0100] rev 707
(0.9.2compat) improve quoting of environment variable in test
Tue, 30 Mar 2010 11:08:13 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 30 Mar 2010 11:08:13 +0100] rev 706
Merge with stable
Wed, 24 Mar 2010 01:43:24 +0100 Tests with spaces in paths stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 24 Mar 2010 01:43:24 +0100] rev 705
Tests with spaces in paths This allows most tests to succeed with ./run-tests.py --tmpdir='/tmp/hg test' and introduces other tests for spaces and shell quoting [ original upstream message ]
Wed, 17 Mar 2010 23:16:44 +0100 (0.9.2compat) get applicable changes from default 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Mar 2010 23:16:44 +0100] rev 704
(0.9.2compat) get applicable changes from default
Wed, 17 Mar 2010 15:04:07 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Mar 2010 15:04:07 +0100] rev 703
(stable) merge Even though this is a fake standalone branch, we do not include the patch that removed extension path detection in kwdemo.
Tue, 16 Mar 2010 22:28:58 +0100 Make kwdemo less verbose
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:28:58 +0100] rev 702
Make kwdemo less verbose 1) Set the branchname always silently with dirstate.setbranch(). We create a branch so that testing the {branches} template does not come up empty. But kwdemo is hardly the place to inform the user by inference why {branches} is empty on the default branch. "demobranch" is ascii and cannot be changed, so using the internal command instead of commands.branch() is safe. 2) Do not show full path to temporary directory (distracting long lines on Mac OS X). 3) No special debug output. Output only related to keyword, no internals like unsetting of commit hooks etc.
Tue, 16 Mar 2010 22:28:23 +0100 1 variable name for overwriting candidates
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:28:23 +0100] rev 701
1 variable name for overwriting candidates
Tue, 16 Mar 2010 22:27:22 +0100 Do not customize ui.note() when overwriting
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Mar 2010 22:27:22 +0100] rev 700
Do not customize ui.note() when overwriting Behaviour change: hg commit --verbose now prints out the names of the files which are overwritten.
Thu, 18 Feb 2010 05:55:05 +0100 Mark improved demo commit message for translation
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Feb 2010 05:55:05 +0100] rev 699
Mark improved demo commit message for translation s/config/configuration/ Inside the quoted command put the message in single quotes in case the translation contains apostrophes.
Thu, 11 Mar 2010 19:56:41 +0100 (0.9.2compat) update copyright _and_ licence 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 19:56:41 +0100] rev 698
(0.9.2compat) update copyright _and_ licence
Thu, 11 Mar 2010 19:48:38 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 19:48:38 +0100] rev 697
(stable) merge
Thu, 11 Mar 2010 18:49:41 +0100 Update copyright
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 18:49:41 +0100] rev 696
Update copyright
Thu, 11 Mar 2010 18:49:14 +0100 Remove deprecated options
Christian Ebert <blacktrash@gmx.net> [Thu, 11 Mar 2010 18:49:14 +0100] rev 695
Remove deprecated options
Sun, 07 Mar 2010 22:57:55 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 22:57:55 +0100] rev 694
Merge with stable
Tue, 09 Feb 2010 01:12:29 +0100 run-tests.py: skipped tests shouldn't change working directory 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 ]
Tue, 29 Dec 2009 19:02:26 -0200 run-tests.py: clears http_proxy for all tests stable
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 ]
Sun, 07 Mar 2010 22:48:01 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 22:48:01 +0100] rev 691
(stable) merge
Sun, 07 Mar 2010 21:50:36 +0100 (0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown 0.9.2compat
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.
Sun, 07 Mar 2010 21:09:04 +0100 (0.9.2compat) use status' names for readability 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 21:09:04 +0100] rev 689
(0.9.2compat) use status' names for readability
Sun, 07 Mar 2010 20:59:43 +0100 Remove spurious locks, improve handling of wlock
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.
Sun, 07 Mar 2010 19:56:37 +0100 Use status' names instead of index
Christian Ebert <blacktrash@gmx.net> [Sun, 07 Mar 2010 19:56:37 +0100] rev 687
Use status' names instead of index
Wed, 17 Feb 2010 21:57:52 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 21:57:52 +0100] rev 686
(stable) merge
Wed, 17 Feb 2010 21:56:15 +0100 Do not postpone commit hooks
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.
Wed, 17 Feb 2010 11:15:18 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Feb 2010 11:15:18 +0100] rev 684
Merge with stable
Tue, 09 Feb 2010 14:12:22 -0600 fix up a bunch of check-code warnings 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 ]
Sat, 06 Feb 2010 15:18:36 +0100 run-tests: kill daemons on ^C with -j. stable
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 ]
Thu, 10 Dec 2009 17:21:31 +0900 run-tests: split tests/blacklist in tests/blacklists/* stable
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 ]
Mon, 25 Jan 2010 00:05:27 -0600 many, many trivial check-code fixups stable
Matt Mackall <mpm@selenic.com> [Mon, 25 Jan 2010 00:05:27 -0600] rev 680
many, many trivial check-code fixups [ original upstream message ]
Tue, 16 Feb 2010 21:04:04 +0100 filelog: sort meta entries, ensure deterministic order stable
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Tue, 16 Feb 2010 21:04:04 +0100] rev 679
filelog: sort meta entries, ensure deterministic order [ original upstream message ]
Fri, 05 Feb 2010 18:08:07 +0000 (0.9.2compat) fix utcdate filter 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Feb 2010 18:08:07 +0000] rev 678
(0.9.2compat) fix utcdate filter
Fri, 05 Feb 2010 17:57:36 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Feb 2010 17:57:36 +0000] rev 677
Merge with stable
Fri, 05 Feb 2010 16:50:31 +0000 Fix utcdate filter stable
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Feb 2010 16:50:31 +0000] rev 676
Fix utcdate filter So far the utcdate filter only omitted the timezone, now it actually converts to utc. Thanks to Kevin Grover for pointing out the issue.
Wed, 20 Jan 2010 10:14:36 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Jan 2010 10:14:36 +0100] rev 675
Merge with stable
Tue, 19 Jan 2010 22:20:08 -0600 Update license to GPLv2+ stable
Matt Mackall <mpm@selenic.com> [Tue, 19 Jan 2010 22:20:08 -0600] rev 674
Update license to GPLv2+ [ original upstream message ]
(0) -300 -100 -64 +64 +100 +300 tip