Merge with stable

killdaemons: correct typo of _check() function caught by pyflakes [ original upstream message ]

Merge with stable

run-tests: test result shows when a failed test could not start a server Failing to start a server happens regularly, at least on windows buildbot. Such a failure often has nothing to do with the test, but with the environment. But half the test output can change because some data is missing. Therefore this is worth an extended error message. Detect the server failure in the diff output because it is most reliable there. Checking the output only does not show if the server failure was expected. Old failure message when server start failed: Failed test-serve.t: output changed New message: Failed test-serve.t: serve failed and output changed [ original upstream message ]

spelling: fixes from spell checker [ original upstream message ]

tests: warn on invalid #if directive [ original upstream message ]

Merge with stable

run-tests: allow test paths in other directories Previously, test paths were assumed to be in the same directory and wouldn't have a directory component. If a path with a directory component was specified, it would be filtered out. This change allow paths to contain directories. This in turn allows tests from other directories to be executed. Executing tests in other directories may break assumptions elsewhere in the testing code. However, on initial glance, things appear to "just work." This approach of running tests from other directories is successfully being used at https://hg.mozilla.org/hgcustom/version-control-tools/file/7085790ff3af/run-mercurial-tests.py [ original upstream message ]

run-tests: allow option parser to be extended This patch moves the OptionParser population into its own function so consumers may modify the OptionParser before arguments are evaluated. This will allow consumers to add custom options, set different defaults, etc. [ original upstream message ]

run-tests: use return values instead of sys.exit [ original upstream message ]

run-tests: Pass arguments into argument parser Before, arguments were not passed into the optparse.OptionParser instance and were coming from sys.argv. This patch enables consumers to define the list of arguments to parse without having to adjust sys.argv. [ original upstream message ]

Merge with stable

tests: add run-tests --changed option for running tests changed in revisions Convenient when polishing patches and changing details of how they change test output. This will probably break in weird ways for revsets with special quoting ... but it is good enough for run-tests. Usage example: yes | ./run-tests.py -li --changed qparent [ original upstream message ]

Merge with stable

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 ]

tests: small refactoring of run-tests' handling of tests list [ original upstream message ]

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 ]

Merge with stable

run-tests: move from dict() construction to {} literals The latter are both faster and more consistent across Python 2 and 3. [ original upstream message ]

templating: make -T much more flexible It can now accept styles and paths and references to settings in [templates]. [ original upstream message ]

changeset_templater: remove use_template method [ original upstream message ]

Merge with stable

tests: fix unused imports from inotify removal caught by pyflakes [ original upstream message ]

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 ]

Merge with stable

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 ]

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 ]

Merge with default

test can be run without option now As per c559280de767

Merge with stable

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 ]

Merge with stable

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 ]

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 ]

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 ]

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 ]

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 ]

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 ]

run-tests: handle sys.exit in main function [ original upstream message ]

run-tests: remove unnecessary variable initialisation ret is always set before it is used, so remove ret = 0 [ original upstream message ]

Merge with stable

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 ]

tests: killdaemons.py for checks reason when getting no process handle [ original upstream message ]

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 ]

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 ]

Merge with stable

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 ]

Merge with stable

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 ]

Merge with stable

tests: 'hghave tic' also requires curses support in Python test-status-color.t would fail when using a Python without curses. [ original upstream message ]

Merge with stable

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 ]

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 ]

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 ]

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 ]

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 ]

cleanup: Remove the only ever used skip-check-code pragma Use the work-around suggested by the rule instead [ original upstream message ]

pathutil: tease out a new library to break an import cycle from canonpath use [ original upstream message ]

Merge with stable