Merge with stable

patch: use temporary files to handle intermediate copies git patches may require copies to be handled out-of-order. For instance, take the following sequence: * modify a * copy a into b Here, we have to generate b from a before its modification. To do so, applydiff() was scanning for copy metadata and performing the copies before processing the other changes in-order. While smart and efficient, this approach complicates things by handling file copies and file creations at different places and times. While a new file must not exist before being patched a copied file already exists before applying the first hunk. Instead of copying the files at their final destination before patching, we store them in a temporary file location and retrieve them when patching. The filestore always stores file content in real files but nothing prevents adding a cache layer. The filestore class was kept separate from fsbackend for at least two reasons: - This class is likely to be reused as a temporary result store for a future repository patching call (entries just have to be extended to contain copy sources). - Delegating this role to backends might be more efficient in a repository backend case: the source files are already available in the repository itself and do not need to be copied again. It also means that third-parties backend would have to implement two other methods. If we ever decide to merge the filestore feature into backend, a minimalistic approach would be to compose with filestore directly. Keep in mind this copy overhead only applies for copy/rename sources, and may even be reduced to copy sources which have to handled ahead of time. [ original upstream message ]

patch: refactor file creation/removal detection The patcher has to know if a file is being created or removed to check if the target already exists, or to actually unlink the file when a hunk emptying it is applied. This was done by embedding the creation/removal information in the first (and only) hunk attached to the file. There are two problems with this approach: - creation/removal is really a property of the file being patched and not its hunk. - for regular patches, file creation cannot be deduced at parsing time: there are case where the *stripped* file paths must be compared. Modifying hunks after their creation is clumsy and prevent further refactorings related to copies handling. Instead, we delegate this job to selectfile() which has all the relevant information, and remove the hunk createfile() and rmfile() methods. [ original upstream message ]

run-tests: fix --blacklist with jobs > 1 filter blacklisted tests before partitioning them to the children. maintains the 'Skipped...' output but not the 's'. [ original upstream message ]

run-tests: slightly simplify blacklist check [ original upstream message ]

Merge with stable

patch: set desired mode when patching, not in updatedir() This patch and the following aim at merging _updatedir() actions into _applydiff(). [ original upstream message ]

Merge with stable

run-tests: print a newline after all warnings [ original upstream message ]

Merge with stable

patch: extract fs access from patchfile into fsbackend Most filesystem calls are already isolated in patchfile but this is not enough: renames are performed before patchfile is available and some chmod calls are even done outside of the applydiff call. Once all these calls are extracted into a backend class, we can provide cleaner APIs to write to a working directory context directly into the repository. [ original upstream message ]

Merge with stable

run-tests: replace chdir() with Popen cwd option [ original upstream message ]

run-tests: make --debug run in the temporary test directory [ original upstream message ]

run-tests: use the common test path on Windows and Java The alternate one did not run in the test directory and controlling the jobs execution with threads instead of process made it harder to fix. [ original upstream message ]

run-tests: ignore timeout when Popen.terminate is unavailable Popen.terminate was introduced in python 2.6 [ original upstream message ]

run-tests: fix hg.bat python reference hg.bat expects to live in pythonxx/scripts and the python interpreter to be in pythonxx. run-tests.py file layout is a little different and python location must be fixed. [ original upstream message ]

run-tests: fix python executable detection and copy on Windows [ original upstream message ]

Merge with stable

scmutil: drop aliases in cmdutil for match functions [ original upstream message ]

Merge with stable

keyword: use cmdutil.command decorator [ original upstream message ]

Merge with stable

run-tests: remove check on --shell argument No shell is needed when executing Python tests and finding a good shell might be difficult/impossible on some platforms (e.g., Windows). [ original upstream message ]

run-tests: take the basepath when constructing the test temp dir so it's possible to run tests that are outside the test/ dir [ original upstream message ]

run-tests: compare absolute paths in _checkhglib [ original upstream message ]

Merge with stable

run-tests: add --shell command line flag This makes it easy to test with, say, both /bin/bash and /bin/dash instead of changing the system-wide /bin/sh. [ original upstream message ]

run-tests: use type of default to convert environment variable Before, defaults could only be integers, they can now also be strings, floats and what have you. [ original upstream message ]

run-tests.py: correctly handle list options with parallel tasks [ original upstream message ]

prevent transient leaks of file handle by using new helper functions These leaks may occur in environments that don't employ a reference counting GC, i.e. PyPy. This implies: - changing opener(...).read() calls to opener.read(...) - changing opener(...).write() calls to opener.write(...) - changing open(...).read(...) to util.readfile(...) - changing open(...).write(...) to util.writefile(...) [ original upstream description ]

localrepo: reuse parent manifest in commitctx if no files have changed This speeds up the in-memory version of debugbuilddag that I'm working on considerably for the case where we want to build just a 00changelog.i (for discovery tests, for instance). There are a couple of test changes because node ids in tests have changed. The changes to the patch names in test-mq-qdelete.t were required because they could collide with nodeid abbreviations and newly actually do (patch "c" collides with id "cafe..." for patch "b"). [ original upstream description ]

Merge with stable

run-tests: add flag to provide extra hgrc options for test runs [ original upstream message ]

tests: move test bundles in a bundles/ subdirectory [ original upstream message ]

Merge with stable

run-tests: print a new line before writing the diff [ original upstream message ]

Merge with stable

run-tests: don't count test as succeeded if it failed regressed around ec4ae5727f07 [ original upstream message ]

Merge with stable

run-tests: do chdir for tests under a lock for thread safety [ original upstream message ]

run-tests: add iolock to vlog [ original upstream message ]

Merge with stable

run-tests: display diff before prompting with --interactive [ original upstream message ]

run-tests: fix some missing i/o locks [ original upstream message ]

run-tests: add a lock for console I/O [ original upstream message ]

run-tests: switch timeout handling from alarm to helper thread This should be slightly more portable than signals and be compatible with threaded dispatch. [ original upstream message ]

run-tests: add locking on results struct [ original upstream message ]

Merge with stable

run-tests: fix --interactive (after 994ad067ac6e) - Do not prompt if there is no .err file - Fix source and target paths [ original upstream message ]

run-tests: move test loop into a helper function [ original upstream message ]

run-tests: use a results dict [ original upstream message ]

run-tests: move blacklist and retest filtering to runone [ original upstream message ]

run-tests: keep a list of passed tests [ original upstream message ]

run-tests: move keyword checking into runone [ original upstream message ]

run-tests: add ignores list [ original upstream message ]

run-tests: move existence/name format check into runone [ original upstream message ]

run-tests: move interactive handling into runone [ original upstream message ]

move canonpath from util to scmutil [ original upstream message ]

Merge with stable