This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6826

py3: drop incorrect fsencode(findexe(...)) in procutil
ClosedPublic

Authored by martinvonz on Sep 7 2019, 1:05 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGacf80f9edc85: py3: drop incorrect fsencode(findexe(...)) in procutil
Summary

I recently added the bad call, thinking that findexe() was a standard
library function returning a string result, but it's actually our own
function returning bytes. Thanks to Yuya for noticing.

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.

Event Timeline

martinvonz created this revision.Sep 7 2019, 1:05 PM
indygreg accepted this revision.Sep 7 2019, 1:21 PM
This revision is now accepted and ready to land.Sep 7 2019, 1:21 PM
martinvonz added a commit: rHGacf80f9edc85: py3: drop incorrect fsencode(findexe(...)) in procutil.Sep 7 2019, 1:22 PM
Closed by commit rHGacf80f9edc85: py3: drop incorrect fsencode(findexe(...)) in procutil (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/procutil.py (7 lines)

Diff 16447

mercurial/utils/procutil.py

# Env variable set by py2app # Env variable set by py2app
_sethgexecutable(encoding.environ['EXECUTABLEPATH']) _sethgexecutable(encoding.environ['EXECUTABLEPATH'])
else: else:
_sethgexecutable(pycompat.sysexecutable) _sethgexecutable(pycompat.sysexecutable)
elif (not pycompat.iswindows and os.path.basename( elif (not pycompat.iswindows and os.path.basename(
pycompat.fsencode(getattr(mainmod, '__file__', ''))) == 'hg'): pycompat.fsencode(getattr(mainmod, '__file__', ''))) == 'hg'):
_sethgexecutable(pycompat.fsencode(mainmod.__file__)) _sethgexecutable(pycompat.fsencode(mainmod.__file__))
else: else:
exe = findexe('hg') _sethgexecutable(findexe('hg') or
if exe: os.path.basename(pycompat.sysargv[0]))
_sethgexecutable(pycompat.fsencode(exe))
else:
_sethgexecutable(os.path.basename(pycompat.sysargv[0]))
return _hgexecutable return _hgexecutable
def _sethgexecutable(path): def _sethgexecutable(path):
"""set location of the 'hg' executable""" """set location of the 'hg' executable"""
global _hgexecutable global _hgexecutable
_hgexecutable = path _hgexecutable = path
def _testfileno(f, stdf): def _testfileno(f, stdf):