This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10764

hg-cpython: fix new occuring TypeError
ClosedPublic

Authored by Alphare on May 21 2021, 12:21 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG33e7508b0ae9: hg-cpython: fix new occuring TypeError
Summary

dd339191f2dc introduced a minor refactoring of error types that highlighted
a fragile error creation mechanism that was in place in the Rust MixedIndex.

PyErr::from_instance also accepts a Python class, as long as it's an
Exception class. Before the aforementioned commit, we never ran into a case
where this duck-typing mechanism failed. We rectify this behavior by doing the
instantiation ourselves.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Alphare created this revision.May 21 2021, 12:21 PM
Alphare added a commit: rHG33e7508b0ae9: hg-cpython: fix new occuring TypeError.May 21 2021, 12:35 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG33e7508b0ae9: hg-cpython: fix new occuring TypeError (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 28180.May 21 2021, 1:12 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mrust/hg-cpython/src/revlog.rs (5 lines)

Diff 28180

rust/hg-cpython/src/revlog.rs

} }
fn revlog_error(py: Python) -> PyErr { fn revlog_error(py: Python) -> PyErr {
match py match py
.import("mercurial.error") .import("mercurial.error")
.and_then(|m| m.get(py, "RevlogError")) .and_then(|m| m.get(py, "RevlogError"))
{ {
Err(e) => e, Err(e) => e,
Ok(cls) => PyErr::from_instance(py, cls), Ok(cls) => PyErr::from_instance(
py,
cls.call(py, (py.None(),), None).ok().into_py_object(py),
),
} }
} }
fn rev_not_in_index(py: Python, rev: Revision) -> PyErr { fn rev_not_in_index(py: Python, rev: Revision) -> PyErr {
PyErr::new::<ValueError, _>( PyErr::new::<ValueError, _>(
py, py,
format!( format!(
"Inconsistency: Revision {} found in nodemap \ "Inconsistency: Revision {} found in nodemap \