Patchwork D6577: py3: make catapult usable from the test runner in py3

login
register
mail settings
Submitter phabricator
Date June 26, 2019, 3:05 a.m.
Message ID <07c22d5308ebdfcb946e0c1fc1bbf3ca@localhost.localdomain>
Download mbox | patch
Permalink /patch/40678/
State Not Applicable
Headers show

Comments

phabricator - June 26, 2019, 3:05 a.m.
rdamazio updated this revision to Diff 15661.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6577?vs=15660&id=15661

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6577/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6577

AFFECTED FILES
  mercurial/debugcommands.py
  tests/run-tests.py

CHANGE DETAILS




To: rdamazio, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1474,6 +1474,12 @@ 
             script.append(b'alias pwd="pwd -W"\n')
 
         if hgcatapult and hgcatapult != os.devnull:
+            if PYTHON3:
+                hgcatapult = hgcatapult.encode('utf8')
+                cataname = self.name.encode('utf8')
+            else:
+                cataname = self.name
+
             # Kludge: use a while loop to keep the pipe from getting
             # closed by our echo commands. The still-running file gets
             # reaped at the end of the script, which causes the while
@@ -1490,9 +1496,9 @@ 
                 b'HGCATAPULTSESSION=%(session)s ; export HGCATAPULTSESSION\n'
                 b'echo START %(session)s %(name)s >> %(catapult)s\n'
                 % {
-                    'name': self.name,
-                    'session': session,
-                    'catapult': hgcatapult,
+                    b'name': cataname,
+                    b'session': session,
+                    b'catapult': hgcatapult,
                 }
             )
 
diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -1240,7 +1240,7 @@ 
 
     # Python
     fm.write('pythonexe', _("checking Python executable (%s)\n"),
-             pycompat.sysexecutable or "unknown")
+             pycompat.sysexecutable or _("unknown"))
     fm.write('pythonver', _("checking Python version (%s)\n"),
              ("%d.%d.%d" % sys.version_info[:3]))
     fm.write('pythonlib', _("checking Python lib (%s)...\n"),