merge with crew

merge in commit that shouldn't be on default

tests: don't use 'test -e' On Solaris 10: $ test -e f test: argument expected

check-code: support multiline matches like try/except/finally - match one pattern at a time against entire file - find line containing match - sort matches by line number

fix bad tag for 2.0-rc This tag was immediately stripped, but not before escaping onto the hg-stable mirror.

largefiles: use separate try/except and try/finally as needed for python2.4 cfccd3bee7b3 introduced a try/except/finally block, which breaks compatibility with python2.4

commands: use separate try/except and try/finally as needed for python2.4 62dc0e7ab092 introduced a try/except/finally block, which breaks compatibility with python2.4

Added signature for changeset fccd350acf79

Added tag 2.0-rc for changeset fccd350acf79

Added signature for changeset 384082750f2c

Added tag 2.0-rc for changeset 384082750f2c

merge default into stable for 2.0 code freeze

rebase: simplify check for orphaned descendants

rebase: simplify set generation

rebase: add --rev option to rebase This option allow a strict set of revision to be specified instead of using -s or -b. Rebase will refuse start if striping rebased changeset will strip non rebased changeset. Rebase will refuse to work on set with multiple root.

rebase: allow revsets for source and base args

revset: fix %r handling in formatspec

rebase: use revset as soon as possible in internal logic The buildstate function now take a set of revs. Logic related to --source and --base option have been moved in the main rebase function. In the process this fixes a bug where the wrong source changeset might be pick. This explain the changes in hgext/rebase.py

revset: add %r for embedded revset support to formatspec This allows folding external revsets or lists of revsets into a revset expression. Revsets are pre-parsed for validity so that syntax errors don't escape.

revert: warn that subrepos cannot be reverted (tests added by mpm)

merge: expand environment variables and ~/ in tool.executable hgrc(5) already implies that this works, so we might as well support it. Another approach would be to implement this in util.findexe(): that would benefit other callers of findexe(), e.g. convert and anyone calling the user's editor. But findexe() is really implemented in both posix.py and windows.py, so this would make both of those modules depend on util.py: not good. So keep it narrow and only for merge tools.

minirst: improve test harness

minirst: add style flag to format

minirst: add basic HTML formatting support

graft: use status verbosity for reporting grafts

contrib: add a script to help diagnose raw output of the cmdserver

mq: eliminate explicit checks for file existence

mq: cleanup of lookup - handling of None is not relevant Patch specifications in mq is passed around as a string or None. None is generally used when no patch has been specified and there thus is nothing to lookup and the calling code should do something else. One code path did however pass None all the way to lookup. That case was handled in lookup, but there was really need for that, it was undocumented, and it used to cause trouble back when patches was specified as integers.

mq: fix corner cases for handling of patch 0 in qselect Most of the code paths in mq would always pass patch specifications as a string. Patches can be specified by their index, but one code path passed that (through pop) to lookup as an integer - all other code paths used a string. Unfortunately pop and lookup (like many other parts of mq) used the boolean value of the patch specification to see if it was None, and they would thus incorrectly handle patch 0 as None. This patch makes the code comply with the actual internal duck typing of patch specifications: patch indices must be encoded as strings. The (now) unused code for partial and thus incorrect handling of indices as integers is removed.

largefiles: cosmetics, whitespace, code style This is mainly about keeping code under the 80-column limit with as few backslashes as possible. I am deliberately not making any logic or behaviour changes here and have restrained myself to a few "peephole" refactorings.

largefiles: more work on cleaning up comments - always say "largefile", not "lfile" - cleanup mangled syntax, hopefully correctly (punctuation: it's your friend!) - wrap to 75 columns (where feasible)

largefiles: improve error reporting - tweak wording of some error messages - use consistent capitalization - always say 'largefile', not 'lfile' - fix I18N problems - only raise Abort for errors the user can do something about