Patchwork D8225: rust-cpython: add `debug` module to expose debug information to Python

login
register
mail settings
Submitter phabricator
Date March 5, 2020, 9:27 a.m.
Message ID <differential-rev-PHID-DREV-y2wat3wdkou3zubdpmnf-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/45498/
State Superseded
Headers show

Comments

phabricator - March 5, 2020, 9:27 a.m.
Alphare created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This will be mostly used in `debuginstall`.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  rust/hg-cpython/src/debug.rs
  rust/hg-cpython/src/lib.rs

CHANGE DETAILS




To: Alphare, #hg-reviewers
Cc: mercurial-devel
phabricator - March 6, 2020, 1:46 p.m.
Alphare added a comment.


  Note to reviewers: I will be rebasing this when D8248 <https://phab.mercurial-scm.org/D8248> is merged and adding a version number to this debug module, so don't take it yet.

REPOSITORY
  rHG Mercurial

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

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

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

Patch

diff --git a/rust/hg-cpython/src/lib.rs b/rust/hg-cpython/src/lib.rs
--- a/rust/hg-cpython/src/lib.rs
+++ b/rust/hg-cpython/src/lib.rs
@@ -30,6 +30,7 @@ 
 #[macro_use]
 pub mod ref_sharing;
 pub mod dagops;
+pub mod debug;
 pub mod dirstate;
 pub mod discovery;
 pub mod exceptions;
@@ -47,6 +48,7 @@ 
     let dotted_name: String = m.get(py, "__name__")?.extract(py)?;
     m.add(py, "ancestor", ancestors::init_module(py, &dotted_name)?)?;
     m.add(py, "dagop", dagops::init_module(py, &dotted_name)?)?;
+    m.add(py, "debug", debug::init_module(py, &dotted_name)?)?;
     m.add(py, "discovery", discovery::init_module(py, &dotted_name)?)?;
     m.add(py, "dirstate", dirstate::init_module(py, &dotted_name)?)?;
     m.add(py, "revlog", revlog::init_module(py, &dotted_name)?)?;
diff --git a/rust/hg-cpython/src/debug.rs b/rust/hg-cpython/src/debug.rs
new file mode 100644
--- /dev/null
+++ b/rust/hg-cpython/src/debug.rs
@@ -0,0 +1,26 @@ 
+// debug.rs
+//
+// Copyright 2020 Raphaël Gomès <rgomes@octobus.net>
+//
+// This software may be used and distributed according to the terms of the
+// GNU General Public License version 2 or any later version.
+
+//! Module to get debug information about Rust extensions.
+use cpython::{PyDict, PyModule, PyResult, Python};
+
+/// Create the module, with `__package__` given from parent
+pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> {
+    let dotted_name = &format!("{}.debug", package);
+    let m = PyModule::new(py, dotted_name)?;
+
+    m.add(py, "__package__", package)?;
+    m.add(py, "__doc__", "Rust debugging information")?;
+
+    m.add(py, "re2_installed", cfg!(feature = "with-re2"))?;
+
+    let sys = PyModule::import(py, "sys")?;
+    let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?;
+    sys_modules.set_item(py, dotted_name, &m)?;
+
+    Ok(m)
+}