D6826: py3: drop incorrect fsencode(findexe(...)) in procutil
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sat Sep 7 13:22:29 EDT 2019
Closed by commit rHGacf80f9edc85: py3: drop incorrect fsencode(findexe(...)) in procutil (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6826?vs=16442&id=16447
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6826/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6826
AFFECTED FILES
mercurial/utils/procutil.py
CHANGE DETAILS
diff --git a/mercurial/utils/procutil.py b/mercurial/utils/procutil.py
--- a/mercurial/utils/procutil.py
+++ b/mercurial/utils/procutil.py
@@ -245,11 +245,8 @@
pycompat.fsencode(getattr(mainmod, '__file__', ''))) == 'hg'):
_sethgexecutable(pycompat.fsencode(mainmod.__file__))
else:
- exe = findexe('hg')
- if exe:
- _sethgexecutable(pycompat.fsencode(exe))
- else:
- _sethgexecutable(os.path.basename(pycompat.sysargv[0]))
+ _sethgexecutable(findexe('hg') or
+ os.path.basename(pycompat.sysargv[0]))
return _hgexecutable
def _sethgexecutable(path):
To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list