Merge with crew-stable

convert_git: avoid returning two entries for the same file in getchanges This could happen in merge changesets if the merged file was different from both parents.

mq: fix qrefresh -e with no patches applied

Push over HTTP: really tell the user the size of the bundle

hgwebdir: ignore hgrc parse errors while building the index page An error in the .hg/hgrc file from a repository would prevent the following repos from being shown in the index page. The IOError handling was unnecessary - it's already handled in readconfig. This should fix issue731. The error in the .hg/hgrc file will still prevent the repo from being exported with hgweb.

hgweb: don't raise an exception when displying empty repos The nullid node claims it's in the default branch, but the branch dict is empty. This fixes the main symptom from issue696, but we may want to set branchtags()['default'] = nullid somewhere for empty repos.

make identify an optionalrepo command Fixes issue726.

copy: if destination ends with "/", make sure it's a directory Fixes issue724.

manifest: minor performance tweak

dirstate: speed up read and write read: - single call to len(st) - fewer assignments for position tracking - don't split apart tuple from unpack - use a literal for the unpack spec write: - localize variables and functions - avoid copied function call - use % for string concatenation

dirstate: make dir collision logic faster - shortcircuit decpath if we haven't built the _dirs map - increment only for leafnodes of directory tree (this should make construction more like O(nlog n) than O(n^2))

Merge with crew

revlog: fix inlined revision transaction extra data (issue 749)

Merge with crew-stable

bisect: remove useless try/except

Merge with crew-stable

bisect: don't write data on failure

bisect: do silent init if necessary

Test renaming files brought by merge second parent (issue 746)

localrepo: fix undelete() on merge working directory (issue 746)

Test static-http calls on '/' URI (issue 747)

statichttprepo: fix calls on '/' URI (issue 747)

convert-cvs: update test to pass on Linux

verify: report first bad changeset - add linkrev and file arguments to err - track lowest reported linkrev in err - find linkrev in a couple cases - sort linkrevs when reporting a bunch of errors against a file - tidy up lots of messages - make more robust against damaged indexes - report first bad changeset if an error is encountered

revlog: more robust for damaged indexes - fix flag reporting - make broken length reporting smarter

debugindex: more robust for damaged indexes

debuginstall: stop looking for patch utility, just test it

Updated zsh completion from issue722.

Merge with crew-stable

convert: test cvs repository conversion

convert: workaround for cvsps.cache under Windows In non-cygwin environment, cvsps fails to create its cache directory and redirect its output to stderr. Just ignore the error and capture stderr as well.

convert: fix remote cvs file paths separator