Merge with crew-stable

test-annotate: add a test for issue 589.

Fix issue 589: "undelete" sequence leads to crash.

Add test for debugrename

Fix debugrename --rev option

Updated copyright notices and add "and others" to "hg version"

Use printenv.py for pre/post-command-hooks (fixes tests on Solaris, too)

Cleanup of whitespace, indentation and line continuation.

dispatch: report failed imports nicely

demandimport: fix issue579 and add a test fix suggested by Brendan

dispatch: add generic pre- and post-command hooks

Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer. Initial version from Shun-ichi GOTO in BTS 449 for private copies of DLLs. Additional changes to remove local DLL flag on uninstall and set privilege level.

Fix for including hgext in Windows compiled version. From Shun-ichi GOTO via Mercurial mailing list.

Merge with crew

Fix for demandimport.py and Windows compiled version. From Shun-ichi Goto in BTS issue 457 http://www.selenic.com/mercurial/bts/msg2780

Work around heisenbug in Popen3.__del__

Merge with mpm

hooks: separate hook code into a separate module

dispatch: fix handling of incorrect number of arguments

dirstate: pull ignore smarts out of ui

encoding: pull fallbackencoding out of localrepo into early parsing

extensions: kill ui readhooks Move .hgrc extension loading into localrepo

extensions: pull extension-aware bits out of ui

dirstate: refactor checkinterfering

dirstate: hide some more internals

dirstate: hide internal vars Add an __iter__ method so commands don't need to poke at _map.

localrepo and dirstate: rename reload to invalidate We want to avoid actually reloading if possible.

dirstate: simplify dirty handling

dirstate: lazify and lambdafy _slash

dirstate: simplify state()

dirstate: move ignore to its own file

dirstate: replace clear()

dirstate: fold parse into read

dirstate: make reload lazy

dirstate: lazify initdirs

dirstate: lazify copymap, _branch, and _pl

dirstate: use getattr rather than lazyread

Make fast-forward merges full merges

Fix up tests for new branch message

Notify the user that hg branch does not create a branch until commit

patchbomb: fix PAGER buglet introduced in 88fc92b0b821

patchbomb: page patchbomb messages only if PAGER is defined. Paging is complicated under win32. It is just better to avoid it by default.

cmdutil: add missing "time" import.

Merge with crew-stable

patchbomb: flush ui before delegating to pager.

test-patchbomb: fix non-existing --date parameter and filtering regexps.

test-patchbomb: sed -e may not work with extended regexps Non-GNU versions of the sed(1) utility (i.e. on Solaris or BSD) may not support extended regexps (i.e. including \| branches), or may need a special option to enable it (like -E instead of -e). Expand the sed RE in tests/test-patchbomb to fix running this test on FreeBSD and Solaris.

Make --import-branch option actually work (- is translated to _)

Add --import-branch option to hg import to pull in branch information without --exact

convert: remove pdb call. *blush*

convert: fix various authormap handling bugs

convert extension: Add support for username mapping Allows mapping usernames to new ones during conversion process. - Use -A option for first import - Then at the end of the conversion process and if the destination repo supports authorfile attribute, author map content is copied to the file pointed by the authorfile call. - On incremental conversions w/o any -A option specified, the destination authorfile, if any, gets read automatically. EG: This allows mapping unix system usernames used in CVS accounts to a more typical "Firstname Lastname <address@server.org>" pair.

convert extension: Save a few opens on the map file Save a few opens on the map file adding a class attribute

Merge with stable

Make parents with a file but not a revision use working directory revision.

Merge with crew

Make parents with a file but not a revision use working directory revision.

Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again. Repainted the bikeshed with its original color.

merge with main

extensions: fix lookup of hgext.foo modules

localrepo: demand-load changeset, manifest, and dirstate

Merge with crew

extensions: fix load of module/__init__.py on OS X

localrepo.status: only append stuff to the clean list if list_clean is true This is consistent with dirstate.status.

mq: reduce matcher abuse The match function should match only the files we're interested in.

commands.remove: don't use the unknown list

commands.commit: don't use the unknown list

localrepo.add: avoid some stats There's still an extra lstat done by dirstate.update.

revert: use util.lexists

addremove: use util.lexists

commands.commit: symlinks are supported

mq: grab locks before starting a transaction

Merge with crew

extensions: load modules in module/__init__.py form. For example, convert=/path/to/convert now works.

test-patchbomb: sed -e may not work with extended regexps Non-GNU versions of the sed(1) utility (i.e. on Solaris or BSD) may not support extended regexps (i.e. including \| branches), or may need a special option to enable it (like -E instead of -e). Expand the sed RE in tests/test-patchbomb to fix running this test on FreeBSD and Solaris.

Correct tests/test-patchbomb* files: mv test-patchbomb test-patchbomb.out hg revert -r 1cf908c00479 test-patchbomb

patchbomb: add --date option

Don't validate email config if we're not sending email.

patchbomb: 0c61124ad877 moved setremoteconfig into cmdutil

dispatch: restore a dropped shlex import Add test-dispatch as a place for command parsing and dispatch tests.

merge with main

extensions: add missing sys import

Revive commands.dispatch as a simple way to call hg from other pythons scripts. This was already used by hg-ssh and others and is really convenient if you just want a native equivalent of calling the command line version.

dispatch: accept an abbreviation of --repository

dispatch: move findrepo to cmdutil

localrepo: don't search from path All current callers already pass in the repo root. This normalizes things a bit. Now all repo types take a direct path to repo root and only the command line interface (or the dispatcher) searches from the current directory.

dispatch: use the repo path found by early parsing This lets us simplify things a bit.

dispatch: parse and apply -R early This allows us to use extensions specified in .hg/hgrc. Unfortunately, this requires us to parse that file twice, but performance impact on the version command appears to be less than 1%.

dispatch: parse and apply cwd opt early

dispatch: rename variables after code motion

dispatch: hoist debugging hook to runcatch

dispatch: move dispatching code to cmdutil

dispatch: move runcommand to cmdutil

dispatch: pull final command execution into its own function

dispatch: reduce nesting by moving parsing exceptions

dispatch: move signal and exception handling to its own function