test-pull: convert regexes to globs

test-ssh: test absolute path that exists

subrepo: improve lookup error messages

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/.

setup: slight simplification

Makefile: remove the build folder manually Given a system Python version of 2.6, the following won't clean up build: $ make local PYTHON=python2.7 $ make clean Distutils only cleans up build subdirectories for the current Python version. This patch cleans up the build folder even if PYTHON=python2.7 isn't specified to clean.

Makefile: remove all .so files during clean This ensures .so files in hgext are cleaned up.

keyword: support rollback by restoring expansion to previous values Prevent spurious differences in the working directory after a rollback. Add tests for several rollback situations.

keyword: 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.

keyword: 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-keyword: fix typo, rephrase

tests: unify test-win32text

tests: unify test-template-engine

tests: unify test-strip-cross

tests: unify test-static-http

tests: unify test-ssh-clone-r

tests: unify test-ssh

tests: unify test-simplemerge-cmd

tests: unify test-share

tests: unify test-schemes

tests: unify test-rollback

tests: unify test-rename-merge2

tests: unify test-push-http

tests: unify test-pull-pull-corruption2

tests: unify test-pull-pull-corruption

tests: unify test-pull-http

tests: unify test-progress

tests: unify test-profile

tests: unify test-patch-offset

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