Add script to rewrite revlog to workaround lack of parent deltas. Defaults to rewriting the manifest in the current repository. Based on a patch to rewrite-log by Benoit Boissinot that I found here: http://article.gmane.org/gmane.comp.version-control.mercurial.general/11908

inotify: use cmdutil.service instead of local daemonizing code

cmdutil: service: add an optional runargs argument to pass the command to run This would be necessary for inotify launching its server: the initial command is a standard 'hg st'/'hg ci'/... but the daemon to run is 'hg inserve'

extdiff: add 3-way diff for merge changesets This adds 3-way diff for merge changesets (using -c) and for diffing the working directory context against two parents. To enable it, use the new magic value '$parent2' in the argument line. In order to work, your differ must support that the second parent argument is left out; this will happen in 2-way mode. Default arguments are as before, without enabling 3-way mode, ensuring backwards compatibility. This also fixes a problem when diffing a merge changeset with a single file change. Extdiff would sometimes do the wrong thing in that situation.

bash_completion: add completions for shelve extension

doc: clarify license footers Mercurial is licensed under version 2 of the GPL

dirstate: kill dirstate.granularity config option The dirstate.granularity configuration parameter was never documented, it only adds code complexity and it is unneeded. Adding comments describing forced 'unset' entries.

Merge with -stable

subrepo: add auto-pull for merge

streamclone: partially encode filename over the wire, not for local read (issue1847) (Fixes issue1847, which was introduced by 810387f59696: stream clone of a repo with directory named *.d failed: server raises exception "IOError: [Errno 2] No such file or directory: /tmp/test/.hg/store/data/foo.d.hg.hg/foo".)