tests: unify test-parseindex

tests: unify test-parentrevspec

tests: unify test-notify-changegroup

tests: unify test-notify

tests: unify test-oldcgi

tests: unify test-newercgi

tests: unify test-newcgi

tests: unify test-mv-cp-st-diff

tests: unify test-mq-qrefresh-replace-log-message

tests: unify test-mq-qpush-fail

tests: unify test-mq-qnew

tests: unify test-mq-qimport-fail-cleanup

tests: unify test-mq-qimport

tests: unify test-mq-qclone-http

tests: unify test-mq-header-from

tests: unify test-mq-header-date

tests: unify test-merge-tools

tests: unify test-merge-symlinks

tests: unify test-mactext

tests: unify test-inotify-lookup

tests: unify test-inotify-issue1556

tests: unify test-inotify-issue1542

tests: unify test-inotify-issue1371

tests: unify test-inotify-issue1208

tests: unify test-inotify-dirty-dirstate

tests: unify test-inotify-debuginotify

tests: unify test-inotify

tests: unify test-http-proxy

tests: unify test-http-clone-r

tests: unify test-http-branchmap

tests: unify test-http

tests: unify test-highlight

tests: unify test-hgwebdirsym

tests: unify test-hgwebdir

tests: unify test-hgweb-removed

tests: unify test-hgweb-raw

tests: unify test-hgweb-non-interactive

tests: unify test-hgweb-no-request-uri

tests: unify test-hgweb-no-path-info

tests: unify test-hgweb-filelog

tests: unify test-hgweb-empty

tests: unify test-hgweb-diffs

tests: unify test-hgweb-descend-empties

tests: unify test-hgweb-commands

tests: unify test-hgweb

tests: unify test-hgk

tests: unify test-hghave

tests: unify test-hgcia

tests: unify test-gpg

tests: unify test-gendoc

tests: unify test-fetch

tests: unify test-eolfilename

tests: unify test-eol-update

tests: unify test-eol-hook

tests: unify test-eol-clone

tests: unify test-eol-add

tests: unify test-eol-patch

tests: unify test-eol

tests: unify test-encoding-align

tests: unify test-encoding

tests: unify test-encode

tests: unify test-diff-color

tests: unify test-ssh

tests: unify test-hup

tests: unify test-clone-pull-corruption

tests: unify test-clone-failure

tests: unify test-clone-cgi

test-ssh: test absolute paths in SSH URLs

revset: support raw string literals This adds support for r'...' and r"..." as string literals. Strings with the "r" prefix will not have their escape characters interpreted. This is especially useful for grep(), where, with regular string literals, \number is interpreted as an octal escape code, and \b is interpreted as the backspace character (\x08).

tests: fold darcs test repository into a bundle

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)

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$".

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.

tests: improve regexes in unified tests

templater: add hex filter.

tests: unify test-convert-svn-*

merge: delay writing the mergestate during until commit is called This speeds up merges of lots of files considerably.

tests: fix touch -t with RHEL

tests: compatibility fix. 'touch -d *' doesn't work on Mac OS X. In order to prevent this from occuring again, a check for the case is added to 'check-code.py'.

tests: drop a bunch of sed calls from unified tests

tests: cleanup exit code handling in unified tests

check-code: add some basic support for unified tests

test-subrepo-recursion: sort archive output for portability

Merge with crew

Merge with stable

context: fix filectx.undelete() (issue2388)

tests: fix hgweb template change

Merge with crew

Restore lexists() changes lost in e0ee3e822a9a merge

tests: fix hgweb template change

merge with stable

merge with crew

hgweb: be consistent with the background highlighting on closed branches (Issue2386) The coal and paper web themes will highlight closed branches as a visual cue to the user. This patch makes the other two themes constistent. For users with difficulty differentiating colors, it would be better to split out closed branches to a new table or optionally hide them.

mq: fix the deprecation comment for qsave & qrestore. Changeset bcf90e712dc3 deprecated qsave and qrestore. In the deprecating comment, users were referred to 'rebase --mq' which -- at the time the message was written -- didn't exist. Currently, on the default branch, rebase *does* take a '--mq' option, but it probably doesn't do what Dirkjan expected it to do when he wrote the message. In the original, deprecating commit, little context was provided as to why this change was made. Based on my recollection, concensus at the Paris Sprint in February 2010 was that one of the problems with MQ was that it exposed far too many commands. Notable among these were qsave & qrestore: very few core developers understood what they did and even fewer (none, IIRC) actually used them. However, they couldn't be removed; not only do the usual backwards compatibility reasons apply, but the hg book refers to them.

revsets: reduce cost of outgoing in the optimizer

test-convert-hg-startrev: enable convert.hg.saverev.

transplant: fix var name conflict introduced by 2912881c2a98