Thu, 20 Mar 2014 01:02:04 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 20 Mar 2014 01:02:04 +0000] rev 1360
Merge with stable
Mon, 10 Mar 2014 17:52:42 -0400 killdaemons: drop superfluous L suffix from constant stable
Augie Fackler <raf@durin42.com> [Mon, 10 Mar 2014 17:52:42 -0400] rev 1359
killdaemons: drop superfluous L suffix from constant As far as I'm aware PEP 237[0] means this suffix is superfluous even on Python 2.4, and we can just drop it, which makes this code happy on Python 3. 0: http://legacy.python.org/dev/peps/pep-0237/ [ original upstream message ]
Wed, 19 Mar 2014 00:19:54 +0100 tests: small refactoring of run-tests' handling of tests list stable
Mads Kiilerich <madski@unity3d.com> [Wed, 19 Mar 2014 00:19:54 +0100] rev 1358
tests: small refactoring of run-tests' handling of tests list [ original upstream message ]
Wed, 19 Mar 2014 02:45:14 +0100 config: set a 'source' in most cases where config don't come from file but code stable
Mads Kiilerich <madski@unity3d.com> [Wed, 19 Mar 2014 02:45:14 +0100] rev 1357
config: set a 'source' in most cases where config don't come from file but code Some extensions set configuration settings that showed up in 'hg showconfig --debug' with 'none' as source. That was confusing. Instead, they will now tell which extension they come from. This change tries to be consistent and specify a source everywhere - also where it perhaps is less relevant. [ original upstream message ]
Thu, 13 Mar 2014 11:19:32 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 13 Mar 2014 11:19:32 +0000] rev 1356
Merge with stable
Wed, 12 Mar 2014 13:19:43 -0400 run-tests: move from dict() construction to {} literals stable
Augie Fackler <raf@durin42.com> [Wed, 12 Mar 2014 13:19:43 -0400] rev 1355
run-tests: move from dict() construction to {} literals The latter are both faster and more consistent across Python 2 and 3. [ original upstream message ]
Sat, 08 Mar 2014 17:38:50 -0600 templating: make -T much more flexible stable
Matt Mackall <mpm@selenic.com> [Sat, 08 Mar 2014 17:38:50 -0600] rev 1354
templating: make -T much more flexible It can now accept styles and paths and references to settings in [templates]. [ original upstream message ]
Sat, 08 Mar 2014 16:14:08 -0600 changeset_templater: remove use_template method stable
Matt Mackall <mpm@selenic.com> [Sat, 08 Mar 2014 16:14:08 -0600] rev 1353
changeset_templater: remove use_template method [ original upstream message ]
Tue, 04 Mar 2014 17:24:44 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 04 Mar 2014 17:24:44 +0000] rev 1352
Merge with stable
Tue, 04 Mar 2014 09:56:59 -0600 tests: fix unused imports from inotify removal caught by pyflakes stable
Matt Mackall <mpm@selenic.com> [Tue, 04 Mar 2014 09:56:59 -0600] rev 1351
tests: fix unused imports from inotify removal caught by pyflakes [ original upstream message ]
Sat, 01 Mar 2014 16:20:15 -0600 extensions: remove the inotify extension (BC) stable
Matt Mackall <mpm@selenic.com> [Sat, 01 Mar 2014 16:20:15 -0600] rev 1350
extensions: remove the inotify extension (BC) This extension has always had correctness issues and has been unmaintained for years. It is now removed in favor of the third-party hgwatchman which is maintained and appears to be correct. Users with inotify enabled in their config files will fall back to standard status performance. [ original upstream message ]
Sun, 02 Mar 2014 13:53:07 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Mar 2014 13:53:07 +0000] rev 1349
Merge with stable
Sun, 16 Feb 2014 23:41:24 +0100 run-tests: fixed warn detection on failures with too many output stable
Simon Heimberg <simohe@besonet.ch> [Sun, 16 Feb 2014 23:41:24 +0100] rev 1348
run-tests: fixed warn detection on failures with too many output The state "warned" was reported too often. The problem fixed here is that warnonly was only reset when a line did not match. When there was a line too much, warnonly remained set. Fix this by setting more states to warnonly. More negative testing (testing on result "Failed") has been done this time. [ original upstream message ]
Sun, 16 Feb 2014 23:36:02 +0100 run-tests: fixed warn detection on detecting warn only for lines stable
Simon Heimberg <simohe@besonet.ch> [Sun, 16 Feb 2014 23:36:02 +0100] rev 1347
run-tests: fixed warn detection on detecting warn only for lines The state "warned" was reported too often. The main problem was that "False == 0" is true in python. Therefore use an empty string instead of 0 for reporting warn only for a line. The other problem is fixed in the next patch. [ original upstream message ]
Sun, 02 Mar 2014 13:51:01 +0000 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sun, 02 Mar 2014 13:51:01 +0000] rev 1346
Merge with default
Tue, 25 Feb 2014 11:11:46 +0000 test can be run without option now
Christian Ebert <blacktrash@gmx.net> [Tue, 25 Feb 2014 11:11:46 +0000] rev 1345
test can be run without option now As per c559280de767
Mon, 24 Feb 2014 22:56:19 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 24 Feb 2014 22:56:19 +0000] rev 1344
Merge with stable
Wed, 19 Feb 2014 21:32:14 -0800 run-tests.py: work when --with-hg is set to system hg stable
Siddharth Agarwal <sid0@fb.com> [Wed, 19 Feb 2014 21:32:14 -0800] rev 1343
run-tests.py: work when --with-hg is set to system hg Previously we'd always assume that --with-hg is a script in a user directory, and would write out a 'python' symlink to the same location. That didn't work if --with-hg was set to a system installation of hg, e.g. /usr/bin/hg. Introduce a TMPBINDIR directory which is used to write out the python symlink. [ original upstream message ]
Mon, 17 Feb 2014 16:30:17 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 17 Feb 2014 16:30:17 +0000] rev 1342
Merge with stable
Sat, 15 Feb 2014 15:28:32 +0100 run-tests: fix heredoctest for out-of-tree extensions stable
Patrick Mezard <patrick@mezard.eu> [Sat, 15 Feb 2014 15:28:32 +0100] rev 1341
run-tests: fix heredoctest for out-of-tree extensions heredoctest.py directory must be in python path to use heredoctest (>>>) in out-of-tree extension tests like: $ cd ext/tests $ python /some/hg/install/tests/run-tests.py test-ext.t [ original upstream message ]
Thu, 13 Feb 2014 08:29:44 +0100 run-tests: unnecessary globs also count as warnings stable
Simon Heimberg <simohe@besonet.ch> [Thu, 13 Feb 2014 08:29:44 +0100] rev 1340
run-tests: unnecessary globs also count as warnings When a glob is unnecessary, now there's a diff output and 'run-tests.py -i' works for accepting the output. On windows, some tests which have "passed" currently (with some info lines printed) will now be reported as "warned". (I recommend to recognize "warned" by buildbot before applying this patch.) [ original upstream message ]
Thu, 13 Feb 2014 08:27:53 +0100 run-tests: report a test as warned when only missing globs stable
Simon Heimberg <simohe@besonet.ch> [Thu, 13 Feb 2014 08:27:53 +0100] rev 1339
run-tests: report a test as warned when only missing globs On windows, some test reported as failed will now be reported as "warned". [ original upstream message ]
Thu, 13 Feb 2014 08:26:13 +0100 run-tests: add possibility for test-runners to report a "warned" test result stable
Simon Heimberg <simohe@besonet.ch> [Thu, 13 Feb 2014 08:26:13 +0100] rev 1338
run-tests: add possibility for test-runners to report a "warned" test result A test result is recognized as "warned" when the test runner returns the exit code False. (False is similar to 0, which is reporting a command has run sucessfully.) The only difference in display is that the failure message while running writes "Warning:" instead of "ERROR:". The diff output is the same as when the test fails. Runing "run-tests.py -i" asks to accept the changed result also for tests reported as "warned". When running tests, a "warned" test would look like this: .. --- xxxx\tests\test-something.t +++ xxxx\tests\test-something.t.err @@ -1279,7 +1279,7 @@ $ echo anything $ hg commit -S -m whatever committing subrepository s - committing subrepository s/sbs + committing subrepository s/sbs (glob) warning: something happened committing subrepository t $ echo something Warning: xxxx\tests\test-sOMETHING.t output changed ~.s...s...s.. Reporting a test result as "warned" will be used in following patches. [ original upstream message ]
Thu, 13 Feb 2014 08:17:39 +0100 run-tests: separate exit code when no failed tests but warned ones stable
Simon Heimberg <simohe@besonet.ch> [Thu, 13 Feb 2014 08:17:39 +0100] rev 1337
run-tests: separate exit code when no failed tests but warned ones This can be used by buildbot to set the result "warnings" instead of "failed". [ original upstream message ]
Thu, 13 Feb 2014 08:14:54 +0100 run-tests: introduce 'warned' as test result stable
Simon Heimberg <simohe@besonet.ch> [Thu, 13 Feb 2014 08:14:54 +0100] rev 1336
run-tests: introduce 'warned' as test result While running, a test resulting in 'warned' is shown as '~'. Test results with state warned are listed between the skipped and the failed tests. Example: Skipped test-revert-flags.t: missing feature: executable bit Skipped test-inotify-lookup.t: missing feature: inotify extension support Warned test-something.t: output changed Failed test-largefiles.t: output changed Failed test-subrepo.t: output changed # Ran 11 tests, 2 skipped, 1 warned, 2 failed. The test result "warned" will be used in later patches. [ original upstream message ]
Thu, 13 Feb 2014 08:02:06 +0100 run-tests: handle sys.exit in main function stable
Simon Heimberg <simohe@besonet.ch> [Thu, 13 Feb 2014 08:02:06 +0100] rev 1335
run-tests: handle sys.exit in main function [ original upstream message ]
Thu, 13 Feb 2014 07:29:28 +0100 run-tests: remove unnecessary variable initialisation stable
Simon Heimberg <simohe@besonet.ch> [Thu, 13 Feb 2014 07:29:28 +0100] rev 1334
run-tests: remove unnecessary variable initialisation ret is always set before it is used, so remove ret = 0 [ original upstream message ]
Fri, 14 Feb 2014 09:52:13 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 14 Feb 2014 09:52:13 +0100] rev 1333
Merge with stable
Wed, 12 Feb 2014 16:09:18 +0100 tests: killdaemons.py for windows distinguishes access violation and terminated stable
Simon Heimberg <simohe@besonet.ch> [Wed, 12 Feb 2014 16:09:18 +0100] rev 1332
tests: killdaemons.py for windows distinguishes access violation and terminated To distinguish between access violaition (process belonging to another user) and a terminated process, PROCESS_QUERY_INFORMATION must be enabled. But TerminateProcess still raises error 5 in both cases. Therefore check before if the process has already terminated. [ original upstream message ]
Wed, 12 Feb 2014 15:38:59 +0100 tests: killdaemons.py for checks reason when getting no process handle stable
Simon Heimberg <simohe@besonet.ch> [Wed, 12 Feb 2014 15:38:59 +0100] rev 1331
tests: killdaemons.py for checks reason when getting no process handle [ original upstream message ]
Fri, 17 Jan 2014 21:13:20 +0100 tests: killdaemons.py for windows waits for killed process to terminate stable
Simon Heimberg <simohe@besonet.ch> [Fri, 17 Jan 2014 21:13:20 +0100] rev 1330
tests: killdaemons.py for windows waits for killed process to terminate After kill, wait for the process to terminate. When it does not in time, write a debug message similar as in other os. But no 2nd forceful attempt is done. [ original upstream message ]
Fri, 17 Jan 2014 21:13:08 +0100 tests: kill for windows in killdaemons.py checks return values stable
Simon Heimberg <simohe@besonet.ch> [Fri, 17 Jan 2014 21:13:08 +0100] rev 1329
tests: kill for windows in killdaemons.py checks return values The return values of the windll calls are checked and when an error is indicated, it is raised. The handle is still closed properly. [ original upstream message ]
Tue, 11 Feb 2014 22:50:56 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 11 Feb 2014 22:50:56 +0100] rev 1328
Merge with stable
Tue, 11 Feb 2014 01:15:07 +0100 run-tests: fix typo and print out failing line stable
Simon Heimberg <simohe@besonet.ch> [Tue, 11 Feb 2014 01:15:07 +0100] rev 1327
run-tests: fix typo and print out failing line Instead of stripping the newline and printing the line, only the newline was printed. The output on buildbot will make more sense now. [ original upstream message ]
Mon, 10 Feb 2014 14:08:42 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 10 Feb 2014 14:08:42 +0100] rev 1326
Merge with stable
Wed, 05 Feb 2014 01:37:37 +0100 tests: ignore http tests that are known wontfix failures on python 2.4 stable
Mads Kiilerich <madski@unity3d.com> [Wed, 05 Feb 2014 01:37:37 +0100] rev 1325
tests: ignore http tests that are known wontfix failures on python 2.4 As mentioned on http://bz.selenic.com/show_bug.cgi?id=2739#c17 , b3083042bdda left test-http.t failing on Python < 2.4.3. That has not been noticed because most 2.4 testing has been done with a patched 2.4.2. This makes sure that the tests only are run for Python >= 2.4.3. That makes it possible to verify that everything else works with Python 2.4. [ original upstream message ]
Tue, 04 Feb 2014 00:22:20 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 04 Feb 2014 00:22:20 +0100] rev 1324
Merge with stable
Mon, 20 Jan 2014 01:29:54 +0100 tests: 'hghave tic' also requires curses support in Python stable
Mads Kiilerich <madski@unity3d.com> [Mon, 20 Jan 2014 01:29:54 +0100] rev 1323
tests: 'hghave tic' also requires curses support in Python test-status-color.t would fail when using a Python without curses. [ original upstream message ]
Fri, 17 Jan 2014 15:32:21 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 17 Jan 2014 15:32:21 +0000] rev 1322
Merge with stable
Thu, 16 Jan 2014 12:08:57 +0100 run-tests: print more information on unnecessary glob matching stable
Simon Heimberg <simohe@besonet.ch> [Thu, 16 Jan 2014 12:08:57 +0100] rev 1321
run-tests: print more information on unnecessary glob matching Extend the message with the test name and the approximate line number. (The line number is the one of the command producing the output.) Finding the line to fix is easier now. old message: ...... Info, unnecessary glob: at a/b/c (glob) .. new message: ...... Info, unnecessary glob in test-example.t (after line 9): at a/b/c (glob) .. The test result is still pass as before. [ original upstream message ]
Thu, 16 Jan 2014 12:08:29 +0100 run-tests: suggest to append glob when only path sep does not match stable
Simon Heimberg <simohe@besonet.ch> [Thu, 16 Jan 2014 12:08:29 +0100] rev 1320
run-tests: suggest to append glob when only path sep does not match When the line does not match because of \ instead of / (on windows), append (glob) in the expected output. This allows to rename test-bla.t.err to test-bla.t for getting a correct output. This worked for other failures like missing (esc), but not here. Output example (only +- lines of diff): Before: - path/with/local/sep + path\\with\\local/sep Now: - path/with/local/sep + path/with/local/sep (glob) [ original upstream message ]
Thu, 16 Jan 2014 12:06:49 +0100 run-tests: test each line matching function on its own stable
Simon Heimberg <simohe@besonet.ch> [Thu, 16 Jan 2014 12:06:49 +0100] rev 1319
run-tests: test each line matching function on its own This has several advantages. * Each match function can return some information to the caller runone (used in the next patch). * It is not checked that the line ends in " (glob)" when rematch() returns false. * And it looks more readable. [ original upstream message ]
Thu, 16 Jan 2014 11:26:54 +0100 run-tests: set the thread name to the test name for info on error stable
Simon Heimberg <simohe@besonet.ch> [Thu, 16 Jan 2014 11:26:54 +0100] rev 1318
run-tests: set the thread name to the test name for info on error This does not happen when running normal. But when fiddling around with the test infrastructure, this helps a lot. Old traceback messge Exception in thread Thread-7: Traceback (most recent call last): ... new traceback message Exception in thread test-something.t: Traceback (most recent call last): ... [ original upstream message ]
Thu, 16 Jan 2014 18:55:35 +0100 run-tests: report tests as failed when run-test raises an error stable
Simon Heimberg <simohe@besonet.ch> [Thu, 16 Jan 2014 18:55:35 +0100] rev 1317
run-tests: report tests as failed when run-test raises an error Before no message was returned to the main thread. No result was registered and no new thread was started. This does not happen when running normal. But when fiddling around with the test infrastructure, this helps a lot. [ original upstream message ]
Tue, 07 Jan 2014 22:29:39 +0100 cleanup: Remove the only ever used skip-check-code pragma stable
Simon Heimberg <simohe@besonet.ch> [Tue, 07 Jan 2014 22:29:39 +0100] rev 1316
cleanup: Remove the only ever used skip-check-code pragma Use the work-around suggested by the rule instead [ original upstream message ]
Wed, 06 Nov 2013 18:19:04 -0500 pathutil: tease out a new library to break an import cycle from canonpath use stable
Augie Fackler <raf@durin42.com> [Wed, 06 Nov 2013 18:19:04 -0500] rev 1315
pathutil: tease out a new library to break an import cycle from canonpath use [ original upstream message ]
Tue, 14 Jan 2014 15:51:15 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 14 Jan 2014 15:51:15 +0000] rev 1314
Merge with stable
Mon, 25 Nov 2013 22:00:46 +0100 run-tests: better check for python version stable
Simon Heimberg <simohe@besonet.ch> [Mon, 25 Nov 2013 22:00:46 +0100] rev 1313
run-tests: better check for python version Compare version by using pythons tuple comparison. So we do not match on python 3.0 or newer. [ original upstream message ]
Thu, 28 Nov 2013 12:59:05 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Nov 2013 12:59:05 +0000] rev 1312
Merge with stable
Sat, 23 Nov 2013 01:06:20 +0100 tests: fix `hghave root` on windows stable
Simon Heimberg <simohe@besonet.ch> [Sat, 23 Nov 2013 01:06:20 +0100] rev 1311
tests: fix `hghave root` on windows This lets tests\test-hghave.t pass on windows where geteuid does not exist. [ original upstream message ]
Thu, 28 Nov 2013 12:57:12 +0000 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Nov 2013 12:57:12 +0000] rev 1310
Merge with default
Wed, 20 Nov 2013 12:55:08 +0000 wlock while setting branch in kwdemo
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Nov 2013 12:55:08 +0000] rev 1309
wlock while setting branch in kwdemo
Wed, 20 Nov 2013 12:26:54 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 20 Nov 2013 12:26:54 +0000] rev 1308
Merge with stable
Sun, 17 Nov 2013 10:59:35 -0500 tests: python hash seed is only relevant after failures - otherwise keep quiet stable
Mads Kiilerich <madski@unity3d.com> [Sun, 17 Nov 2013 10:59:35 -0500] rev 1307
tests: python hash seed is only relevant after failures - otherwise keep quiet [ original upstream message ]
Sun, 17 Nov 2013 17:30:23 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 17 Nov 2013 17:30:23 +0000] rev 1306
Merge with stable
Fri, 15 Nov 2013 22:57:11 -0500 run-tests: remove files that we potentially create outside of $TMPDIR stable
Sean Farley <sean.michael.farley@gmail.com> [Fri, 15 Nov 2013 22:57:11 -0500] rev 1305
run-tests: remove files that we potentially create outside of $TMPDIR [ original upstream message ]
Fri, 15 Nov 2013 22:56:08 -0500 run-tests: remove code that creates a dummy 'diffstat' stable
Sean Farley <sean.michael.farley@gmail.com> [Fri, 15 Nov 2013 22:56:08 -0500] rev 1304
run-tests: remove code that creates a dummy 'diffstat' This was introduced in fb1d7a42663c for an old test that is no longer the same. [ original upstream message ]
Thu, 14 Nov 2013 18:07:43 -0600 tests: skip tests that require not having root (issue4089) stable
Matt Mackall <mpm@selenic.com> [Thu, 14 Nov 2013 18:07:43 -0600] rev 1303
tests: skip tests that require not having root (issue4089) This adds a new root hghave to test against. Almost all of these are a subset of unix-permissions, but that is also used for checking exec bit handling. [ original upstream message ]
Fri, 01 Nov 2013 17:14:49 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 01 Nov 2013 17:14:49 +0000] rev 1302
Merge with stable
Sat, 05 Oct 2013 01:02:22 +0900 hghave: add "py3k" feature to check whether test runs with Python 3.x stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 05 Oct 2013 01:02:22 +0900] rev 1301
hghave: add "py3k" feature to check whether test runs with Python 3.x This patch adds "py3k" feature to check whether test runs with Python 3.x. This check is needed for portability of test code: for example, in the default, modules are imported relatively first with python 2.x, but imported absolutely with Python 3.x. [ original upstream message ]
Sat, 05 Oct 2013 01:02:22 +0900 hghave: add "absimport" feature to check "absolute_import" in __future__ stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 05 Oct 2013 01:02:22 +0900] rev 1300
hghave: add "absimport" feature to check "absolute_import" in __future__ This patch adds "absimport" feature to check whether "absolute_import" exists in __future__, which means supporting module loading by absolute name. This check is needed for portability of test code using "absolute_import", because Python earlier than 2.5 doesn't support it. [ original upstream message ]
Mon, 07 Oct 2013 13:51:33 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Oct 2013 13:51:33 +0100] rev 1299
Merge with stable
Thu, 03 Oct 2013 14:50:47 +0200 run-tests: place the .t shell script next to $TESTTMP and with a useful name stable
Mads Kiilerich <madski@unity3d.com> [Thu, 03 Oct 2013 14:50:47 +0200] rev 1298
run-tests: place the .t shell script next to $TESTTMP and with a useful name --keep can thus keep it around - very convenient for debugging. [ original upstream message ]
Wed, 02 Oct 2013 22:46:32 +0100 get-with-headers: don't block indefinitely if the server had an internal error stable
Javi Merino <cibervicho@gmail.com> [Wed, 02 Oct 2013 22:46:32 +0100] rev 1297
get-with-headers: don't block indefinitely if the server had an internal error If the server had an internal error and returned 500, there's nothing to read, so "response.read()" blocks indefinitely. Only output the response if there's really a response. [ original upstream message ]
Wed, 02 Oct 2013 01:22:11 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 02 Oct 2013 01:22:11 +0100] rev 1296
Merge with stable
Thu, 29 Aug 2013 09:22:13 -0700 shelve: add a shelve extension to save/restore working changes stable
David Soria Parra <dsp@experimentalworks.net> [Thu, 29 Aug 2013 09:22:13 -0700] rev 1295
shelve: add a shelve extension to save/restore working changes This extension saves shelved changes using a temporary draft commit, and bundles the temporary commit and its draft ancestors, then strips them. This strategy makes it possible to use Mercurial's bundle and merge machinery to resolve conflicts if necessary when unshelving, even when the destination commit or its ancestors have been amended, squashed, or evolved. (Once a change has been unshelved, its associated unbundled commits are either rolled back or stripped.) Storing the shelved change as a bundle also avoids the difficulty that hidden commits would cause, of making it impossible to amend the parent if it is a draft commits (a common scenario). Although this extension shares its name and some functionality with the third party hgshelve extension, it has little else in common. Notably, the hgshelve extension shelves changes as unified diffs, which makes conflict resolution a matter of finding .rej files and conflict markers, and cleaning up the mess by hand. We do not yet allow hunk-level choosing of changes to record. Compared to the hgshelve extension, this is a small regression in usability, but we hope to integrate that at a later point, once the record machinery becomes more reusable and robust. [ original upstream message ]
Tue, 24 Sep 2013 03:12:59 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 24 Sep 2013 03:12:59 +0100] rev 1294
Merge with stable
Thu, 19 Sep 2013 15:29:28 -0400 run-tests: find mercurial path with syntax valid on both py2 and py3 stable
Augie Fackler <raf@durin42.com> [Thu, 19 Sep 2013 15:29:28 -0400] rev 1293
run-tests: find mercurial path with syntax valid on both py2 and py3 [ original upstream message ]
Thu, 19 Sep 2013 15:29:04 -0400 run-tests: if run by python3, execute setup.py with --c2to3 stable
Augie Fackler <raf@durin42.com> [Thu, 19 Sep 2013 15:29:04 -0400] rev 1292
run-tests: if run by python3, execute setup.py with --c2to3 [ original upstream message ]
Mon, 05 Aug 2013 13:19:38 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 05 Aug 2013 13:19:38 +0100] rev 1291
Merge with stable
Fri, 26 Jul 2013 21:18:40 -0400 run-tests: only check the common criteria once per test stable
Simon Heimberg <simohe@besonet.ch> [Fri, 26 Jul 2013 21:18:40 -0400] rev 1290
run-tests: only check the common criteria once per test [ original upstream message ]
Thu, 18 Jul 2013 23:22:59 -0500 run-tests: backout 4f32747879d1 line endings change stable
Matt Mackall <mpm@selenic.com> [Thu, 18 Jul 2013 23:22:59 -0500] rev 1289
run-tests: backout 4f32747879d1 line endings change It made the windows buildbot sad. [ original upstream message ]
Fri, 19 Jul 2013 00:37:26 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 19 Jul 2013 00:37:26 +0100] rev 1288
Merge with stable
Thu, 18 Jul 2013 09:42:44 -0700 run-tests: revert previous commit, run() waits after a timeout stable
Brendan Cully <brendan@kublai.com> [Thu, 18 Jul 2013 09:42:44 -0700] rev 1287
run-tests: revert previous commit, run() waits after a timeout [ original upstream message ]
Thu, 18 Jul 2013 09:39:01 -0700 run-tests: reap timed-out zombies stable
Brendan Cully <brendan@kublai.com> [Thu, 18 Jul 2013 09:39:01 -0700] rev 1286
run-tests: reap timed-out zombies [ original upstream message ]
Sat, 13 Jul 2013 23:58:01 +0200 run-tests: generally handle line endings on windows by re stable
Simon Heimberg <simohe@besonet.ch> [Sat, 13 Jul 2013 23:58:01 +0200] rev 1285
run-tests: generally handle line endings on windows by re Recently this regexp was only appended when running a python test. When running a tsttest there was a separate handling for each line type. Simplify and unify this. [ original upstream message ]
Sat, 13 Jul 2013 23:57:55 +0200 run-tests: test for os.altsep instead of os.name when checking \ for / stable
Simon Heimberg <simohe@besonet.ch> [Sat, 13 Jul 2013 23:57:55 +0200] rev 1284
run-tests: test for os.altsep instead of os.name when checking \ for / This tells more explicitly what it is about [ original upstream message ]
Wed, 17 Jul 2013 13:42:08 -0700 run-tests: replace popen locking with a noop _cleanup handler on py24 stable
Brendan Cully <brendan@kublai.com> [Wed, 17 Jul 2013 13:42:08 -0700] rev 1283
run-tests: replace popen locking with a noop _cleanup handler on py24 This also avoids the race condition, and isn't detrimental to job scheduling. [ original upstream message ]
Wed, 17 Jul 2013 13:02:12 -0700 run-tests: only lock Popen wait/poll on python 2.4 stable
Brendan Cully <brendan@kublai.com> [Wed, 17 Jul 2013 13:02:12 -0700] rev 1282
run-tests: only lock Popen wait/poll on python 2.4 It can cause scheduling bubbles and is not necessary on newer pythons. [ original upstream message ]
Wed, 17 Jul 2013 12:45:12 -0700 run-tests: lock popen wait/poll stable
Brendan Cully <brendan@kublai.com> [Wed, 17 Jul 2013 12:45:12 -0700] rev 1281
run-tests: lock popen wait/poll In python2.4, any call to Popen() may attempt to wait on any active process, and wait is not thread-safe. Make it thread-safe. See http://bugs.python.org/issue1731717 for details. [ original upstream message ]
Tue, 16 Jul 2013 12:44:11 -0500 run-tests: patch over py2.4 proc.wait() race stable
Matt Mackall <mpm@selenic.com> [Tue, 16 Jul 2013 12:44:11 -0500] rev 1280
run-tests: patch over py2.4 proc.wait() race [ original upstream message ]
Mon, 01 Jul 2013 20:48:56 +0200 cleanup: drop unused variables and an unused import stable
Simon Heimberg <simohe@besonet.ch> [Mon, 01 Jul 2013 20:48:56 +0200] rev 1279
cleanup: drop unused variables and an unused import [ original upstream message ]
Tue, 30 Apr 2013 14:56:33 +0100 tests: AIX can't handle negative date in test-dirstate.t stable
Jim Hague <jim.hague@acm.org> [Tue, 30 Apr 2013 14:56:33 +0100] rev 1278
tests: AIX can't handle negative date in test-dirstate.t test-dirstate.t fails on AIX in the absurd date test. AIX touch errors on any date prior to 1970. AIX mktime() gives an error on such dates, so the problem is deeper than touch and attempts to work around touch in Python failed. Give up. Add an AIX test to hghave and skip the absurd date test on AIX. [ original upstream message ]
Mon, 01 Jul 2013 14:19:04 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 01 Jul 2013 14:19:04 +0100] rev 1277
Merge with stable
Thu, 13 Jun 2013 01:36:58 +0200 cleanup: remove unused imports stable
Simon Heimberg <simohe@besonet.ch> [Thu, 13 Jun 2013 01:36:58 +0200] rev 1276
cleanup: remove unused imports detected by pyflakes [ original upstream message ]
Thu, 13 Jun 2013 19:37:59 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 13 Jun 2013 19:37:59 +0100] rev 1275
Merge with stable
Tue, 11 Jun 2013 23:39:48 +0200 run-tests: sort missing files first instead of raising an error stable
simon@laptop-tosh [Tue, 11 Jun 2013 23:39:48 +0200] rev 1274
run-tests: sort missing files first instead of raising an error sort first for early telling typos in test names [ original upstream message ]
Sun, 09 Jun 2013 16:49:08 +0200 run-tests: call Threads constructor with keyword arguments stable
simon@laptop-tosh [Sun, 09 Jun 2013 16:49:08 +0200] rev 1273
run-tests: call Threads constructor with keyword arguments This is suggested in the python documentation (on http://docs.python.org/2/library/threading.html#thread-objects) [ original upstream message ]
Sun, 09 Jun 2013 16:42:55 +0200 run-tests: ignoring tests works again stable
simon@laptop-tosh [Sun, 09 Jun 2013 16:42:55 +0200] rev 1272
run-tests: ignoring tests works again running with --retest did not work anymore because runone still returned None for this case. But this is not allowed since 6a127fa5de23. [ original upstream message ]
Sat, 08 Jun 2013 13:46:05 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 08 Jun 2013 13:46:05 +0100] rev 1271
Merge with stable
Fri, 07 Jun 2013 16:04:11 -0500 run-tests: simplify interrupted message stable
Matt Mackall <mpm@selenic.com> [Fri, 07 Jun 2013 16:04:11 -0500] rev 1270
run-tests: simplify interrupted message [ original upstream message ]
Fri, 07 Jun 2013 15:58:14 -0500 run-tests: remove spurious disable of --time with --debug stable
Matt Mackall <mpm@selenic.com> [Fri, 07 Jun 2013 15:58:14 -0500] rev 1269
run-tests: remove spurious disable of --time with --debug [ original upstream message ]
Fri, 07 Jun 2013 15:56:16 -0500 run-tests: always gather runtimes stable
Matt Mackall <mpm@selenic.com> [Fri, 07 Jun 2013 15:56:16 -0500] rev 1268
run-tests: always gather runtimes [ original upstream message ]
Wed, 05 Jun 2013 22:05:29 +0200 run-tests: when interrupted report time in failure message stable
Simon Heimberg <simohe@besonet.ch> [Wed, 05 Jun 2013 22:05:29 +0200] rev 1267
run-tests: when interrupted report time in failure message When --time is specified, the interruption message of an interrupted test is extended with the time the test has run INTERRUPTED: /path/to/tests/test-example.t (after 513 seconds) [ original upstream message ]
Wed, 05 Jun 2013 22:05:02 +0200 run-tests: report interrupted tests stable
Simon Heimberg <simohe@besonet.ch> [Wed, 05 Jun 2013 22:05:02 +0200] rev 1266
run-tests: report interrupted tests When the test run is aborted, a message is printed for each interrupted test. This is helpful when a test is hanging. example failure message: INTERRUPTED: /path/to/tests/test-example.t The message can appear before or after the line with the number of tests [ original upstream message ]
Wed, 05 Jun 2013 22:42:43 +0200 run-tests: open hgrc file only for writing stable
Simon Heimberg <simohe@besonet.ch> [Wed, 05 Jun 2013 22:42:43 +0200] rev 1265
run-tests: open hgrc file only for writing The file is not read here. Opening with "w+" is unnecessary. [ original upstream message ]
Thu, 06 Jun 2013 22:36:18 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 06 Jun 2013 22:36:18 +0100] rev 1264
Merge with stable
Thu, 06 Jun 2013 14:40:26 -0500 run-tests: make --noskips work stable
Matt Mackall <mpm@selenic.com> [Thu, 06 Jun 2013 14:40:26 -0500] rev 1263
run-tests: make --noskips work [ original upstream message ]
Mon, 03 Jun 2013 09:59:32 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Jun 2013 09:59:32 +0100] rev 1262
Merge with stable
Sun, 02 Jun 2013 18:09:06 -0500 run-tests: add --loop support stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 18:09:06 -0500] rev 1261
run-tests: add --loop support This makes it easy to run tests repeatedly at high loads to look for test failures. [ original upstream message ]
Sun, 02 Jun 2013 17:58:51 -0500 run-tests: --interactive and --jobs no longer conflict stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 17:58:51 -0500] rev 1260
run-tests: --interactive and --jobs no longer conflict [ original upstream message ]
Sun, 02 Jun 2013 17:58:49 -0500 run-tests: sort certain slow tests earlier by keyword stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 17:58:49 -0500] rev 1259
run-tests: sort certain slow tests earlier by keyword There are a few tests that evade the size heuristic [ original upstream message ]
Sun, 02 Jun 2013 17:57:37 -0500 run-tests: drop unused resultslock stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 17:57:37 -0500] rev 1258
run-tests: drop unused resultslock [ original upstream message ]
Sun, 02 Jun 2013 17:57:36 -0500 run-tests: drop options.child and users stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 17:57:36 -0500] rev 1257
run-tests: drop options.child and users [ original upstream message ]
Sun, 02 Jun 2013 17:56:53 -0500 run-tests: remove runchildren, now unused stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 17:56:53 -0500] rev 1256
run-tests: remove runchildren, now unused [ original upstream message ]
Sun, 02 Jun 2013 17:56:51 -0500 run-tests: schedule largest tests first stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 17:56:51 -0500] rev 1255
run-tests: schedule largest tests first [ original upstream message ]
Sun, 02 Jun 2013 16:58:22 -0500 run-tests: introduce thread scheduler stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:58:22 -0500] rev 1254
run-tests: introduce thread scheduler [ original upstream message ]
Sun, 02 Jun 2013 16:55:19 -0500 run-tests: use count to calculate port to use stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:55:19 -0500] rev 1253
run-tests: use count to calculate port to use This will keep threads from using the same server ports [ original upstream message ]
Sun, 02 Jun 2013 16:38:15 -0500 run-tests: introduce threadtmp directory stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:38:15 -0500] rev 1252
run-tests: introduce threadtmp directory [ original upstream message ]
Sun, 02 Jun 2013 16:29:35 -0500 run-tests: add abort flag stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:29:35 -0500] rev 1251
run-tests: add abort flag This will be used to help threads clean up gracefully [ original upstream message ]
Sun, 02 Jun 2013 16:29:22 -0500 run-tests: move more variables to env stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:29:22 -0500] rev 1250
run-tests: move more variables to env [ original upstream message ]
Sun, 02 Jun 2013 16:29:20 -0500 run-tests: simplify env deletion stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:29:20 -0500] rev 1249
run-tests: simplify env deletion [ original upstream message ]
Sun, 02 Jun 2013 16:22:51 -0500 run-tests: move most of remaining environment tweaks stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:22:51 -0500] rev 1248
run-tests: move most of remaining environment tweaks [ original upstream message ]
Sun, 02 Jun 2013 16:22:51 -0500 run-tests: move environment creation to a separate function stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:22:51 -0500] rev 1247
run-tests: move environment creation to a separate function [ original upstream message ]
Sun, 02 Jun 2013 16:22:51 -0500 run-tests: move HGRCPATH to env stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:22:51 -0500] rev 1246
run-tests: move HGRCPATH to env [ original upstream message ]
Sun, 02 Jun 2013 16:22:51 -0500 run-tests: move DAEMON_PIDS to env stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:22:51 -0500] rev 1245
run-tests: move DAEMON_PIDS to env [ original upstream message ]
Sun, 02 Jun 2013 16:22:34 -0500 run-tests: move HGPORT setting to env stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 16:22:34 -0500] rev 1244
run-tests: move HGPORT setting to env [ original upstream message ]
Sun, 02 Jun 2013 15:33:41 -0500 run-tests: write tmp paths into env copy stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 15:33:41 -0500] rev 1243
run-tests: write tmp paths into env copy [ original upstream message ]
Sun, 02 Jun 2013 14:04:55 -0500 run-tests: use env dict to kill daemons stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 14:04:55 -0500] rev 1242
run-tests: use env dict to kill daemons [ original upstream message ]
Sun, 02 Jun 2013 13:45:08 -0500 run-tests: add env dict to isolate test environment stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Jun 2013 13:45:08 -0500] rev 1241
run-tests: add env dict to isolate test environment [ original upstream message ]
(0) -1000 -120 tip