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 ]