support for unicode-precomposition for gix apps (#301)

crate-status.md

@@ -323,6 +323,7 @@ See its [README.md](https://github.com/Byron/gitoxide/blob/main/git-lock/README.
   * [x] initialize
       * [ ] Proper configuration depending on platform (e.g. ignorecase, filemode, …)
   * [ ] All mutations are multi-process safe and this is tested and configurable (i.e. abort or wait if lock is encountered)
+* support for unicode-precomposition of command-line arguments (needs explicit use in parent application)
 * **Easy** (_porcelain_)
   * **Id**
     * [x] short hashes with detection of ambiguity.

git-repository/Cargo.toml

@@ -86,6 +86,9 @@ log = "0.4.14"
 
 document-features = { version = "0.2.0", optional = true }
 
+[target.'cfg(target_vendor = "apple")'.dependencies]
+unicode-normalization = { version = "0.1.19", default-features = false }
+
 [dev-dependencies]
 git-testtools = { path = "../tests/tools" }
 anyhow = "1"

git-repository/src/lib.rs

@@ -286,3 +286,26 @@ pub mod discover {
         }
     }
 }
+
+///
+pub mod env {
+    use std::ffi::OsString;
+
+    /// Equivalent to `std::env::args_os()`, but with precomposed unicode on MacOS and other apple platforms.
+    #[cfg(not(target_vendor = "apple"))]
+    pub fn args_os() -> impl Iterator<Item = OsString> {
+        std::env::args_os()
+    }
+
+    /// Equivalent to `std::env::args_os()`, but with precomposed unicode on MacOS and other apple platforms.
+    ///
+    /// Note that this ignores `core.precomposeUnicode` as git-config isn't available yet. It's default enabled in modern git though.
+    #[cfg(target_vendor = "apple")]
+    pub fn args_os() -> impl Iterator<Item = OsString> {
+        use unicode_normalization::UnicodeNormalization;
+        std::env::args_os().map(|arg| match arg.to_str() {
+            Some(arg) => arg.nfc().collect::<String>().into(),
+            None => arg,
+        })
+    }
+}

git-worktree/src/os.rs

@@ -26,23 +26,3 @@ pub fn create_symlink(original: &Path, link: &Path) -> io::Result<()> {
         symlink_file(original, link)
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn io_err_if_symlink_target_is_a_file() {
-        let dir = tempfile::tempdir().unwrap();
-        let a = dir.path().join("a");
-        let b = dir.path().join("b");
-
-        std::fs::write(&a, &[]).unwrap();
-        std::fs::write(&b, &[]).unwrap();
-
-        assert_eq!(
-            create_symlink(&a, &b).unwrap_err().kind(),
-            std::io::ErrorKind::AlreadyExists
-        );
-    }
-}

src/plumbing/main.rs

@@ -46,7 +46,7 @@ pub mod async_util {
 }
 
 pub fn main() -> Result<()> {
-    let args: Args = Args::parse();
+    let args: Args = Args::parse_from(git_repository::env::args_os());
     let thread_limit = args.threads;
     let verbose = args.verbose;
     let format = args.format;

src/porcelain/main.rs

@@ -13,7 +13,7 @@ use crate::{
 };
 
 pub fn main() -> Result<()> {
-    let args: Args = Args::parse();
+    let args: Args = Args::parse_from(git_repository::env::args_os());
     let should_interrupt = Arc::new(AtomicBool::new(false));
     git_repository::interrupt::init_handler({
         let should_interrupt = Arc::clone(&should_interrupt);