tests: let run-tests.py default to use 'sh' in $PATH instead of '/bin/sh' This makes it easier to run tests on systems that have a usable sh in the search path but not in the standard location. [ original upstream message ]

tests: add 'set -x' to the .t sh scripts in run-tests.py debug mode This makes -d output much more readable when debugging the test framework or very strange test failures. [ original upstream message ]

Merge with default

Update filectx.cmp monkeypatch to handle '\1\n' at start of file Analogous to 012b285cf643 in mercurial main.

phases: use nodemap to check for missing nodes [ original upstream message ]

Merge with stable

tests: add htmlcov option [ original upstream message ]

run-tests: use a list comprehension instead of map [ original upstream message ]

tests: fix omit path list All directories need a trailing asterisk. Otherwise the files are not excluded from coverage. [ original upstream message ]

Merge with stable

branch: warn on branching [ orginal upstream message ]

Merge with stable

tests: use an alias to make msys 'pwd' return paths with forward slashes [ original upstream message ]

tests: skip cvs tests with msys on windows They will fail with weird 'ssh' errors. [ original upstream message ]

tests: introduce 'hghave msys' to skip tests that would fail because of msys [ original upstream message ]

Merge with default

test-keyword: use inline doctest syntax

Merge with stable

tests: skip color test on platforms without tic [ original upstream message ]

Merge with default Make tests/hgave executable on stable branch too.

Merge with stable

merge: give a special message for internal:merge failure (issue3105) [ original upstream message ]

Merge with stable

tests: use the specified shell for running old fashioned sh tests [ original upstream message ]

Merge with stable

Make hghave executable

run-tests: make $TESTTMP matching case-insensitive on windows [ original upstream message ]

run-tests: don't quote command names - that do apparently not work with msys [ original upstream message ]

tests: ignore \r on windows [ original upstream message ]

run-tests: convert windows paths to unix [ original upstream message ]

tests: make (glob) on windows accept \ instead of / Globbing is usually used for filenames, so on windows it is reasonable and very convenient that glob patterns accepts '\' or '/' when the pattern specifies '/'. [ original upstream message ]

tests: use 'hghave serve' to guard tests that requires serve daemon management [ original upstream message ]

tests: use 'hghave system-sh' to guard tests that requires sh in system() [ original upstream message ]

tests: use 'hghave no-windows' to avoid testing reserved file names on windows [ original upstream message ]

tests: use 'hghave unix-permissions' for tests that really use chmod chmod of helper scripts is not included. tests that exercise the x bit in the file system uses 'hghave execbit'. [ original upstream message ]

tests: use 'hghave symlink' for tests using symlinks [ original upstream message ]

tests: make '(esc)' matching in run-tests.py work as intended The code for match on (esc) lines didn't work, and it would thus always end up emitting another suggestion ... which however would match the old one. [ original upstream message ]

Merge with default

Add hghave test as of 5635a4017061

Merge with stable

run-tests: replace inline python handling with more native scheme Normally changes in tests are reported like this in diffs: $ cat foo - a + b Using -i mode lets us update tests when the new results are correct and/or populate tests with their output. But with the standard doctest framework, inline Python sections in tests changes instead result in a big failure report that's unhelpful. So here, we replace the doctest calls with a simple compile/eval loop. [ original upstream message ]

Merge with stable

run-tests: minor cleanups [ original upstream message ]

run-tests: pull out line matching function [ original upstream message ]

run-tests: pull out unified matching funcs [ original upstream message ]

tests: add some comments to the unified test code [ original upstream message ]

tests: rewrite inline Python support Tests with inline Python could turn '>>>' into their underlying python invocation if the test got updated with -i. [ original upstream message ]

Backout b78cce2b1430 until a proper solution is found

Merge with stable

run-tests: make sure no_proxy/NO_PROXY are empty to fix test-http-proxy.t If no_proxy (or NO_PROXY) includes localhost, the test for detecting an unreachable proxy fails, because the proxy setting is ignored. [ original upstream message ]

keyword: use util.realpath instead of os.path.realpath This makes test-keyword.t pass on Python 2.4.1 (e.g. Debian sarge) [ original upstream message ]

Merge with default

Correct grammar in iskwfile docstring

Merge with stable

rollback: avoid unsafe rollback when not at tip (issue2998) You can get into trouble if you commit, update back to an older changeset, and then rollback. The update removes your valuable changes from the working dir, then rollback removes them history. Oops: you've just irretrievably lost data running nothing but core Mercurial commands. (More subtly: rollback from a shared clone that was already at an older changeset -- no update required, just rollback from the wrong directory.) The fix assumes that only "commit" transactions have irreplaceable data, and allows rolling back non-commit transactions as always. But when rolling back a commit, check that the working dir is checked out to tip, i.e. the changeset we're about to destroy. If not, abort. You can get back the old (dangerous) behaviour with --force. [ original upstream message ]

Merge with stable

run-tests: end doctest block when seeing a non-command [ original upstream message ]

Merge with stable

tests: add support for inline doctests in test files This adds doctest like syntax to .t files, that can be interleaved with regular shell code: $ echo -n a > file >>> print open('file').read() a >>> open('file', 'a').write('b') $ cat file ab The syntax is exactly the same as regular doctests, so multiline statements look like this: >>> for i in range(3): ... print i 0 1 2 Each block has its own context, i.e.: >>> x = 0 >>> print x 0 $ echo 'foo' foo >>> print x will result in a NameError. Errors are displayed in standard doctest format: >>> print 'foo' bar --- /home/idan/dev/hg/default/tests/test-test.t +++ /home/idan/dev/hg/default/tests/test-test.t.err @@ -2,3 +2,16 @@ > >>> print 'foo' > bar > EOF + ********************************************************************** + File "/tmp/tmps8X_0ohg-tst", line 1, in tmps8X_0ohg-tst + Failed example: + print 'foo' + Expected: + bar + Got: + foo + ********************************************************************** + 1 items had failures: + 1 of 1 in tmps8X_0ohg-tst + ***Test Failed*** 1 failures. + [1] As for the implementation, it's quite simple: when the test runner sees a line starting with '>>>' it converts it, and all subsequent lines until the next line that begins with '$' to a 'python -m heredoctest <<EOF' call with the proper heredoc to follow. So if we have this test file: >>> for c in 'abcd': ... print c a b c d $ echo foo foo It gets converted to: $ python -m heredoctest <<EOF > >>> for c in 'abcd': > ... print c > a > b > c > d > EOF $ echo foo foo And then processed like every other test file by converting it to a sh script. [ original upstream message ]

Merge with stable

import: wrap a transaction around the whole command Now 'rollback' after 'import' is less surprising: it rolls back all of the imported changesets, not just the last one. As an extra added benefit, you don't need 'rollback -f' after 'import --bypass', which was an undesired side effect of fixing issue2998 (59e8bc22506e).. Note that this is a different take on issue963, which complained that rollback after importing multiple patches returned the working dir parent to the starting point, not to the second-last patch applied. Since we now rollback the entire import, returning the working dir to the starting point is entirely logical. So this change also undoes a732eebf1958, the fix to issue963, and updates its tests accordingly. Bottom line: rollback after import was weird before issue963, understandable since the fix for issue963, and even better now. [ original upstream message ]

(0.9.2compat) merge with default Adapt preserving filemode. Fix a typo. Clean up last merge.

Merge with default

Make status test after record and kwexpand/kwshrink reliable This guarantees test failure when the dirstate code is omitted at the end of the kwtemplater.overwrite method. kwexpand/kwshrink: Without a 1 second wait the test succeeds sometimes, even when the dirstate of the overwritten file is not forced to normal. record: status after recording an added file allows to check whether normallookup is needed after overwriting.

Preserve file mode when overwriting

Merge with default

Avoid x = a and b or c

Merge with stable

tests: use getattr instead of hasattr [ original upstream message ]

Merge with stable

run-tests: fix summary when accepting changes interactively Accepted changes were not counted as success. [ original upstream message ]

Merge with default

Reuse already present working contexts for match Shortens overlong line as side-effect.

Merge with stable

run-test: revert most of 439ed4721a6d, timeout uses fallback for terminate() [ original upstream message ]

run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate() [ original upstream message ]

Merge with stable

scmutil: switch match users to supplying contexts The most appropriate context is not always clearly defined. The obvious cases: For working directory commands, we use None For commands (eg annotate) with single revs, we use that revision The less obvious cases: For commands (eg status, diff) with a pair of revs, we use the second revision For commands that take a range (like log), we use None [ original upstream message ]

Merge with stable

run-tests: verbose log ignored test [ original upstream message ]

Merge with stable

patch: generalize the use of patchmeta in applydiff() - Add patchmeta.copy() and emit copies from iterhunks. Modifying patchmeta instances in applydiff() makes things simpler. - Rename selectfile() into makepatchmeta(). It is responsible for creating patchmeta for regular patches. - Pass patchmeta objects to patchfile() directly patchmeta instances were associated with git patches, for regular patches we had to pass additional variables to tell the patch intent to patchfile(). Instead, we generate patchmeta for regular patches and pass them. This will also help with patch filtering by matcher objects. [ original upstream message ]

Merge with stable

run-tests: allow whitelisting tests that should always run It's desirable to run some tests all the time, for example test-check-pyflakes.t and test-check-code-hg.py. This allows passing --whitelist as a path to a file (flag can be specified more than once) which contains a list of files to whitelist. Whitelisted tests are run even if they're blacklisted or wouldn't match a --keyword test run. For example, to do a quick test of usehttp2, one can now do $ cat > test-whitelist <<EOF > test-check-pyflakes.t > test-check-code-hg.py > EOF $ (cd tests && ./run-tests.py --extra-config-opt 'ui.usehttp2=true' > -k http -j 8 --whitelist test-whitelist) and have all http-specific tests run as well as the two code linters. [ original upstream message ]

Merge with stable

run-tests: fix --blacklist (broken by 95715c2f90bf) [ original upstream message ]

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 ]