diff --git a/heptapod/hooks/dev_util.py b/heptapod/hooks/dev_util.py index b4a6ffb16f81d9a6b7a8c54ee712d8334d35e1dd_aGVwdGFwb2QvaG9va3MvZGV2X3V0aWwucHk=..21a8947cb5138a58c9148648252d68755934623e_aGVwdGFwb2QvaG9va3MvZGV2X3V0aWwucHk= 100644 --- a/heptapod/hooks/dev_util.py +++ b/heptapod/hooks/dev_util.py @@ -8,8 +8,14 @@ def print_heptapod_env(repo, *args, **kwargs): + # this environment variable is present on invocation from Heptapod Shell + # but is not forwarded in the WSGI wrapper (and shouldn't). + # Removing it for consistency + to_print = dict(repo.ui.environ) + to_print.pop(b'HEPTAPOD_HG_NATIVE', None) + # repr() does the job for us to format the list # sysstr decodes from latin-1 (no failures), and we need to reencode # for ui.status repo.ui.status(repr(sorted( (pycompat.sysstr(k), pycompat.sysstr(v)) @@ -11,8 +17,8 @@ # repr() does the job for us to format the list # sysstr decodes from latin-1 (no failures), and we need to reencode # for ui.status repo.ui.status(repr(sorted( (pycompat.sysstr(k), pycompat.sysstr(v)) - for (k, v) in repo.ui.environ.items() + for (k, v) in to_print.items() if k.startswith(b'HEPTAPOD_'))).encode('latin-1')) return 0