This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8248

debuginstall: print if Rust extensions are installed
ClosedPublic

Authored by Alphare on Mar 6 2020, 8:45 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG295417387769: debuginstall: print if Rust extensions are installed
rHGbf7d15b1ad2f: debuginstall: print if Rust extensions are installed
rHG69935d41ada4: debuginstall: print if Rust extensions are installed
Summary

This should make it easier to use the Rust extensions.

Another patch on will be exposing a version and more useful information, but
it can only be done on top of this very patch, since it is targeting the stable
branch and the API has already changed on the default branch.

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.

Event Timeline

Alphare created this revision.Mar 6 2020, 8:45 AM
Alphare updated this revision to Diff 20553.Mar 6 2020, 8:51 AM
Alphare updated this revision to Diff 20568.Mar 6 2020, 1:00 PM
pulkit accepted this revision.Mar 9 2020, 4:51 AM
This revision is now accepted and ready to land.Mar 9 2020, 4:51 AM
pulkit added a comment.Mar 9 2020, 5:46 AM

Amended the following to make test-check-module-imports.t happy.

diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -1509,7 +1509,7 @@ def debuginstall(ui, **opts):
     )
 
     try:
-        from mercurial import rustext
+        from . import rustext
         rustext.__doc__  # trigger lazy import
     except ImportError:
         rustext = None
pulkit added a comment.Mar 9 2020, 5:54 AM

and the following too to make test-check-format.t happy.

diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -1510,6 +1510,7 @@ def debuginstall(ui, **opts):
 
     try:
         from . import rustext
+
         rustext.__doc__  # trigger lazy import
     except ImportError:
         rustext = None
@@ -1542,8 +1543,10 @@ def debuginstall(ui, **opts):
         )
 
     fm.plain(
-        _(b"checking Rust extensions (%s)\n" % (b'missing'
-          if rustext is None else b'installed')),
+        _(
+            b"checking Rust extensions (%s)\n"
+            % (b'missing' if rustext is None else b'installed')
+        ),
     )
 
     # TODO print CA cert info
Alphare added a commit: rHG69935d41ada4: debuginstall: print if Rust extensions are installed.Mar 9 2020, 6:03 AM
Closed by commit rHG69935d41ada4: debuginstall: print if Rust extensions are installed (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (14 lines)
Mtests/test-install.t (6 lines)

Diff 20618

mercurial/debugcommands.py

(b"%d.%d.%d" % sys.version_info[:3]), (b"%d.%d.%d" % sys.version_info[:3]),
) )
fm.write( fm.write(
b'pythonlib', b'pythonlib',
_(b"checking Python lib (%s)...\n"), _(b"checking Python lib (%s)...\n"),
pythonlib or _(b"unknown"), pythonlib or _(b"unknown"),
) )
try:
from . import rustext
rustext.__doc__ # trigger lazy import
except ImportError:
rustext = None
security = set(sslutil.supportedprotocols) security = set(sslutil.supportedprotocols)
if sslutil.hassni: if sslutil.hassni:
security.add(b'sni') security.add(b'sni')
fm.write( fm.write(
b'pythonsecurity', b'pythonsecurity',
_(b"checking Python security support (%s)\n"), _(b"checking Python security support (%s)\n"),
fm.formatlist(sorted(security), name=b'protocol', fmt=b'%s', sep=b','), fm.formatlist(sorted(security), name=b'protocol', fmt=b'%s', sep=b','),
if b'sni' not in security: if b'sni' not in security:
fm.plain( fm.plain(
_( _(
b' SNI not supported by Python install; may have ' b' SNI not supported by Python install; may have '
b'connectivity issues with some servers\n' b'connectivity issues with some servers\n'
) )
) )
fm.plain(
_(
b"checking Rust extensions (%s)\n"
% (b'missing' if rustext is None else b'installed')
),
)
# TODO print CA cert info # TODO print CA cert info
# hg version # hg version
hgver = util.version() hgver = util.version()
fm.write( fm.write(
b'hgver', _(b"checking Mercurial version (%s)\n"), hgver.split(b'+')[0] b'hgver', _(b"checking Mercurial version (%s)\n"), hgver.split(b'+')[0]
) )
fm.write( fm.write(

tests/test-install.t

hg debuginstall hg debuginstall
$ hg debuginstall $ hg debuginstall
checking encoding (ascii)... checking encoding (ascii)...
checking Python executable (*) (glob) checking Python executable (*) (glob)
checking Python implementation (*) (glob) checking Python implementation (*) (glob)
checking Python version (2.*) (glob) (no-py3 !) checking Python version (2.*) (glob) (no-py3 !)
checking Python version (3.*) (glob) (py3 !) checking Python version (3.*) (glob) (py3 !)
checking Python lib (.*[Ll]ib.*)... (re) checking Python lib (.*[Ll]ib.*)... (re)
checking Python security support (*) (glob) checking Python security support (*) (glob)
TLS 1.2 not supported by Python install; network connections lack modern security (?) TLS 1.2 not supported by Python install; network connections lack modern security (?)
SNI not supported by Python install; may have connectivity issues with some servers (?) SNI not supported by Python install; may have connectivity issues with some servers (?)
checking Rust extensions \((installed|missing)\) (re)
checking Mercurial version (*) (glob) checking Mercurial version (*) (glob)
checking Mercurial custom build (*) (glob) checking Mercurial custom build (*) (glob)
checking module policy (*) (glob) checking module policy (*) (glob)
checking installed modules (*mercurial)... (glob) checking installed modules (*mercurial)... (glob)
checking registered compression engines (*zlib*) (glob) checking registered compression engines (*zlib*) (glob)
checking available compression engines (*zlib*) (glob) checking available compression engines (*zlib*) (glob)
checking available compression engines for wire protocol (*zlib*) (glob) checking available compression engines for wire protocol (*zlib*) (glob)
checking "re2" regexp engine \((available|missing)\) (re) checking "re2" regexp engine \((available|missing)\) (re)
checking Python executable (*) (glob) checking Python executable (*) (glob)
checking Python implementation (*) (glob) checking Python implementation (*) (glob)
checking Python version (2.*) (glob) (no-py3 !) checking Python version (2.*) (glob) (no-py3 !)
checking Python version (3.*) (glob) (py3 !) checking Python version (3.*) (glob) (py3 !)
checking Python lib (.*[Ll]ib.*)... (re) checking Python lib (.*[Ll]ib.*)... (re)
checking Python security support (*) (glob) checking Python security support (*) (glob)
TLS 1.2 not supported by Python install; network connections lack modern security (?) TLS 1.2 not supported by Python install; network connections lack modern security (?)
SNI not supported by Python install; may have connectivity issues with some servers (?) SNI not supported by Python install; may have connectivity issues with some servers (?)
checking Rust extensions \((installed|missing)\) (re)
checking Mercurial version (*) (glob) checking Mercurial version (*) (glob)
checking Mercurial custom build (*) (glob) checking Mercurial custom build (*) (glob)
checking module policy (*) (glob) checking module policy (*) (glob)
checking installed modules (*mercurial)... (glob) checking installed modules (*mercurial)... (glob)
checking registered compression engines (*zlib*) (glob) checking registered compression engines (*zlib*) (glob)
checking available compression engines (*zlib*) (glob) checking available compression engines (*zlib*) (glob)
checking available compression engines for wire protocol (*zlib*) (glob) checking available compression engines for wire protocol (*zlib*) (glob)
checking "re2" regexp engine \((available|missing)\) (re) checking "re2" regexp engine \((available|missing)\) (re)
checking Python executable (*) (glob) checking Python executable (*) (glob)
checking Python implementation (*) (glob) checking Python implementation (*) (glob)
checking Python version (2.*) (glob) (no-py3 !) checking Python version (2.*) (glob) (no-py3 !)
checking Python version (3.*) (glob) (py3 !) checking Python version (3.*) (glob) (py3 !)
checking Python lib (.*[Ll]ib.*)... (re) checking Python lib (.*[Ll]ib.*)... (re)
checking Python security support (*) (glob) checking Python security support (*) (glob)
TLS 1.2 not supported by Python install; network connections lack modern security (?) TLS 1.2 not supported by Python install; network connections lack modern security (?)
SNI not supported by Python install; may have connectivity issues with some servers (?) SNI not supported by Python install; may have connectivity issues with some servers (?)
checking Rust extensions \((installed|missing)\) (re)
checking Mercurial version (*) (glob) checking Mercurial version (*) (glob)
checking Mercurial custom build (*) (glob) checking Mercurial custom build (*) (glob)
checking module policy (*) (glob) checking module policy (*) (glob)
checking installed modules (*mercurial)... (glob) checking installed modules (*mercurial)... (glob)
checking registered compression engines (*zlib*) (glob) checking registered compression engines (*zlib*) (glob)
checking available compression engines (*zlib*) (glob) checking available compression engines (*zlib*) (glob)
checking available compression engines for wire protocol (*zlib*) (glob) checking available compression engines for wire protocol (*zlib*) (glob)
checking "re2" regexp engine \((available|missing)\) (re) checking "re2" regexp engine \((available|missing)\) (re)
checking Python executable (*) (glob) checking Python executable (*) (glob)
checking Python implementation (*) (glob) checking Python implementation (*) (glob)
checking Python version (2.*) (glob) (no-py3 !) checking Python version (2.*) (glob) (no-py3 !)
checking Python version (3.*) (glob) (py3 !) checking Python version (3.*) (glob) (py3 !)
checking Python lib (.*[Ll]ib.*)... (re) checking Python lib (.*[Ll]ib.*)... (re)
checking Python security support (*) (glob) checking Python security support (*) (glob)
TLS 1.2 not supported by Python install; network connections lack modern security (?) TLS 1.2 not supported by Python install; network connections lack modern security (?)
SNI not supported by Python install; may have connectivity issues with some servers (?) SNI not supported by Python install; may have connectivity issues with some servers (?)
checking Rust extensions \((installed|missing)\) (re)
checking Mercurial version (*) (glob) checking Mercurial version (*) (glob)
checking Mercurial custom build (*) (glob) checking Mercurial custom build (*) (glob)
checking module policy (*) (glob) checking module policy (*) (glob)
checking installed modules (*mercurial)... (glob) checking installed modules (*mercurial)... (glob)
checking registered compression engines (*zlib*) (glob) checking registered compression engines (*zlib*) (glob)
checking available compression engines (*zlib*) (glob) checking available compression engines (*zlib*) (glob)
checking available compression engines for wire protocol (*zlib*) (glob) checking available compression engines for wire protocol (*zlib*) (glob)
checking "re2" regexp engine \((available|missing)\) (re) checking "re2" regexp engine \((available|missing)\) (re)
Failed building wheel for mercurial (?) Failed building wheel for mercurial (?)
$ ./installenv/*/hg debuginstall || cat pip.log $ ./installenv/*/hg debuginstall || cat pip.log
checking encoding (ascii)... checking encoding (ascii)...
checking Python executable (*) (glob) checking Python executable (*) (glob)
checking Python implementation (*) (glob) checking Python implementation (*) (glob)
checking Python version (3.*) (glob) checking Python version (3.*) (glob)
checking Python lib (*)... (glob) checking Python lib (*)... (glob)
checking Python security support (*) (glob) checking Python security support (*) (glob)
checking Rust extensions \((installed|missing)\) (re)
checking Mercurial version (*) (glob) checking Mercurial version (*) (glob)
checking Mercurial custom build (*) (glob) checking Mercurial custom build (*) (glob)
checking module policy (*) (glob) checking module policy (*) (glob)
checking installed modules (*/mercurial)... (glob) checking installed modules (*/mercurial)... (glob)
checking registered compression engines (*) (glob) checking registered compression engines (*) (glob)
checking available compression engines (*) (glob) checking available compression engines (*) (glob)
checking available compression engines for wire protocol (*) (glob) checking available compression engines for wire protocol (*) (glob)
checking "re2" regexp engine \((available|missing)\) (re) checking "re2" regexp engine \((available|missing)\) (re)
checking encoding (ascii)... checking encoding (ascii)...
checking Python executable (*) (glob) checking Python executable (*) (glob)
checking Python implementation (*) (glob) checking Python implementation (*) (glob)
checking Python version (2.*) (glob) checking Python version (2.*) (glob)
checking Python lib (*)... (glob) checking Python lib (*)... (glob)
checking Python security support (*) (glob) checking Python security support (*) (glob)
TLS 1.2 not supported by Python install; network connections lack modern security (?) TLS 1.2 not supported by Python install; network connections lack modern security (?)
SNI not supported by Python install; may have connectivity issues with some servers (?) SNI not supported by Python install; may have connectivity issues with some servers (?)
checking Rust extensions \((installed|missing)\) (re)
checking Mercurial version (*) (glob) checking Mercurial version (*) (glob)
checking Mercurial custom build (*) (glob) checking Mercurial custom build (*) (glob)
checking module policy (*) (glob) checking module policy (*) (glob)
checking installed modules (*/mercurial)... (glob) checking installed modules (*/mercurial)... (glob)
checking registered compression engines (*) (glob) checking registered compression engines (*) (glob)
checking available compression engines (*) (glob) checking available compression engines (*) (glob)
checking available compression engines for wire protocol (*) (glob) checking available compression engines for wire protocol (*) (glob)
checking "re2" regexp engine \((available|missing)\) (re) checking "re2" regexp engine \((available|missing)\) (re)
checking templates ($TESTTMP/installenv/*/site-packages/mercurial/templates)... (glob) checking templates ($TESTTMP/installenv/*/site-packages/mercurial/templates)... (glob)
checking default template ($TESTTMP/installenv/*/site-packages/mercurial/templates/map-cmdline.default) (glob) checking default template ($TESTTMP/installenv/*/site-packages/mercurial/templates/map-cmdline.default) (glob)
checking commit editor... (*) (glob) checking commit editor... (*) (glob)
checking username (test) checking username (test)
no problems detected no problems detected
#endif #endif