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 ]