Sat, 11 Sep 2010 10:57:35 +0200 tests: fix incompatibility with python-2.4 in test-hgweb stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 11 Sep 2010 10:57:35 +0200] rev 1053
tests: fix incompatibility with python-2.4 in test-hgweb Thanks to lcantey for catching it. [ original upstream message ]
Wed, 08 Sep 2010 15:11:35 +0200 tests: extend get-with-headers to support cache testing stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 08 Sep 2010 15:11:35 +0200] rev 1052
tests: extend get-with-headers to support cache testing [ original upstream message ]
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 1051
pylint, pyflakes: remove unused or duplicate imports [ original upstream message ]
Sat, 11 Feb 2012 14:18:19 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 11 Feb 2012 14:18:19 +0000] rev 1050
Merge with stable
Tue, 07 Feb 2012 18:47:16 +0100 mq: restore _branchtags() fast path (issue3223) stable
Patrick Mezard <patrick@mezard.eu> [Tue, 07 Feb 2012 18:47:16 +0100] rev 1049
mq: restore _branchtags() fast path (issue3223) Since a5917346c72e, mq saves the nodeid of the first applied patch to cache/branchheads, which breaks the optimized cache handling introduced in fbf8320f25c8. The problem is the revision being committed is appended to mqrepo.applied after the commit succeeds, which means mqrepo._branchtags() performs a regular update and write the first applied patch to the branch cache. One solution is to set a context variable _committingpatch on the mqrepo while it is committing a patch and to take it in account when deciding to fast-path mqrepo._branchtags(). Not really elegant but it works. The changes to test-mq-caches.t reverse changes introduced by a5917346c72e. The cache should not have been updated with mq records. The changes to test-keyword.t are indirectly caused by a5917346c72e. Reported and analyzed by Yuya Nishihara <yuya@tcha.org> Notes: - qpush still makes a slow path _branchtags() call when checking heads. Maybe this can be optimized. - be careful when merging this patch in default as secretcommit() was renamed newcommit() right after the end of the code freeze. [ original upstream message ]
Wed, 08 Feb 2012 16:56:00 +0000 tests: tighten checks for octal escapes in shell printf. stable
Jim Hague <jim.hague@acm.org> [Wed, 08 Feb 2012 16:56:00 +0000] rev 1048
tests: tighten checks for octal escapes in shell printf. printf on AIX default shell ksh (89) says \1 is an invalid escape. It insists on at least 2 digits. This causes failures in test-keyword.t and test-status.t. check-code.py already looks out for \NNN and recommends using Python for outputting octal values. Extend the check to \NN and \N and fix up resulting failures. [ original upstream message ]
Mon, 23 Jan 2012 16:21:12 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 23 Jan 2012 16:21:12 +0100] rev 1047
Merge with stable
Sat, 14 Jan 2012 01:56:27 +0100 run-tests: expand user in --with-hg stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 14 Jan 2012 01:56:27 +0100] rev 1046
run-tests: expand user in --with-hg This makes it possible to run: $ ./run-tests.py --with-hg=~/hg-bin/hg [ original upstream message ]
Fri, 20 Jan 2012 01:24:16 +0100 tests: let run-tests.py default to use 'sh' in $PATH instead of '/bin/sh' stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 20 Jan 2012 01:24:16 +0100] rev 1045
tests: let run-tests.py default to use 'sh' in $PATH instead of '/bin/sh' This makes it easier to run tests on systems that have a usable sh in the search path but not in the standard location. [ original upstream message ]
Sat, 14 Jan 2012 01:55:50 +0100 tests: add 'set -x' to the .t sh scripts in run-tests.py debug mode stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 14 Jan 2012 01:55:50 +0100] rev 1044
tests: add 'set -x' to the .t sh scripts in run-tests.py debug mode This makes -d output much more readable when debugging the test framework or very strange test failures. [ original upstream message ]
Thu, 19 Jan 2012 02:01:05 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 19 Jan 2012 02:01:05 +0100] rev 1043
Merge with default
Sun, 15 Jan 2012 13:37:33 +0100 Update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net> [Sun, 15 Jan 2012 13:37:33 +0100] rev 1042
Update filectx.cmp monkeypatch to handle '\1\n' at start of file Analogous to 012b285cf643 in mercurial main.
Wed, 18 Jan 2012 16:46:15 +0100 phases: use nodemap to check for missing nodes stable
Sune Foldager <cryo@cyanite.org> [Wed, 18 Jan 2012 16:46:15 +0100] rev 1041
phases: use nodemap to check for missing nodes [ original upstream message ]
Thu, 19 Jan 2012 01:50:48 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 19 Jan 2012 01:50:48 +0100] rev 1040
Merge with stable
Wed, 11 Jan 2012 15:38:31 +0100 tests: add htmlcov option stable
Markus Zapke-Gr?ndemann <info@keimlink.de> [Wed, 11 Jan 2012 15:38:31 +0100] rev 1039
tests: add htmlcov option [ original upstream message ]
Thu, 12 Jan 2012 14:39:02 -0600 run-tests: use a list comprehension instead of map stable
Matt Mackall <mpm@selenic.com> [Thu, 12 Jan 2012 14:39:02 -0600] rev 1038
run-tests: use a list comprehension instead of map [ original upstream message ]
Wed, 11 Jan 2012 15:37:25 +0100 tests: fix omit path list stable
Markus Zapke-Gr?ndemann <info@keimlink.de> [Wed, 11 Jan 2012 15:37:25 +0100] rev 1037
tests: fix omit path list All directories need a trailing asterisk. Otherwise the files are not excluded from coverage. [ original upstream message ]
Fri, 09 Dec 2011 00:10:00 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 09 Dec 2011 00:10:00 +0100] rev 1036
Merge with stable
Thu, 08 Dec 2011 14:32:44 -0600 branch: warn on branching stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Dec 2011 14:32:44 -0600] rev 1035
branch: warn on branching [ orginal upstream message ]
Thu, 24 Nov 2011 06:43:43 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Nov 2011 06:43:43 +0000] rev 1034
Merge with stable
Mon, 21 Nov 2011 01:49:20 +0100 tests: use an alias to make msys 'pwd' return paths with forward slashes stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 21 Nov 2011 01:49:20 +0100] rev 1033
tests: use an alias to make msys 'pwd' return paths with forward slashes [ original upstream message ]
Mon, 21 Nov 2011 01:49:20 +0100 tests: skip cvs tests with msys on windows stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 21 Nov 2011 01:49:20 +0100] rev 1032
tests: skip cvs tests with msys on windows They will fail with weird 'ssh' errors. [ original upstream message ]
Mon, 21 Nov 2011 01:49:20 +0100 tests: introduce 'hghave msys' to skip tests that would fail because of msys stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 21 Nov 2011 01:49:20 +0100] rev 1031
tests: introduce 'hghave msys' to skip tests that would fail because of msys [ original upstream message ]
Thu, 24 Nov 2011 06:42:48 +0000 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Nov 2011 06:42:48 +0000] rev 1030
Merge with default
Wed, 23 Nov 2011 01:20:32 +0000 test-keyword: use inline doctest syntax
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Nov 2011 01:20:32 +0000] rev 1029
test-keyword: use inline doctest syntax
Mon, 21 Nov 2011 11:52:11 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 21 Nov 2011 11:52:11 +0000] rev 1028
Merge with stable
Mon, 21 Nov 2011 00:39:32 +0100 tests: skip color test on platforms without tic stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 21 Nov 2011 00:39:32 +0100] rev 1027
tests: skip color test on platforms without tic [ original upstream message ]
Mon, 21 Nov 2011 11:51:46 +0000 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Mon, 21 Nov 2011 11:51:46 +0000] rev 1026
Merge with default Make tests/hgave executable on stable branch too.
Fri, 18 Nov 2011 11:06:59 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 18 Nov 2011 11:06:59 +0000] rev 1025
Merge with stable
Wed, 16 Nov 2011 18:04:19 -0600 merge: give a special message for internal:merge failure (issue3105) stable
Matt Mackall <mpm@selenic.com> [Wed, 16 Nov 2011 18:04:19 -0600] rev 1024
merge: give a special message for internal:merge failure (issue3105) [ original upstream message ]
Wed, 16 Nov 2011 12:55:59 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 16 Nov 2011 12:55:59 +0000] rev 1023
Merge with stable
Wed, 16 Nov 2011 03:45:14 +0100 tests: use the specified shell for running old fashioned sh tests stable
Mads Kiilerich <mads@kiilerich.com> [Wed, 16 Nov 2011 03:45:14 +0100] rev 1022
tests: use the specified shell for running old fashioned sh tests [ original upstream message ]
Fri, 11 Nov 2011 09:39:33 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 11 Nov 2011 09:39:33 +0000] rev 1021
Merge with stable
Fri, 11 Nov 2011 09:38:45 +0000 Make hghave executable
Christian Ebert <blacktrash@gmx.net> [Fri, 11 Nov 2011 09:38:45 +0000] rev 1020
Make hghave executable
Mon, 07 Nov 2011 03:25:10 +0100 run-tests: make $TESTTMP matching case-insensitive on windows stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 1019
run-tests: make $TESTTMP matching case-insensitive on windows [ original upstream message ]
Mon, 07 Nov 2011 03:25:10 +0100 run-tests: don't quote command names - that do apparently not work with msys stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 1018
run-tests: don't quote command names - that do apparently not work with msys [ original upstream message ]
Mon, 07 Nov 2011 03:25:10 +0100 tests: ignore \r on windows stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 1017
tests: ignore \r on windows [ original upstream message ]
Mon, 07 Nov 2011 03:25:10 +0100 run-tests: convert windows paths to unix stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 1016
run-tests: convert windows paths to unix [ original upstream message ]
Mon, 07 Nov 2011 03:25:10 +0100 tests: make (glob) on windows accept \ instead of / stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:25:10 +0100] rev 1015
tests: make (glob) on windows accept \ instead of / Globbing is usually used for filenames, so on windows it is reasonable and very convenient that glob patterns accepts '\' or '/' when the pattern specifies '/'. [ original upstream message ]
Mon, 07 Nov 2011 03:24:53 +0100 tests: use 'hghave serve' to guard tests that requires serve daemon management stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:24:53 +0100] rev 1014
tests: use 'hghave serve' to guard tests that requires serve daemon management [ original upstream message ]
Mon, 07 Nov 2011 03:14:55 +0100 tests: use 'hghave system-sh' to guard tests that requires sh in system() stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:55 +0100] rev 1013
tests: use 'hghave system-sh' to guard tests that requires sh in system() [ original upstream message ]
Mon, 07 Nov 2011 03:14:55 +0100 tests: use 'hghave no-windows' to avoid testing reserved file names on windows stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:55 +0100] rev 1012
tests: use 'hghave no-windows' to avoid testing reserved file names on windows [ original upstream message ]
Mon, 07 Nov 2011 03:14:55 +0100 tests: use 'hghave unix-permissions' for tests that really use chmod stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:55 +0100] rev 1011
tests: use 'hghave unix-permissions' for tests that really use chmod chmod of helper scripts is not included. tests that exercise the x bit in the file system uses 'hghave execbit'. [ original upstream message ]
Mon, 07 Nov 2011 03:14:54 +0100 tests: use 'hghave symlink' for tests using symlinks stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 03:14:54 +0100] rev 1010
tests: use 'hghave symlink' for tests using symlinks [ original upstream message ]
Mon, 07 Nov 2011 02:44:04 +0100 tests: make '(esc)' matching in run-tests.py work as intended stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 07 Nov 2011 02:44:04 +0100] rev 1009
tests: make '(esc)' matching in run-tests.py work as intended The code for match on (esc) lines didn't work, and it would thus always end up emitting another suggestion ... which however would match the old one. [ original upstream message ]
Wed, 09 Nov 2011 13:45:20 +0000 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Nov 2011 13:45:20 +0000] rev 1008
Merge with default
Wed, 09 Nov 2011 13:44:57 +0000 Add hghave test as of 5635a4017061
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Nov 2011 13:44:57 +0000] rev 1007
Add hghave test as of 5635a4017061
Tue, 08 Nov 2011 18:13:53 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 08 Nov 2011 18:13:53 +0000] rev 1006
Merge with stable
Mon, 07 Nov 2011 13:46:41 -0600 run-tests: replace inline python handling with more native scheme stable
Matt Mackall <mpm@selenic.com> [Mon, 07 Nov 2011 13:46:41 -0600] rev 1005
run-tests: replace inline python handling with more native scheme Normally changes in tests are reported like this in diffs: $ cat foo - a + b Using -i mode lets us update tests when the new results are correct and/or populate tests with their output. But with the standard doctest framework, inline Python sections in tests changes instead result in a big failure report that's unhelpful. So here, we replace the doctest calls with a simple compile/eval loop. [ original upstream message ]
Mon, 07 Nov 2011 13:52:03 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Nov 2011 13:52:03 +0000] rev 1004
Merge with stable
Thu, 03 Nov 2011 15:18:10 -0500 run-tests: minor cleanups stable
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 15:18:10 -0500] rev 1003
run-tests: minor cleanups [ original upstream message ]
Thu, 03 Nov 2011 15:08:45 -0500 run-tests: pull out line matching function stable
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 15:08:45 -0500] rev 1002
run-tests: pull out line matching function [ original upstream message ]
Thu, 03 Nov 2011 14:51:04 -0500 run-tests: pull out unified matching funcs stable
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 14:51:04 -0500] rev 1001
run-tests: pull out unified matching funcs [ original upstream message ]
Thu, 03 Nov 2011 14:48:56 -0500 tests: add some comments to the unified test code stable
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 14:48:56 -0500] rev 1000
tests: add some comments to the unified test code [ original upstream message ]
Thu, 03 Nov 2011 14:30:00 -0500 tests: rewrite inline Python support stable
Matt Mackall <mpm@selenic.com> [Thu, 03 Nov 2011 14:30:00 -0500] rev 999
tests: rewrite inline Python support Tests with inline Python could turn '>>>' into their underlying python invocation if the test got updated with -i. [ original upstream message ]
Mon, 07 Nov 2011 13:48:11 +0000 Backout b78cce2b1430 until a proper solution is found stable
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Nov 2011 13:48:11 +0000] rev 998
Backout b78cce2b1430 until a proper solution is found
Mon, 24 Oct 2011 17:02:10 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 24 Oct 2011 17:02:10 +0100] rev 997
Merge with stable
Sat, 22 Oct 2011 23:21:38 +0200 run-tests: make sure no_proxy/NO_PROXY are empty to fix test-http-proxy.t stable
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 22 Oct 2011 23:21:38 +0200] rev 996
run-tests: make sure no_proxy/NO_PROXY are empty to fix test-http-proxy.t If no_proxy (or NO_PROXY) includes localhost, the test for detecting an unreachable proxy fails, because the proxy setting is ignored. [ original upstream message ]
Mon, 24 Oct 2011 13:54:59 +0200 keyword: use util.realpath instead of os.path.realpath stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 24 Oct 2011 13:54:59 +0200] rev 995
keyword: use util.realpath instead of os.path.realpath This makes test-keyword.t pass on Python 2.4.1 (e.g. Debian sarge) [ original upstream message ]
Sat, 22 Oct 2011 15:45:19 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sat, 22 Oct 2011 15:45:19 +0100] rev 994
Merge with default
Fri, 21 Oct 2011 12:07:27 +0100 Correct grammar in iskwfile docstring
Christian Ebert <blacktrash@gmx.net> [Fri, 21 Oct 2011 12:07:27 +0100] rev 993
Correct grammar in iskwfile docstring
Sat, 22 Oct 2011 15:43:48 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 22 Oct 2011 15:43:48 +0100] rev 992
Merge with stable
Fri, 30 Sep 2011 21:58:54 -0400 rollback: avoid unsafe rollback when not at tip (issue2998) stable
Greg Ward <greg@gerg.ca> [Fri, 30 Sep 2011 21:58:54 -0400] rev 991
rollback: avoid unsafe rollback when not at tip (issue2998) You can get into trouble if you commit, update back to an older changeset, and then rollback. The update removes your valuable changes from the working dir, then rollback removes them history. Oops: you've just irretrievably lost data running nothing but core Mercurial commands. (More subtly: rollback from a shared clone that was already at an older changeset -- no update required, just rollback from the wrong directory.) The fix assumes that only "commit" transactions have irreplaceable data, and allows rolling back non-commit transactions as always. But when rolling back a commit, check that the working dir is checked out to tip, i.e. the changeset we're about to destroy. If not, abort. You can get back the old (dangerous) behaviour with --force. [ original upstream message ]
Sun, 16 Oct 2011 15:32:04 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 16 Oct 2011 15:32:04 +0100] rev 990
Merge with stable
Thu, 13 Oct 2011 17:54:37 +0200 run-tests: end doctest block when seeing a non-command stable
Idan Kamara <idankk86@gmail.com> [Thu, 13 Oct 2011 17:54:37 +0200] rev 989
run-tests: end doctest block when seeing a non-command [ original upstream message ]
Thu, 13 Oct 2011 17:48:29 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 13 Oct 2011 17:48:29 +0100] rev 988
Merge with stable
Wed, 12 Oct 2011 22:01:14 +0200 tests: add support for inline doctests in test files stable
Idan Kamara <idankk86@gmail.com> [Wed, 12 Oct 2011 22:01:14 +0200] rev 987
tests: add support for inline doctests in test files This adds doctest like syntax to .t files, that can be interleaved with regular shell code: $ echo -n a > file >>> print open('file').read() a >>> open('file', 'a').write('b') $ cat file ab The syntax is exactly the same as regular doctests, so multiline statements look like this: >>> for i in range(3): ... print i 0 1 2 Each block has its own context, i.e.: >>> x = 0 >>> print x 0 $ echo 'foo' foo >>> print x will result in a NameError. Errors are displayed in standard doctest format: >>> print 'foo' bar --- /home/idan/dev/hg/default/tests/test-test.t +++ /home/idan/dev/hg/default/tests/test-test.t.err @@ -2,3 +2,16 @@ > >>> print 'foo' > bar > EOF + ********************************************************************** + File "/tmp/tmps8X_0ohg-tst", line 1, in tmps8X_0ohg-tst + Failed example: + print 'foo' + Expected: + bar + Got: + foo + ********************************************************************** + 1 items had failures: + 1 of 1 in tmps8X_0ohg-tst + ***Test Failed*** 1 failures. + [1] As for the implementation, it's quite simple: when the test runner sees a line starting with '>>>' it converts it, and all subsequent lines until the next line that begins with '$' to a 'python -m heredoctest <<EOF' call with the proper heredoc to follow. So if we have this test file: >>> for c in 'abcd': ... print c a b c d $ echo foo foo It gets converted to: $ python -m heredoctest <<EOF > >>> for c in 'abcd': > ... print c > a > b > c > d > EOF $ echo foo foo And then processed like every other test file by converting it to a sh script. [ original upstream message ]
Sat, 08 Oct 2011 00:24:35 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 08 Oct 2011 00:24:35 +0100] rev 986
Merge with stable
Sun, 02 Oct 2011 14:34:28 -0400 import: wrap a transaction around the whole command stable
Greg Ward <greg@gerg.ca> [Sun, 02 Oct 2011 14:34:28 -0400] rev 985
import: wrap a transaction around the whole command Now 'rollback' after 'import' is less surprising: it rolls back all of the imported changesets, not just the last one. As an extra added benefit, you don't need 'rollback -f' after 'import --bypass', which was an undesired side effect of fixing issue2998 (59e8bc22506e).. Note that this is a different take on issue963, which complained that rollback after importing multiple patches returned the working dir parent to the starting point, not to the second-last patch applied. Since we now rollback the entire import, returning the working dir to the starting point is entirely logical. So this change also undoes a732eebf1958, the fix to issue963, and updates its tests accordingly. Bottom line: rollback after import was weird before issue963, understandable since the fix for issue963, and even better now. [ original upstream message ]
Wed, 14 Sep 2011 16:19:33 +0100 (0.9.2compat) merge with default 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Sep 2011 16:19:33 +0100] rev 984
(0.9.2compat) merge with default Adapt preserving filemode. Fix a typo. Clean up last merge.
Wed, 14 Sep 2011 15:34:32 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Sep 2011 15:34:32 +0100] rev 983
Merge with default
Sat, 10 Sep 2011 13:23:41 +0100 Make status test after record and kwexpand/kwshrink reliable
Christian Ebert <blacktrash@gmx.net> [Sat, 10 Sep 2011 13:23:41 +0100] rev 982
Make status test after record and kwexpand/kwshrink reliable This guarantees test failure when the dirstate code is omitted at the end of the kwtemplater.overwrite method. kwexpand/kwshrink: Without a 1 second wait the test succeeds sometimes, even when the dirstate of the overwritten file is not forced to normal. record: status after recording an added file allows to check whether normallookup is needed after overwriting.
Wed, 14 Sep 2011 15:30:21 +0100 Preserve file mode when overwriting
Christian Ebert <blacktrash@gmx.net> [Wed, 14 Sep 2011 15:30:21 +0100] rev 981
Preserve file mode when overwriting
Tue, 09 Aug 2011 12:56:43 +0200 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Aug 2011 12:56:43 +0200] rev 980
Merge with default
Tue, 09 Aug 2011 12:54:11 +0200 Avoid x = a and b or c
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Aug 2011 12:54:11 +0200] rev 979
Avoid x = a and b or c
Mon, 08 Aug 2011 09:38:40 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Aug 2011 09:38:40 +0100] rev 978
Merge with stable
Mon, 25 Jul 2011 16:37:18 -0500 tests: use getattr instead of hasattr stable
Augie Fackler <durin42@gmail.com> [Mon, 25 Jul 2011 16:37:18 -0500] rev 977
tests: use getattr instead of hasattr [ original upstream message ]
Thu, 14 Jul 2011 08:39:48 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Jul 2011 08:39:48 +0100] rev 976
Merge with stable
Wed, 13 Jul 2011 19:23:08 +0200 run-tests: fix summary when accepting changes interactively stable
Patrick Mezard <pmezard@gmail.com> [Wed, 13 Jul 2011 19:23:08 +0200] rev 975
run-tests: fix summary when accepting changes interactively Accepted changes were not counted as success. [ original upstream message ]
Thu, 07 Jul 2011 12:54:12 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Jul 2011 12:54:12 +0100] rev 974
Merge with default
Sun, 03 Jul 2011 12:58:03 +0200 Reuse already present working contexts for match
Christian Ebert <blacktrash@gmx.net> [Sun, 03 Jul 2011 12:58:03 +0200] rev 973
Reuse already present working contexts for match Shortens overlong line as side-effect.
Fri, 01 Jul 2011 14:52:14 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Jul 2011 14:52:14 +0200] rev 972
Merge with stable
Thu, 30 Jun 2011 16:36:38 +0200 run-test: revert most of 439ed4721a6d, timeout uses fallback for terminate() stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 30 Jun 2011 16:36:38 +0200] rev 971
run-test: revert most of 439ed4721a6d, timeout uses fallback for terminate() [ original upstream message ]
Thu, 30 Jun 2011 16:25:05 +0200 run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 30 Jun 2011 16:25:05 +0200] rev 970
run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() [ original upstream message ]
Mon, 20 Jun 2011 12:02:52 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 20 Jun 2011 12:02:52 +0200] rev 969
Merge with stable
Sat, 18 Jun 2011 16:52:51 -0500 scmutil: switch match users to supplying contexts stable
Matt Mackall <mpm@selenic.com> [Sat, 18 Jun 2011 16:52:51 -0500] rev 968
scmutil: switch match users to supplying contexts The most appropriate context is not always clearly defined. The obvious cases: For working directory commands, we use None For commands (eg annotate) with single revs, we use that revision The less obvious cases: For commands (eg status, diff) with a pair of revs, we use the second revision For commands that take a range (like log), we use None [ original upstream message ]
Tue, 14 Jun 2011 20:35:21 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 14 Jun 2011 20:35:21 +0200] rev 967
Merge with stable
Sun, 12 Jun 2011 17:26:20 +0300 run-tests: verbose log ignored test stable
Idan Kamara <idankk86@gmail.com> [Sun, 12 Jun 2011 17:26:20 +0300] rev 966
run-tests: verbose log ignored test [ original upstream message ]
Sat, 11 Jun 2011 15:03:58 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 11 Jun 2011 15:03:58 +0200] rev 965
Merge with stable
Sat, 11 Jun 2011 14:17:25 +0200 patch: generalize the use of patchmeta in applydiff() stable
Patrick Mezard <pmezard@gmail.com> [Sat, 11 Jun 2011 14:17:25 +0200] rev 964
patch: generalize the use of patchmeta in applydiff() - Add patchmeta.copy() and emit copies from iterhunks. Modifying patchmeta instances in applydiff() makes things simpler. - Rename selectfile() into makepatchmeta(). It is responsible for creating patchmeta for regular patches. - Pass patchmeta objects to patchfile() directly patchmeta instances were associated with git patches, for regular patches we had to pass additional variables to tell the patch intent to patchfile(). Instead, we generate patchmeta for regular patches and pass them. This will also help with patch filtering by matcher objects. [ original upstream message ]
Thu, 02 Jun 2011 00:12:10 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 02 Jun 2011 00:12:10 +0100] rev 963
Merge with stable
Tue, 31 May 2011 20:39:04 -0500 run-tests: allow whitelisting tests that should always run stable
Augie Fackler <durin42@gmail.com> [Tue, 31 May 2011 20:39:04 -0500] rev 962
run-tests: allow whitelisting tests that should always run It's desirable to run some tests all the time, for example test-check-pyflakes.t and test-check-code-hg.py. This allows passing --whitelist as a path to a file (flag can be specified more than once) which contains a list of files to whitelist. Whitelisted tests are run even if they're blacklisted or wouldn't match a --keyword test run. For example, to do a quick test of usehttp2, one can now do $ cat > test-whitelist <<EOF > test-check-pyflakes.t > test-check-code-hg.py > EOF $ (cd tests && ./run-tests.py --extra-config-opt 'ui.usehttp2=true' > -k http -j 8 --whitelist test-whitelist) and have all http-specific tests run as well as the two code linters. [ original upstream message ]
Sat, 28 May 2011 15:16:55 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 28 May 2011 15:16:55 +0100] rev 961
Merge with stable
Sat, 28 May 2011 11:44:27 +0200 run-tests: fix --blacklist (broken by 95715c2f90bf) stable
Patrick Mezard <pmezard@gmail.com> [Sat, 28 May 2011 11:44:27 +0200] rev 960
run-tests: fix --blacklist (broken by 95715c2f90bf) [ original upstream message ]
Sat, 28 May 2011 03:19:16 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 28 May 2011 03:19:16 +0100] rev 959
Merge with stable
Fri, 27 May 2011 21:50:10 +0200 patch: use temporary files to handle intermediate copies stable
Patrick Mezard <pmezard@gmail.com> [Fri, 27 May 2011 21:50:10 +0200] rev 958
patch: use temporary files to handle intermediate copies git patches may require copies to be handled out-of-order. For instance, take the following sequence: * modify a * copy a into b Here, we have to generate b from a before its modification. To do so, applydiff() was scanning for copy metadata and performing the copies before processing the other changes in-order. While smart and efficient, this approach complicates things by handling file copies and file creations at different places and times. While a new file must not exist before being patched a copied file already exists before applying the first hunk. Instead of copying the files at their final destination before patching, we store them in a temporary file location and retrieve them when patching. The filestore always stores file content in real files but nothing prevents adding a cache layer. The filestore class was kept separate from fsbackend for at least two reasons: - This class is likely to be reused as a temporary result store for a future repository patching call (entries just have to be extended to contain copy sources). - Delegating this role to backends might be more efficient in a repository backend case: the source files are already available in the repository itself and do not need to be copied again. It also means that third-parties backend would have to implement two other methods. If we ever decide to merge the filestore feature into backend, a minimalistic approach would be to compose with filestore directly. Keep in mind this copy overhead only applies for copy/rename sources, and may even be reduced to copy sources which have to handled ahead of time. [ original upstream message ]
Fri, 27 May 2011 21:50:09 +0200 patch: refactor file creation/removal detection stable
Patrick Mezard <pmezard@gmail.com> [Fri, 27 May 2011 21:50:09 +0200] rev 957
patch: refactor file creation/removal detection The patcher has to know if a file is being created or removed to check if the target already exists, or to actually unlink the file when a hunk emptying it is applied. This was done by embedding the creation/removal information in the first (and only) hunk attached to the file. There are two problems with this approach: - creation/removal is really a property of the file being patched and not its hunk. - for regular patches, file creation cannot be deduced at parsing time: there are case where the *stripped* file paths must be compared. Modifying hunks after their creation is clumsy and prevent further refactorings related to copies handling. Instead, we delegate this job to selectfile() which has all the relevant information, and remove the hunk createfile() and rmfile() methods. [ original upstream message ]
Fri, 27 May 2011 17:46:48 +0300 run-tests: fix --blacklist with jobs > 1 stable
Idan Kamara <idankk86@gmail.com> [Fri, 27 May 2011 17:46:48 +0300] rev 956
run-tests: fix --blacklist with jobs > 1 filter blacklisted tests before partitioning them to the children. maintains the 'Skipped...' output but not the 's'. [ original upstream message ]
Fri, 27 May 2011 17:46:47 +0300 run-tests: slightly simplify blacklist check stable
Idan Kamara <idankk86@gmail.com> [Fri, 27 May 2011 17:46:47 +0300] rev 955
run-tests: slightly simplify blacklist check [ original upstream message ]
Thu, 19 May 2011 00:51:06 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 19 May 2011 00:51:06 +0200] rev 954
Merge with stable
Wed, 18 May 2011 23:48:13 +0200 patch: set desired mode when patching, not in updatedir() stable
Patrick Mezard <pmezard@gmail.com> [Wed, 18 May 2011 23:48:13 +0200] rev 953
patch: set desired mode when patching, not in updatedir() This patch and the following aim at merging _updatedir() actions into _applydiff(). [ original upstream message ]
Wed, 18 May 2011 23:30:45 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 18 May 2011 23:30:45 +0200] rev 952
Merge with stable
Wed, 18 May 2011 15:45:57 +0200 run-tests: print a newline after all warnings stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 May 2011 15:45:57 +0200] rev 951
run-tests: print a newline after all warnings [ original upstream message ]
Wed, 18 May 2011 00:44:15 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 18 May 2011 00:44:15 +0200] rev 950
Merge with stable
Tue, 17 May 2011 23:46:15 +0200 patch: extract fs access from patchfile into fsbackend stable
Patrick Mezard <pmezard@gmail.com> [Tue, 17 May 2011 23:46:15 +0200] rev 949
patch: extract fs access from patchfile into fsbackend Most filesystem calls are already isolated in patchfile but this is not enough: renames are performed before patchfile is available and some chmod calls are even done outside of the applydiff call. Once all these calls are extracted into a backend class, we can provide cleaner APIs to write to a working directory context directly into the repository. [ original upstream message ]
Tue, 17 May 2011 13:45:25 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 17 May 2011 13:45:25 +0200] rev 948
Merge with stable
Mon, 16 May 2011 21:56:26 +0200 run-tests: replace chdir() with Popen cwd option stable
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:56:26 +0200] rev 947
run-tests: replace chdir() with Popen cwd option [ original upstream message ]
Mon, 16 May 2011 21:54:43 +0200 run-tests: make --debug run in the temporary test directory stable
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:54:43 +0200] rev 946
run-tests: make --debug run in the temporary test directory [ original upstream message ]
Mon, 16 May 2011 21:52:28 +0200 run-tests: use the common test path on Windows and Java stable
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:52:28 +0200] rev 945
run-tests: use the common test path on Windows and Java The alternate one did not run in the test directory and controlling the jobs execution with threads instead of process made it harder to fix. [ original upstream message ]
Mon, 16 May 2011 21:41:46 +0200 run-tests: ignore timeout when Popen.terminate is unavailable stable
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:41:46 +0200] rev 944
run-tests: ignore timeout when Popen.terminate is unavailable Popen.terminate was introduced in python 2.6 [ original upstream message ]
Mon, 16 May 2011 21:26:50 +0200 run-tests: fix hg.bat python reference stable
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:26:50 +0200] rev 943
run-tests: fix hg.bat python reference hg.bat expects to live in pythonxx/scripts and the python interpreter to be in pythonxx. run-tests.py file layout is a little different and python location must be fixed. [ original upstream message ]
Mon, 16 May 2011 21:24:14 +0200 run-tests: fix python executable detection and copy on Windows stable
Patrick Mezard <pmezard@gmail.com> [Mon, 16 May 2011 21:24:14 +0200] rev 942
run-tests: fix python executable detection and copy on Windows [ original upstream message ]
Sat, 14 May 2011 13:26:49 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 14 May 2011 13:26:49 +0200] rev 941
Merge with stable
Fri, 13 May 2011 14:58:24 -0500 scmutil: drop aliases in cmdutil for match functions stable
Matt Mackall <mpm@selenic.com> [Fri, 13 May 2011 14:58:24 -0500] rev 940
scmutil: drop aliases in cmdutil for match functions [ original upstream message ]
Thu, 12 May 2011 19:45:46 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 12 May 2011 19:45:46 +0200] rev 939
Merge with stable
Thu, 12 May 2011 14:31:07 +0200 keyword: use cmdutil.command decorator stable
Martin Geisler <mg@aragost.com> [Thu, 12 May 2011 14:31:07 +0200] rev 938
keyword: use cmdutil.command decorator [ original upstream message ]
Tue, 10 May 2011 01:44:09 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 10 May 2011 01:44:09 +0200] rev 937
Merge with stable
Mon, 09 May 2011 17:20:15 +0200 run-tests: remove check on --shell argument stable
Martin Geisler <mg@aragost.com> [Mon, 09 May 2011 17:20:15 +0200] rev 936
run-tests: remove check on --shell argument No shell is needed when executing Python tests and finding a good shell might be difficult/impossible on some platforms (e.g., Windows). [ original upstream message ]
Sat, 07 May 2011 21:01:15 +0300 run-tests: take the basepath when constructing the test temp dir stable
Idan Kamara <idankk86@gmail.com> [Sat, 07 May 2011 21:01:15 +0300] rev 935
run-tests: take the basepath when constructing the test temp dir so it's possible to run tests that are outside the test/ dir [ original upstream message ]
Sat, 07 May 2011 20:56:43 +0300 run-tests: compare absolute paths in _checkhglib stable
Idan Kamara <idankk86@gmail.com> [Sat, 07 May 2011 20:56:43 +0300] rev 934
run-tests: compare absolute paths in _checkhglib [ original upstream message ]
Fri, 06 May 2011 20:13:10 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 06 May 2011 20:13:10 +0200] rev 933
Merge with stable
Thu, 05 May 2011 20:04:49 +0200 run-tests: add --shell command line flag stable
Martin Geisler <mg@lazybytes.net> [Thu, 05 May 2011 20:04:49 +0200] rev 932
run-tests: add --shell command line flag This makes it easy to test with, say, both /bin/bash and /bin/dash instead of changing the system-wide /bin/sh. [ original upstream message ]
Thu, 05 May 2011 20:03:43 +0200 run-tests: use type of default to convert environment variable stable
Martin Geisler <mg@lazybytes.net> [Thu, 05 May 2011 20:03:43 +0200] rev 931
run-tests: use type of default to convert environment variable Before, defaults could only be integers, they can now also be strings, floats and what have you. [ original upstream message ]
Wed, 04 May 2011 10:39:10 -0500 run-tests.py: correctly handle list options with parallel tasks stable
Augie Fackler <durin42@gmail.com> [Wed, 04 May 2011 10:39:10 -0500] rev 930
run-tests.py: correctly handle list options with parallel tasks [ original upstream message ]
Mon, 02 May 2011 10:11:18 +0200 prevent transient leaks of file handle by using new helper functions stable
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Mon, 02 May 2011 10:11:18 +0200] rev 929
prevent transient leaks of file handle by using new helper functions These leaks may occur in environments that don't employ a reference counting GC, i.e. PyPy. This implies: - changing opener(...).read() calls to opener.read(...) - changing opener(...).write() calls to opener.write(...) - changing open(...).read(...) to util.readfile(...) - changing open(...).write(...) to util.writefile(...) [ original upstream description ]
Mon, 02 May 2011 19:20:29 +0200 localrepo: reuse parent manifest in commitctx if no files have changed stable
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 02 May 2011 19:20:29 +0200] rev 928
localrepo: reuse parent manifest in commitctx if no files have changed This speeds up the in-memory version of debugbuilddag that I'm working on considerably for the case where we want to build just a 00changelog.i (for discovery tests, for instance). There are a couple of test changes because node ids in tests have changed. The changes to the patch names in test-mq-qdelete.t were required because they could collide with nodeid abbreviations and newly actually do (patch "c" collides with id "cafe..." for patch "b"). [ original upstream description ]
Sun, 01 May 2011 18:18:31 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 01 May 2011 18:18:31 +0100] rev 927
Merge with stable
Sun, 01 May 2011 08:00:25 -0500 run-tests: add flag to provide extra hgrc options for test runs stable
Augie Fackler <durin42@gmail.com> [Sun, 01 May 2011 08:00:25 -0500] rev 926
run-tests: add flag to provide extra hgrc options for test runs [ original upstream message ]
Sat, 30 Apr 2011 17:38:06 +0200 tests: move test bundles in a bundles/ subdirectory stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 30 Apr 2011 17:38:06 +0200] rev 925
tests: move test bundles in a bundles/ subdirectory [ original upstream message ]
Sun, 01 May 2011 10:37:57 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 01 May 2011 10:37:57 +0100] rev 924
Merge with stable
Sat, 30 Apr 2011 15:20:27 +0300 run-tests: print a new line before writing the diff stable
Idan Kamara <idankk86@gmail.com> [Sat, 30 Apr 2011 15:20:27 +0300] rev 923
run-tests: print a new line before writing the diff [ original upstream message ]
Sat, 30 Apr 2011 11:41:20 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 30 Apr 2011 11:41:20 +0100] rev 922
Merge with stable
Fri, 29 Apr 2011 20:29:22 +0300 run-tests: don't count test as succeeded if it failed stable
Idan Kamara <idankk86@gmail.com> [Fri, 29 Apr 2011 20:29:22 +0300] rev 921
run-tests: don't count test as succeeded if it failed regressed around ec4ae5727f07 [ original upstream message ]
Sat, 30 Apr 2011 01:25:43 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 30 Apr 2011 01:25:43 +0100] rev 920
Merge with stable
Mon, 25 Apr 2011 17:01:34 -0500 run-tests: do chdir for tests under a lock for thread safety stable
Matt Mackall <mpm@selenic.com> [Mon, 25 Apr 2011 17:01:34 -0500] rev 919
run-tests: do chdir for tests under a lock for thread safety [ original upstream message ]
Mon, 25 Apr 2011 16:17:08 -0500 run-tests: add iolock to vlog stable
Matt Mackall <mpm@selenic.com> [Mon, 25 Apr 2011 16:17:08 -0500] rev 918
run-tests: add iolock to vlog [ original upstream message ]
Mon, 25 Apr 2011 23:09:47 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Apr 2011 23:09:47 +0100] rev 917
Merge with stable
Mon, 25 Apr 2011 18:42:31 +0200 run-tests: display diff before prompting with --interactive stable
Patrick Mezard <pmezard@gmail.com> [Mon, 25 Apr 2011 18:42:31 +0200] rev 916
run-tests: display diff before prompting with --interactive [ original upstream message ]
Sun, 24 Apr 2011 17:52:46 -0500 run-tests: fix some missing i/o locks stable
Matt Mackall <mpm@selenic.com> [Sun, 24 Apr 2011 17:52:46 -0500] rev 915
run-tests: fix some missing i/o locks [ original upstream message ]
Sun, 24 Apr 2011 16:46:37 -0500 run-tests: add a lock for console I/O stable
Matt Mackall <mpm@selenic.com> [Sun, 24 Apr 2011 16:46:37 -0500] rev 914
run-tests: add a lock for console I/O [ original upstream message ]
Sun, 24 Apr 2011 16:42:15 -0500 run-tests: switch timeout handling from alarm to helper thread stable
Matt Mackall <mpm@selenic.com> [Sun, 24 Apr 2011 16:42:15 -0500] rev 913
run-tests: switch timeout handling from alarm to helper thread This should be slightly more portable than signals and be compatible with threaded dispatch. [ original upstream message ]
Sun, 24 Apr 2011 16:42:11 -0500 run-tests: add locking on results struct stable
Matt Mackall <mpm@selenic.com> [Sun, 24 Apr 2011 16:42:11 -0500] rev 912
run-tests: add locking on results struct [ original upstream message ]
Mon, 25 Apr 2011 01:42:21 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Apr 2011 01:42:21 +0100] rev 911
Merge with stable
Sun, 24 Apr 2011 23:33:48 +0200 run-tests: fix --interactive (after 994ad067ac6e) stable
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Apr 2011 23:33:48 +0200] rev 910
run-tests: fix --interactive (after 994ad067ac6e) - Do not prompt if there is no .err file - Fix source and target paths [ original upstream message ]
Fri, 22 Apr 2011 14:04:34 -0500 run-tests: move test loop into a helper function stable
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 14:04:34 -0500] rev 909
run-tests: move test loop into a helper function [ original upstream message ]
Fri, 22 Apr 2011 12:24:22 -0500 run-tests: use a results dict stable
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 12:24:22 -0500] rev 908
run-tests: use a results dict [ original upstream message ]
Fri, 22 Apr 2011 11:36:40 -0500 run-tests: move blacklist and retest filtering to runone stable
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 11:36:40 -0500] rev 907
run-tests: move blacklist and retest filtering to runone [ original upstream message ]
Fri, 22 Apr 2011 11:32:05 -0500 run-tests: keep a list of passed tests stable
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 11:32:05 -0500] rev 906
run-tests: keep a list of passed tests [ original upstream message ]
Fri, 22 Apr 2011 11:24:27 -0500 run-tests: move keyword checking into runone stable
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 11:24:27 -0500] rev 905
run-tests: move keyword checking into runone [ original upstream message ]
Fri, 22 Apr 2011 11:22:02 -0500 run-tests: add ignores list stable
Matt Mackall <mpm@selenic.com> [Fri, 22 Apr 2011 11:22:02 -0500] rev 904
run-tests: add ignores list [ original upstream message ]
Thu, 21 Apr 2011 18:38:30 -0500 run-tests: move existence/name format check into runone stable
Matt Mackall <mpm@selenic.com> [Thu, 21 Apr 2011 18:38:30 -0500] rev 903
run-tests: move existence/name format check into runone [ original upstream message ]
Thu, 21 Apr 2011 18:19:45 -0500 run-tests: move interactive handling into runone stable
Matt Mackall <mpm@selenic.com> [Thu, 21 Apr 2011 18:19:45 -0500] rev 902
run-tests: move interactive handling into runone [ original upstream message ]
Wed, 20 Apr 2011 21:41:41 +0200 move canonpath from util to scmutil stable
Adrian Buehlmann <adrian@cadifra.com> [Wed, 20 Apr 2011 21:41:41 +0200] rev 901
move canonpath from util to scmutil [ original upstream message ]
Sun, 10 Apr 2011 20:51:39 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Apr 2011 20:51:39 +0200] rev 900
Merge with stable
Sat, 09 Apr 2011 15:52:19 -0500 tests: better output on timeouts stable
Matt Mackall <mpm@selenic.com> [Sat, 09 Apr 2011 15:52:19 -0500] rev 899
tests: better output on timeouts Formerly, timeouts would generate huge scrollback-destroying diffs and weird -15 return codes in the summary. Now we simply report "timed out". [ original upstream message ]
Tue, 05 Apr 2011 16:35:41 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 05 Apr 2011 16:35:41 +0200] rev 898
Merge with stable
Tue, 05 Apr 2011 11:07:25 +0200 keyword: convert a verbatim block to a field list stable
Martin Geisler <mg@aragost.com> [Tue, 05 Apr 2011 11:07:25 +0200] rev 897
keyword: convert a verbatim block to a field list [ orginal upstream message ]
Sun, 27 Mar 2011 13:15:35 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 27 Mar 2011 13:15:35 +0200] rev 896
Merge with stable
Fri, 25 Mar 2011 22:15:37 +0200 tests: set HOME to the test temp dir (issue2707) stable
Idan Kamara <idankk86@gmail.com> [Fri, 25 Mar 2011 22:15:37 +0200] rev 895
tests: set HOME to the test temp dir (issue2707) [ original upstream message ]
Mon, 14 Mar 2011 23:11:14 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Mar 2011 23:11:14 +0100] rev 894
Merge with default
Mon, 14 Mar 2011 12:26:50 +0100 Offer additional datefilters when the extension is enabled
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Mar 2011 12:26:50 +0100] rev 893
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.
Mon, 14 Mar 2011 12:19:59 +0100 Docstrings for additional date filters
Christian Ebert <blacktrash@gmx.net> [Mon, 14 Mar 2011 12:19:59 +0100] rev 892
Docstrings for additional date filters
Sat, 12 Mar 2011 13:19:55 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 12 Mar 2011 13:19:55 +0100] rev 891
Merge with stable
Sat, 12 Mar 2011 12:46:31 +0100 templates: document missing keywords or filters stable
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Mar 2011 12:46:31 +0100] rev 890
templates: document missing keywords or filters Keywords keywords are not documented yet but are turned into function definitions to avoid lambda docstring weirdness. [ original upstream message ]
Thu, 10 Mar 2011 22:02:02 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Mar 2011 22:02:02 +0100] rev 889
Merge with stable
Thu, 10 Mar 2011 13:43:47 +0100 tests: use $TESTTMP more and use (glob) less stable
Martin Geisler <mg@aragost.com> [Thu, 10 Mar 2011 13:43:47 +0100] rev 888
tests: use $TESTTMP more and use (glob) less This locks down the test output a little more. [ original upstream message ]
Thu, 10 Mar 2011 22:01:08 +0100 stable: merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Mar 2011 22:01:08 +0100] rev 887
stable: merge with default
Mon, 07 Mar 2011 14:43:27 +0100 README: minimal test command line
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Mar 2011 14:43:27 +0100] rev 886
README: minimal test command line
Mon, 07 Mar 2011 14:41:14 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Mar 2011 14:41:14 +0100] rev 885
Merge with stable
Thu, 10 Feb 2011 09:03:06 +0100 rollback: clarifies the message about the reverted state (issue2628) stable
Gilles Moris <gilles.moris@free.fr> [Thu, 10 Feb 2011 09:03:06 +0100] rev 884
rollback: clarifies the message about the reverted state (issue2628) Previously, when rolling back a transaction, some users could be confused between the level to which the store is rolled back, and the new parents of the working directory. $ hg rollback rolling back to revision 4 (undo commit) With this change: $ hg rollback repository tip rolled back to tip revision 4 (undo commit) working directory now based on revision 2 and 1 So now the user can realize that the store has been rolled back to an older tip, but also that the working directory may not on the tip (here we are rolling back the merge of the heads 2 and 1) [ original upstream message ]
Mon, 07 Mar 2011 14:34:27 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Mar 2011 14:34:27 +0100] rev 883
Merge with stable
Sun, 06 Mar 2011 14:19:57 +0100 run-tests: handle mixed comment lines in blacklists stable
Patrick Mezard <pmezard@gmail.com> [Sun, 06 Mar 2011 14:19:57 +0100] rev 882
run-tests: handle mixed comment lines in blacklists [ original upstream message ]
Tue, 15 Feb 2011 10:40:29 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 15 Feb 2011 10:40:29 +0100] rev 881
Merge with stable
Fri, 24 Dec 2010 15:23:01 +0100 explicitly close files stable
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 24 Dec 2010 15:23:01 +0100] rev 880
explicitly close files Add missing calls to close() to many places where files are opened. Relying on reference counting to catch them soon-ish is not portable and fails in environments with a proper GC, such as PyPy. [ original upstream description ]
Fri, 11 Feb 2011 04:55:00 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 11 Feb 2011 04:55:00 +0100] rev 879
Merge with stable
Wed, 02 Feb 2011 23:21:13 +0100 run-tests: only call WIFEXITED on systems it exists stable
Simon Heimberg <simohe@besonet.ch> [Wed, 02 Feb 2011 23:21:13 +0100] rev 878
run-tests: only call WIFEXITED on systems it exists not on Windows or in jython [ original upstream message ]
Tue, 01 Feb 2011 20:47:05 +0100 run-tests: loadable as module stable
Simon Heimberg <simohe@besonet.ch> [Tue, 01 Feb 2011 20:47:05 +0100] rev 877
run-tests: loadable as module [ original upstream message ]
Wed, 26 Jan 2011 17:49:11 +0000 stable: merge with default stable
Christian Ebert <blacktrash@gmx.net> [Wed, 26 Jan 2011 17:49:11 +0000] rev 876
stable: merge with default
Sun, 23 Jan 2011 03:15:44 +0100 Move repo.__class__ assignment out of monkeypatch context
Christian Ebert <blacktrash@gmx.net> [Sun, 23 Jan 2011 03:15:44 +0100] rev 875
Move repo.__class__ assignment out of monkeypatch context A cosmetic change to improve readability.
Sun, 23 Jan 2011 03:15:39 +0100 Inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net> [Sun, 23 Jan 2011 03:15:39 +0100] rev 874
Inform user about current keywordset in kwdemo The kwdemo --default output now looks roughly like this: configuration using default cvs keywordset [extensions] keyword = [keyword] demo.txt = [keywordset] * section added with this change svn = False [keywordmaps] ...
Sun, 16 Jan 2011 15:45:26 +0100 Update documentation for kwshrink
Christian Ebert <blacktrash@gmx.net> [Sun, 16 Jan 2011 15:45:26 +0100] rev 873
Update documentation for kwshrink * remove obsolete reference to potential problems with merge and import * emphasize that running kwshrink before configuration changes which affect active/expanded keywords is mandatory
Sat, 11 Dec 2010 12:49:10 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sat, 11 Dec 2010 12:49:10 +0100] rev 872
Merge with default
Sun, 05 Dec 2010 13:07:28 +0100 Make kwfiles show deleted files configured for expansion
Christian Ebert <blacktrash@gmx.net> [Sun, 05 Dec 2010 13:07:28 +0100] rev 871
Make kwfiles show deleted files configured for expansion
Sun, 05 Dec 2010 13:07:24 +0100 Colorize hg kwfiles output
Christian Ebert <blacktrash@gmx.net> [Sun, 05 Dec 2010 13:07:24 +0100] rev 870
Colorize hg kwfiles output
Thu, 02 Dec 2010 09:44:01 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 02 Dec 2010 09:44:01 +0100] rev 869
Merge with default
Thu, 02 Dec 2010 09:42:21 +0100 Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net> [Thu, 02 Dec 2010 09:42:21 +0100] rev 868
Copy: when copied source is a symlink, follow it 1) hg cp symlink copy -> copy is a symlink. 2) cp symlink copy; hg cp -A symlink copy -> copy is a regular file. In the second case we have to follow the symlink to its target to find out whether we have to unexpand keywords in the copy. Add test covering the case where the copied link's target is ignored by keyword but has content which would match the regex for expanded keywords to check whether we indeed leave the destination alone.
Thu, 02 Dec 2010 09:41:56 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 02 Dec 2010 09:41:56 +0100] rev 867
Merge with stable
Mon, 22 Nov 2010 18:15:58 +0100 code style: prefer 'is' and 'is not' tests with singletons stable
Martin Geisler <mg@aragost.com> [Mon, 22 Nov 2010 18:15:58 +0100] rev 866
code style: prefer 'is' and 'is not' tests with singletons [ original upstream description ]
Mon, 22 Nov 2010 20:45:42 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Mon, 22 Nov 2010 20:45:42 +0100] rev 865
Merge with default
Mon, 22 Nov 2010 20:44:36 +0100 s/config/configuration/ in help
Christian Ebert <blacktrash@gmx.net> [Mon, 22 Nov 2010 20:44:36 +0100] rev 864
s/config/configuration/ in help
Tue, 16 Nov 2010 16:59:06 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 16 Nov 2010 16:59:06 +0100] rev 863
Merge with stable
Tue, 16 Nov 2010 10:33:19 +0900 run-tests: fix --debug for .t tests stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 16 Nov 2010 10:33:19 +0900] rev 862
run-tests: fix --debug for .t tests When --debug is given to the test runner, run() returns (retcode, None). Do not try to use None output as a string, and return directly, similarly as other testers. [ original upstream message ]
Tue, 09 Nov 2010 10:31:54 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Nov 2010 10:31:54 +0000] rev 861
Merge with stable
Mon, 08 Nov 2010 10:56:47 +0100 run-test: fixed wrong parenthesis stable
Erik Zielke <ez@aragost.com> [Mon, 08 Nov 2010 10:56:47 +0100] rev 860
run-test: fixed wrong parenthesis Fixed wrong placement of end parenthesis, from b911cb80c671 [ original upstream message ]
Mon, 08 Nov 2010 11:11:23 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 08 Nov 2010 11:11:23 +0000] rev 859
Merge with stable
Mon, 08 Nov 2010 01:35:41 +0100 tests: use (esc) markup for string-escape stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:35:41 +0100] rev 858
tests: use (esc) markup for string-escape This makes test output less ambiguous. Failing test output will be escaped and marked up if necessary. A Python string-escape compatible encoding is used, but not everything is encoded - especially not \n and \t and '. [ original upstream message ]
Mon, 08 Nov 2010 01:35:40 +0100 tests: (no-eol) markup for command output without trailing LF stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:35:40 +0100] rev 857
tests: (no-eol) markup for command output without trailing LF Output chunks without a trailing LF will now work but get (no-eol) appended. This change mostly moves code around so we can handle that an output line starts with data from previous command, followed by salt and the next command. [ original upstream message ]
Sat, 06 Nov 2010 00:31:44 +0100 tests: handle .t files without trailing LF stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 06 Nov 2010 00:31:44 +0100] rev 856
tests: handle .t files without trailing LF 9a2de8dae27b made this simple test-test.t succeed silently: $ printf ' $ true' > test-test.t but did not give a usable .err in this case: $ printf ' $ false' > test-test.t The missing LF will now be fixed in the test output and it will thus give a test failure and a solution in the .err file. [ original upstream message ]
Fri, 05 Nov 2010 10:01:23 +0000 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Nov 2010 10:01:23 +0000] rev 855
Merge with default
Fri, 05 Nov 2010 10:00:11 +0000 Turn regexes and escaped keywords into a propertycache
Christian Ebert <blacktrash@gmx.net> [Fri, 05 Nov 2010 10:00:11 +0000] rev 854
Turn regexes and escaped keywords into a propertycache
Tue, 02 Nov 2010 14:04:21 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 02 Nov 2010 14:04:21 +0100] rev 853
Merge with stable
Mon, 01 Nov 2010 10:24:07 +0100 run-tests: use regex when searching for $HGPORT in test output stable
Martin Geisler <mg@aragost.com> [Mon, 01 Nov 2010 10:24:07 +0100] rev 852
run-tests: use regex when searching for $HGPORT in test output This prevents spurious errors when a changeset hash happens to match the port number. Before, this invocation gave a test failure: $ ./run-tests.py test-log.t --port 24427 ERROR: /home/mg/src/mercurial-crew/tests/test-log.t output changed --- /home/mg/src/mercurial-crew/tests/test-log.t +++ /home/mg/src/mercurial-crew/tests/test-log.t.err @@ -626,12 +626,12 @@ $ hg log -b default changeset: 2:c3a4f03cc9a7 - parent: 0:24427303d56f + parent: 0:$HGPORT303d56f user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: commit on default ... [ original upstream message ]
Wed, 27 Oct 2010 11:15:31 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 27 Oct 2010 11:15:31 +0100] rev 851
Merge with stable
Wed, 20 Oct 2010 17:38:21 -0500 pull: silence spurious 'requesting all changes' message stable
Kevin Bullock <kbullock@ringworld.org> [Wed, 20 Oct 2010 17:38:21 -0500] rev 850
pull: silence spurious 'requesting all changes' message When issuing `hg pull -r REV` in a repo with no common ancestor with the remote repo, the message 'requesting all changes' is printed, even though only the changese that are ancestors of REV are actually requested. This can be confusing for users (see http://www.selenic.com/pipermail/mercurial/2010-October/035508.html). This silences the message if (and only if) the '-r' option was passed. [ original upstream message ]
Mon, 25 Oct 2010 19:21:06 +0100 Function to look up changectx for expansion
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Oct 2010 19:21:06 +0100] rev 849
Function to look up changectx for expansion Similarly rename variable in kwtemplater.overwrite().
Mon, 25 Oct 2010 19:21:06 +0100 Compile regexes on demand
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Oct 2010 19:21:06 +0100] rev 848
Compile regexes on demand
Mon, 25 Oct 2010 20:00:18 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Oct 2010 20:00:18 +0100] rev 847
Merge with default
Mon, 25 Oct 2010 19:21:06 +0100 Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net> [Mon, 25 Oct 2010 19:21:06 +0100] rev 846
Fix regressions introduced in 9d01f9cab5e2 - dirstate of overwritten files must be forced to normal with kwexpand/kwshrink, not commit. - recorded files must be weeded before overwriting. - add test cases.
Wed, 20 Oct 2010 22:46:09 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Oct 2010 22:46:09 +0100] rev 845
Merge with stable
Sat, 02 Oct 2010 22:57:25 +0900 tests: accept \-escaped test output stable
Yuya Nishihara <yuya@tcha.org> [Sat, 02 Oct 2010 22:57:25 +0900] rev 844
tests: accept \-escaped test output It changes tsttest to accept expected outputs in python-style \-escapes. It aims to avoid trouble with outputs for non-ascii, color and progress tests. [ original upstream message ]
Fri, 15 Oct 2010 00:36:45 +0200 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Oct 2010 00:36:45 +0200] rev 843
Merge with default
Thu, 14 Oct 2010 22:53:17 +0200 Only use expensive fctx.cmp when needed
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Oct 2010 22:53:17 +0200] rev 842
Only use expensive fctx.cmp when needed Restrict expensive cmp to cases when: - comparing against working directory and - encode filters active or - path is configured for keyword expansion
Wed, 13 Oct 2010 09:21:19 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 13 Oct 2010 09:21:19 +0100] rev 841
Merge with stable
Tue, 27 Jul 2010 23:07:30 +0900 filectx: use ctx.size comparisons to speed up ctx.cmp stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 27 Jul 2010 23:07:30 +0900] rev 840
filectx: use ctx.size comparisons to speed up ctx.cmp Comparing sizes is cheaper than comparing file contents, as it does not involve reading the file on disk or from the filelog. It is however not always possible: some extensions, or encode filters, change data when extracting it to the working directory. [ original upstream description ]
Wed, 13 Oct 2010 09:18:46 +0100 Merge with stable stable
Christian Ebert <blacktrash@gmx.net> [Wed, 13 Oct 2010 09:18:46 +0100] rev 839
Merge with stable
Tue, 12 Oct 2010 16:29:32 +0100 Code cleanup
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Oct 2010 16:29:32 +0100] rev 838
Code cleanup - move preselection of expansion candidates for rollback and record into helper function - same overwrite order in rollback and record: 1. modified, 2. added - self.wlock() inside kwrepo class instead of repo.wlock()
Sun, 10 Oct 2010 01:07:16 +0100 enforce subn method via boolean switch
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Oct 2010 01:07:16 +0100] rev 837
enforce subn method via boolean switch There are only 2 patterns to choose, and so far only 1 case where kwtemplater.re_kw.subn is applied on data read from the working directory: when recording added files. With this change the code reflects more closely the boolean character of the switch and underlines the special case.
Sun, 10 Oct 2010 01:07:16 +0100 Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Oct 2010 01:07:16 +0100] rev 836
Fix weeding of expansion candidates when recording Rearrange tests to check this, i.e. that there are changes in other files, not only the recorded one.
Sun, 10 Oct 2010 01:10:13 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Oct 2010 01:10:13 +0100] rev 835
Merge with stable
Sat, 09 Oct 2010 16:27:10 -0500 run-tests.py: remove support for .bat files stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Oct 2010 16:27:10 -0500] rev 834
run-tests.py: remove support for .bat files [ original upstream message ]
Sat, 09 Oct 2010 16:25:28 -0500 run-tests.py: do not install hg when the tests do no exist stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 09 Oct 2010 16:25:28 -0500] rev 833
run-tests.py: do not install hg when the tests do no exist [ original upstream message ]
Sat, 09 Oct 2010 15:47:19 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 15:47:19 +0100] rev 832
Merge with stable
Sat, 09 Oct 2010 07:13:51 -0500 test-keyword: ignore subject in notify hook mails stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 09 Oct 2010 07:13:51 -0500] rev 831
test-keyword: ignore subject in notify hook mails Long tmpdir names caused truncation of subject anyway, and that made $TESTTMP replacement fail. [ original upstream description ]
Sat, 09 Oct 2010 07:13:49 -0500 test-keyword: fix test glob to ACL/SELinux flag stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 09 Oct 2010 07:13:49 -0500] rev 830
test-keyword: fix test glob to ACL/SELinux flag [ original upstream description ]
Fri, 08 Oct 2010 22:36:11 -0500 tests: reintroduce ":$HGPORT" in test output stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:11 -0500] rev 829
tests: reintroduce ":$HGPORT" in test output This reduces the number of patterns that must be adjusted when writing tests. [ original upstream description ]
Fri, 08 Oct 2010 22:36:10 -0500 tests: remove redundant globs stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:10 -0500] rev 828
tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed. [ original upstream description ]
Thu, 30 Sep 2010 09:49:40 +0200 tests: removed test names in tests stable
Erik Zielke <ez@aragost.com> [Thu, 30 Sep 2010 09:49:40 +0200] rev 827
tests: removed test names in tests The name of the test files is replaced with a glob * expression, thereby the tests does not depend on the filename of the file they are in. [ original upstream description ]
Fri, 08 Oct 2010 22:36:10 -0500 tests: replace test tmp directory with $TESTTMP in test output stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 08 Oct 2010 22:36:10 -0500] rev 826
tests: replace test tmp directory with $TESTTMP in test output This reduces the number of patterns that must be adjusted when writing tests. [ original upstream description ]
Sat, 09 Oct 2010 12:26:56 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 12:26:56 +0100] rev 825
Merge with stable
Fri, 08 Oct 2010 17:00:38 -0500 run-tests: handle .tst not ending with an LF stable
Patrick Mezard <pmezard@gmail.com> [Fri, 08 Oct 2010 17:00:38 -0500] rev 824
run-tests: handle .tst not ending with an LF [ original upstream description ]
Mon, 27 Sep 2010 22:49:30 +0200 tests: show skip reason instead of "irrelevant" with unified tests, too stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 27 Sep 2010 22:49:30 +0200] rev 823
tests: show skip reason instead of "irrelevant" with unified tests, too parsehghaveoutput expects just the test output, not the merged test/output, so for skipped unified tests e.g.: Skipped test-convert-darcs.t: missing feature: irrelevant was shown instead of: Skipped test-convert-darcs.t: missing feature: darcs client [ original upstream description ]
Sun, 26 Sep 2010 22:22:59 +0200 run-tests: move build/ directory to HGTMP stable
Martin Geisler <mg@lazybytes.net> [Sun, 26 Sep 2010 22:22:59 +0200] rev 822
run-tests: move build/ directory to HGTMP Before, running a test would give you a build/ directory in the root of your Mercurial source tree. The directory had a full copy of the the source, so a grep in '**/*.py' would find files inside build/. [ original upstream description ]
Fri, 08 Oct 2010 20:12:40 -0500 keyword: fix test glob stable
Matt Mackall <mpm@selenic.com> [Fri, 08 Oct 2010 20:12:40 -0500] rev 821
keyword: fix test glob [ original upstream description ]
Sat, 09 Oct 2010 11:52:32 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:52:32 +0100] rev 820
Merge with default
Sat, 09 Oct 2010 11:35:31 +0100 Switch kwtemplater.record in kw_dorecord()
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:35:31 +0100] rev 819
Switch kwtemplater.record in kw_dorecord() Obsoletes the need for a global recordcommands variable.
Sat, 09 Oct 2010 11:35:24 +0100 Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:35:24 +0100] rev 818
Specific regular expressions depending on read mode More safeguarding against accidental (un)expansion: Reading filelog: act only on \$(kw1|kw2|..)\$ as keywords are always stored unexpanded. Reading wdir: act only on \$(kw1|kw2|..): [^$\n\r]*? \$ as we only are interested in expanded keywords in this situation. Note: we cannot use ..): [^$\n\r]+? \$ because e.g. the {branch} template might be empty. hg record is a special case as we read from the working directory and need one regex each for modified and added files. Therefore test recording an added file. This way we finally also forbid sequences like $Id: $ being treated as keywords.
Sat, 09 Oct 2010 11:34:55 +0100 test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:34:55 +0100] rev 817
test: remove remaining sed calls
Sat, 09 Oct 2010 11:34:39 +0100 disable expansion in kwfilelog.read() if file renamed in node
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:34:39 +0100] rev 816
disable expansion in kwfilelog.read() if file renamed in node Simplifies kwfilelog.cmp() and avoids fiddling with/importing revlog. Reorder imports alphabetically.
Sat, 09 Oct 2010 11:33:38 +0100 Make iskwfile() a weeding method in lieu of a boolean
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:33:38 +0100] rev 815
Make iskwfile() a weeding method in lieu of a boolean Update iskwfile docstring.
Sat, 09 Oct 2010 11:33:12 +0100 Support copy and rename
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:33:12 +0100] rev 814
Support copy and rename copy/rename destinations being unversioned and possibly ignored by the extension should not contain expanded keywords. Files copied/renamed from an ignored source are not touched. Add tests covering both of the above cases, plus the corner case of cp symlink foo; hg cp -A symlink foo (where foo becomes a regular file).
Sat, 09 Oct 2010 11:33:04 +0100 Refactor kwtemplater.overwrite()
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Oct 2010 11:33:04 +0100] rev 813
Refactor kwtemplater.overwrite() Make kwexpand, kwshrink restricted commands - i.e. read from filelog without expansion for substition in kwtemplater.overwrite, and set/unset restricted mode for overwrite() in in kwcommitctx and the dorecord wrapper. Preselect candidates when working on changed files (rollback, record) outside kwtemplater class, and remove 6th argument from overwrite(). Avoid duplicate substitution/search in overwrite(): Only go into restricted read mode when reading from filelog. rollback and record read from the working directory, where restricted mode would already shrink keywords before overwrite() either expands or shrinks them again. This ensures that the usual automatic operations on keywords are turned off during overwrite() and only overwrite() itself acts on them. Reduce manifest calculation to the cases where it is needed. Move helper function for expansion removal outside kwtemplater class.
Fri, 01 Oct 2010 02:13:31 +0200 Use workingctx to detect modified and added files after rollback
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Oct 2010 02:13:31 +0200] rev 812
Use workingctx to detect modified and added files after rollback
Fri, 01 Oct 2010 02:13:31 +0200 Rename variable "cfiles" to "changed" for clarity
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Oct 2010 02:13:31 +0200] rev 811
Rename variable "cfiles" to "changed" for clarity
Sun, 26 Sep 2010 21:59:47 +0200 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 21:59:47 +0200] rev 810
Merge with default
Sun, 26 Sep 2010 19:18:41 +0200 Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 809
Support rollback by restoring expansion to previous values Prevent spurious differences in the working directory after a rollback. Add tests for several rollback situations.
Sun, 26 Sep 2010 19:18:41 +0200 Do not expand at all during diff
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 808
Do not expand at all during diff Always shrink and never expand keywords during a diff operation. Avoid user distraction e.g. because of spurious differences appearing in the commit editor.
Sun, 26 Sep 2010 19:18:41 +0200 Restore restricted read mode value after overwriting
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 807
Restore restricted read mode value after overwriting Even though just enforcing expansion after overwriting files in the working directory caused no problems that we know of, this avoids a potential source of problems (e.g. in collaboration other extensions) at no costs.
Sun, 26 Sep 2010 19:18:41 +0200 test: fix typo, rephrase
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Sep 2010 19:18:41 +0200] rev 806
test: fix typo, rephrase
Thu, 23 Sep 2010 17:03:23 +0200 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Sep 2010 17:03:23 +0200] rev 805
Merge with default
Thu, 23 Sep 2010 16:31:38 +0200 Use note admonition in help text
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Sep 2010 16:31:38 +0200] rev 804
Use note admonition in help text
Thu, 23 Sep 2010 10:33:58 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Sep 2010 10:33:58 +0200] rev 803
Merge with stable
Wed, 22 Sep 2010 18:20:47 -0500 tests: various fixes for new unified test pattern format stable
Matt Mackall <mpm@selenic.com> [Wed, 22 Sep 2010 18:20:47 -0500] rev 802
tests: various fixes for new unified test pattern format [ original upstream message ]
Wed, 22 Sep 2010 16:06:02 -0500 tests: add glob matching for unified tests stable
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:06:02 -0500] rev 801
tests: add glob matching for unified tests This adds a " (glob)" marker that works like a simpler version of (re): "*" is converted to ".*", and "?" is converted to ".". Both special characters can be escaped using "\", and the backslash itself can be escaped as well. Other glob-style syntax, like "**", "[chars]", or "[!chars]", isn't supported. [ original upstream message ]
Wed, 22 Sep 2010 16:06:00 -0500 tests: require regexes in unified tests to be marked with " (re)" stable
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:06:00 -0500] rev 800
tests: require regexes in unified tests to be marked with " (re)" Consider this test: $ hg glog --template '{rev}:{node|short} "{desc}"\n' @ 2:20c4f79fd7ac "3" | | o 1:38f24201dcab "2" |/ o 0:2a18120dc1c9 "1" Because each line beginning with "|" can be compiled as a regular expression (equivalent to ".*|"), they will match any output. Similarly: $ echo foo The blank output line can be compiled as a regular expression and will also match any output. With this patch, none of the above output lines will be matched as regular expressions. A line must end in " (re)" in order to be matched as one. Lines are still matched literally first, so the following will pass: $ echo 'foo (re)' foo (re) [ original upstream message ]
Wed, 22 Sep 2010 16:05:59 -0500 tests: ensure regexes match to the end of the string stable
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:59 -0500] rev 799
tests: ensure regexes match to the end of the string Regular expressions in the test suite are currently written assuming that you need a trailing ".*" to avoid matching to the end. Instead of matching regular expressions using "^pattern", this patch makes matching more restrictive by matching "^pattern$". [ original upstream message ]
Wed, 22 Sep 2010 16:05:59 -0500 tests: don't match blank output lines as regexes in unified tests stable
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:59 -0500] rev 798
tests: don't match blank output lines as regexes in unified tests Currently, the following unified test will pass: $ echo foo A blank output line (a line containing just two spaces) will match any output. The patch modifies the unified test runner to ignore empty strings strings when do regular expression matching. [ original upstream message ]
Wed, 22 Sep 2010 16:05:58 -0500 tests: improve regexes in unified tests stable
Brodie Rao <brodie@bitheap.org> [Wed, 22 Sep 2010 16:05:58 -0500] rev 797
tests: improve regexes in unified tests [ original upstream message ]
Wed, 22 Sep 2010 23:46:57 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Sep 2010 23:46:57 +0200] rev 796
Merge with stable
Mon, 20 Sep 2010 14:36:36 -0500 tests: add hack to avoid problem with graphlog in unified tests stable
Matt Mackall <mpm@selenic.com> [Mon, 20 Sep 2010 14:36:36 -0500] rev 795
tests: add hack to avoid problem with graphlog in unified tests [ original upstream message ]
Fri, 17 Sep 2010 20:53:56 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 17 Sep 2010 20:53:56 +0200] rev 794
Merge with stable
Thu, 16 Sep 2010 17:51:32 -0500 tests: add exit codes to unified tests stable
Matt Mackall <mpm@selenic.com> [Thu, 16 Sep 2010 17:51:32 -0500] rev 793
tests: add exit codes to unified tests [ original upstream message ]
Sun, 12 Sep 2010 18:05:53 -0500 merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' stable
Brodie Rao <brodie@bitheap.org> [Sun, 12 Sep 2010 18:05:53 -0500] rev 792
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Without specifying the parent revision of the working copy, users will update to tip, which is most likely the other head they were trying to merge, not the revision they were at before the merge. [ original upstream message ]
Fri, 10 Sep 2010 21:22:11 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Sep 2010 21:22:11 +0200] rev 791
(stable) merge
Fri, 10 Sep 2010 16:58:13 +0200 Explain file-wise expansion in help
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Sep 2010 16:58:13 +0200] rev 790
Explain file-wise expansion in help
Fri, 03 Sep 2010 15:59:08 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 03 Sep 2010 15:59:08 +0100] rev 789
Merge with stable
Fri, 03 Sep 2010 12:58:51 +0200 diff: recurse into subrepositories with --subrepos/-S flag stable
Martin Geisler <mg@lazybytes.net> [Fri, 03 Sep 2010 12:58:51 +0200] rev 788
diff: recurse into subrepositories with --subrepos/-S flag [ original upstream message ]
Tue, 31 Aug 2010 18:18:28 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 31 Aug 2010 18:18:28 +0100] rev 787
Merge with stable
Mon, 30 Aug 2010 13:15:30 +0900 test-keyword: use regular expressions instead of grepping stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 30 Aug 2010 13:15:30 +0900] rev 786
test-keyword: use regular expressions instead of grepping [ original upstream message]
Mon, 16 Aug 2010 01:01:41 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 16 Aug 2010 01:01:41 +0100] rev 785
Merge with stable
Sun, 15 Aug 2010 13:26:12 -0500 tests: drop big sed from test-keyword.t stable
Matt Mackall <mpm@selenic.com> [Sun, 15 Aug 2010 13:26:12 -0500] rev 784
tests: drop big sed from test-keyword.t [ original upstream message ]
Mon, 16 Aug 2010 01:00:29 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 16 Aug 2010 01:00:29 +0100] rev 783
(stable) merge
Sat, 14 Aug 2010 09:47:57 +0100 tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:47:57 +0100] rev 782
tests: unify test-keyword
Sat, 14 Aug 2010 09:47:41 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:47:41 +0100] rev 781
Merge with stable
Fri, 14 May 2010 10:01:09 -0500 rollback: fix up tests stable
Matt Mackall <mpm@selenic.com> [Fri, 14 May 2010 10:01:09 -0500] rev 780
rollback: fix up tests [ original upstream message ]
Sat, 14 Aug 2010 09:42:14 +0100 Merge after backout stable
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:42:14 +0100] rev 779
Merge after backout
Sat, 14 Aug 2010 09:30:42 +0100 Backed out changeset bceb04857ce1 (not all upstream hunks applied) stable
Christian Ebert <blacktrash@gmx.net> [Sat, 14 Aug 2010 09:30:42 +0100] rev 778
Backed out changeset bceb04857ce1 (not all upstream hunks applied)
Thu, 12 Aug 2010 14:53:34 +0900 tests: catch re.error if test line is not a valid regular expression stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 12 Aug 2010 14:53:34 +0900] rev 777
tests: catch re.error if test line is not a valid regular expression [ original upstream message ]
Mon, 02 Aug 2010 23:27:22 -0500 tests: basic support for unified tests stable
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 23:27:22 -0500] rev 776
tests: basic support for unified tests [ original upstream message ]
Mon, 02 Aug 2010 15:44:54 -0500 tests: move script execution in runner helpers stable
Matt Mackall <mpm@selenic.com> [Mon, 02 Aug 2010 15:44:54 -0500] rev 775
tests: move script execution in runner helpers [ original upstream message ]
Mon, 26 Jul 2010 12:34:33 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Jul 2010 12:34:33 +0200] rev 774
(stable) merge
Mon, 26 Jul 2010 12:32:45 +0200 Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net> [Mon, 26 Jul 2010 12:32:45 +0200] rev 773
Move collecting of [keyword] patterns to reposetup (issue2303) When cloning, prevent [keyword] filename patterns configured locally in the source directory to persist during the update in the destination. a) move [keyword] retrieval (back) to reposetup b) remove the corresponding global kwtools attributes Add test cases.
Mon, 19 Jul 2010 08:13:48 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Jul 2010 08:13:48 +0100] rev 772
(stable) merge
Thu, 15 Jul 2010 10:24:31 +0200 Add extra datefilters in a single update call
Christian Ebert <blacktrash@gmx.net> [Thu, 15 Jul 2010 10:24:31 +0200] rev 771
Add extra datefilters in a single update call
Wed, 16 Jun 2010 11:08:43 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 16 Jun 2010 11:08:43 +0200] rev 770
(stable) merge
Tue, 15 Jun 2010 21:58:53 +0200 Postpone manifest calculation in kwtemplater.overwrite
Christian Ebert <blacktrash@gmx.net> [Tue, 15 Jun 2010 21:58:53 +0200] rev 769
Postpone manifest calculation in kwtemplater.overwrite We can check for file existence in the working directory (needed in case of recording) by simply using the given context and calculate the manifest only when there are in fact candidates for expansion/shrinking.
Thu, 10 Jun 2010 11:33:01 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Jun 2010 11:33:01 +0100] rev 768
Merge with stable
Sun, 06 Jun 2010 17:25:00 +0900 help: show value requirement and multiple occurrence of options stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 06 Jun 2010 17:25:00 +0900] rev 767
help: show value requirement and multiple occurrence of options this helps users to know what kind of option is: - no value is required(flag option) - value is required - value is required, and multiple occurrences are allowed each kinds are shown as below: -f --force force push -e --ssh CMD specify ssh command to use -b --branch BRANCH [+] a specific branch you would like to push if one or more 3rd type options are shown, explanation for '[+]' mark is also shown as footnote. [ original upstream message ]
Wed, 09 Jun 2010 22:50:30 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jun 2010 22:50:30 +0100] rev 766
(stable) merge
Tue, 01 Jun 2010 01:05:45 +0200 Force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Jun 2010 01:05:45 +0200] rev 765
Force dirstate normal when all changes in a file are recorded Before this bugfix a file whose changes were entirely recorded was still considered modified by "hg status". Note: the test must use hg record -l/--logfile, because this is not reproducible with hg record -m/--message.
Wed, 09 Jun 2010 17:21:12 +0100 Pass context to kwtemplater.overwrite
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Jun 2010 17:21:12 +0100] rev 764
Pass context to kwtemplater.overwrite Now that we have retrieved the context in every calling function except commit, pass it as argument to kwtemplater.overwrite to avoid looking it up twice. Reorder arguments to kwtemplater.overwrite to reflect their importance. Turn node argument into a simple boolean and rename it to iswctx.
Tue, 01 Jun 2010 03:45:10 +0200 Retrieve added and modified files from commitctx
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Jun 2010 03:45:10 +0200] rev 763
Retrieve added and modified files from commitctx
Tue, 08 Jun 2010 09:55:08 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 08 Jun 2010 09:55:08 +0100] rev 762
Merge with stable
Mon, 07 Jun 2010 20:03:32 +0200 move working dir/dirstate methods from localrepo to workingctx stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 07 Jun 2010 20:03:32 +0200] rev 761
move working dir/dirstate methods from localrepo to workingctx [ original upstream message ]
Sun, 06 Jun 2010 20:19:24 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sun, 06 Jun 2010 20:19:24 +0100] rev 760
(stable) merge
Thu, 03 Jun 2010 10:37:31 +0100 Use context to detect uncommitted merge
Christian Ebert <blacktrash@gmx.net> [Thu, 03 Jun 2010 10:37:31 +0100] rev 759
Use context to detect uncommitted merge
Sat, 22 May 2010 14:10:49 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sat, 22 May 2010 14:10:49 +0200] rev 758
(stable) merge
Fri, 21 May 2010 22:12:39 +0200 Offer svn-like default keywordmaps
Christian Ebert <blacktrash@gmx.net> [Fri, 21 May 2010 22:12:39 +0200] rev 757
Offer svn-like default keywordmaps svn-like default keywords can be set in a new configuration section called [keywordset] -- thanks to timeless for the name. Move setup of default keywordmaps into dedicated function used by kwtemplater.__init__ and demo. HeadURL/URL is not supported (by default).
Fri, 21 May 2010 22:12:39 +0200 Add 2 svn-like date filters
Christian Ebert <blacktrash@gmx.net> [Fri, 21 May 2010 22:12:39 +0200] rev 756
Add 2 svn-like date filters svnisodate yields the format the date in svn's Id keyword expands to. svnutcdate yields the format svn's Date/LastChangedDate expands to. http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html
Tue, 18 May 2010 22:22:59 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 18 May 2010 22:22:59 +0200] rev 755
Merge with stable
Tue, 18 May 2010 16:31:10 +0200 Use our custom hg reStructuredText role some more stable
Martin Geisler <mg@aragost.com> [Tue, 18 May 2010 16:31:10 +0200] rev 754
Use our custom hg reStructuredText role some more I missed these occurrences on my first scan through the source. [ original upstream message ]
Fri, 14 May 2010 17:15:38 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 14 May 2010 17:15:38 +0200] rev 753
Merge with stable
Fri, 14 May 2010 10:01:09 -0500 rollback: fix up tests stable
Matt Mackall <mpm@selenic.com> [Fri, 14 May 2010 10:01:09 -0500] rev 752
rollback: fix up tests [ original upstream message ]
Fri, 14 May 2010 10:56:47 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 14 May 2010 10:56:47 +0200] rev 751
(stable) merge
Thu, 13 May 2010 17:24:21 -0500 commit: note new branch heads rather than topological heads stable
Matt Mackall <mpm@selenic.com> [Thu, 13 May 2010 17:24:21 -0500] rev 750
commit: note new branch heads rather than topological heads Move to using contexts while we're at it. [ original upstream message ]
Sun, 09 May 2010 11:14:43 +0200 Support extensions using dorecord, e.g. crecord
Christian Ebert <blacktrash@gmx.net> [Sun, 09 May 2010 11:14:43 +0200] rev 749
Support extensions using dorecord, e.g. crecord Provide extendable keyword.recordextensions variable, so other extensions beside hgext.record which provide the dorecord function can cooperate with hgext.keyword like so (example from crecord): def extsetup(): try: keyword = extensions.find('keyword') keyword.restricted += ' crecord qcrecord' try: # use record support in keyword.py if present keyword.recordcommands += ' crecord qcrecord' keyword.recordextensions += ' crecord' except AttributeError: pass except KeyError: pass
Wed, 05 May 2010 17:16:00 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 05 May 2010 17:16:00 +0200] rev 748
(stable) merge
Wed, 05 May 2010 14:02:45 +0200 Omit setting extra variable for record context
Christian Ebert <blacktrash@gmx.net> [Wed, 05 May 2010 14:02:45 +0200] rev 747
Omit setting extra variable for record context Since dc2f37864348 the context is always retrieved in kwtemplater.overwrite().
Tue, 04 May 2010 01:15:34 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Tue, 04 May 2010 01:15:34 +0200] rev 746
(stable) merge
Sun, 02 May 2010 22:39:43 +0200 Simplify record switch in kwtemplater.overwrite
Christian Ebert <blacktrash@gmx.net> [Sun, 02 May 2010 22:39:43 +0200] rev 745
Simplify record switch in kwtemplater.overwrite 1) use kwtemplater.record attribute for clarity 2) drop optional context argument; consider the speed loss by duplicating the dictionary lookup repo['.'] as negligible
Sat, 01 May 2010 23:18:42 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Sat, 01 May 2010 23:18:42 +0200] rev 744
(stable) merge
Sat, 01 May 2010 20:49:40 +0200 Cleanup test and make it portable
Christian Ebert <blacktrash@gmx.net> [Sat, 01 May 2010 20:49:40 +0200] rev 743
Cleanup test and make it portable - replace sed call with python command - no need to back up hgrc before record
Fri, 30 Apr 2010 16:30:09 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 30 Apr 2010 16:30:09 +0200] rev 742
Merge with stable
Thu, 29 Apr 2010 22:04:05 -0500 run-tests: add --view switch to use external diff viewer 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 ]
Thu, 29 Apr 2010 18:25:45 -0500 run-tests: sort options stable
Matt Mackall <mpm@selenic.com> [Thu, 29 Apr 2010 18:25:45 -0500] rev 740
run-tests: sort options [original upstream message ]
Thu, 29 Apr 2010 18:25:45 -0500 run-tests: add -l short option for --local stable
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 ]
Fri, 30 Apr 2010 15:21:59 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 30 Apr 2010 15:21:59 +0200] rev 738
(stable) merge
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 ]
Thu, 24 Dec 2009 11:02:48 +0000 (0.9.2compat) load extensions with "ext =" 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 11:02:48 +0000] rev 673
(0.9.2compat) load extensions with "ext ="
Thu, 24 Dec 2009 10:54:00 +0000 (0.9.2compat) do not monkeypatch diff in restricted mode; transplant restricted 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:54:00 +0000] rev 672
(0.9.2compat) do not monkeypatch diff in restricted mode; transplant restricted See 52b03aad673b, 13a6a2c0440f.
Thu, 24 Dec 2009 10:15:49 +0000 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:15:49 +0000] rev 671
(stable) merge
Thu, 24 Dec 2009 10:14:36 +0000 run-tests.py: update
Christian Ebert <blacktrash@gmx.net> [Thu, 24 Dec 2009 10:14:36 +0000] rev 670
run-tests.py: update
Wed, 23 Dec 2009 17:46:48 +0000 tests: load extensions with "ext ="
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 17:46:48 +0000] rev 669
tests: load extensions with "ext ="
Wed, 23 Dec 2009 12:04:17 +0000 Go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 12:04:17 +0000] rev 668
Go into restricted mode when transplanting Expanded keyword is read into diff with transplant -b otherwise. Test this scenario. Thanks to Adam Berkes for providing an example case.
Wed, 23 Dec 2009 12:04:04 +0000 Do not monkeypatch diff when in restricted mode
Christian Ebert <blacktrash@gmx.net> [Wed, 23 Dec 2009 12:04:04 +0000] rev 667
Do not monkeypatch diff when in restricted mode kw_diff actually disabled restricted mode when 2 revisions were given, because it effectively disables the extension in this case. But the commands working with diff and patch need restricted mode always enabled, i.e. expansion enabled when writing to the working directory and - crucial for these commands - no expansion when reading the filelog.
Sun, 29 Nov 2009 11:27:33 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 29 Nov 2009 11:27:33 +0000] rev 666
Merge with stable
Fri, 27 Nov 2009 18:26:25 +0000 keyword: clarify object of backwards compatibility stable
timeless [Fri, 27 Nov 2009 18:26:25 +0000] rev 665
keyword: clarify object of backwards compatibility [ original upstream message ]
Sat, 28 Nov 2009 19:51:21 +0000 (0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sat, 28 Nov 2009 19:51:21 +0000] rev 664
(0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output Keep $RCSFile$ for backwards compatibility.
Fri, 27 Nov 2009 18:04:02 +0000 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Nov 2009 18:04:02 +0000] rev 663
(stable) merge
Thu, 26 Nov 2009 10:51:17 +0100 The CVS keyword is $RCSfile$, not $RCSFile$
Christian Ebert <blacktrash@gmx.net> [Thu, 26 Nov 2009 10:51:17 +0100] rev 662
The CVS keyword is $RCSfile$, not $RCSFile$ http://cvsbook.red-bean.com/cvsbook.html#List%20Of%20Keywords Fix default keyword map accordingly. Keep $RCSFile$ for Mercurial backwards compatibility.
Fri, 27 Nov 2009 18:03:29 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 27 Nov 2009 18:03:29 +0000] rev 661
Merge with stable
Thu, 26 Nov 2009 20:50:16 +0100 keyword: sort demo output to ensure deterministic output stable
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 20:50:16 +0100] rev 660
keyword: sort demo output to ensure deterministic output [ original upstream message ]
Mon, 19 Oct 2009 22:42:05 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:42:05 +0200] rev 659
Merge with stable
Mon, 19 Oct 2009 22:40:48 +0200 (0.9.2compat) update wiki url 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:40:48 +0200] rev 658
(0.9.2compat) update wiki url
Fri, 16 Oct 2009 23:57:34 +0200 hg.clone: report branch name on update stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 16 Oct 2009 23:57:34 +0200] rev 657
hg.clone: report branch name on update [ original upstream message ]
Wed, 24 Jun 2009 15:32:37 +0200 change wiki/bts URLs to point to new hostname stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 15:32:37 +0200] rev 656
change wiki/bts URLs to point to new hostname [ original upstream message ]
Mon, 19 Oct 2009 22:37:14 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 19 Oct 2009 22:37:14 +0200] rev 655
(stable) merge
Thu, 01 Oct 2009 13:39:15 +0200 Uppercase short option for kwfiles --all, like hg status -A
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 654
Uppercase short option for kwfiles --all, like hg status -A Deprecate kwfiles -a.
Thu, 01 Oct 2009 13:39:15 +0200 Make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 653
Make kwfiles -u show untracked files only (like status) Remove extra documentation of -u/--unknown, as this is covered in the option help already. Like commands.status the code now zips the status flags. Add more kwfiles tests.
Thu, 01 Oct 2009 13:39:15 +0200 Make kwfiles --all show unknown files too
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 652
Make kwfiles --all show unknown files too More consistent and similar to hg status.
Thu, 01 Oct 2009 13:39:15 +0200 kwfiles --unknown instead of --untracked
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 13:39:15 +0200] rev 651
kwfiles --unknown instead of --untracked Use the same option name as "hg status". Retrieve option in _status(). Mark --untracked as deprecated.
Thu, 01 Oct 2009 20:42:39 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 01 Oct 2009 20:42:39 +0200] rev 650
Merge with stable
Thu, 17 Sep 2009 22:39:38 -0700 hg: say 'hg update' instead of 'hg up' in merge status message stable
Stuart W Marks <smarks@smarks.org> [Thu, 17 Sep 2009 22:39:38 -0700] rev 649
hg: say 'hg update' instead of 'hg up' in merge status message Includes the change to the message itself, along with several test output files that also had to change. [ original upstream message ]
Sat, 19 Sep 2009 12:06:50 +0200 (0.9.2compat) do not mark debug message for translation 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:06:50 +0200] rev 648
(0.9.2compat) do not mark debug message for translation
Sat, 19 Sep 2009 12:04:38 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:04:38 +0200] rev 647
Merge with stable
Sat, 19 Sep 2009 01:15:38 +0200 do not attempt to translate ui.debug output stable
Martin Geisler <mg@lazybytes.net> [Sat, 19 Sep 2009 01:15:38 +0200] rev 646
do not attempt to translate ui.debug output [ original upstream message ]
Sat, 19 Sep 2009 12:00:41 +0200 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:00:41 +0200] rev 645
(stable) merge with default
Sat, 19 Sep 2009 12:00:02 +0200 (0.9.2compat): run kwdemo before setting up [keyword] files 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sat, 19 Sep 2009 12:00:02 +0200] rev 644
(0.9.2compat): run kwdemo before setting up [keyword] files Ensures that kwdemo runs correctly without further configuration. Also no need to specify --default option.
Thu, 10 Sep 2009 23:15:37 +0200 test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net> [Thu, 10 Sep 2009 23:15:37 +0200] rev 643
test: run kwdemo before setting up [keyword] files kwdemo would pass the test without uisetup otherwise. Also no need to specify --default option.
Fri, 28 Aug 2009 16:18:28 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 28 Aug 2009 16:18:28 +0100] rev 642
Merge with stable
Thu, 27 Aug 2009 00:00:15 +0200 test-keyword: update output to match 5d49fdef6fd0 stable
Martin Geisler <mg@lazybytes.net> [Thu, 27 Aug 2009 00:00:15 +0200] rev 641
test-keyword: update output to match 5d49fdef6fd0 [ original upstream description ]
Wed, 05 Aug 2009 17:25:33 +0200 (0.9.2compat) update and rewrap documentation 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:25:33 +0200] rev 640
(0.9.2compat) update and rewrap documentation
Wed, 05 Aug 2009 17:18:32 +0200 (0.9.2compat) prefer util.datestr over time module import 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:18:32 +0200] rev 639
(0.9.2compat) prefer util.datestr over time module import We keep the function in this branch to catch the TypeError.
Wed, 05 Aug 2009 17:01:55 +0200 (0.9.2compat) remove "help keyword" from test 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 17:01:55 +0200] rev 638
(0.9.2compat) remove "help keyword" from test
Wed, 05 Aug 2009 16:57:21 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:57:21 +0200] rev 637
(stable) merge
Wed, 05 Aug 2009 16:56:49 +0200 Use util.datestr for utcdate filter, make it accessable in variable
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:56:49 +0200] rev 636
Use util.datestr for utcdate filter, make it accessable in variable lambda syntax mimicking templatefilters.py
Wed, 05 Aug 2009 16:56:44 +0200 Reference templating help, add utcdate filter example
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:56:44 +0200] rev 635
Reference templating help, add utcdate filter example
Wed, 05 Aug 2009 16:56:36 +0200 Remove "help keyword" from test
Christian Ebert <blacktrash@gmx.net> [Wed, 05 Aug 2009 16:56:36 +0200] rev 634
Remove "help keyword" from test Testing help output does not make sense as we have no way to check for errors in content which would be the only reasonable test here.
Sun, 26 Jul 2009 10:45:35 +0100 Refactor kwdemo and make output translatable
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Jul 2009 10:45:35 +0100] rev 633
Refactor kwdemo and make output translatable Better reflect the actual behaviour of the extension: - Make map arguments and -f/--rcfile not mutually exclusive but extend the current configuration - Map arguments and -f/--rcfile both override the defaults even when -d/--default is specified - -d/--default only overrides the current configuration Inform the user about extending/overriding behaviour, but only at the beginning; the following messages become terser, making the output translatable without too much code clutter. Rephrase help (use "short/long" option notation etc.).
Mon, 03 Aug 2009 11:53:13 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:53:13 +0200] rev 632
(stable) merge
Mon, 03 Aug 2009 11:51:41 +0200 Update copyright
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:51:41 +0200] rev 631
Update copyright
Mon, 03 Aug 2009 11:49:46 +0200 (0.9.2compat) update copyright 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:49:46 +0200] rev 630
(0.9.2compat) update copyright
Mon, 03 Aug 2009 11:09:02 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Aug 2009 11:09:02 +0200] rev 629
Merge with stable
Mon, 03 Aug 2009 00:01:50 +0200 help: use field lists for lists of extensions stable
Martin Geisler <mg@lazybytes.net> [Mon, 03 Aug 2009 00:01:50 +0200] rev 628
help: use field lists for lists of extensions [ original upstream message ]
Sun, 02 Aug 2009 17:17:17 +0200 minirst: indent literal blocks with two spaces stable
Martin Geisler <mg@lazybytes.net> [Sun, 02 Aug 2009 17:17:17 +0200] rev 627
minirst: indent literal blocks with two spaces The vast majority* of them are formatted like this in the source, so this basically reverts the output to how it looked before we got the minirst parser. *: the help on templating use four spaces for some examples and will now shown with an indentation of just two spaces. [ original upstream message ]
Sun, 26 Jul 2009 10:40:59 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 26 Jul 2009 10:40:59 +0100] rev 626
Merge with stable
Sun, 26 Jul 2009 01:53:06 +0200 keyword: wrap docstrings at 70 characters stable
Martin Geisler <mg@lazybytes.net> [Sun, 26 Jul 2009 01:53:06 +0200] rev 625
keyword: wrap docstrings at 70 characters [ original upstream description ]
Thu, 16 Jul 2009 23:25:26 +0200 commands: use minirst parser when displaying help stable
Martin Geisler <mg@lazybytes.net> [Thu, 16 Jul 2009 23:25:26 +0200] rev 624
commands: use minirst parser when displaying help [ original upstream description ]
Thu, 23 Jul 2009 20:00:23 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Jul 2009 20:00:23 +0100] rev 623
(stable) merge
Thu, 23 Jul 2009 07:37:09 +0100 (0.9.2compat) argument to "kwdemo --rcfile" must be string (bugfix) 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Jul 2009 07:37:09 +0100] rev 622
(0.9.2compat) argument to "kwdemo --rcfile" must be string (bugfix)
Thu, 23 Jul 2009 07:26:16 +0100 Argument to "kwdemo --rcfile" must be string (bugfix)
Christian Ebert <blacktrash@gmx.net> [Thu, 23 Jul 2009 07:26:16 +0100] rev 621
Argument to "kwdemo --rcfile" must be string (bugfix)
Wed, 22 Jul 2009 08:28:30 +0100 Reformat kwfiles help for minirst parser
Christian Ebert <blacktrash@gmx.net> [Wed, 22 Jul 2009 08:28:30 +0100] rev 620
Reformat kwfiles help for minirst parser
Sat, 11 Jul 2009 01:25:51 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 11 Jul 2009 01:25:51 +0200] rev 619
Merge with stable
Thu, 09 Jul 2009 23:59:03 +0200 mq: qpop now tells which patches are popped stable
Mads Kiilerich <mads@kiilerich.com> [Thu, 09 Jul 2009 23:59:03 +0200] rev 618
mq: qpop now tells which patches are popped When navigating through a patch series by qpushing and qpopping it was easy to get lost because qpop was silent. I found myself often running qnext after qpop to see which patch I just dropped - especially if I was about to qrm it. This patch makes qpop more symmetric to qpush by showing which patches are applied/"unapplied". I think it is a good change even though it changes output by adding a new line of output. [ original upstream message ]
Fri, 10 Jul 2009 12:40:24 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 12:40:24 +0200] rev 617
Merge with stable
Fri, 10 Jul 2009 12:39:58 +0200 (0.9.2compat) empty string as default value for hgcmd 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 12:39:58 +0200] rev 616
(0.9.2compat) empty string as default value for hgcmd
Fri, 10 Jul 2009 12:37:34 +0200 (0.9.2compat) use all caps NOTE: in help string 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 12:37:34 +0200] rev 615
(0.9.2compat) use all caps NOTE: in help string
Thu, 09 Jul 2009 22:52:39 +0200 keyword: use all caps for 'note:' in help string stable
Martin Geisler <mg@lazybytes.net> [Thu, 09 Jul 2009 22:52:39 +0200] rev 614
keyword: use all caps for 'note:' in help string The diff, export, log, and status commands write it as 'NOTE:'. [ original upstream message ]
Fri, 10 Jul 2009 01:52:11 +0200 (0.9.2compat) prefer self.func over repo.func in kwrepo 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 01:52:11 +0200] rev 613
(0.9.2compat) prefer self.func over repo.func in kwrepo Avoid nesting by falling back on parent class member function.
Fri, 10 Jul 2009 01:33:01 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Fri, 10 Jul 2009 01:33:01 +0200] rev 612
(stable) merge
Thu, 09 Jul 2009 11:59:12 +0200 Eliminate potential reference cycles from kwrepo
Christian Ebert <blacktrash@gmx.net> [Thu, 09 Jul 2009 11:59:12 +0200] rev 611
Eliminate potential reference cycles from kwrepo - delete kwrepo.commitctx after using the tweaked version - prefer self.hook over repo.hook to avoid nesting Also pass arguments to commit as arbitrary list. Thanks to Simon Heimberg and Matt Mackall for guidance.
Wed, 08 Jul 2009 03:25:07 +0200 (0.9.2compat) kwdemo: get rid of subfunction and ease translation 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 03:25:07 +0200] rev 610
(0.9.2compat) kwdemo: get rid of subfunction and ease translation
Tue, 07 Jul 2009 23:30:53 +0200 Collect kwmaps using a generator expression
Christian Ebert <blacktrash@gmx.net> [Tue, 07 Jul 2009 23:30:53 +0200] rev 609
Collect kwmaps using a generator expression Allowed for Python 2.4.
Wed, 08 Jul 2009 03:09:07 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 03:09:07 +0200] rev 608
Merge with stable
Wed, 08 Jul 2009 02:50:01 +0200 (0.9.2compat) warp docstrings at 78 chars 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 02:50:01 +0200] rev 607
(0.9.2compat) warp docstrings at 78 chars
Tue, 07 Jul 2009 23:54:42 +0200 keyword: wrapped docstrings at 78 characters stable
Martin Geisler <mg@lazybytes.net> [Tue, 07 Jul 2009 23:54:42 +0200] rev 606
keyword: wrapped docstrings at 78 characters [ original upstream description ]
Wed, 08 Jul 2009 01:02:51 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 08 Jul 2009 01:02:51 +0200] rev 605
(stable) merge
Sat, 04 Jul 2009 15:26:14 +0200 Remove unused import
Christian Ebert <blacktrash@gmx.net> [Sat, 04 Jul 2009 15:26:14 +0200] rev 604
Remove unused import
Thu, 02 Jul 2009 10:56:01 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 02 Jul 2009 10:56:01 +0200] rev 603
(stable) merge
Mon, 29 Jun 2009 23:46:28 +0200 Break overlong line
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 23:46:28 +0200] rev 602
Break overlong line
Wed, 01 Jul 2009 17:36:36 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Wed, 01 Jul 2009 17:36:36 +0200] rev 601
(stable) merge
Wed, 01 Jul 2009 17:34:39 +0200 Make repo.commit use a custom commitctx wrapper
Christian Ebert <blacktrash@gmx.net> [Wed, 01 Jul 2009 17:34:39 +0200] rev 600
Make repo.commit use a custom commitctx wrapper This avoids forcing the dirstate of overwritten files to normal during a commit. Thanks to Dan Villiom Podlaski Christiansen for the idea of a "double wrapper", so other extensions can still wrap repo.commitctx safely.
Mon, 29 Jun 2009 19:10:48 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 19:10:48 +0200] rev 599
(stable) merge
Mon, 29 Jun 2009 18:55:09 +0200 (0.9.2compat) lowercase status flags of untracked files in kwfile output 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 18:55:09 +0200] rev 598
(0.9.2compat) lowercase status flags of untracked files in kwfile output Improve help as well, like in default branch.
Mon, 29 Jun 2009 18:37:08 +0200 Improve help for kwfiles
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 18:37:08 +0200] rev 597
Improve help for kwfiles - just use "files" instead of "filenames" (analogous to "hg status -h") - reference the extension help wrt pattern configuration Kudos to timeless for helpful suggestions.
Mon, 29 Jun 2009 18:37:08 +0200 Lowercase status flags of untracked files in kwfile output
Christian Ebert <blacktrash@gmx.net> [Mon, 29 Jun 2009 18:37:08 +0200] rev 596
Lowercase status flags of untracked files in kwfile output Document the flags and their meanings in the command help (thanks to timeless for bringing this to my attention).
Sat, 27 Jun 2009 15:59:18 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 15:59:18 +0200] rev 595
Merge with stable
Sat, 27 Jun 2009 15:58:46 +0200 (0.9.2compat) improve help for kwfiles 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 15:58:46 +0200] rev 594
(0.9.2compat) improve help for kwfiles
Sat, 27 Jun 2009 13:05:25 +0200 keyword: improve help for kwfiles stable
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 13:05:25 +0200] rev 593
keyword: improve help for kwfiles
Sat, 27 Jun 2009 15:50:52 +0200 Improve help for kwfiles
Christian Ebert <blacktrash@gmx.net> [Sat, 27 Jun 2009 15:50:52 +0200] rev 592
Improve help for kwfiles
Thu, 25 Jun 2009 12:00:30 +0200 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 25 Jun 2009 12:00:30 +0200] rev 591
(stable) merge
Thu, 25 Jun 2009 11:58:30 +0200 Make kwdemo more translation friendly
Christian Ebert <blacktrash@gmx.net> [Thu, 25 Jun 2009 11:58:30 +0200] rev 590
Make kwdemo more translation friendly
Wed, 24 Jun 2009 14:29:48 +0200 (0.9.2compat) update synopsis 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 24 Jun 2009 14:29:48 +0200] rev 589
(0.9.2compat) update synopsis
Wed, 24 Jun 2009 14:27:27 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 24 Jun 2009 14:27:27 +0200] rev 588
Merge with stable
Wed, 24 Jun 2009 13:42:34 +0200 extensions: change descriptions for hook-providing extensions stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 13:42:34 +0200] rev 587
extensions: change descriptions for hook-providing extensions Thanks to timeless and Dave Townsend for advice! [ original upstream message ]
Wed, 24 Jun 2009 12:25:56 +0200 extensions: fix up description lines some more stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 24 Jun 2009 12:25:56 +0200] rev 586
extensions: fix up description lines some more [ original upstream message ]
Tue, 23 Jun 2009 18:12:44 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 23 Jun 2009 18:12:44 +0200] rev 585
Merge with stable
Mon, 22 Jun 2009 15:48:08 +0200 extensions: improve the consistency of synopses stable
C?dric Duval <cedricduval@free.fr> [Mon, 22 Jun 2009 15:48:08 +0200] rev 584
extensions: improve the consistency of synopses Trying as much as possible to consistently: - use a present tense predicate followed by a direct object - verb referring directly to the functionality provided (ie. not "add command that does this" but simple "do that") - keep simple and to the point, leaving details for the long help (width is tight, possibly even more so for translations) Thanks to timeless, Martin Geisler, Rafael Villar Burke, Dan Villiom Podlaski Christiansen and others for the helpful suggestions. [ original upstream message ]
Sun, 21 Jun 2009 23:17:37 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 21 Jun 2009 23:17:37 +0100] rev 583
Merge with stable
Sat, 20 Jun 2009 20:57:13 +0200 help: remove per-extension paragraph on how to enable it stable
C?dric Duval <cedricduval@free.fr> [Sat, 20 Jun 2009 20:57:13 +0200] rev 582
help: remove per-extension paragraph on how to enable it The central place to find this information is the "extensions" help topic. [ original upstream message ]
Thu, 18 Jun 2009 12:45:39 +0100 (0.9.2compat) concise help title 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jun 2009 12:45:39 +0100] rev 581
(0.9.2compat) concise help title
Thu, 18 Jun 2009 12:43:19 +0100 (stable) merge stable
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jun 2009 12:43:19 +0100] rev 580
(stable) merge
Thu, 18 Jun 2009 01:21:26 +0100 Concise help title
Christian Ebert <blacktrash@gmx.net> [Thu, 18 Jun 2009 01:21:26 +0100] rev 579
Concise help title
Mon, 15 Jun 2009 11:10:15 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 15 Jun 2009 11:10:15 +0100] rev 578
Merge with stable
Mon, 15 Jun 2009 00:03:26 +0200 Add patch.eol to ignore EOLs when patching (issue1019) stable
Patrick Mezard <pmezard@gmail.com> [Mon, 15 Jun 2009 00:03:26 +0200] rev 577
Add patch.eol to ignore EOLs when patching (issue1019) The intent is to fix many issues involving patching when win32ext is enabled. With win32ext, the working directory and repository files EOLs are not the same which means that patches made on a non-win32ext host do not apply cleanly because of EOLs discrepancies. A theorically correct approach would be transform either the patched file or the patch content with the encoding/decoding filters used by win32ext. This solution is tricky to implement and invasive, instead we prefer to address the win32ext case, by offering a way to ignore input EOLs when patching and rewriting them when saving the patched result. [ original upstream message ]
Tue, 09 Jun 2009 22:42:39 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 22:42:39 +0200] rev 576
Merge with stable
Tue, 09 Jun 2009 22:42:23 +0200 (0.9.2compat) update doc strings and help 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 22:42:23 +0200] rev 575
(0.9.2compat) update doc strings and help
Tue, 09 Jun 2009 22:32:14 +0200 (0.9.2compat) improve English; from stable 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Tue, 09 Jun 2009 22:32:14 +0200] rev 574
(0.9.2compat) improve English; from stable
(0) -1000 -480 tip