bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).

merge with crew

hgweb: cleanup the manifest generation

convert: make built-in cvsps the default Reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>

merge with crew

dirstate.walk: skip unreadable directories (issue1213) Do not abort on permission denied error, just skip the directory.

osutil.c: refactor argument parsing, allow skip=None being passed

convert: fix builtin cvsps under Windows Drafted and reviewed by Frank Kingswood <frank@kingswood-consulting.co.uk>.

dirstate._dirs: fix refcounting broken by 7dfac37cfabf reported by Patrick Waugh

patchbomb: consistently use opts.get

annotate: fix bug when annotating multiple files

dirstate: C parsing extension

parsers: speed up hex decoding for manifests

parsers: clean up whitespace

diff: pass contexts to status Allow status() to take contexts as well as nodes. This lets us avoid unpacking manifests multiple times and intelligently unpack manifests in revision order. Also, we can avoid unpacking manifests at all when there are no changes in the working directory.

revlog: fix heads performance regression