Fix

Author: vlad-ivanov-name

josh-cli/src/bin/josh.rs

@@ -20,7 +20,7 @@ fn spawn_git_command(
     args: &[&str],
     env: &[(&str, &str)],
 ) -> anyhow::Result<()> {
-    log::debug!("spawn_git_command: {:?}", args);
+    eprintln!("spawn_git_command: {:?}", args);
 
     let mut command = ProcessCommand::new("git");
     command.current_dir(cwd).args(args);
@@ -292,12 +292,9 @@ fn apply_josh_filtering(
     );
 
     // Open Josh transaction
-    let transaction = josh::cache::TransactionContext::from_env(cache.clone())
-        .map_err(from_josh_err)
-        .context("Failed TransactionContext::from_env")?
+    let transaction = josh::cache::TransactionContext::new(repo_path, cache.clone())
         .open(None)
-        .map_err(from_josh_err)
-        .context("Failed TransactionContext::open")?;
+        .map_err(from_josh_err)?;
 
     let repo = transaction.repo();
 
@@ -355,6 +352,24 @@ fn apply_josh_filtering(
     Ok(())
 }
 
+fn to_absolute_remote_url(url: &str) -> anyhow::Result<String> {
+    if url.starts_with("http://")
+        || url.starts_with("https://")
+        || url.starts_with("ssh://")
+        || url.starts_with("file://")
+    {
+        Ok(url.to_owned())
+    } else {
+        // For local paths, make them absolute
+        let path = std::fs::canonicalize(&url)
+            .with_context(|| format!("Failed to resolve path {}", url))?
+            .display()
+            .to_string();
+
+        Ok(format!("file://{}", path))
+    }
+}
+
 fn handle_clone(args: &CloneArgs) -> anyhow::Result<()> {
     // Use the provided output directory
     let output_dir = args.out.clone();
@@ -365,30 +380,10 @@ fn handle_clone(args: &CloneArgs) -> anyhow::Result<()> {
     // Initialize a new git repository inside the directory using git2
     git2::Repository::init(&output_dir).context("Failed to initialize git repository")?;
 
-    let original_dir = std::env::current_dir()?;
-
-    // Make the URL absolute if it's a relative path (for local repositories)
-    let absolute_url = if args.url.starts_with("http://")
-        || args.url.starts_with("https://")
-        || args.url.starts_with("ssh://")
-    {
-        args.url.clone()
-    } else {
-        // For local paths, make them absolute relative to the original directory
-        let absolute_path = if args.url.starts_with('/') {
-            // Already absolute
-            args.url.clone()
-        } else {
-            // Relative to original directory
-            original_dir.join(&args.url).to_string_lossy().to_string()
-        };
-        absolute_path
-    };
-
     // Use handle_remote_add to add the remote with the filter
     let remote_add_args = RemoteAddArgs {
         name: "origin".to_string(),
-        url: absolute_url,
+        url: to_absolute_remote_url(&args.url)?,
         filter: args.filter.clone(),
         keep_trivial_merges: args.keep_trivial_merges,
     };
@@ -816,15 +811,7 @@ fn handle_remote_add_repo(args: &RemoteAddArgs, repo_path: &std::path::Path) ->
     let repo = git2::Repository::open(repo_path).context("Failed to open repository")?;
 
     // Store the remote information in josh-remote config instead of adding a git remote
-    let remote_path = if args.url.starts_with("http") || args.url.starts_with("ssh://") {
-        args.url.clone()
-    } else {
-        // For local paths, make them absolute
-        std::fs::canonicalize(&args.url)
-            .with_context(|| format!("Failed to resolve path {}", args.url))?
-            .display()
-            .to_string()
-    };
+    let remote_url = to_absolute_remote_url(&args.url)?;
 
     // Store the filter in git config per remote
     // Append ":prune=trivial-merge" to all filters unless --keep-trivial-merges flag is set
@@ -838,7 +825,7 @@ fn handle_remote_add_repo(args: &RemoteAddArgs, repo_path: &std::path::Path) ->
 
     // Store remote URL in josh-remote section
     config
-        .set_str(&format!("josh-remote.{}.url", args.name), &remote_path)
+        .set_str(&format!("josh-remote.{}.url", args.name), &remote_url)
         .context("Failed to store remote URL in git config")?;
 
     // Store filter in josh-remote section
@@ -857,17 +844,8 @@ fn handle_remote_add_repo(args: &RemoteAddArgs, repo_path: &std::path::Path) ->
 
     // Set up a git remote that points to "." with a refspec to fetch filtered refs
     // Add remote pointing to current directory
-    spawn_git_command(
-        repo_path,
-        &[
-            "remote",
-            "add",
-            &args.name,
-            &format!("file://{}", repo_path.to_string_lossy()),
-        ],
-        &[],
-    )
-    .context("Failed to add git remote")?;
+    spawn_git_command(repo_path, &["remote", "add", &args.name, &remote_url], &[])
+        .context("Failed to add git remote")?;
 
     // Set up namespace configuration for the remote
     let namespace = format!("josh-{}", args.name);