Use system git instead of libgit2

Author: nbacquey

Cargo.lock

@@ -57,7 +57,6 @@ criterion = "0.5"
 directories = "5.0"
 env_logger = "0.10"
 futures = "0.3.28"
-git2 = "0.19.0"
 itertools = "0.11"
 js-sys = "0.3"
 libloading = "0.8.4"

Cargo.toml

@@ -29,7 +29,6 @@ topiary-web-tree-sitter-sys.workspace = true
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 clap = { workspace = true, features = ["derive"] }
 cc.workspace = true
-git2.workspace = true
 libloading.workspace = true
 
 [features]

topiary-config/Cargo.toml

@@ -4,7 +4,7 @@
       extensions = ["sh", "bash"],
       grammar = {
         git = "https://github.com/tree-sitter/tree-sitter-bash.git",
-        rev = "1b0321ee85701d5036c334a6f04761cdc672e64c",
+        rev = "d1a1a3fe7189fdab5bd29a54d1df4a5873db5cb1",
       }
     },
 
@@ -52,7 +52,7 @@
       grammar = {
         git = "https://github.com/tree-sitter/tree-sitter-ocaml.git",
         rev = "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677",
-        subdir = "grammars/ocaml",
+        subdir = "ocaml",
       },
     },
 
@@ -61,7 +61,7 @@
       grammar = {
         git = "https://github.com/tree-sitter/tree-sitter-ocaml.git",
         rev = "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677",
-        subdir = "grammars/interface",
+        subdir = "interface",
       },
     },
 

topiary-config/languages.ncl

@@ -25,7 +25,7 @@ pub enum TopiaryConfigError {
 /// Since fetching an compilation is something that can easily be parallelized, we create a special error that DOES implement Sync/Send.
 #[cfg(not(target_arch = "wasm32"))]
 pub enum TopiaryConfigFetchingError {
-    Git(git2::Error),
+    Git(io::Error),
     Subprocess(String),
     Io(io::Error),
     LibLoading(libloading::Error),
@@ -112,13 +112,6 @@ impl From<libloading::Error> for TopiaryConfigFetchingError {
     }
 }
 
-#[cfg(not(target_arch = "wasm32"))]
-impl From<git2::Error> for TopiaryConfigFetchingError {
-    fn from(e: git2::Error) -> Self {
-        Self::Git(e)
-    }
-}
-
 impl error::Error for TopiaryConfigError {
     fn source(&self) -> Option<&(dyn error::Error + 'static)> {
         match self {

topiary-config/src/error.rs

@@ -7,9 +7,7 @@ use crate::error::{TopiaryConfigError, TopiaryConfigFetchingError};
 use std::collections::HashSet;
 
 #[cfg(not(target_arch = "wasm32"))]
-use git2::Oid;
-#[cfg(not(target_arch = "wasm32"))]
-use git2::Repository;
+use std::env;
 #[cfg(not(target_arch = "wasm32"))]
 use std::path::PathBuf;
 #[cfg(not(target_arch = "wasm32"))]
@@ -185,10 +183,21 @@ impl Language {
 
         // Clone the repository and checkout the configured revision
         log::info!("{}: cloning from {}", self.name, self.config.grammar.git);
-        let repo = Repository::clone(&self.config.grammar.git, &tmp_dir)?;
+        Command::new("git")
+            .arg("clone")
+            .arg(&self.config.grammar.git)
+            .arg(&tmp_dir)
+            .status()
+            .map_err(TopiaryConfigFetchingError::Git)?;
         log::info!("{}: checking out {}", self.name, self.config.grammar.rev);
-        repo.set_head_detached(Oid::from_str(&self.config.grammar.rev)?)?;
-
+        let current_dir = env::current_dir().map_err(TopiaryConfigFetchingError::Io)?;
+        env::set_current_dir(&tmp_dir).map_err(TopiaryConfigFetchingError::Io)?;
+        Command::new("git")
+            .arg("checkout")
+            .arg(&self.config.grammar.rev)
+            .status()
+            .map_err(TopiaryConfigFetchingError::Git)?;
+        env::set_current_dir(current_dir).map_err(TopiaryConfigFetchingError::Io)?;
         let path = match self.config.grammar.subdir.clone() {
             // Some grammars are in a subdirectory, go there
             Some(subdir) => tmp_dir.join(subdir),