Merge with cmason

Remove bogus raise from localrepo.lookup()

Fix hg qdiff <file>

Ignore EPIPE in pipefilter This hides the following traceback (there's a race condition involved, so you may have to try a few times to hit it): $ hg sign --key key-that-does-not-exist Signing 2062:4bad92f4ea65 gpg: skipped "key-that-does-not-exist": secret key not available gpg: signing failed: secret key not available Exception in thread Thread-1: Traceback (most recent call last): File "threading.py", line 442, in __bootstrap self.run() File "threading.py", line 422, in run self.__target(*self.__args, **self.__kwargs) File "mercurial/util.py", line 24, in writer pin.close() IOError: [Errno 32] Broken pipe abort: Error while signing

Don't send "Content-Type: none" mimetypes.guess_type will return (None, None) when it can't detect the filetype.

Fix filerevision-raw.tmpl Two bugs: - conteXt-type instead of conteNt-type - trailing newline The easiest way to fix the second one (and keep it fixed) is to put everything inline in map-raw.

convert-repo: fix reversed time zone offset

catch SIGBREAK on windows.

update windows readme to document msys/mingw rxvt problems.

fix util.canonpath on windows. old test for absolute path was not portable. use os.path api instead.