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 ]