This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8038

setup: don't skip the search for global hg.exe if there is no local instance
ClosedPublic

Authored by mharbison72 on Jan 29 2020, 12:29 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa7f8160cc4e4: setup: don't skip the search for global hg.exe if there is no local instance
rHG35289b5654e0: setup: don't skip the search for global hg.exe if there is no local instance
Summary

The point of trying not to blindly execute hg on Windows is that the local
hg.exe would be given precedence, and if py3 isn't on PATH, it errors out with a
modal dialog. But that's not a problem if there is no local executable that
could be run.

The problem that I recently ran into was I upgraded the repo format to use zstd.
But doing a make clean deletes all of the supporting libraries, causing the
next run to abort with a message about not understanding the
revlog-compression-zstd requirement. By getting rid of the local executable
in the previous commit when cleaning, we avoid leaving a broken executable
around, and avoid the py3 PATH problem too. There is still a small hole in that
hg.exe needs to be deleted before switching between py2/py3/PyOxidizer builds,
because the zstd module won't load. But that seems like good hygiene anyway.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Msetup.py (2 lines)

Diff 19688

setup.py

hgenv['HGPLAIN'] = '1' hgenv['HGPLAIN'] = '1'
hgenv['LANGUAGE'] = 'C' hgenv['LANGUAGE'] = 'C'
hgcmd = ['hg'] hgcmd = ['hg']
# Run a simple "hg log" command just to see if using hg from the user's # Run a simple "hg log" command just to see if using hg from the user's
# path works and can successfully interact with this repository. Windows # path works and can successfully interact with this repository. Windows
# gives precedence to hg.exe in the current directory, so fall back to the # gives precedence to hg.exe in the current directory, so fall back to the
# python invocation of local hg, where pythonXY.dll can always be found. # python invocation of local hg, where pythonXY.dll can always be found.
check_cmd = ['log', '-r.', '-Ttest'] check_cmd = ['log', '-r.', '-Ttest']
if os.name != 'nt': if os.name != 'nt' or not os.path.exists("hg.exe"):
try: try:
retcode, out, err = runcmd(hgcmd + check_cmd, hgenv) retcode, out, err = runcmd(hgcmd + check_cmd, hgenv)
except EnvironmentError: except EnvironmentError:
retcode = -1 retcode = -1
if retcode == 0 and not filterhgerr(err): if retcode == 0 and not filterhgerr(err):
return hgcommand(hgcmd, hgenv) return hgcommand(hgcmd, hgenv)
# Fall back to trying the local hg installation. # Fall back to trying the local hg installation.