merge with mpm

inotify: inotify.server.walk() simplify control flow

inotify: inotify.server.walk*() remove unnecessary var Remove hginside var and the test it relates to: not( top or not hginside ) == (not top) and hginside, so the only case when nothing will be yielded is when hginside is True and top is False. Because of the returns placed upstream, this case will not happen anymore. We can then safely remove hginside and the (if)s

inotify: inotify.server.walk*() cleanup When not in root repo, if we meet a .hg, bail out. break was used, but return can be safely used instead: if we go through break then (top or not hginside) == False -> nothing is done after the for loop

inotify: inotify.server.walkrepodirs() simplify walking Do not 'yield tuple, boolean' to filter later on the boolean. Test the boolean first, and yield tuple only if needed.

inotify: inotify.server.walkrepodirs() simplify compute string concatenation only once

inotify: inotify.server.walk() simplify algorithm Do not yield (bool, tuple) in a subfunction and check later: 'if not bool: yield tuple'. Instead simplify so the tuple doesnt get yielded on the first time, to avoid systematic checks.

inotify: inotify.server.walk cleanups * Removing useless path computation * moving 'reporoot' computation down to the first call to avoid confusion with the parameter used in walkit()

revlog: add cache priming for reconstructing delta chains

revlog: use chunk cache to avoid rereading when splitting inline files

revlog: clean up the chunk caching code

revlog: use index to find index size

revlog: preread revlog .i file Smaller revlogs can be read with a single read, do it on open.

commit: be more verbose in the -u help text Make the requirement of an argument for -u a little more explicit.

separate import lines from mercurial and general python modules

manpage build: fail early when xmlto is not available When we try to build manpages with xmlto and sed, but xmlto is missing fail at the xmlto stage. Otherwise, one may run `cd doc; make' and miss the warnings like: xmlto: not found sed: hg.1: No such file or directory and end up with empty files installed as manpages.

dirstate: translate forgotten string

util: overwrite sha1 and _fastsha1

test-convert-bzr: tweak sed hack to preserve timezone in 'bzr log' output

zeroconf: remove unwarranted execute bit

test-convert-bzr: use sed instead of awk The run-tests.py script has a list of required tools and awk is not one of them -- luckily it could be replaced by sed in this case.

convert/bzr: handle Bazaar timestamps correctly (issue1652).

dispatch: remember loaded extensions in a real set

gpg: use reverse kwarg to sort sigs in reversed order

util: simplify pipefilter and avoid subprocess race The subprocess module is not thread safe. Spawning a thread to read the output leads to exceptions like this when Mercurial exits: Exception exceptions.TypeError: TypeError("'NoneType' object is not callable",) in <bound method Popen.__del__ of <subprocess.Popen object at 0x9ed0dcc>> ignored The bug is already reported in the Python bug tracker: http://bugs.python.org/issue1731717

Removed unnecessary call to dict.keys.

gpg: fix traceback in revs{} display code

util: kill unused Popen3

config: make remap actually work

util: stop overwriting sha1, overwrite _fastsha1 instead Some modules (like revlog) would import util.sha1 as _sha1. This defeats the purpose of having util.sha1 overwrite itself with a faster version -- revlog would end up always calling the slow version. By always delegating to util._fastsha1 we avoid this at the cost of an extra (but unconditional) indirection.

util: remove md5 This hash function is broken and should not be used by new code. It is currently only used by keepalive.

util: remove warnings when importing md5 and sha