This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7414

py3: use native string for 'macosx_app'
ClosedPublic

Authored by martinvonz on Nov 14 2019, 5:17 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG38387f9e4d22: py3: use native string for 'macosx_app'
Summary

I couldn't find any definitive information on this, but all examples
(except for ours) seem to use a native string.

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.Nov 14 2019, 5:17 PM
indygreg accepted this revision.Nov 14 2019, 10:35 PM
This revision is now accepted and ready to land.Nov 14 2019, 10:35 PM
martinvonz added a commit: rHG38387f9e4d22: py3: use native string for 'macosx_app'.Nov 14 2019, 10:43 PM
Closed by commit rHG38387f9e4d22: py3: use native string for 'macosx_app' (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (2 lines)
Mmercurial/utils/procutil.py (4 lines)

Diff 18137

mercurial/util.py

while a and b and a[-1] == b[-1]: while a and b and a[-1] == b[-1]:
a.pop() a.pop()
b.pop() b.pop()
b.reverse() b.reverse()
return pycompat.ossep.join(([b'..'] * len(a)) + b) or b'.' return pycompat.ossep.join(([b'..'] * len(a)) + b) or b'.'
# the location of data files matching the source code # the location of data files matching the source code
if procutil.mainfrozen() and getattr(sys, 'frozen', None) != b'macosx_app': if procutil.mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
# executable version (py2exe) doesn't support __file__ # executable version (py2exe) doesn't support __file__
datapath = os.path.dirname(pycompat.sysexecutable) datapath = os.path.dirname(pycompat.sysexecutable)
else: else:
datapath = os.path.dirname(pycompat.fsencode(__file__)) datapath = os.path.dirname(pycompat.fsencode(__file__))
i18n.setdatapath(datapath) i18n.setdatapath(datapath)

mercurial/utils/procutil.py

Defaults to $HG or 'hg' in the search path. Defaults to $HG or 'hg' in the search path.
""" """
if _hgexecutable is None: if _hgexecutable is None:
hg = encoding.environ.get(b'HG') hg = encoding.environ.get(b'HG')
mainmod = sys.modules['__main__'] mainmod = sys.modules['__main__']
if hg: if hg:
_sethgexecutable(hg) _sethgexecutable(hg)
elif mainfrozen(): elif mainfrozen():
if getattr(sys, 'frozen', None) == b'macosx_app': if getattr(sys, 'frozen', None) == 'macosx_app':
# Env variable set by py2app # Env variable set by py2app
_sethgexecutable(encoding.environ[b'EXECUTABLEPATH']) _sethgexecutable(encoding.environ[b'EXECUTABLEPATH'])
else: else:
_sethgexecutable(pycompat.sysexecutable) _sethgexecutable(pycompat.sysexecutable)
elif ( elif (
not pycompat.iswindows not pycompat.iswindows
and os.path.basename(getattr(mainmod, '__file__', '')) == 'hg' and os.path.basename(getattr(mainmod, '__file__', '')) == 'hg'
): ):
def hgcmd(): def hgcmd():
"""Return the command used to execute current hg """Return the command used to execute current hg
This is different from hgexecutable() because on Windows we want This is different from hgexecutable() because on Windows we want
to avoid things opening new shell windows like batch files, so we to avoid things opening new shell windows like batch files, so we
get either the python call or current executable. get either the python call or current executable.
""" """
if mainfrozen(): if mainfrozen():
if getattr(sys, 'frozen', None) == b'macosx_app': if getattr(sys, 'frozen', None) == 'macosx_app':
# Env variable set by py2app # Env variable set by py2app
return [encoding.environ[b'EXECUTABLEPATH']] return [encoding.environ[b'EXECUTABLEPATH']]
else: else:
return [pycompat.sysexecutable] return [pycompat.sysexecutable]
return _gethgcmd() return _gethgcmd()
def rundetached(args, condfn): def rundetached(args, condfn):