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

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 ]

Merge with stable

tests: fix `hghave root` on windows This lets tests\test-hghave.t pass on windows where geteuid does not exist. [ original upstream message ]

Merge with default

wlock while setting branch in kwdemo

Merge with stable

tests: python hash seed is only relevant after failures - otherwise keep quiet [ original upstream message ]

Merge with stable

run-tests: remove files that we potentially create outside of $TMPDIR [ original upstream message ]

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 ]

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 ]

Merge with stable

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 ]

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 ]

Merge with stable

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 ]

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 ]

Merge with stable

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 ]

Merge with stable

run-tests: find mercurial path with syntax valid on both py2 and py3 [ original upstream message ]

run-tests: if run by python3, execute setup.py with --c2to3 [ original upstream message ]

Merge with stable

run-tests: only check the common criteria once per test [ original upstream message ]

run-tests: backout 4f32747879d1 line endings change It made the windows buildbot sad. [ original upstream message ]

Merge with stable

run-tests: revert previous commit, run() waits after a timeout [ original upstream message ]

run-tests: reap timed-out zombies [ original upstream message ]

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 ]

run-tests: test for os.altsep instead of os.name when checking \ for / This tells more explicitly what it is about [ original upstream message ]

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 ]

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 ]

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 ]

run-tests: patch over py2.4 proc.wait() race [ original upstream message ]

cleanup: drop unused variables and an unused import [ original upstream message ]

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 ]

Merge with stable

cleanup: remove unused imports detected by pyflakes [ original upstream message ]

Merge with stable

run-tests: sort missing files first instead of raising an error sort first for early telling typos in test names [ original upstream message ]

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 ]

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 ]

Merge with stable

run-tests: simplify interrupted message [ original upstream message ]

run-tests: remove spurious disable of --time with --debug [ original upstream message ]

run-tests: always gather runtimes [ original upstream message ]

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 ]

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 ]

run-tests: open hgrc file only for writing The file is not read here. Opening with "w+" is unnecessary. [ original upstream message ]

Merge with stable

run-tests: make --noskips work [ original upstream message ]

Merge with stable

run-tests: add --loop support This makes it easy to run tests repeatedly at high loads to look for test failures. [ original upstream message ]

run-tests: --interactive and --jobs no longer conflict [ original upstream message ]

run-tests: sort certain slow tests earlier by keyword There are a few tests that evade the size heuristic [ original upstream message ]

run-tests: drop unused resultslock [ original upstream message ]

run-tests: drop options.child and users [ original upstream message ]

run-tests: remove runchildren, now unused [ original upstream message ]

run-tests: schedule largest tests first [ original upstream message ]

run-tests: introduce thread scheduler [ original upstream message ]

run-tests: use count to calculate port to use This will keep threads from using the same server ports [ original upstream message ]

run-tests: introduce threadtmp directory [ original upstream message ]

run-tests: add abort flag This will be used to help threads clean up gracefully [ original upstream message ]

run-tests: move more variables to env [ original upstream message ]

run-tests: simplify env deletion [ original upstream message ]

run-tests: move most of remaining environment tweaks [ original upstream message ]

run-tests: move environment creation to a separate function [ original upstream message ]

run-tests: move HGRCPATH to env [ original upstream message ]

run-tests: move DAEMON_PIDS to env [ original upstream message ]

run-tests: move HGPORT setting to env [ original upstream message ]

run-tests: write tmp paths into env copy [ original upstream message ]

run-tests: use env dict to kill daemons [ original upstream message ]

run-tests: add env dict to isolate test environment [ original upstream message ]