This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7062

convert: convert os.devnull to bytes before trying to join it with other bytes
ClosedPublic

Authored by Kwan on Oct 11 2019, 1:12 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG8c0fe77f47c5: convert: convert os.devnull to bytes before trying to join it with other bytes
rHG6ef48274e803: convert: convert os.devnull to bytes before trying to join it with other bytes
Summary

Together with the previous commit relating to emailparser this gets
test-convert-tla.t passing under py3.

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/convert/gnuarch.py (3 lines)

Diff 17281

hgext/convert/gnuarch.py

def gettags(self): def gettags(self):
return self.tags return self.tags
def _execute(self, cmd, *args, **kwargs): def _execute(self, cmd, *args, **kwargs):
cmdline = [self.execmd, cmd] cmdline = [self.execmd, cmd]
cmdline += args cmdline += args
cmdline = [procutil.shellquote(arg) for arg in cmdline] cmdline = [procutil.shellquote(arg) for arg in cmdline]
cmdline += [b'>', os.devnull, b'2>', os.devnull] bdevnull = pycompat.bytestr(os.devnull)
cmdline += [b'>', bdevnull, b'2>', bdevnull]
cmdline = procutil.quotecommand(b' '.join(cmdline)) cmdline = procutil.quotecommand(b' '.join(cmdline))
self.ui.debug(cmdline, b'\n') self.ui.debug(cmdline, b'\n')
return os.system(pycompat.rapply(procutil.tonativestr, cmdline)) return os.system(pycompat.rapply(procutil.tonativestr, cmdline))
def _update(self, rev): def _update(self, rev):
self.ui.debug(b'applying revision %s...\n' % rev) self.ui.debug(b'applying revision %s...\n' % rev)
changeset, status = self.runlines(b'replay', b'-d', self.tmppath, rev) changeset, status = self.runlines(b'replay', b'-d', self.tmppath, rev)
if status: if status: