Patchwork [3,of,3,V2] chgserver: drop os.environ['CHGINTERNALMARK']

login
register
mail settings
Submitter Jun Wu
Date Feb. 26, 2016, 2:20 p.m.
Message ID <1ff7f2afa4e25dccd3f9.1456496427@x1c>
Download mbox | patch
Permalink /patch/13410/
State Accepted
Delegated to: Yuya Nishihara
Headers show

Comments

Jun Wu - Feb. 26, 2016, 2:20 p.m.
# HG changeset patch
# User Jun Wu <quark@fb.com>
# Date 1456495837 0
#      Fri Feb 26 14:10:37 2016 +0000
# Node ID 1ff7f2afa4e25dccd3f91ef3d44c127787ddc675
# Parent  39999aaee9397d8f21823dae5f5551fc5251feea
chgserver: drop os.environ['CHGINTERNALMARK']

CHGINTERNALMARK is set by chg client to detect the situation that chg is
started by chg. It is temporary and should be dropped to avoid possible
side effects.

Patch

diff --git a/hgext/chgserver.py b/hgext/chgserver.py
--- a/hgext/chgserver.py
+++ b/hgext/chgserver.py
@@ -472,3 +472,8 @@ 
 
 def uisetup(ui):
     commandserver._servicemap['chgunix'] = chgunixservice
+
+    # CHGINTERNALMARK is temporarily set by chg client to detect if chg will
+    # start another chg. drop it to avoid possible side effects.
+    if 'CHGINTERNALMARK' in os.environ:
+        del os.environ['CHGINTERNALMARK']