tests: avoid checking the exitcode of false Solaris false returns 255 instead of 1, so we remove one unneeded instance and replaces another with (exit 1) as suggested by Brodie Rao.

test-rename: accept solaris diff Solaris diff gives @@ -1,1 +1,1 @@ instead of @@ -1 +1 @@

test-subrepo-svn: restore expr functionality for solaris Cleanup in 22f3353bcc36 removed a syntactically incorrect and apparently unnecessary escape of / for expr - but solaris needs it.

test-serve: fix test for binding to low named port on solaris Solaris do not know the service called http, so we use echo instead. Trying to define KILLQUIETLY when running the hgserve function didn't set the value within the function. Now we set the variable before calling the function.

templater: add a few comments.

backout most of 4f8067c94729

incoming/outgoing: Fix recursion on sub repositories Incoming and outgoing are fixed so they go through the whole three of repositories instead of only visiting first level of sub repositories.

tests: added a short description to issue numbers Many tests already had a short line to describe what IssueXXX is about. I find that quite useful when reading a test.

merge with stable

test-gendoc: mute gendoc stderr Solaris had problems with zh_CN and warned "couldn't set locale correctly" on stderr. We don't care.

test-mq-symlinks: fix symlink handling on solaris It seems like ln -s gets confused if an existing symlink is dangling: $ rm -f a b; ln -s a b; ln -sf b b ln: cannot create b: File exists We now rely on rm instead of on ln -sf.

test-archive: fix touch datestamps Backport 3acd5f7ab9d0 and 9581d5efb6a5 to stable.

Merge with stable

convert/darcs: improve unsupported format detection (issue2172)

bookmarks: fix _bookmarks/lookup() reentrancy issue (issue2016) _bookmarks is loaded lazily and calls super.lookup(). Unfortunately, branch and tags caches initializations also recurse in lookup() and end up trying to access _bookmarks again. Massive confusion ensues. I considered fixing all branches and tags cache loading to avoid recursing in lookup() but it would add complexity to otherwise working code provided lookups are performed on nodes or revnums.

Fix memory leak when using hg commands over http repositories When using hg commands over an http repository in a long running process, a httphandler instance is leaked for each command, because of a loop handler.parent -> OpenerDirector and OpenerDirector.handlers -> handler which is not handled by Python's gc. Discussion on #mercurial concluded that removing the __del__ method solved the problem.

Use more note admonitions in help texts

Use note admonition

minirst: Support for admonitions The old asciidoc format supported something like this, this is why there is NOTE: scattered here and there.

cleanup: use x in (a, b) instead of x == a or x == b

merge with stable

grep: only catch re.error when compiling regular expressions

doc: clarify smtp.password usage

merge with stable

log: include unmodified-in-merge files in log diff/stat (issue2383) f786fc4b8764 assumed that walkchangerevs called prep with all relevant matched filenames, but actually it only contains the names of files changed in the relevant changeset. That meant that log diff/stat of merges missed the diff for files only changed in the other branch. This is a minimal fix for making sure we only use fns when we are following and thus will have problems with merges anyway ...

tests: fix unzip -l variability fix 01-01-1980 slipped through the grep.

merge with stable

tests: fix unzip -l variability

mq: always require --force when pushing patches (issue2363) --force was not necessary when passing --rev since 55578a8d7e84, but this behaviour is usually harmful when branch names are passed instead of explicit revisions.

tests: various fixes for new unified test pattern format

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.

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)