This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7614

rust-cpython: do not convert warning pattern to utf-8 bytes
ClosedPublic

Authored by Alphare on Dec 12 2019, 12:38 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb06cf2809ec3: rust-cpython: do not convert warning pattern to utf-8 bytes
Summary

On Unix, both Rust Path and Mercurial expect a locale-dependent bytes,
and we don't support Windows yet.

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.Dec 12 2019, 12:38 PM
yuja added a commit: rHGb06cf2809ec3: rust-cpython: do not convert warning pattern to utf-8 bytes.Dec 13 2019, 1:17 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb06cf2809ec3: rust-cpython: do not convert warning pattern to utf-8 bytes (authored by yuja). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 18692

rust/hg-core/src/utils/files.rs

} }
// TODO Handle other platforms // TODO Handle other platforms
// TODO: convert from WTF8 to Windows MBCS (ANSI encoding). // TODO: convert from WTF8 to Windows MBCS (ANSI encoding).
// Perhaps, the return type would have to be Result<PathBuf>. // Perhaps, the return type would have to be Result<PathBuf>.
Path::new(os_str) Path::new(os_str)
} }
// TODO: need to convert from WTF8 to MBCS bytes on Windows.
// that's why Vec<u8> is returned.
#[cfg(unix)]
pub fn get_bytes_from_path(path: impl AsRef<Path>) -> Vec<u8> {
use std::os::unix::ffi::OsStrExt;
path.as_ref().as_os_str().as_bytes().to_vec()
}
/// An iterator over repository path yielding itself and its ancestors. /// An iterator over repository path yielding itself and its ancestors.
#[derive(Copy, Clone, Debug)] #[derive(Copy, Clone, Debug)]
pub struct Ancestors<'a> { pub struct Ancestors<'a> {
next: Option<&'a HgPath>, next: Option<&'a HgPath>,
} }
impl<'a> Iterator for Ancestors<'a> { impl<'a> Iterator for Ancestors<'a> {
type Item = &'a HgPath; type Item = &'a HgPath;

rust/hg-cpython/src/filepatterns.rs

fn warnings_to_py_bytes( fn warnings_to_py_bytes(
py: Python, py: Python,
warnings: &[(PathBuf, Vec<u8>)], warnings: &[(PathBuf, Vec<u8>)],
) -> Vec<(PyBytes, PyBytes)> { ) -> Vec<(PyBytes, PyBytes)> {
warnings warnings
.iter() .iter()
.map(|(path, syn)| { .map(|(path, syn)| {
( (
PyBytes::new(py, &path.to_string_lossy().as_bytes()), PyBytes::new(py, &files::get_bytes_from_path(path)),
PyBytes::new(py, syn), PyBytes::new(py, syn),
) )
}) })
.collect() .collect()
} }
fn build_single_regex_wrapper( fn build_single_regex_wrapper(
py: Python, py: Python,