This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7386

help: access text files as resources under PyOxidizer
AbandonedPublic

Authored by mharbison72 on Nov 13 2019, 11:00 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This allows hg help revsets to run on an oxidized Mac executable. I left the
old path in place for py2 support, as well as the other packaging apps.

On Windows, that same command simply prints:

abort: Incorrect function

... and doesn't put out a stacktrace even with --traceback.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mharbison72 created this revision.Nov 13 2019, 11:00 PM
mharbison72 added a subscriber: indygreg.Nov 13 2019, 11:09 PM

It looks like py2app puts it's name in sys.frozen[1], instead of just making it True/False. Should PyOxidizer do the same @indygreg ?

I don't have any idea why the error on Windows (I even disabled pager). I know I had trouble with hg.exe until I started setting Py_LegacyWindowsStdioFlag = 1.

[1] https://www.mercurial-scm.org/repo/hg/file/5.2/mercurial/util.py#l1829

mharbison72 abandoned this revision.Dec 28 2019, 12:52 PM

Superseded by D7622.

Revision Contents
Changeset List

PathPackages
Mmercurial/help.py (25 lines)

Diff 18074

mercurial/help.py

# help.py - help data for mercurial # help.py - help data for mercurial
# #
# Copyright 2006 Matt Mackall <mpm@selenic.com> # Copyright 2006 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import itertools import itertools
import os import os
import re import re
import sys
import textwrap import textwrap
from .i18n import ( from .i18n import (
_, _,
gettext, gettext,
) )
from .pycompat import getattr from .pycompat import getattr
from . import ( from . import (
continue continue
results[b'extensioncommands'].append((cmdname, cmddoc)) results[b'extensioncommands'].append((cmdname, cmddoc))
return results return results
def loaddoc(topic, subdir=None): def loaddoc(topic, subdir=None):
"""Return a delayed loader for help/topic.txt.""" """Return a delayed loader for help/topic.txt."""
def loader(ui): if getattr(sys, 'oxidized', None):
from importlib import resources
def _docdata():
docpkg = b'mercurial.helptext'
if subdir:
docpkg += b'.' + subdir
with resources.open_binary(pycompat.sysstr(docpkg),
pycompat.sysstr(topic + b".txt")) as dh:
return dh.read()
else:
def _docdata():
docdir = os.path.join(util.datapath, b'helptext') docdir = os.path.join(util.datapath, b'helptext')
if subdir: if subdir:
docdir = os.path.join(docdir, subdir) docdir = os.path.join(docdir, subdir)
path = os.path.join(docdir, topic + b".txt") path = os.path.join(docdir, topic + b".txt")
doc = gettext(util.readfile(path)) return util.readfile(path)
def loader(ui):
doc = gettext(_docdata())
for rewriter in helphooks.get(topic, []): for rewriter in helphooks.get(topic, []):
doc = rewriter(ui, topic, doc) doc = rewriter(ui, topic, doc)
return doc return doc
return loader return loader
internalstable = sorted( internalstable = sorted(