This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8331

py3: make setup.py's hgcommand() consistently return bytes
ClosedPublic

Authored by martinvonz on Mar 25 2020, 9:28 PM.

Details

Reviewers
mharbison72
pulkit
Group Reviewers
hg-reviewers
Commits
rHGbda050bc9987: py3: make setup.py's hgcommand() consistently return bytes
Summary

Before this patch, it returned unicode when the command failed. That
made e.g. make local PYTHON=python3 fail on an obsolete commit.

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.

Event Timeline

martinvonz created this revision.Mar 25 2020, 9:28 PM
mharbison72 accepted this revision.Mar 25 2020, 11:47 PM
pulkit accepted this revision.Mar 26 2020, 4:43 AM
This revision is now accepted and ready to land.Mar 26 2020, 4:43 AM

Revision Contents
Changeset List

PathPackages
Msetup.py (2 lines)

Diff 20888

setup.py

def run(self, args): def run(self, args):
cmd = self.cmd + args cmd = self.cmd + args
returncode, out, err = runcmd(cmd, self.env) returncode, out, err = runcmd(cmd, self.env)
err = filterhgerr(err) err = filterhgerr(err)
if err or returncode != 0: if err or returncode != 0:
printf("stderr from '%s':" % (' '.join(cmd)), file=sys.stderr) printf("stderr from '%s':" % (' '.join(cmd)), file=sys.stderr)
printf(err, file=sys.stderr) printf(err, file=sys.stderr)
return '' return b''
return out return out
def filterhgerr(err): def filterhgerr(err):
# If root is executing setup.py, but the repository is owned by # If root is executing setup.py, but the repository is owned by
# another user (as in "sudo python setup.py install") we will get # another user (as in "sudo python setup.py install") we will get
# trust warnings since the .hg/hgrc file is untrusted. That is # trust warnings since the .hg/hgrc file is untrusted. That is
# fine, we don't want to load it anyway. Python may warn about # fine, we don't want to load it anyway. Python may warn about