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 ]
(0) -1000 -300 -100 -50 -30 tip