Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust-cpython: do not convert warning pattern to utf-8 bytes
authorYuya Nishihara <yuya@tcha.org>
Tue, 19 Nov 2019 23:19:57 +0900
changeset 43792 ee3872c14ab3
parent 43791 f79377f24487
child 43793 7b14d649af1b
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.
rust/hg-core/src/utils/files.rs file | annotate | diff | comparison | revisions
rust/hg-cpython/src/filepatterns.rs file | annotate | diff | comparison | revisions 
--- 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<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.
 #[derive(Copy, Clone, Debug)]
 pub struct Ancestors<'a> {
--- 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),
             )
         })
hg-stable