Patchwork D351: demandimport: disable if chg is being used

login
register
mail settings
Submitter phabricator
Date Aug. 18, 2017, 6:12 p.m.
Message ID <88e83a3071fa07f2cf4af691e27594b4@localhost.localdomain>
Download mbox | patch
Permalink /patch/23124/
State Not Applicable
Headers show

Comments

phabricator - Aug. 18, 2017, 6:12 p.m.
quark updated this revision to Diff 1078.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D351?vs=1076&id=1078

REVISION DETAIL
  https://phab.mercurial-scm.org/D351

AFFECTED FILES
  hgdemandimport/__init__.py
  mercurial/chgserver.py

CHANGE DETAILS




To: quark, #hg-reviewers, phillco
Cc: phillco, sid0, yuja, mercurial-devel

Patch

diff --git a/mercurial/chgserver.py b/mercurial/chgserver.py
--- a/mercurial/chgserver.py
+++ b/mercurial/chgserver.py
@@ -565,8 +565,11 @@ 
                             self._hashstate, self._baseaddress)
 
 def chgunixservice(ui, repo, opts):
-    # CHGINTERNALMARK is temporarily set by chg client to detect if chg will
-    # start another chg. drop it to avoid possible side effects.
+    # CHGINTERNALMARK is set by chg client. It is an indication of things are
+    # started by chg so other code can do things accordingly, like disabling
+    # demandimport or detecting chg client started by chg client. When executed
+    # here, CHGINTERNALMARK is no longer useful and hence dropped to make
+    # environ cleaner.
     if 'CHGINTERNALMARK' in encoding.environ:
         del encoding.environ['CHGINTERNALMARK']
 
diff --git a/hgdemandimport/__init__.py b/hgdemandimport/__init__.py
--- a/hgdemandimport/__init__.py
+++ b/hgdemandimport/__init__.py
@@ -73,5 +73,7 @@ 
 deactivated = demandimport.deactivated
 
 def enable():
-    if os.environ.get('HGDEMANDIMPORT') != 'disable':
+    # chg pre-imports modules so do not enable demandimport for it
+    if ('CHGINTERNALMARK' not in os.environ
+        and os.environ.get('HGDEMANDIMPORT') != 'disable'):
         demandimport.enable()