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 ]