| indygreg |
| hg-reviewers |
This fixes at least some environment variable prints for util.system()
callers on Python 3. Yay!
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/util.py (2 lines) |
| def shellenviron(environ=None): | def shellenviron(environ=None): | ||||
| """return environ with optional override, useful for shelling out""" | """return environ with optional override, useful for shelling out""" | ||||
| def py2shell(val): | def py2shell(val): | ||||
| 'convert python object into string that is useful to shell' | 'convert python object into string that is useful to shell' | ||||
| if val is None or val is False: | if val is None or val is False: | ||||
| return '0' | return '0' | ||||
| if val is True: | if val is True: | ||||
| return '1' | return '1' | ||||
| return str(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 environ.iteritems()) | env.update((k, py2shell(v)) for k, v in environ.iteritems()) | ||||
| env['HG'] = hgexecutable() | env['HG'] = hgexecutable() | ||||
| return env | return env | ||||
| def system(cmd, environ=None, cwd=None, out=None): | def system(cmd, environ=None, cwd=None, out=None): | ||||
| '''enhanced shell command execution. | '''enhanced shell command execution. | ||||