( )⚙ D9319 rust-status: properly translate OSError to Python

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9319

rust-status: properly translate OSError to Python
ClosedPublic

Authored by Alphare on Nov 16 2020, 11:02 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc9c3c277e5a5: rust-status: properly translate OSError to Python
Summary

This is probably never going to be called after the next few patches, but we
might as well make sure this is done correctly for the future rewrite.

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.Nov 16 2020, 11:02 AM
Alphare added a commit: rHGc9c3c277e5a5: rust-status: properly translate OSError to Python.Nov 18 2020, 6:06 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc9c3c277e5a5: rust-status: properly translate OSError to Python (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 23545

rust/hg-cpython/src/dirstate/status.rs

// status.rs // status.rs
// //
// Copyright 2019, Raphaël Gomès <rgomes@octobus.net> // Copyright 2019, Raphaël Gomès <rgomes@octobus.net>
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
//! Bindings for the `hg::status` module provided by the //! Bindings for the `hg::status` module provided by the
//! `hg-core` crate. From Python, this will be seen as //! `hg-core` crate. From Python, this will be seen as
//! `rustext.dirstate.status`. //! `rustext.dirstate.status`.
use crate::{dirstate::DirstateMap, exceptions::FallbackError}; use crate::{dirstate::DirstateMap, exceptions::FallbackError};
use cpython::exc::OSError;
use cpython::{ use cpython::{
exc::ValueError, ObjectProtocol, PyBytes, PyErr, PyList, PyObject, exc::ValueError, ObjectProtocol, PyBytes, PyErr, PyList, PyObject,
PyResult, PyTuple, Python, PythonObject, ToPyObject, PyResult, PyTuple, Python, PythonObject, ToPyObject,
}; };
use hg::{ use hg::{
matchers::{AlwaysMatcher, FileMatcher, IncludeMatcher}, matchers::{AlwaysMatcher, FileMatcher, IncludeMatcher},
parse_pattern_syntax, status, parse_pattern_syntax, status,
utils::{ utils::{
fn handle_fallback(py: Python, err: StatusError) -> PyErr { fn handle_fallback(py: Python, err: StatusError) -> PyErr {
match err { match err {
StatusError::Pattern(e) => { StatusError::Pattern(e) => {
let as_string = e.to_string(); let as_string = e.to_string();
log::trace!("Rust status fallback: `{}`", &as_string); log::trace!("Rust status fallback: `{}`", &as_string);
PyErr::new::<FallbackError, _>(py, &as_string) PyErr::new::<FallbackError, _>(py, &as_string)
} }
StatusError::IO(e) => PyErr::new::<OSError, _>(py, e.to_string()),
e => PyErr::new::<ValueError, _>(py, e.to_string()), e => PyErr::new::<ValueError, _>(py, e.to_string()),
} }
} }
pub fn status_wrapper( pub fn status_wrapper(
py: Python, py: Python,
dmap: DirstateMap, dmap: DirstateMap,
matcher: PyObject, matcher: PyObject,