mercurial-4.0: merge with future 6.0.0
A new version will be released soon, we start handling mismatch in test output
to make the actual release time smoother.
# name space package to host third party extensionsfrom__future__importabsolute_importimportpkgutil__path__=pkgutil.extend_path(__path__,__name__)