This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8054

resourceutil: correct the root path for file based lookup under py2exe
ClosedPublic

Authored by mharbison72 on Jan 30 2020, 11:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9e367157a990: resourceutil: correct the root path for file based lookup under py2exe
rHGccb719dd1fe3: resourceutil: correct the root path for file based lookup under py2exe
Summary

This silly copy/paste error caused "Mercurial" to be truncated from
"C:\Program Files". The fact that "helptext" and "defaultrc" are now in a
subpackage of "mercurial" added it back on, and everything seemed to work. But
that broke if not installed to the default directory, and also caused TortoiseHg
to look at Mercurial's config files instead of its own.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/resourceutil.py (2 lines)

Diff 19733

mercurial/utils/resourceutil.py

or imp.is_frozen("__main__") # old py2exe or imp.is_frozen("__main__") # old py2exe
) # tools/freeze ) # tools/freeze
# the location of data files matching the source code # the location of data files matching the source code
if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app': if 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)
_rootpath = os.path.dirname(datapath) _rootpath = datapath
else: else:
datapath = os.path.dirname(os.path.dirname(pycompat.fsencode(__file__))) datapath = os.path.dirname(os.path.dirname(pycompat.fsencode(__file__)))
_rootpath = os.path.dirname(datapath) _rootpath = os.path.dirname(datapath)
try: try:
from importlib import resources from importlib import resources
from .. import encoding from .. import encoding