hg log --limit shouldn't count unprinted revisions (found by TK Soh)

Cleanup: Put initialization of br in front of --branches option handling.

Make option --branch vs. --branches more consistent. As you can abbreviate --branches to --branch, old scripts using the long name will still work.

Add option -b/--branch to hg tip (as done for hg parents).

merge with crew

fix typo in debugrebuildstate

Sunpro compiler patch The compiling runs through without warning, but runnig the newly builded hg emmits a message: | ImportError: ld.so.1: python: fatal: relocation error: | file /opt/local/lib/python2.3/site-packages/mercurial/bdiff.so: | symbol cmp: referenced symbol not found Removing the inline infront of cmp corrects this error message.

add options to log man page.

merge with crew.

add -l,--limit to log command.

add 'debugrebuildstate' to rebuild the dirstate from a given revision - added and removed files will be lost while recreating the dirstate - modifications are not lost

use repo.lock when cloning via copy, use lock.LockException when necessary

Raise a different exception when the lock is not available When the filesystem is read-only or if we have some other error, there is no need to wait. Raise a lock.LockUnavailable exception.

merge with crew

localrepo: refactor the locking functions

make test-pull-permission cleanup correctly in case of errors

fix warnings from pychecker (unused variables and shadowing)

bisect: fix for recent changes disallowing "false" merges

transitive copy/rename Add support for transitive copy or rename operations, e.g. hg rename a b ... (possibly edit b) hg rename b c hg commit ... by actually renaming "b" as "c" while recording a copy of "a" to "c" and a removal of "a".

Fixed misleading indentation in mpatch.c

merge with crew.

make server tests use --daemon.

Merge with upstream

Added help string for --daemon-pipefds

stop read end of pipe from staying open forever in child process.

add --daemon option to serve command. for issue 45. code looks odd because it is portable to windows. windows does not have os.fork, so have to spawn and use pipe to tell parent ready instead.

AmbiguousCommand is raised too soon. Right now, hg raises AmbiguousCommand as soon as it finds two commands/aliases that start with the substring it's searching for, even though it may still find a full match later on. This is a bit hard to hit on purpose, because hg checks the list of commands in whatever order is returned by table.keys(), which will change when you add an alias to a command. You should be able to hit it by adding an alias "u" to the "identify" command - not that that makes a lot of sense...

Don't hard-code /tmp in test-ro-message This makes the test succeed when $TMPDIR is set.

Merge with crew

add preoutgoing and outgoing hooks. preoutgoing lets prevent pull over http or ssh. outgoing lets notify after pull.