This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6782

py3: use pycompat.sysargv[0] for instead of fsencode(sys.argv[0])
ClosedPublic

Authored by martinvonz on Sep 2 2019, 2:48 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGdb51a4ac85ac: py3: use pycompat.sysargv[0] for instead of fsencode(sys.argv[0])
Summary

Yuya noted in a recent review that fsencode(sys.argv[0]) could be
incorrect on Windows.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Sep 2 2019, 2:48 AM
martinvonz updated this revision to Diff 16363.Sep 2 2019, 2:51 AM
martinvonz added a commit: rHGdb51a4ac85ac: py3: use pycompat.sysargv[0] for instead of fsencode(sys.argv[0]).Sep 5 2019, 2:57 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGdb51a4ac85ac: py3: use pycompat.sysargv[0] for instead of fsencode(sys.argv[0]) (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Sep 5 2019, 7:20 PM

@@ -245,8 +245,11 @@

    pycompat.fsencode(getattr(mainmod, '__file__', ''))) == 'hg'):
    _sethgexecutable(pycompat.fsencode(mainmod.__file__))
else:
  • exe = findexe('hg') or os.path.basename(sys.argv[0])
  • _sethgexecutable(pycompat.fsencode(exe))

+ exe = findexe('hg')
+ if exe:
+ _sethgexecutable(pycompat.fsencode(exe))
+ else:
+ _sethgexecutable(os.path.basename(pycompat.sysargv[0]))

findexe() is supposed to return bytes. If not always, it's the bug
of findexe().

martinvonz added a comment.Sep 5 2019, 7:26 PM
In D6782#99619, @yuja wrote:

@@ -245,8 +245,11 @@

    pycompat.fsencode(getattr(mainmod, '__file__', ''))) == 'hg'):
    _sethgexecutable(pycompat.fsencode(mainmod.__file__))
else:
  • exe = findexe('hg') or os.path.basename(sys.argv[0])
  • _sethgexecutable(pycompat.fsencode(exe))

+ exe = findexe('hg')
+ if exe:
+ _sethgexecutable(pycompat.fsencode(exe))
+ else:
+ _sethgexecutable(os.path.basename(pycompat.sysargv[0]))

findexe() is supposed to return bytes. If not always, it's the bug
of findexe().

Oh, findexe() is our own function. I somehow thought it was from the standard library. I'll send another follow-up. Thanks.

Revision Contents
Changeset List

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

Diff 16363

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') or os.path.basename(sys.argv[0]) exe = findexe('hg')
if exe:
_sethgexecutable(pycompat.fsencode(exe)) _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):