This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7415

procutil: move datapath logic to procutil()
AbandonedPublic

Authored by indygreg on Nov 14 2019, 10:58 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

And refactor it as a function.

procutil.py is the more appropriate location for this code, as
procutil is responsible for managing aspects of the executable
environment.

The impetus for this change is introducing an abstraction for
resource reading. I'd like that code to live in procutil.py
so we don't make util.py any larger. The code requires datapath.
And since util imports procutil, we need datapath in procutil
to avoid a cycle.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

indygreg created this revision.Nov 14 2019, 10:58 PM
indygreg added a subscriber: mharbison72.Nov 14 2019, 11:01 PM
indygreg planned changes to this revision.

This is an old series I had authored a few months back as part of preliminary PyOxidizer porting. It demonstrates an alternate approach to loading files with the resources API. Essentially, I was trying to abstract the resources API so that in the future once we are Python 3.7+ native we could use importlib.resources directly and perform all resources I/O using a resources abstraction.

This series is in desperate need of a rebase.

Please take a look @mharbison72 and consider taking ownership of these patches under your own name.

martinvonz added a subscriber: martinvonz.Nov 15 2019, 2:22 PM

Also see D7433-D7436, which move this code to a new module so the i18n module can depend on this code.

indygreg abandoned this revision.Nov 16 2019, 2:20 PM

This patch is now irrelevant due to D7434.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (8 lines)
Mmercurial/utils/procutil.py (9 lines)

Diff 18138

mercurial/util.py

a.reverse() a.reverse()
b.reverse() b.reverse()
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((['..'] * len(a)) + b) or '.' return pycompat.ossep.join((['..'] * len(a)) + b) or '.'
# the location of data files matching the source code datapath = procutil.datapath()
if procutil.mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
# executable version (py2exe) doesn't support __file__
datapath = os.path.dirname(pycompat.sysexecutable)
else:
datapath = os.path.dirname(pycompat.fsencode(__file__))
i18n.setdatapath(datapath) i18n.setdatapath(datapath)
def checksignature(func): def checksignature(func):
'''wrap a function with code to check for calling errors''' '''wrap a function with code to check for calling errors'''
def check(*args, **kwargs): def check(*args, **kwargs):
try: try:
return func(*args, **kwargs) return func(*args, **kwargs)
except TypeError: except TypeError:

mercurial/utils/procutil.py

# return code is never 0 here. # return code is never 0 here.
returncode = 255 returncode = 255
except Exception: except Exception:
returncode = 255 returncode = 255
finally: finally:
# mission accomplished, this child needs to exit and not # mission accomplished, this child needs to exit and not
# continue the hg process here. # continue the hg process here.
os._exit(returncode) os._exit(returncode)
def datapath():
"""Return location of data/resource files that are part of the source."""
if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
# executable version (py2exe) doesn't support __file__
return os.path.dirname(pycompat.sysexecutable)
else:
return os.path.dirname(
os.path.dirname(pycompat.fsencode(__file__)))