# HG changeset patch # User Yuya Nishihara # Date 1574173197 -32400 # Node ID ee3872c14ab38c30c01aa6679927b16026b18881 # Parent f79377f24487272bdf2e32f838bc9fb983319320 rust-cpython: do not convert warning pattern to utf-8 bytes On Unix, both Rust Path and Mercurial expect a locale-dependent bytes, and we don't support Windows yet. diff -r f79377f24487 -r ee3872c14ab3 rust/hg-core/src/utils/files.rs --- a/rust/hg-core/src/utils/files.rs Tue Nov 19 23:16:16 2019 +0900 +++ b/rust/hg-core/src/utils/files.rs Tue Nov 19 23:19:57 2019 +0900 @@ -29,6 +29,14 @@ Path::new(os_str) } +// TODO: need to convert from WTF8 to MBCS bytes on Windows. +// that's why Vec is returned. +#[cfg(unix)] +pub fn get_bytes_from_path(path: impl AsRef) -> Vec { + 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. #[derive(Copy, Clone, Debug)] pub struct Ancestors<'a> { diff -r f79377f24487 -r ee3872c14ab3 rust/hg-cpython/src/filepatterns.rs --- a/rust/hg-cpython/src/filepatterns.rs Tue Nov 19 23:16:16 2019 +0900 +++ b/rust/hg-cpython/src/filepatterns.rs Tue Nov 19 23:19:57 2019 +0900 @@ -68,7 +68,7 @@ .iter() .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), ) })