This is an archive of the discontinued Mercurial Phabricator instance.

Differential D350

demandimport: test whether to enable or not in hg script
AbandonedPublic

Authored by quark on Aug 11 2017, 2:24 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This allows us to avoid side effects caused by importing demandimport if
demandimport is disabled. It also gives the hg script more control about
choosing whether to enable or disable demandimport.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Aug 11 2017, 2:24 PM
yuja added a subscriber: yuja.Aug 15 2017, 2:59 AM

Seems fine, but what is the "side effects caused by importing demandimport" ?

quark added a comment.Aug 15 2017, 11:13 AM

sys.modules['hgdemandimport'] being set? Maybe I should remove it from commit message.

yuja added a comment.Aug 15 2017, 10:46 PM

sys.modules['hgdemandimport'] being set? Maybe I should remove it from commit message.

So there's no point to duplicate the HGDEMANDIMPORT check?

quark abandoned this revision.Aug 15 2017, 11:44 PM

So there's no point to duplicate the HGDEMANDIMPORT check?

Hmm... I cannot remember why I did this at the first place. Just checking chg alone should be enough.

Revision Contents
Changeset List

PathPackages
Mhg (5 lines)

Diff 784

hg

if not os.path.isabs(libdir): if not os.path.isabs(libdir):
libdir = os.path.join(os.path.dirname(os.path.realpath(__file__)), libdir = os.path.join(os.path.dirname(os.path.realpath(__file__)),
libdir) libdir)
libdir = os.path.abspath(libdir) libdir = os.path.abspath(libdir)
sys.path.insert(0, libdir) sys.path.insert(0, libdir)
# enable importing on demand to reduce startup time # enable importing on demand to reduce startup time
try: try:
if os.environ.get('HGDEMANDIMPORT') != 'disable':
if sys.version_info[0] < 3 or sys.version_info >= (3, 6): if sys.version_info[0] < 3 or sys.version_info >= (3, 6):
import hgdemandimport; hgdemandimport.enable() import hgdemandimport; hgdemandimport.enable()
except ImportError: except ImportError:
sys.stderr.write("abort: couldn't find mercurial libraries in [%s]\n" % sys.stderr.write("abort: couldn't find mercurial libraries in [%s]\n" %
' '.join(sys.path)) ' '.join(sys.path))
sys.stderr.write("(check your install and PYTHONPATH)\n") sys.stderr.write("(check your install and PYTHONPATH)\n")
sys.exit(-1) sys.exit(-1)
import mercurial.util import mercurial.util
import mercurial.dispatch import mercurial.dispatch
for fp in (sys.stdin, sys.stdout, sys.stderr): for fp in (sys.stdin, sys.stdout, sys.stderr):
mercurial.util.setbinary(fp) mercurial.util.setbinary(fp)
mercurial.dispatch.run() mercurial.dispatch.run()