merge with the stable branch

cmdutil: copy auth section in remoteui This allows me to specify an auth section in a .hg/hgrc instead of just a global or user-level hgrc.

log --follow: use a set instead of a list benchmarked with hg log -qf on the linux kernel: before: Time: real 39.010 secs (user 38.840+0.000 sys 0.060+0.000) after: Time: real 8.560 secs (user 8.440+0.000 sys 0.080+0.000)

Merge with stable

patchbomb: fix bug introduced in 4ddfad7ebd98 and add test Thanks to Augie Fackler for reporting this.

help: don't display bogus help messages for invalid aliases

run-tests: install data files correctly In 68964567e406 we began installing some data files in PREFIX/share. When preparing to run the tests, run-tests.py uses --home="" in order to work around home being set in a ~/.pydistutils.cfg file. This somehow overwrites the --prefix option. The result was that the share/ directory was installed in the top of the Mercurial source tree.

Merge with stable

patchbomb: handle repository#rev URLs correctly

contrib: helper extension to track memory usage

export: fix tests

commands.export: accept -r option as revision specification This brings consistency with other commands option and allows specification of negative numbers (-r -2), which were recognized as options earlier.

status: add the --change option to display files changed in a revision This option is similar to the one already used for the diff command. Unfortunately, the c and C short option are already used for status, so there is no corresponding short option. However, there is no short option for --rev either, so that's consistent.

run-tests: --inotify: use inotify.appendpid to append pids to $DAEMON_PIDS Introduce a inotify.appendpid configuration possibility that appends pids to inotify.pidfile when set to True.

cmdutil: service: add appendpid parameter to append pids to pid file

changegroupsubset: readdelta() can be used if the previous rev is a parent

changegroupsubset: simplify parents pruning

shrink-revlog: improve performance: use changegroup instead of revisions Before: real 0m23.971s Now: real 0m4.229s The only case where the output would be different is if the newer hg was using a different diff algorithm than used originally.

Update win32 installer paths for bash and zsh scripts after move done in 68964567e406

rst2man: s/dont/don't/ in comment

rst2man: separate inline blocks from previous paragraphs

setup: install some useful data files. The selection is somewhat arbitrary. In the case of the Zsh completion file, it will not conflict with the builtin Zsh completions: they are in a file named `_mercurial', not `_hg'.

color: add support for churn --diffstat

Makefile: help/ was moved in f91e5630ce7e update paths to match

Update win32 installer with changes from f91e5630ce7e

doc: correct path to help files in Makefile

setup: cleanup coding style

setup: install translation files as package data Remove the `install_package_data' subclass of `install_data' and use the `package_data' functionality provided by distutils instead. As package data must be located within the package directory, the data files are now generated in the build directory. To simplify the functionality of this change, the top-level `doc' and `templates' directories have been moved into the `mercurial' package directory.

setup: don't ship i18n directory The directory was never actually used at runtime and other programs don't ship it either.

Merge with stable

handle file URIs correctly, according to RFC 2396 (issue1153) The new code aims to implement the RFC correctly for file URIs. Previously they were handled incorrectly in several ways, which could cause problem on Windows in particular.

transplant: fix small bug when a patch fails while using --filter