This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9980

procutil: add a way to unset and environment variable
AbandonedPublic

Authored by marmoute on Feb 10 2021, 6:47 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

The only way to not get the HGPLAIN behavior, is to not have the variable set at
all. Having it set with -any- value will trigger the behavior.

Currently the procutil utility used to spawn the hook have no way to unset an
environment variable. So we start with adding one such way before we can
proceed.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Feb 10 2021, 6:47 PM
baymax updated this revision to Diff 25542.Feb 10 2021, 8:11 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a subscriber: joerg.sonnenberger.Feb 11 2021, 4:48 AM
marmoute abandoned this revision.

@joerg.sonnenberger pointed out that using empy value unset the variable, so I am dropping that specific commit. Update to the other one coming.

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/procutil.py (8 lines)

Diff 25542

mercurial/utils/procutil.py

osutil = policy.importmod('osutil') osutil = policy.importmod('osutil')
if pycompat.iswindows: if pycompat.iswindows:
from .. import windows as platform from .. import windows as platform
else: else:
from .. import posix as platform from .. import posix as platform
UNSET_ENV = object()
def isatty(fp): def isatty(fp):
try: try:
return fp.isatty() return fp.isatty()
except AttributeError: except AttributeError:
return False return False
if val is None or val is False: if val is None or val is False:
return b'0' return b'0'
if val is True: if val is True:
return b'1' return b'1'
return pycompat.bytestr(val) return pycompat.bytestr(val)
env = dict(encoding.environ) env = dict(encoding.environ)
if environ: if environ:
env.update((k, py2shell(v)) for k, v in pycompat.iteritems(environ)) for k, v in pycompat.iteritems(environ):
if v is UNSET_ENV:
env.pop(k, None)
else:
env[k] = py2shell(v)
env[b'HG'] = hgexecutable() env[b'HG'] = hgexecutable()
return env return env
if pycompat.iswindows: if pycompat.iswindows:
def shelltonative(cmd, env): def shelltonative(cmd, env):
return platform.shelltocmdexe( # pytype: disable=module-attr return platform.shelltocmdexe( # pytype: disable=module-attr