setup: read .hg_archival.txt for version info (
issue1670)
Previously, setup.py was enhanced to identify the Mercurial version
from either .hg/ or mercurial/__version__.py. When archives are
created using 'hg archive' or via hgweb, neither of those options are
available. However, there is a .hg_archival.txt file in the root of
the archive that has the information. This patch enhances setup.py to
identify the Mercurial version from the .hg_archival.txt file when
there is no .hg/ or mercurial/__version__.py available.
setup.py: subprocess instead of os.popen, sys.stderr.write instead of print
Also check that .hg is a directory.
merge: give hint as to how to discover uncommitted changes
Many users will try 'hg diff' here, and it will not show them missing files.
test-merge-tools: windows fixes
- /bin/cat does not exist, expect 'cat'
- non-interactive mode is not correctly detected in pysh, force it