run-tests: add --time option to log times for each test --time also prints out the wall-clock time each test takes in descending order. [ original upstream message ]

run-tests: remove resultslock since it serves no useful purpose Each child process has its own copy of the results dict, so all access to the results dict is serial. [ original upstream message ]

run-tests: use pickle to send results from children to parent JSON would probably be preferable, but it isn't available for Python 2.4 or 2.5. [ original upstream message ]

Merge with stable

run-tests: skip unnecessary operations on the args in the child proces The arguments are already sorted and never empty. [ original upstream message ]

Merge with stable

Merge with default

run-tests: remove dead code for supporting old test scripts [ original upstream message ]

run-tests: handle windows crlf in .py tests again Before af7c6bc48d8d all crlf occurrences in test output on Windows were simply changed to lf. In af7c6bc48d8d it was replaced by more clever handling in the .t test runner ... but the .py runner was forgotten and many .py tests were failing on Windows. The crlf/lf replacement is now reintroduced in the py test runner. [ original upstream message ]

run-tests: make it possible to combine (esc) with (glob) and (re) This makes it possible to combine the annotations ... if done in the right order. [ original upstream message ]

run-tests: alternative way of handling \r on Windows After f71d60da58fb all \r was stripped from output on Windows, and the places where a \r explicitly was expected it was accepted that it was missing. Ugly hack. Instead we now accept that an extra \r might appear at the end of lines on Windows. That is more to the point and less ugly. [ original upstream message ]

amend: add noise in extra to avoid creating obsolescence cycle (issue3664) Obsolescence cycle are bad and should be avoided as much as possible. The current amend implemented touch changeset meta data as few as possible. This make is easy for amend to result in the same node than a precursors. We add some deterministic noise in extra to avoid this. In practice, the hex of the amended changeset is stored in 'amend_source' extra key. [ original upstream message ]

Move commands.inferrepo for code maintenance

Merge with stable

commands: don't infer repo for commands like update (issue2748) Maintain a whitelist of commands to infer the repo for instead. The whitelist contains those commands that take file(s) in the working dir as arguments. [ original upstream message ]

Merge with stable

tests: correctly report a test killed by a signal [ original upstream message ]

Merge with default

Avoid traceback caused by bogus date input (issue3344) Wrap datefilters which split date texts with util.parsedate. We do not abort, as the bogus date must have been given by the user.

Merge with stable

run-tests: allow test output lines to be terminated with \r in addition to \n str.splitlines could not be used in 546c76e5a3e6, but _now_ we would like to have lines with other line endings than \n. Some fine occurences of (esc) markup of \r is replaced with multiple lines ending with '\r (no-eol) (esc)'. That is no win but also no significant loss. This change makes it possible to drop filtercr.py - _that_ is a win. [ original upstream message ]

run-tests: use more explicit criteria for detecting no-eol Preparing for the situation where there could be unsalted lines not terminated with \n. [ original upstream message ]

Merge with stable

subrepo, hghave: use "svn --version --quiet" to determine version number svn --version --quiet is implemented since svn 0.14.1 (August 2002) and prints just the version number, not the long output (21 lines) of "svn --version". Additionally I expect this output format to be more stable, at least it is not changed with different translations. [ original upstream message ]

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

Merge with stable

test-http-branchmap: enable on Windows Tests using "hg serve --daemon" are currently disabled on Windows for lack of proper kill utility. The one shipped with MinGW operates on internal process identifiers and not on the ones recorded by hg serve. Fortunately we can replace most of them by calls to killdaemons.py. This patch is a proof of concept on how to run these tests on Windows. The plan is: - Check test-http-branchmap.t does not fail/hang on the buildbot - Convert all kill utility calls to killdaemons.py calls. - Add a rule in check-code.py to forbid kill calls, or ignore the remaining ones (test-hup.t, etc.). - Possibly drop the 'serve' rule from hghave. The: listening at http://*:$HGPORT1/ line does not appear on Windows because the detached process can no longer write on its parent streams. Grepping hg serve stdout directly causes the parent process to never return and hangs the test. This is a bug, but I have no simple solution and prefer to pay this small price and enable hg serve tests on Windows. [ orginal upstream message ]

Merge with stable

tests: unset variable HG if it is set When hg tries to call itself it can call a different hg executable when this variable is set. Some tests fail when the called hg version is different. [ original upstream message ]

Merge with stable

spelling: destination [ original upstream message ]

killdaemons: take file argument explicitely It makes it easier to use as a generic replacement for kill utility, mostly for Windows tests. [ original upstream message ]

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

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 ]

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

tests: better output on timeouts Formerly, timeouts would generate huge scrollback-destroying diffs and weird -15 return codes in the summary. Now we simply report "timed out". [ original upstream message ]

Merge with stable

keyword: convert a verbatim block to a field list [ orginal upstream message ]

Merge with stable

tests: set HOME to the test temp dir (issue2707) [ original upstream message ]

Merge with default

Offer additional datefilters when the extension is enabled Before the additional datefilters (utcdate, svnisodate, svnutcdate) were used when kwtemplater was initialized. Now they always be used once the extension is enabled.

Docstrings for additional date filters

Merge with stable

templates: document missing keywords or filters Keywords keywords are not documented yet but are turned into function definitions to avoid lambda docstring weirdness. [ original upstream message ]

Merge with stable

tests: use $TESTTMP more and use (glob) less This locks down the test output a little more. [ original upstream message ]

stable: merge with default

README: minimal test command line

Merge with stable

rollback: clarifies the message about the reverted state (issue2628) Previously, when rolling back a transaction, some users could be confused between the level to which the store is rolled back, and the new parents of the working directory. $ hg rollback rolling back to revision 4 (undo commit) With this change: $ hg rollback repository tip rolled back to tip revision 4 (undo commit) working directory now based on revision 2 and 1 So now the user can realize that the store has been rolled back to an older tip, but also that the working directory may not on the tip (here we are rolling back the merge of the heads 2 and 1) [ original upstream message ]

Merge with stable

run-tests: handle mixed comment lines in blacklists [ original upstream message ]

Merge with stable

explicitly close files Add missing calls to close() to many places where files are opened. Relying on reference counting to catch them soon-ish is not portable and fails in environments with a proper GC, such as PyPy. [ original upstream description ]

Merge with stable

run-tests: only call WIFEXITED on systems it exists not on Windows or in jython [ original upstream message ]

run-tests: loadable as module [ original upstream message ]

stable: merge with default

Move repo.__class__ assignment out of monkeypatch context A cosmetic change to improve readability.

Inform user about current keywordset in kwdemo The kwdemo --default output now looks roughly like this: configuration using default cvs keywordset [extensions] keyword = [keyword] demo.txt = [keywordset] * section added with this change svn = False [keywordmaps] ...

Update documentation for kwshrink * remove obsolete reference to potential problems with merge and import * emphasize that running kwshrink before configuration changes which affect active/expanded keywords is mandatory

Merge with default

Make kwfiles show deleted files configured for expansion

Colorize hg kwfiles output

Merge with default

Copy: when copied source is a symlink, follow it 1) hg cp symlink copy -> copy is a symlink. 2) cp symlink copy; hg cp -A symlink copy -> copy is a regular file. In the second case we have to follow the symlink to its target to find out whether we have to unexpand keywords in the copy. Add test covering the case where the copied link's target is ignored by keyword but has content which would match the regex for expanded keywords to check whether we indeed leave the destination alone.

Merge with stable

code style: prefer 'is' and 'is not' tests with singletons [ original upstream description ]

Merge with default

s/config/configuration/ in help

Merge with stable

run-tests: fix --debug for .t tests When --debug is given to the test runner, run() returns (retcode, None). Do not try to use None output as a string, and return directly, similarly as other testers. [ original upstream message ]

Merge with stable

run-test: fixed wrong parenthesis Fixed wrong placement of end parenthesis, from b911cb80c671 [ original upstream message ]

Merge with stable

tests: use (esc) markup for string-escape This makes test output less ambiguous. Failing test output will be escaped and marked up if necessary. A Python string-escape compatible encoding is used, but not everything is encoded - especially not \n and \t and '. [ original upstream message ]

tests: (no-eol) markup for command output without trailing LF Output chunks without a trailing LF will now work but get (no-eol) appended. This change mostly moves code around so we can handle that an output line starts with data from previous command, followed by salt and the next command. [ original upstream message ]

tests: handle .t files without trailing LF 9a2de8dae27b made this simple test-test.t succeed silently: $ printf ' $ true' > test-test.t but did not give a usable .err in this case: $ printf ' $ false' > test-test.t The missing LF will now be fixed in the test output and it will thus give a test failure and a solution in the .err file. [ original upstream message ]

Merge with default

Turn regexes and escaped keywords into a propertycache

Merge with stable

run-tests: use regex when searching for $HGPORT in test output This prevents spurious errors when a changeset hash happens to match the port number. Before, this invocation gave a test failure: $ ./run-tests.py test-log.t --port 24427 ERROR: /home/mg/src/mercurial-crew/tests/test-log.t output changed --- /home/mg/src/mercurial-crew/tests/test-log.t +++ /home/mg/src/mercurial-crew/tests/test-log.t.err @@ -626,12 +626,12 @@ $ hg log -b default changeset: 2:c3a4f03cc9a7 - parent: 0:24427303d56f + parent: 0:$HGPORT303d56f user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: commit on default ... [ original upstream message ]

Merge with stable

pull: silence spurious 'requesting all changes' message When issuing `hg pull -r REV` in a repo with no common ancestor with the remote repo, the message 'requesting all changes' is printed, even though only the changese that are ancestors of REV are actually requested. This can be confusing for users (see http://www.selenic.com/pipermail/mercurial/2010-October/035508.html). This silences the message if (and only if) the '-r' option was passed. [ original upstream message ]

Function to look up changectx for expansion Similarly rename variable in kwtemplater.overwrite().

Compile regexes on demand

Merge with default

Fix regressions introduced in 9d01f9cab5e2 - dirstate of overwritten files must be forced to normal with kwexpand/kwshrink, not commit. - recorded files must be weeded before overwriting. - add test cases.

Merge with stable

tests: accept \-escaped test output It changes tsttest to accept expected outputs in python-style \-escapes. It aims to avoid trouble with outputs for non-ascii, color and progress tests. [ original upstream message ]

Merge with default

Only use expensive fctx.cmp when needed Restrict expensive cmp to cases when: - comparing against working directory and - encode filters active or - path is configured for keyword expansion

Merge with stable

filectx: use ctx.size comparisons to speed up ctx.cmp Comparing sizes is cheaper than comparing file contents, as it does not involve reading the file on disk or from the filelog. It is however not always possible: some extensions, or encode filters, change data when extracting it to the working directory. [ original upstream description ]

Merge with stable

Code cleanup - move preselection of expansion candidates for rollback and record into helper function - same overwrite order in rollback and record: 1. modified, 2. added - self.wlock() inside kwrepo class instead of repo.wlock()

enforce subn method via boolean switch There are only 2 patterns to choose, and so far only 1 case where kwtemplater.re_kw.subn is applied on data read from the working directory: when recording added files. With this change the code reflects more closely the boolean character of the switch and underlines the special case.

Fix weeding of expansion candidates when recording Rearrange tests to check this, i.e. that there are changes in other files, not only the recorded one.

Merge with stable

run-tests.py: remove support for .bat files [ original upstream message ]

run-tests.py: do not install hg when the tests do no exist [ original upstream message ]

Merge with stable

test-keyword: ignore subject in notify hook mails Long tmpdir names caused truncation of subject anyway, and that made $TESTTMP replacement fail. [ original upstream description ]

test-keyword: fix test glob to ACL/SELinux flag [ original upstream description ]

tests: reintroduce ":$HGPORT" in test output This reduces the number of patterns that must be adjusted when writing tests. [ original upstream description ]

tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed. [ original upstream description ]

tests: removed test names in tests The name of the test files is replaced with a glob * expression, thereby the tests does not depend on the filename of the file they are in. [ original upstream description ]

tests: replace test tmp directory with $TESTTMP in test output This reduces the number of patterns that must be adjusted when writing tests. [ original upstream description ]

Merge with stable

run-tests: handle .tst not ending with an LF [ original upstream description ]

tests: show skip reason instead of "irrelevant" with unified tests, too parsehghaveoutput expects just the test output, not the merged test/output, so for skipped unified tests e.g.: Skipped test-convert-darcs.t: missing feature: irrelevant was shown instead of: Skipped test-convert-darcs.t: missing feature: darcs client [ original upstream description ]

run-tests: move build/ directory to HGTMP Before, running a test would give you a build/ directory in the root of your Mercurial source tree. The directory had a full copy of the the source, so a grep in '**/*.py' would find files inside build/. [ original upstream description ]

keyword: fix test glob [ original upstream description ]

Merge with default

Switch kwtemplater.record in kw_dorecord() Obsoletes the need for a global recordcommands variable.

Specific regular expressions depending on read mode More safeguarding against accidental (un)expansion: Reading filelog: act only on \$(kw1|kw2|..)\$ as keywords are always stored unexpanded. Reading wdir: act only on \$(kw1|kw2|..): [^$\n\r]*? \$ as we only are interested in expanded keywords in this situation. Note: we cannot use ..): [^$\n\r]+? \$ because e.g. the {branch} template might be empty. hg record is a special case as we read from the working directory and need one regex each for modified and added files. Therefore test recording an added file. This way we finally also forbid sequences like $Id: $ being treated as keywords.

test: remove remaining sed calls

disable expansion in kwfilelog.read() if file renamed in node Simplifies kwfilelog.cmp() and avoids fiddling with/importing revlog. Reorder imports alphabetically.

Make iskwfile() a weeding method in lieu of a boolean Update iskwfile docstring.

Support copy and rename copy/rename destinations being unversioned and possibly ignored by the extension should not contain expanded keywords. Files copied/renamed from an ignored source are not touched. Add tests covering both of the above cases, plus the corner case of cp symlink foo; hg cp -A symlink foo (where foo becomes a regular file).

Refactor kwtemplater.overwrite() Make kwexpand, kwshrink restricted commands - i.e. read from filelog without expansion for substition in kwtemplater.overwrite, and set/unset restricted mode for overwrite() in in kwcommitctx and the dorecord wrapper. Preselect candidates when working on changed files (rollback, record) outside kwtemplater class, and remove 6th argument from overwrite(). Avoid duplicate substitution/search in overwrite(): Only go into restricted read mode when reading from filelog. rollback and record read from the working directory, where restricted mode would already shrink keywords before overwrite() either expands or shrinks them again. This ensures that the usual automatic operations on keywords are turned off during overwrite() and only overwrite() itself acts on them. Reduce manifest calculation to the cases where it is needed. Move helper function for expansion removal outside kwtemplater class.

Use workingctx to detect modified and added files after rollback

Rename variable "cfiles" to "changed" for clarity

Merge with default

Support rollback by restoring expansion to previous values Prevent spurious differences in the working directory after a rollback. Add tests for several rollback situations.

Do not expand at all during diff Always shrink and never expand keywords during a diff operation. Avoid user distraction e.g. because of spurious differences appearing in the commit editor.

Restore restricted read mode value after overwriting Even though just enforcing expansion after overwriting files in the working directory caused no problems that we know of, this avoids a potential source of problems (e.g. in collaboration other extensions) at no costs.

test: fix typo, rephrase

Merge with default

Use note admonition in help text

Merge with stable

tests: various fixes for new unified test pattern format [ original upstream message ]

tests: add glob matching for unified tests This adds a " (glob)" marker that works like a simpler version of (re): "*" is converted to ".*", and "?" is converted to ".". Both special characters can be escaped using "\", and the backslash itself can be escaped as well. Other glob-style syntax, like "**", "[chars]", or "[!chars]", isn't supported. [ original upstream message ]

tests: require regexes in unified tests to be marked with " (re)" Consider this test: $ hg glog --template '{rev}:{node|short} "{desc}"\n' @ 2:20c4f79fd7ac "3" | | o 1:38f24201dcab "2" |/ o 0:2a18120dc1c9 "1" Because each line beginning with "|" can be compiled as a regular expression (equivalent to ".*|"), they will match any output. Similarly: $ echo foo The blank output line can be compiled as a regular expression and will also match any output. With this patch, none of the above output lines will be matched as regular expressions. A line must end in " (re)" in order to be matched as one. Lines are still matched literally first, so the following will pass: $ echo 'foo (re)' foo (re) [ original upstream message ]

tests: ensure regexes match to the end of the string Regular expressions in the test suite are currently written assuming that you need a trailing ".*" to avoid matching to the end. Instead of matching regular expressions using "^pattern", this patch makes matching more restrictive by matching "^pattern$". [ original upstream message ]

tests: don't match blank output lines as regexes in unified tests Currently, the following unified test will pass: $ echo foo A blank output line (a line containing just two spaces) will match any output. The patch modifies the unified test runner to ignore empty strings strings when do regular expression matching. [ original upstream message ]

tests: improve regexes in unified tests [ original upstream message ]

Merge with stable

tests: add hack to avoid problem with graphlog in unified tests [ original upstream message ]

Merge with stable

tests: add exit codes to unified tests [ original upstream message ]

merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Without specifying the parent revision of the working copy, users will update to tip, which is most likely the other head they were trying to merge, not the revision they were at before the merge. [ original upstream message ]

(stable) merge

Explain file-wise expansion in help

Merge with stable

diff: recurse into subrepositories with --subrepos/-S flag [ original upstream message ]

Merge with stable

test-keyword: use regular expressions instead of grepping [ original upstream message]

Merge with stable

tests: drop big sed from test-keyword.t [ original upstream message ]

(stable) merge

tests: unify test-keyword

Merge with stable

rollback: fix up tests [ original upstream message ]

Merge after backout

Backed out changeset bceb04857ce1 (not all upstream hunks applied)

tests: catch re.error if test line is not a valid regular expression [ original upstream message ]

tests: basic support for unified tests [ original upstream message ]

tests: move script execution in runner helpers [ original upstream message ]

(stable) merge

Move collecting of [keyword] patterns to reposetup (issue2303) When cloning, prevent [keyword] filename patterns configured locally in the source directory to persist during the update in the destination. a) move [keyword] retrieval (back) to reposetup b) remove the corresponding global kwtools attributes Add test cases.

(stable) merge

Add extra datefilters in a single update call

(stable) merge

Postpone manifest calculation in kwtemplater.overwrite We can check for file existence in the working directory (needed in case of recording) by simply using the given context and calculate the manifest only when there are in fact candidates for expansion/shrinking.

Merge with stable

help: show value requirement and multiple occurrence of options this helps users to know what kind of option is: - no value is required(flag option) - value is required - value is required, and multiple occurrences are allowed each kinds are shown as below: -f --force force push -e --ssh CMD specify ssh command to use -b --branch BRANCH [+] a specific branch you would like to push if one or more 3rd type options are shown, explanation for '[+]' mark is also shown as footnote. [ original upstream message ]

(stable) merge

Force dirstate normal when all changes in a file are recorded Before this bugfix a file whose changes were entirely recorded was still considered modified by "hg status". Note: the test must use hg record -l/--logfile, because this is not reproducible with hg record -m/--message.

Pass context to kwtemplater.overwrite Now that we have retrieved the context in every calling function except commit, pass it as argument to kwtemplater.overwrite to avoid looking it up twice. Reorder arguments to kwtemplater.overwrite to reflect their importance. Turn node argument into a simple boolean and rename it to iswctx.

Retrieve added and modified files from commitctx

Merge with stable

move working dir/dirstate methods from localrepo to workingctx [ original upstream message ]

(stable) merge

Use context to detect uncommitted merge

(stable) merge

Offer svn-like default keywordmaps svn-like default keywords can be set in a new configuration section called [keywordset] -- thanks to timeless for the name. Move setup of default keywordmaps into dedicated function used by kwtemplater.__init__ and demo. HeadURL/URL is not supported (by default).

Add 2 svn-like date filters svnisodate yields the format the date in svn's Id keyword expands to. svnutcdate yields the format svn's Date/LastChangedDate expands to. http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html

Merge with stable

Use our custom hg reStructuredText role some more I missed these occurrences on my first scan through the source. [ original upstream message ]

Merge with stable

rollback: fix up tests [ original upstream message ]

(stable) merge

commit: note new branch heads rather than topological heads Move to using contexts while we're at it. [ original upstream message ]

Support extensions using dorecord, e.g. crecord Provide extendable keyword.recordextensions variable, so other extensions beside hgext.record which provide the dorecord function can cooperate with hgext.keyword like so (example from crecord): def extsetup(): try: keyword = extensions.find('keyword') keyword.restricted += ' crecord qcrecord' try: # use record support in keyword.py if present keyword.recordcommands += ' crecord qcrecord' keyword.recordextensions += ' crecord' except AttributeError: pass except KeyError: pass

(stable) merge

Omit setting extra variable for record context Since dc2f37864348 the context is always retrieved in kwtemplater.overwrite().

(stable) merge

Simplify record switch in kwtemplater.overwrite 1) use kwtemplater.record attribute for clarity 2) drop optional context argument; consider the speed loss by duplicating the dictionary lookup repo['.'] as negligible

(stable) merge

Cleanup test and make it portable - replace sed call with python command - no need to back up hgrc before record

Merge with stable

run-tests: add --view switch to use external diff viewer [original upstream message ]

run-tests: sort options [original upstream message ]

run-tests: add -l short option for --local [original upstream message ]

(stable) merge

Test recording

Support (q)record Monkeypatch hgext.dorecord to trigger keyword expansion. Read data from working directory, not from filelog. Prevent keyword expansion from within record's commitfunc, thereby fixing a bug/inconsistency where files which are clean after recording were overwritten twice.

Remove mq commands from restricted list Monkeypatching patch.diff takes care of this since 911f5be5d159. Test mq more thoroughly by loosening [keywordmaps] and comparing the output of hg cat with keyword expansion enabled and disabled.

Replace deprecated mq commands in test

Merge with stable

Use hg role in help strings [ original upstream message ]

Merge with stable

keyword: monkeypatch patch so that optional args can be passed as kwargs [ original upstream message ]

Merge with stable

run-tests.py: can't remove from os.environ on solaris [ original upstream message ]

Merge with stable

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

Fix --blacklist when --jobs > 1 in run_tests.py. The options parsing logic replaces the options.blacklist initial value, a list of filenames, with a dict of test names to filenames. When runchildren rebuilds the command line to launch child processes the dict is flattened and provided as a malformed argument when a filename is expected. Fix is to remove the blacklist option from child invocations since the filtering is handled in the parent anyway. [ original upstream message ]

run-tests.py: reset env variables set by hooks [ original upstream message ]

Merge with stable

run-tests: force to test pure on pypy as well [ original upstream message ]

Fix run-tests.py -jX after 2ed667a9dfcb [ original upstream message ]

tests: adapt the test runner to work with jython [ original upstream message ]

run-tests: make sure GREP_OPTIONS isn't set This can interfere with test output, especially for options like --color. [ original upstream message ]

tests: use external coverage, mandate newer version This removes the option for including the stdlib in coverage reports. [ original upstream message ]

templater: readable dates older than 24 months revert to ISO8601 (issue1006) [ original upstream message ]

(stable) merge

Add forgotten comment

Make the templater a local variable

Merge with stable

rollback: improve message [ original upstream message ]

rollback: add dry-run argument, emit transaction description [ original upstream message ]

Do not bother about detecting extension path in demo Detecting and showing the path to a keyword extension in a non-standard place only made sense while keyword.py was not shipped with Mercurial. The test output has changed because we do not have a spurious space at eol anymore.

Merge with stable

keywords: build a new templater to work around caching interaction

(0.9.2compat) improve quoting of environment variable in test

Merge with stable

Tests with spaces in paths This allows most tests to succeed with ./run-tests.py --tmpdir='/tmp/hg test' and introduces other tests for spaces and shell quoting [ original upstream message ]

(0.9.2compat) get applicable changes from default

(stable) merge Even though this is a fake standalone branch, we do not include the patch that removed extension path detection in kwdemo.

Make kwdemo less verbose 1) Set the branchname always silently with dirstate.setbranch(). We create a branch so that testing the {branches} template does not come up empty. But kwdemo is hardly the place to inform the user by inference why {branches} is empty on the default branch. "demobranch" is ascii and cannot be changed, so using the internal command instead of commands.branch() is safe. 2) Do not show full path to temporary directory (distracting long lines on Mac OS X). 3) No special debug output. Output only related to keyword, no internals like unsetting of commit hooks etc.

1 variable name for overwriting candidates

Do not customize ui.note() when overwriting Behaviour change: hg commit --verbose now prints out the names of the files which are overwritten.

Mark improved demo commit message for translation s/config/configuration/ Inside the quoted command put the message in single quotes in case the translation contains apostrophes.

(0.9.2compat) update copyright _and_ licence

(stable) merge

Update copyright

Remove deprecated options

Merge with stable

run-tests.py: skipped tests shouldn't change working directory [ original upstream message ]

run-tests.py: clears http_proxy for all tests [ original upstream message ]

(stable) merge

(0.9.2compat) upgrade kwfiles behaviour to match default wrt --unknown Switch long option name from --untracked to --unknown.

(0.9.2compat) use status' names for readability

Remove spurious locks, improve handling of wlock - kwcommitctx is inside the wlock of repo.commit: no lock - _kwfwrite only needs wlock wlock outside try block, so we don't need to import lock.release _kwfwrite should even be safer that way, as we moved the status call inside the try-except block. Thanks to Benoit Boissinot for help.

Use status' names instead of index

(stable) merge

Do not postpone commit hooks With 0e64d814d7d0 in place, this hack is not needed any more.

Merge with stable

fix up a bunch of check-code warnings [ original upstream message ]

run-tests: kill daemons on ^C with -j. This is not perfect, but the problem is fundamentally racy. [ original upstream message ]

run-tests: split tests/blacklist in tests/blacklists/* Following discussions with Gilles Morris [1], it seems that it is preferable to use several blacklist files in a blacklists/ directory. It is easier to add an unversioned file for experiments than modifying a tracked file. Also fall back to a simpler syntax, giving up ConfigParser, now that section names are not needed anymore. And allow --blacklist parameter to be a complete path, instead of only one of the filenames contained in tests/blacklists/ [1] http://www.selenic.com/pipermail/mercurial-devel/2009-December/017317.html [ original upstream message ]

many, many trivial check-code fixups [ original upstream message ]

filelog: sort meta entries, ensure deterministic order [ original upstream message ]

(0.9.2compat) fix utcdate filter

Merge with stable

Fix utcdate filter So far the utcdate filter only omitted the timezone, now it actually converts to utc. Thanks to Kevin Grover for pointing out the issue.

Merge with stable

Update license to GPLv2+ [ original upstream message ]

(0.9.2compat) load extensions with "ext ="

(0.9.2compat) do not monkeypatch diff in restricted mode; transplant restricted See 52b03aad673b, 13a6a2c0440f.

(stable) merge

run-tests.py: update

tests: load extensions with "ext ="

Go into restricted mode when transplanting Expanded keyword is read into diff with transplant -b otherwise. Test this scenario. Thanks to Adam Berkes for providing an example case.

Do not monkeypatch diff when in restricted mode kw_diff actually disabled restricted mode when 2 revisions were given, because it effectively disables the extension in this case. But the commands working with diff and patch need restricted mode always enabled, i.e. expansion enabled when writing to the working directory and - crucial for these commands - no expansion when reading the filelog.

Merge with stable

keyword: clarify object of backwards compatibility [ original upstream message ]

(0.9.2compat) add correct $RCSfile$ default keyword; sort kwdemo output Keep $RCSFile$ for backwards compatibility.

(stable) merge

The CVS keyword is $RCSfile$, not $RCSFile$ http://cvsbook.red-bean.com/cvsbook.html#List%20Of%20Keywords Fix default keyword map accordingly. Keep $RCSFile$ for Mercurial backwards compatibility.

Merge with stable

keyword: sort demo output to ensure deterministic output [ original upstream message ]

Merge with stable

(0.9.2compat) update wiki url

hg.clone: report branch name on update [ original upstream message ]

change wiki/bts URLs to point to new hostname [ original upstream message ]

(stable) merge

Uppercase short option for kwfiles --all, like hg status -A Deprecate kwfiles -a.

Make kwfiles -u show untracked files only (like status) Remove extra documentation of -u/--unknown, as this is covered in the option help already. Like commands.status the code now zips the status flags. Add more kwfiles tests.

Make kwfiles --all show unknown files too More consistent and similar to hg status.

kwfiles --unknown instead of --untracked Use the same option name as "hg status". Retrieve option in _status(). Mark --untracked as deprecated.

Merge with stable

hg: say 'hg update' instead of 'hg up' in merge status message Includes the change to the message itself, along with several test output files that also had to change. [ original upstream message ]

(0.9.2compat) do not mark debug message for translation

Merge with stable

do not attempt to translate ui.debug output [ original upstream message ]

(stable) merge with default

(0.9.2compat): run kwdemo before setting up [keyword] files Ensures that kwdemo runs correctly without further configuration. Also no need to specify --default option.

test: run kwdemo before setting up [keyword] files kwdemo would pass the test without uisetup otherwise. Also no need to specify --default option.

Merge with stable

test-keyword: update output to match 5d49fdef6fd0 [ original upstream description ]

(0.9.2compat) update and rewrap documentation

(0.9.2compat) prefer util.datestr over time module import We keep the function in this branch to catch the TypeError.

(0.9.2compat) remove "help keyword" from test

(stable) merge

Use util.datestr for utcdate filter, make it accessable in variable lambda syntax mimicking templatefilters.py

Reference templating help, add utcdate filter example

Remove "help keyword" from test Testing help output does not make sense as we have no way to check for errors in content which would be the only reasonable test here.

Refactor kwdemo and make output translatable Better reflect the actual behaviour of the extension: - Make map arguments and -f/--rcfile not mutually exclusive but extend the current configuration - Map arguments and -f/--rcfile both override the defaults even when -d/--default is specified - -d/--default only overrides the current configuration Inform the user about extending/overriding behaviour, but only at the beginning; the following messages become terser, making the output translatable without too much code clutter. Rephrase help (use "short/long" option notation etc.).

(stable) merge

Update copyright

(0.9.2compat) update copyright

Merge with stable

help: use field lists for lists of extensions [ original upstream message ]

minirst: indent literal blocks with two spaces The vast majority* of them are formatted like this in the source, so this basically reverts the output to how it looked before we got the minirst parser. *: the help on templating use four spaces for some examples and will now shown with an indentation of just two spaces. [ original upstream message ]

Merge with stable

keyword: wrap docstrings at 70 characters [ original upstream description ]

commands: use minirst parser when displaying help [ original upstream description ]

(stable) merge

(0.9.2compat) argument to "kwdemo --rcfile" must be string (bugfix)

Argument to "kwdemo --rcfile" must be string (bugfix)

Reformat kwfiles help for minirst parser

Merge with stable

mq: qpop now tells which patches are popped When navigating through a patch series by qpushing and qpopping it was easy to get lost because qpop was silent. I found myself often running qnext after qpop to see which patch I just dropped - especially if I was about to qrm it. This patch makes qpop more symmetric to qpush by showing which patches are applied/"unapplied". I think it is a good change even though it changes output by adding a new line of output. [ original upstream message ]

Merge with stable

(0.9.2compat) empty string as default value for hgcmd

(0.9.2compat) use all caps NOTE: in help string

keyword: use all caps for 'note:' in help string The diff, export, log, and status commands write it as 'NOTE:'. [ original upstream message ]

(0.9.2compat) prefer self.func over repo.func in kwrepo Avoid nesting by falling back on parent class member function.

(stable) merge

Eliminate potential reference cycles from kwrepo - delete kwrepo.commitctx after using the tweaked version - prefer self.hook over repo.hook to avoid nesting Also pass arguments to commit as arbitrary list. Thanks to Simon Heimberg and Matt Mackall for guidance.

(0.9.2compat) kwdemo: get rid of subfunction and ease translation

Collect kwmaps using a generator expression Allowed for Python 2.4.

Merge with stable

(0.9.2compat) warp docstrings at 78 chars

keyword: wrapped docstrings at 78 characters [ original upstream description ]

(stable) merge

Remove unused import

(stable) merge

Break overlong line

(stable) merge

Make repo.commit use a custom commitctx wrapper This avoids forcing the dirstate of overwritten files to normal during a commit. Thanks to Dan Villiom Podlaski Christiansen for the idea of a "double wrapper", so other extensions can still wrap repo.commitctx safely.

(stable) merge

(0.9.2compat) lowercase status flags of untracked files in kwfile output Improve help as well, like in default branch.

Improve help for kwfiles - just use "files" instead of "filenames" (analogous to "hg status -h") - reference the extension help wrt pattern configuration Kudos to timeless for helpful suggestions.

Lowercase status flags of untracked files in kwfile output Document the flags and their meanings in the command help (thanks to timeless for bringing this to my attention).

Merge with stable

(0.9.2compat) improve help for kwfiles

keyword: improve help for kwfiles

Improve help for kwfiles

(stable) merge

Make kwdemo more translation friendly

(0.9.2compat) update synopsis

Merge with stable

extensions: change descriptions for hook-providing extensions Thanks to timeless and Dave Townsend for advice! [ original upstream message ]

extensions: fix up description lines some more [ original upstream message ]

Merge with stable

extensions: improve the consistency of synopses Trying as much as possible to consistently: - use a present tense predicate followed by a direct object - verb referring directly to the functionality provided (ie. not "add command that does this" but simple "do that") - keep simple and to the point, leaving details for the long help (width is tight, possibly even more so for translations) Thanks to timeless, Martin Geisler, Rafael Villar Burke, Dan Villiom Podlaski Christiansen and others for the helpful suggestions. [ original upstream message ]

Merge with stable

help: remove per-extension paragraph on how to enable it The central place to find this information is the "extensions" help topic. [ original upstream message ]

(0.9.2compat) concise help title

(stable) merge

Concise help title

Merge with stable

Add patch.eol to ignore EOLs when patching (issue1019) The intent is to fix many issues involving patching when win32ext is enabled. With win32ext, the working directory and repository files EOLs are not the same which means that patches made on a non-win32ext host do not apply cleanly because of EOLs discrepancies. A theorically correct approach would be transform either the patched file or the patch content with the encoding/decoding filters used by win32ext. This solution is tricky to implement and invasive, instead we prefer to address the win32ext case, by offering a way to ignore input EOLs when patching and rewriting them when saving the patched result. [ original upstream message ]

Merge with stable

(0.9.2compat) update doc strings and help

(0.9.2compat) improve English; from stable

keyword: improve English [ original upstream message ]

Merge with stable

merge: allow merging going backwards New behavior is generally superior and more correct, except possibly with regards to missing files. hg up . is now effectively a no-op, which is probably the desired behavior for people expecting to move to tip, but may surprise people who were expecting deleted files to reappear. case 1: update to . a-w -> a-w classic: ancestor a missing recreated right? rmed recreated WRONG added forgotten WRONG changed preserved RIGHT conflicted can't happen backward merge: ancestor a (NO EFFECT) missing missing wrong? rm'ed rm'ed RIGHT added preserved RIGHT changed preserved RIGHT conflicted can't happen case 2: update to ancestor of . a-b-w -> b-w \ a classic: ancestor a missing recreated right? rmed recreated wrong? added forgotten wrong? changed preserved RIGHT conflicted preserved wrong? backwards merge: ancestor b missing missing or conflict right? rm'ed missing or conflict right? changed preserved RIGHT conflicted merge RIGHT added preserved right? [ original upstream message ]

(stable) merge

Remove doc string for standalone version default and stable branches only for development and history.

Merge with stable

tests: fix doc string in get-with-headers.py [ original upstream message ]

test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py Note that other sed replacement commands are also filtering get-with-headers.py, but they seem to be more test specific, hence not handled here. [ original upstream message ]

(stable) merge for run-tests.py

Merge with stable

(stable) fix import gone wrong in 43d8c042ca20

Add run-tests.py from main and update README

Refer users to distribution or 0.9.2compat branch

(0.9.2compat) document Mercurial version range for standalone extension

Merge with stable

resolve: require -a switch to resolve all files Like revert -a, this should make this command slightly safer [ original upstream message ]

Merge with stable

commit: drop the now-unused files parameter [ original upstream message ]

Merge with stable

fixed typos found in translatable strings This is from a spell-check of hg.pot. [ original upstream message ]

(stable) merge with default

keyword: rename matcher() to match() mimicking changes in main

Merge with stable

match: add some default args [ original upstream message ]

match: change all users of util.matcher to match.match [ original upstream message ]

Merge with stable

update --clean: do not unlink added files (issue575) [ original upstream message ]

Merge with stable

commit: move editor outside transaction The commit editor is now invoked before files and manifest are committed. The editor is now run with only the wlock held and aborting an edit no longer requires rolling back a transaction. Changes to files during a commit still result in undefined behavior. (This is preliminary work for committing subrepositories) [ original upstream message ]

Merge with stable

commit: move commit editor to cmdutil, pass as function [ original upstream message ]

commit: drop unused p1 and p2 args [ original upstream message ]

Merge with stable

updated license to be explicit about GPL version 2 [ original upstream message ]

Merge with stable

replace util.sort with sorted built-in This is marginally faster for small and moderately-sized lists [ original upstream message ]

Merge with stable

tests: removed redundant "-d '0 0'" from test scripts The tests are executed with a .hgrc file which adds "-d '0 0'" by default. [ original upstream message ]

Merge with stable

switch lock releasing in the extensions from gc to explicit [ original upstream message ]

Merge with stable

keyword: set overwrite message only once, not for each file [ original upstream message ]

keyword, i18n: avoid untranslated strings as message parameters [ original upstream message ]

Merge with stable

expand "repo" to "repository" in help texts [ original upstream message ]

Merge with stable

keyword: word-wrap help texts at 70 characters [ original upstream description ]

Merge with stable

bundlerepo: reintroduce dirstate [ original upstream description ]

Merge with stable

add --git option to commands supporting --patch (log, incoming, history, tip) No short -g form, since it would conflict with -g from the graphlog extension. [ original upstream descrition]

patch: pass an opener to patchfile [ original upstream description ]

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533. [ original upstream description ]

mq: lowercase output This extension produces quite a lot of informational messages during its normal operation and it is hard to say which strings can be changed and which cannot. [ original upstream description ]

(0.9.2compat) do not use builtin format

(stable) merge with default

keyword: simplify repo.local and bundle check (as in 2f4a399a8787)

Merge with stable

get-with-headers: fix stream modes under Windows [ original upstream descripton ]

hgweb: return meaningful HTTP status codes instead of nonsense [ original upstream description ]

Add a test for getting raw files via the web UI. [ original upstream description ]

hgweb: nodeids should be aligned in raw changesets If they aren't it breaks hg import --exact Thanks to Jesper Noehr for noticing it. [ original upstream description ]

notify: mime-encode messages - addresses will be properly encoded - message bodies will also be encoded as we are not sending patches that are meant to be applied - update test output - adapt test-keyword to ignore the new headers [ original upstream description ]

(stable) merge with default

Do not shadow builtin format (detected by pychecker)

(stable) merge with default

keyword: move common code out of commit condition

Merge with stable

keyword: be more efficient about ctx usage [ original uptstream description ]

cmdutil: use change contexts for cset-printer and cset-templater [ original uptstream description ]

Merge with stable

patch: turn patch.diff() into a generator This should even be a little faster than passing in an fp argument. [ original upstream description ]

Merge with stable

extensions: use new wrapper functions [ original upstream description]

Merge with stable

help: better documentation intro for a few extensions [ original upstream description ]

show enabled extensions in hg help [ original upstream description ]

untest

cross them fingahs

Merge with stable

fix test output broken by a04d8cadb6af

Merge with stable

Have verbose and debug flag print the changeset rev and hash when committing. Besides updating the tests output, I had to push back at the end the test for issue1193 in test-commit, solved by cset 4386a7706828, because it was using the current date for commit and was randomizing the subsequent hash. [ original upstream description ]

Backed out changeset d557749c627a Replace this change with a better one. [ original upstream description ]

(0.9.2compat) remove new verbose commit message for backwards compatibility

(stable) merge with default

Have verbose flag print the changeset hash when committing [ original upstream message ]

(0.9.2compat) add merge, resolve to restricted This is not really backwards compatible (test only as comment) and doesn't prevent extra conflicts with older Hg versions. On the other hand it doesn't do any damage either and provides the 3-way merge ease if possible.

Avoid additional conflicts during merge/resolve Make merge and resolve trigger kwtemplater.restricted to compare data without keyword expansion. The keyword stays outside the conflict: $Keyword$ <<<<<<< local bar ======= foo >>>>>>> other and will again be expanded on commit. Demonstrate in test case.

(stable) merge with default

(0.9.2compat) fix test compatibility Comment out non-backwards compatible hgweb test (at default position). Make kwexpand nonexistent work on Windows (originally by pmezard).

Thorough hgweb testing - test hgweb while keyword extension is _enabled_ - check expansion with hgweb.file - besides log and diff, also check annotate for not expanding

(stable) merge with default

(0.9.2compat) add verify to nokwcommands

Add verify to nokwcommands after refactor in e79a8f36c2a5 Add test as well. Thanks to Guy Brand for spotting this.

(0.9.2compat) context, status refactor keeping backwards compatible fallback

(0.9.2compat) ddb8a222249b is backwards compatible

Merge with stable

util: add sort helper [ original upstream description]

status: clean up all users for unknown files [ original upstream description]

repo.status: eliminate list_ [ original upstream description]