convert: differentiate between IOError and OSError on commitctx() The IOError exception is overloaded to mean 'this file was deleted in the current commit'. Separate the code that handles IOError and file deletion from general OSError exceptions. The latter are real errors, but IOError is not always a throwable error. This solves the accidental marking of files as 'deleted' in commits that try to write for example in .hg/store/data revlogs that the current user has no permission to modify (a normal OSError that should abort the current commit). Changed by pmezard: use getattr() to be on the safe side.

test-mq-qclone: test --mq option

merge with crew

ui.progress: clarify termination requirement

relink: properly use the progress API

test-subrepo-svn: handle svn output changes gracefully

util: fix trailing whitespace found by check-code

ui: look before you leap on sys.stderr.closed (and look nicer) f83291e5643e introduced a fix if sys.stdout.closed does not exist. This change uses a getattr with default instead of hasattr (which just calls getattr) and accessing the attribute. Additionally it applies the same fix for sys.stderr.closed as this is not available in the bpython shell (reported by Roger Gammans).

Merge with stable

hgrc: update docs for the server section

localrepo: add optional validation (defaults to off) for incoming changes This verifies that all manifests are present for incoming changes, and all files for those manifests are also present. This is a simple first-pass, and could be better, but seems like a valuable thing to have, as I've seen pushes in the past that propagated revlog corruption.

branch: avoid using reserved tag names Reported as Debian bug #552423.

doc: add missing documentation for http_proxy.always

url: proxy handling, simplify and correctly deal with IPv6 Thanks to Henrik for testing.

streaming: actually change default

fix up a bunch of check-code warnings

check-code: import some pylint checks

ssl: fix compatibility with pre-2.6 Python

mq: remove unused import

url: SSL server certificate verification using web.cacerts file (issue1174)

url: httplib.HTTPSConnection already handles IPv6 and port parsing fine

mq: incorporate mq repo config when using --mq For example, incoming should use the paths defined in .hg/patches/hgrc instead of .hg/hgrc.

run-tests.py: skipped tests shouldn't change working directory

whitespace cleanup

revlog.size: remove alternate implementation (revlogv0 specific) it's only useful for revlogv0 anyway, revlogNG has the uncompressed size in the index.

pylintrc: string isn't deprecated, only some of its methods

mq: make init -Q do what qinit -c did

mq: add -Q option to all commands not in norepo

setup.py: fixing version info for Windows hg.exe (py2exe) Fixes warning: py2exe: Version Info will not be included: could not parse version number ... which was seen when doing nightly builds. hg.exe files of nightly builds did not have any version info resoure, which may cause problems with installers. Also setting a copyright string for the version resource (was missing).

test-branch-option: make it executable