D6577: py3: make catapult usable from the test runner in py3
Closed by commit rHG9913fffd744b: py3: make catapult usable from the test
runner in py3 (authored by rdamazio).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6577?vs=15662&id=15677
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6577/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6577
AFFECTED FILES
tests/run-tests.py
CHANGE DETAILS
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,
}
)
To: rdamazio, #hg-reviewers, pulkit
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D6577: py3: make catapult usable from the test runner in py3
rdamazio updated this revision to Diff 15662.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6577?vs=15661&id=15662
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6577/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6577
AFFECTED FILES
tests/run-tests.py
CHANGE DETAILS
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,
}
)
To: rdamazio, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D6577: py3: make catapult usable from the test runner in py3
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
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"),
To: rdamazio, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D6577: py3: make catapult usable from the test runner in py3
rdamazio created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6577
AFFECTED FILES
tests/run-tests.py
CHANGE DETAILS
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,
}
)
To: rdamazio, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
