This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4432

py3: do .decode(), .encode() dance in runtests.py
AbandonedPublic

Authored by pulkit on Aug 31 2018, 4:53 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

shlex.quote() is not happy to work on bytes in Python 3. Let's feed that with
unicodes.

This should make the py3 buildbot green.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Aug 31 2018, 4:53 PM
pulkit updated this revision to Diff 10689.Aug 31 2018, 5:00 PM
yuja added a subscriber: yuja.Aug 31 2018, 8:29 PM
def toggletrace(cmd):
  • quoted = shellquote(cmd.strip()).replace(b'\\', b'\\\\')

+ cmd = cmd.decode('ascii')
+ quoted = shellquote(cmd.strip()).encode('ascii')
+ quoted = quoted.replace(b'\\', b'\\\\')

Perhaps _bytespath/_strpath can be used to avoid possible side effect on
Python 2.

durin42 added a subscriber: durin42.Sep 1 2018, 11:10 AM

I have an alternative fix in D4444.

pulkit abandoned this revision.Sep 3 2018, 6:12 AM

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (4 lines)

Diff 10689

tests/run-tests.py

script.append(b'%s %d 0\n' % (salt, line)) script.append(b'%s %d 0\n' % (salt, line))
else: else:
script.append(b'echo %s %d $?\n' % (salt, line)) script.append(b'echo %s %d $?\n' % (salt, line))
active = [] active = []
session = str(uuid.uuid4()) session = str(uuid.uuid4())
if PYTHON3: if PYTHON3:
session = session.encode('ascii') session = session.encode('ascii')
def toggletrace(cmd): def toggletrace(cmd):
quoted = shellquote(cmd.strip()).replace(b'\\', b'\\\\') cmd = cmd.decode('utf8')
quoted = shellquote(cmd.strip()).encode('utf8')
quoted = quoted.replace(b'\\', b'\\\\')
if active: if active:
script.append( script.append(
b'echo END %s %s >> "$HGCATAPULTSERVERPIPE"\n' % ( b'echo END %s %s >> "$HGCATAPULTSERVERPIPE"\n' % (
session, active[0])) session, active[0]))
script.append( script.append(
b'echo START %s %s >> "$HGCATAPULTSERVERPIPE"\n' % ( b'echo START %s %s >> "$HGCATAPULTSERVERPIPE"\n' % (
session, quoted)) session, quoted))
active[0:] = [quoted] active[0:] = [quoted]