mq: Fix --qrefresh --short to work with --exclude and --include pmezard expects hg qref -s -X b to apply the -X to the list of files in the patch, and thus remove b from the patch. That's how it worked before f7fc5f5ecd62. That change seemed sensible, but it wasn't... mpm says (17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ? (17:22:54) pmezard_: kiilerix1: and --include too (17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar so mpm expects hg qref -s -X b * to apply the -X to the list of files in the working directory, and thus don't include b in the patch This patch tries to make both usecases work by creating a matchfn which uses the include/excludes but not the filelist.

merge with crew

parsers.c: do not try to untrack after a failure

parsers.c: fix integer overflows thanks to zzuf for helping finding those

Merge with crew

Use dummy diffstat in tests and remove older diffstat workaround. This makes test-notify pass on systems without diffstat installed or where the diffstat version yields a different output.

Fix test-bundle-type output by changing head|cut to cut|head. With some versions of cut the output otherwise has no end of line.

convert documentation: --config argument with spaces needs quoting.

Copy index before parsing to enforce alignment with inline data present. Fixes issue1348 (Bus error in parsers.c) on Solaris/sparc.

parsers.c: there is no reference to data_obj, so it shouldn't be decref'ed

merge with crew

hgweb: nodeids should be aligned in raw changesets If they aren't it breaks hg import --exact Thanks to Jesper Noehr for noticing it.

Fix test-notify output for older diffstat versions.

Add util.popen3 fallback, simplify import of Popen3

Fix util.popen2 for Python 2.3 1. trigger ImportError early, so fallbacks are activated 2. util.popen2 replaces previous usage of os.popen2, not popen2.popen2

mq: heavy rearrangement of qnew to make it recover reliably from errors. Closes issue1269.

mq: abort qnew -f if any file in an explicit list cannot be read

mq: make qimport -f work properly. Closes issue1255. From Bernhard Leiner.

Merge with crew

mq: let qimport read patches from URLs

mq: do not invoke editor until just before patch creation. Closes issue1346.

merge with crew

add a missing +x to test-inotify-lookup

index parser: fix refcounting in case of errors, refactor due to incorrect refcounting, on a bad revlog it was failing with: *** glibc detected *** /usr/bin/python: corrupted double-linked list: 0x0816d318 *** and a backtrace.

patch: pass linereader to binaryhunk.extract() instead of wrapped fp It unifies input patch file access methods

patch: pass linereader to scangitpatch(), extract from iterhunks() It's good because it unifies the patch file access methods.

patch: change functions definition order for readability

patch: map changed files to patchmeta directly

patch: patchmeta gives (islink, isexec) tuple instead of int mode

patch: extract and rename gitpatch into patchmeta, document