This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7079

py3: convert cwd to native string when running `fix`
ClosedPublic

Authored by mharbison72 on Oct 12 2019, 10:31 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG2d1f9880af1b: py3: convert cwd to native string when running `fix`
Summary

This prevents a bunch of failures on Windows.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (2 lines)

Diff 17124

hgext/fix.py

ranges = lineranges(opts, path, basectxs, fixctx, newdata) ranges = lineranges(opts, path, basectxs, fixctx, newdata)
command = fixer.command(ui, path, ranges) command = fixer.command(ui, path, ranges)
if command is None: if command is None:
continue continue
ui.debug(b'subprocess: %s\n' % (command,)) ui.debug(b'subprocess: %s\n' % (command,))
proc = subprocess.Popen( proc = subprocess.Popen(
procutil.tonativestr(command), procutil.tonativestr(command),
shell=True, shell=True,
cwd=repo.root, cwd=procutil.tonativestr(repo.root),
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
) )
stdout, stderr = proc.communicate(newdata) stdout, stderr = proc.communicate(newdata)
if stderr: if stderr:
showstderr(ui, fixctx.rev(), fixername, stderr) showstderr(ui, fixctx.rev(), fixername, stderr)
newerdata = stdout newerdata = stdout