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 ]
(0) -112 +112 tip