Show More
@@ -13,6 +13,7 b' import difflib' | |||||
13 | import errno |
|
13 | import errno | |
14 | import operator |
|
14 | import operator | |
15 | import os |
|
15 | import os | |
|
16 | import platform | |||
16 | import random |
|
17 | import random | |
17 | import re |
|
18 | import re | |
18 | import socket |
|
19 | import socket | |
@@ -1487,6 +1488,11 b' def debuginstall(ui, **opts):' | |||||
1487 | pycompat.sysexecutable or _(b"unknown"), |
|
1488 | pycompat.sysexecutable or _(b"unknown"), | |
1488 | ) |
|
1489 | ) | |
1489 | fm.write( |
|
1490 | fm.write( | |
|
1491 | b'pythonimplementation', | |||
|
1492 | _(b"checking Python implementation (%s)\n"), | |||
|
1493 | pycompat.sysbytes(platform.python_implementation()), | |||
|
1494 | ) | |||
|
1495 | fm.write( | |||
1490 | b'pythonver', |
|
1496 | b'pythonver', | |
1491 | _(b"checking Python version (%s)\n"), |
|
1497 | _(b"checking Python version (%s)\n"), | |
1492 | (b"%d.%d.%d" % sys.version_info[:3]), |
|
1498 | (b"%d.%d.%d" % sys.version_info[:3]), |
@@ -2,6 +2,7 b' hg debuginstall' | |||||
2 | $ hg debuginstall |
|
2 | $ hg debuginstall | |
3 | checking encoding (ascii)... |
|
3 | checking encoding (ascii)... | |
4 | checking Python executable (*) (glob) |
|
4 | checking Python executable (*) (glob) | |
|
5 | checking Python implementation (*) (glob) | |||
5 | checking Python version (2.*) (glob) (no-py3 !) |
|
6 | checking Python version (2.*) (glob) (no-py3 !) | |
6 | checking Python version (3.*) (glob) (py3 !) |
|
7 | checking Python version (3.*) (glob) (py3 !) | |
7 | checking Python lib (.*[Ll]ib.*)... (re) |
|
8 | checking Python lib (.*[Ll]ib.*)... (re) | |
@@ -43,6 +44,7 b' hg debuginstall JSON' | |||||
43 | "hgverextra": "*", (glob) |
|
44 | "hgverextra": "*", (glob) | |
44 | "problems": 0, |
|
45 | "problems": 0, | |
45 | "pythonexe": "*", (glob) |
|
46 | "pythonexe": "*", (glob) | |
|
47 | "pythonimplementation": "*", (glob) | |||
46 | "pythonlib": "*", (glob) |
|
48 | "pythonlib": "*", (glob) | |
47 | "pythonsecurity": [*], (glob) |
|
49 | "pythonsecurity": [*], (glob) | |
48 | "pythonver": "*.*.*", (glob) |
|
50 | "pythonver": "*.*.*", (glob) | |
@@ -58,6 +60,7 b' hg debuginstall with no username' | |||||
58 | $ HGUSER= hg debuginstall |
|
60 | $ HGUSER= hg debuginstall | |
59 | checking encoding (ascii)... |
|
61 | checking encoding (ascii)... | |
60 | checking Python executable (*) (glob) |
|
62 | checking Python executable (*) (glob) | |
|
63 | checking Python implementation (*) (glob) | |||
61 | checking Python version (2.*) (glob) (no-py3 !) |
|
64 | checking Python version (2.*) (glob) (no-py3 !) | |
62 | checking Python version (3.*) (glob) (py3 !) |
|
65 | checking Python version (3.*) (glob) (py3 !) | |
63 | checking Python lib (.*[Ll]ib.*)... (re) |
|
66 | checking Python lib (.*[Ll]ib.*)... (re) | |
@@ -103,6 +106,7 b' path variables are expanded (~ is the sa' | |||||
103 | $ HGEDITOR="~/tools/testeditor.exe" hg debuginstall |
|
106 | $ HGEDITOR="~/tools/testeditor.exe" hg debuginstall | |
104 | checking encoding (ascii)... |
|
107 | checking encoding (ascii)... | |
105 | checking Python executable (*) (glob) |
|
108 | checking Python executable (*) (glob) | |
|
109 | checking Python implementation (*) (glob) | |||
106 | checking Python version (2.*) (glob) (no-py3 !) |
|
110 | checking Python version (2.*) (glob) (no-py3 !) | |
107 | checking Python version (3.*) (glob) (py3 !) |
|
111 | checking Python version (3.*) (glob) (py3 !) | |
108 | checking Python lib (.*[Ll]ib.*)... (re) |
|
112 | checking Python lib (.*[Ll]ib.*)... (re) | |
@@ -128,6 +132,7 b' not found (this is intentionally using b' | |||||
128 | $ HGEDITOR="c:\foo\bar\baz.exe -y -z" hg debuginstall |
|
132 | $ HGEDITOR="c:\foo\bar\baz.exe -y -z" hg debuginstall | |
129 | checking encoding (ascii)... |
|
133 | checking encoding (ascii)... | |
130 | checking Python executable (*) (glob) |
|
134 | checking Python executable (*) (glob) | |
|
135 | checking Python implementation (*) (glob) | |||
131 | checking Python version (2.*) (glob) (no-py3 !) |
|
136 | checking Python version (2.*) (glob) (no-py3 !) | |
132 | checking Python version (3.*) (glob) (py3 !) |
|
137 | checking Python version (3.*) (glob) (py3 !) | |
133 | checking Python lib (.*[Ll]ib.*)... (re) |
|
138 | checking Python lib (.*[Ll]ib.*)... (re) | |
@@ -185,6 +190,7 b" since it's bin on most platforms but Scr" | |||||
185 | $ ./installenv/*/hg debuginstall || cat pip.log |
|
190 | $ ./installenv/*/hg debuginstall || cat pip.log | |
186 | checking encoding (ascii)... |
|
191 | checking encoding (ascii)... | |
187 | checking Python executable (*) (glob) |
|
192 | checking Python executable (*) (glob) | |
|
193 | checking Python implementation (*) (glob) | |||
188 | checking Python version (3.*) (glob) |
|
194 | checking Python version (3.*) (glob) | |
189 | checking Python lib (*)... (glob) |
|
195 | checking Python lib (*)... (glob) | |
190 | checking Python security support (*) (glob) |
|
196 | checking Python security support (*) (glob) | |
@@ -221,6 +227,7 b" since it's bin on most platforms but Scr" | |||||
221 | $ ./installenv/*/hg debuginstall || cat pip.log |
|
227 | $ ./installenv/*/hg debuginstall || cat pip.log | |
222 | checking encoding (ascii)... |
|
228 | checking encoding (ascii)... | |
223 | checking Python executable (*) (glob) |
|
229 | checking Python executable (*) (glob) | |
|
230 | checking Python implementation (*) (glob) | |||
224 | checking Python version (2.*) (glob) |
|
231 | checking Python version (2.*) (glob) | |
225 | checking Python lib (*)... (glob) |
|
232 | checking Python lib (*)... (glob) | |
226 | checking Python security support (*) (glob) |
|
233 | checking Python security support (*) (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now