killdaemons: add windows implementation [ original upstream message ]

run-tests: do not duplicate killdaemons() code [ original upstream message ]

pylint, pyflakes: remove unused or duplicate imports [ original upstream message, already done for run-tests.py ]

compat: use open() instead of file() everywhere [ original upstream message only for killdaemons here ]

tests: add killdaemons helper script [ orgininal upstream message ]

Merge with stable

fix trivial spelling errors [ original upstream message ]

Merge with stable

check-code: fix check for trailing whitespace on sh command lines The $ has been without necessary escaping since introduced in c7d23b4ca4ba. [ original upstream message ]

Merge with stable

test-keyword: adapt for Windows [ original upstream message ]

tests: don't use dates before epoch in test-keyword.t Timezone offsets of less than a minute is not shown but can cause displayed dates to be before epoch start - and dates before epoch start is not shown correctly on Windows (see also 4d5b12a5517b). These 'negative' dates could be considered undefined behaviour so we don't care and swap the tests values for timestamp and timezone. [ original upstream message ]

Merge with default

Use ui.formatter for kwfiles output

Merge with stable

strip: incrementally update the branchheads cache after a strip This function augments strip to incrementally update the branchheads cache rather than recompute it from scratch. This speeds up the performance of strip and rebase on repos with long history. The performance optimization only happens if the revisions stripped are all on the same branch and the parents of the stripped revisions are also on that same branch. This adds a few test cases, particularly one that reproduces the extra heads that mpm observed. [ original upstream message ]

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 - missed change to heredoctest ]

tests: fix readline escape characters in heredoctest.py/test-url.py This fix mirrors the changes made to test-doctest.py in b856071435f7 and 967adcf5910d. Without this change, tests running heredoctest.py can fail on certain versions of OS X when TERM is set to xterm-256color: $ /opt/local/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/Python -m heredoctest <<EOF > >>> open('b', 'w').write('this' * 1000) > EOF + \x1b[?1034h (no-eol) (esc) A similar problem occurs with test-url.py: $ ./run-tests.py test-url.py --- .../tests/test-url.py.out +++ .../tests/test-url.py.err @@ -0,0 +1 @@ + ERROR: .../test-url.py output changed ! Failed test-url.py: output changed # Ran 1 tests, 0 skipped, 1 failed. [ original upstream message ]

tests: remove temp doctest file when finished running it [ original upstream message ]

tests: add helper script for processing doctests read from stdin Writes stdin to a temp file and doctests it. In the future we might want to spare the temp file and directly call into doctest. Also, with some tweaking it seems possible to adjust the line numbers reported in an error report so they match the ones in the original file. [ original upstream message ]

tests: prepare get-with-headers.py for MSYS get-with-headers.py took the http GET parameter as a command line parameter that had to start with '/'. MSYS on windows will mangle such paths. Instead of applying a workaround everywhere (such as an extra '/') we let get-with-headers.py add the mandatory '/'. That is consistent with the url path handling in the Mercurial url class. A few tests sent 'GET ?cmd=...' which is invalid. They will now send 'GET /?cmd=...'. This will not enable any tests for being run on windows - only remove one reason they were disabled. [ original upstream message ]

tests: hghave outer-repo should be true even if a bad repo is found Only the abort message 'no repository found' is a reliable indication that there is no outer repo. [ original upstream message ]

tests: add missing no-outer-repo requirements Outer repos (if any) will now never be touched by the tests. But it is better to run without any repos around the tmp directory. [ original upstream message ]

Merge with stable

tests: introduce hghave hardlinks Some tests can't be run on FAT filesystems because it doesn't support hardlinks. [ original upstream message ]

tests/hghave: test that the inotify unix socket actually can be created Inotify do not work on FAT filesystems. [ original upstream message ]

tests/hghave: test that a fifo actually can be created on the filesystem Some tests were failing on FAT filesystems. [ original upstream message ]

tests/hghave: consistently use dir='.', prefix=tempprefix for tempfiles Some feature tests were done in the wrong directory and could thus give the wrong result. [ original upstream message ]

tests/hghave: extract hghave.py hghave is degraded to a bare script, moving the functions to hghave.py so they can be shared later on. [ original upstream message ]

Merge with stable

tests: add missing trailing 'cd ..' Many tests didn't change back from subdirectories at the end of the tests ... and they don't have to. The missing 'cd ..' could always be added when another test case is added to the test file. This change do that tests (99.5%) consistently end up in $TESTDIR where they started, thus making it simpler to extend them or move them around. [ original upstream message ]

tests: convert some 'hghave symlink' to #if This will enable some tests for windows. [ original upstream message ]

tests: use the right directory for running hghave from run-tests.py [ original upstream message ]

tests: make .t tests stop immediately if a cd fails This prevents tests from escaping from TESTTMP as a consequence of a failing directory creation. [ original upstream message ]

Merge with stable

tests/hghave: implement #if true / #if false For unconditionally testing / skipping a section. Useful for testing the test infrastructure in test-run-tests.t and for debugging/developing tests. [ original upstream message ]

tests/run-tests: avoid C:/ in arguments MSYS replaces C:/... in arguments with C;... as it interprets the C:/ as a colon separated POSIX path list. The colon is replaced with ; (path separator on Windows) according to http://www.mingw.org/wiki/Posix_path_conversion So we must not replace \ with / for neither $TESTTMP nor $TESTDIR, but we have to keep replacing \ with / for the Popen4 call of function hghave. If we don't do the latter, test-run-tests.t will fail with $ python run-tests.py --local test-run-tests.t --- C:\Users\adi\hgrepos\hg-main\tests\test-run-tests.t +++ C:\Users\adi\hgrepos\hg-main\tests\test-run-tests.t.err @@ -70,6 +70,7 @@ tested #else $ echo skipped + skipped #endif #if false An additional tweak in test-ssh.t is needed that globs away an encoded path, as it can't be translated back to $TESTTMP, because the backslashes in the output have been already encoded as %5C. This patch makes test-ssh.t pass in MSYS on Windows. [ original upstream message ]

hghave: wrap command in 'sh -c "..."' for has_pyflakes() Without this, the has_pyflakes() check always fails in MSYS on Windows. [ original upstream message ]

tests/run-tests: use $TMP on Windows (issue3490) This is just a short-term workaround for that issue. More work needs to be done on scmutil.canonpath & friends. $TMP on Windows is specified to be defined, and it has correct casing, so we can use that as the default dir for tempfile.mkdtemp on Windows. [ original upstream message ]

Merge with stable

tests: introduce c-style conditional sections in .t tests This makes it possible to have conditional sections like: #if windows $ echo foo foo #else $ echo bar bar #endif The directives and skipped sections are treated like comments, so don't interleave them with commands and their output. The parameters to #if are evaluated while preparing the test by passing them over to hghave. Requirements can thus be negated with 'no-' prefix, and multiple requirements must all be true to return true. [ original upstream message ]

run-tests: don't add python lines to expected dict For test input lines of *.t files starting with ' >>> ', the code block for ' >>> ' 609: if l.startswith(' >>> '): # python inlines 610: after.setdefault(pos, []).append(l) was (unsurprisingly) executed, but because there was an "if" instead of an "elif" on the condition "l.startswith(' ... ')", program execution proceeded to line 636 635: elif l.startswith(' '): # results 636: # queue up a list of expected results 637: expected.setdefault(pos, []).append(l[2:]) due to the fact that if l starts with ' >>> ' it also starts with ' '. The net effect was that python command lines in *.t files were (surprisingly) also added to the "expected" dict. This caused no externally observable bad behavior, as the "expected" dict was not consulted for these lines. [ original upstream message ]

run-test: replace backslashes in TESTDIR This may cause troubles in MSYS on Windows. [ original upstream message ]

Merge with default

Update copyleft

Wlock cmdutil.copy wrapper Expanding/shrinking happens outside the wrapped copy function; therefore write lock the repo.

Support commit --amend (issue3471) Include a test as well.

Rename kwt.record attribute to kwt.postcommit A more general descriptive name, as the attribute will be used for commit --amend as well.

Merge with stable

hgext: mark all first-party extensions as such [ original upstream message ]

Merge with default

Intentionally ignore check-code warning about unwrapped ui message

Merge with stable

cleanup: "not x in y" -> "x not in y" [ original upstream message ]

cleanup: replace naked excepts with more specific ones [ original upstream message ]

cleanup: replace hasattr() usage with getattr() in hghave [ original upstream message ]

cleanup: "x != None" -> "x is not None" [ original upstream message ]

cleanup: eradicate long lines [ original upstream message ]

tests: set a standard terminal type This makes test-ui-color.py happy when run in a dumb terminal. Spotted by Jesse Glick <jesse.glick@oracle.com> [ original upstream message ]

repair: no need to call filterunknown() in strip() Calling strip() will eventually trigger localrepo.destroyed() which will invalidate _parseroots. It will call filterunknown() upon reload. Changes to test-keyword.t are related to commit --debug running after either qpop or rollback. [ original upstream message ]

Merge with stable

tests: don't require 'hg' without extension on windows Hackable uses hg.exe instead. [ original upstream message ]

Merge with stable

hghave: remove symlink test made useless by ac0da5caebec [ original upstream message ]

Merge with stable

tests: make tests work if directory contains special characters With this quoting tests will work e.g. in "/tmp/foo bar/mercurial/". [ original upstream message ]

Merge with stable

tests: shorten post-test sleeps This helps expose races [ original upstream message ]

Merge with stable

record: allow splitting of hunks by manually editing patches It is possible that unrelated changes in a file are on sequential lines. The current record extension does not allow these to be committed independently. An example use case for this is in software development for deeply embedded real-time systems. In these environments, it is not always possible to use a debugger (due to time-constraints) and hence inline UART-based printing is often used. When fixing a bug in a module, it is often convenient to add a large number of 'printf's (linked to the UART via a custom fputc) to the module in order to work out what is going wrong. printf is a very slow function (and also variadic so somewhat frowned upon by the MISRA standard) and hence it is highly undesirable to commit these lines to the repository. If only a partial fix is implemented, however, it is desirable to commit the fix without deleting all of the printf lines. This is also simplifies removal of the printf lines as once the final fix is committed, 'hg revert' does the rest. It is likely that the printf lines will be very near the actual fix, so being able to split the hunk is very useful in this case. There were two alternatives I considered for the user interface. One was to manually edit the patch, the other to allow a hunk to be split into individual lines for consideration. The latter option would require a significant refactor of the record module and is less flexible. While the former is potentially more complicated to use, this is a feature that is likely to only be used in certain exceptional cases (such as the use case proposed above) and hence I felt that the complexity would not be a considerable issue. I've also written a follow-up patch that refactors the 'prompt' code to base everything on the choices variable. This tidies up and clarifies the code a bit (removes constructs like 'if ret == 7' and removes the 'e' option from the file scope options as it's not relevant there. It's not really a necessity, so I've excluded it from this submission for now, but I can send it separately if there's a desire and it's on bitbucket (see below) in the meantime. Possible future improvements include: * Tidying up the 'prompt' code to base everything on the choices variable. This would allow entries to be removed from the prompt as currently 'e' is offered even for entire file patches, which is currently unsupported. * Allowing the entire file (or even multi-file) patch to be edited manually: this would require quite a large refactor without much benefit, so I decided to exclude it from the initial submission. * Allow the option to retry if a patch fails to apply (this is what Git does). This would require quite a bit of refactoring given the current 'hg record' implementation, so it's debatable whether it's worth it. Output is similar to existing record user interface except that an additional option ('e') exists to allow manual editing of the patch. This opens the user's configured editor with the patch. A comment is added to the bottom of the patch explaining what to do (based on Git's one). A large proportion of the changeset is test-case changes to update the options reported by record (Ynesfdaq? instead of Ynsfdaq?). Functional changes are in record.py and there are some new test cases in test-record.t. [ original upstream message ]

tests: make hghave handle exec bit on Linux with vfat [ original upstream message ]

tests: teach hghave to actually test for symlink support [ original upstream message ]

Merge with stable

tests: fix incompatibility with python-2.4 in test-hgweb Thanks to lcantey for catching it. [ original upstream message ]

tests: extend get-with-headers to support cache testing [ original upstream message ]

pylint, pyflakes: remove unused or duplicate imports [ original upstream message ]

Merge with stable

mq: restore _branchtags() fast path (issue3223) Since a5917346c72e, mq saves the nodeid of the first applied patch to cache/branchheads, which breaks the optimized cache handling introduced in fbf8320f25c8. The problem is the revision being committed is appended to mqrepo.applied after the commit succeeds, which means mqrepo._branchtags() performs a regular update and write the first applied patch to the branch cache. One solution is to set a context variable _committingpatch on the mqrepo while it is committing a patch and to take it in account when deciding to fast-path mqrepo._branchtags(). Not really elegant but it works. The changes to test-mq-caches.t reverse changes introduced by a5917346c72e. The cache should not have been updated with mq records. The changes to test-keyword.t are indirectly caused by a5917346c72e. Reported and analyzed by Yuya Nishihara <yuya@tcha.org> Notes: - qpush still makes a slow path _branchtags() call when checking heads. Maybe this can be optimized. - be careful when merging this patch in default as secretcommit() was renamed newcommit() right after the end of the code freeze. [ original upstream message ]

tests: tighten checks for octal escapes in shell printf. printf on AIX default shell ksh (89) says \1 is an invalid escape. It insists on at least 2 digits. This causes failures in test-keyword.t and test-status.t. check-code.py already looks out for \NNN and recommends using Python for outputting octal values. Extend the check to \NN and \N and fix up resulting failures. [ original upstream message ]

Merge with stable

run-tests: expand user in --with-hg This makes it possible to run: $ ./run-tests.py --with-hg=~/hg-bin/hg [ original upstream message ]

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