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.

Download Raw Diff

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

Branch

stable

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

Alphare created this revision.Mar 6 2020, 8:45 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 6 2020, 8:45 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

Alphare mentioned this in D8225: rust-cpython: add `debug` module to expose debug information to Python.Mar 6 2020, 8:46 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

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

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.

Alphare added a commit: rHGbf7d15b1ad2f: debuginstall: print if Rust extensions are installed.Mar 9 2020, 11:27 AM

Alphare added a commit: rHG295417387769: debuginstall: print if Rust extensions are installed.Mar 9 2020, 1:31 PM

Revision Contents
Changeset List

			Path	Packages
M			mercurial/debugcommands.py (12 lines)
M			rust/hg-cpython/src/lib.rs (6 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	20552		Mar 6 2020, 8:45 AM	★	★
Diff 2	20553		Mar 6 2020, 8:51 AM	★	★
Diff 3	20568		Mar 6 2020, 1:00 PM	★	★
Diff 4	20618	rHG69935d41ada4fb4c4026e7bd8d2ca10fa6c9cf3b	Mar 6 2020, 6:44 AM	★	★

Commit	Parents	Author	Summary	Date
a90f8b2bc2d3	b24721e7c5ee	Raphaël Gomès		Mar 6 2020, 6:44 AM

Diff 20552

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 mercurial import rustext
				rustext.__doc__ # trigger lazy import
				except ImportError:
				rustext = None

				fm.write(
				b'',
				_(b"checking Rust extensions (%s)\n"),
				b'missing' if rustext is None else 'installed',
				)

	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','),

rust/hg-cpython/src/lib.rs

	"PatternFileError",			"PatternFileError",
	py.get_type::<exceptions::PatternFileError>(),			py.get_type::<exceptions::PatternFileError>(),
	)?;			)?;
	m.add(			m.add(
	py,			py,
	"PatternError",			"PatternError",
	py.get_type::<exceptions::PatternError>(),			py.get_type::<exceptions::PatternError>(),
	)?;			)?;
				/// Change this version whenever the API is changed
				m.add(
				py,
				"version",
				0,
				)?;
	Ok(())			Ok(())
	});			});

	#[cfg(not(any(feature = "python27-bin", feature = "python3-bin")))]			#[cfg(not(any(feature = "python27-bin", feature = "python3-bin")))]
	#[test]			#[test]
	#[ignore]			#[ignore]
	fn libpython_must_be_linked_to_run_tests() {			fn libpython_must_be_linked_to_run_tests() {
	// stub function to tell that some tests wouldn't run			// stub function to tell that some tests wouldn't run
	}			}