repo: migrate add_remote to gix config

Co-authored-by: Sebastian Thiel <sebastian.thiel@icloud.com>

Author: codex

crates/gitbutler-repo/src/commands.rs

@@ -3,6 +3,7 @@ use std::{path::Path, sync::Mutex};
 use anyhow::{Result, bail};
 use base64::engine::Engine as _;
 use but_core::commit::sign_buffer;
+use but_core::git_config::edit_repo_config;
 use but_ctx::Context;
 use fuzzy_matcher::{FuzzyMatcher, skim::SkimMatcherV2};
 use ignore::WalkBuilder;
@@ -11,7 +12,7 @@ use itertools::Itertools;
 use serde::Serialize;
 use tracing::warn;
 
-use crate::{RepositoryExt, remote::GitRemote};
+use crate::remote::GitRemote;
 
 #[derive(Default, Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -202,25 +203,40 @@ impl RepoCommands for Context {
     }
 
     fn add_remote(&self, name: &str, url: &str) -> Result<()> {
-        #[expect(deprecated, reason = "legacy remote configuration adapter")]
-        let repo = self.git2_repo.get()?;
+        let repo = self.open_isolated_repo()?;
 
         // Bail if remote with given name already exists.
         if repo.find_remote(name).is_ok() {
             bail!("Remote name '{name}' already exists");
         }
 
         // Bail if remote with given url already exists.
-        if repo
-            .remotes_as_string()?
+        if let Some(remote_name) = repo
+            .remote_names()
             .iter()
-            .map(|name| repo.find_remote(name))
-            .any(|result| result.is_ok_and(|remote| remote.url() == Some(url)))
+            .filter_map(|name| repo.find_remote(name.as_ref()).ok())
+            .find_map(|remote| {
+                remote
+                    .url(gix::remote::Direction::Fetch)
+                    .and_then(|remote_url| {
+                        if remote_url.to_bstring() == url {
+                            remote
+                                .name()
+                                .and_then(|n| n.as_symbol().map(ToOwned::to_owned))
+                        } else {
+                            None
+                        }
+                    })
+            })
         {
-            bail!("Remote with url '{url}' already exists");
+            bail!("Remote with url '{url}' already exists at '{remote_name}'");
         }
 
-        repo.remote(name, url)?;
+        edit_repo_config(&repo, gix::config::Source::Local, |config| {
+            let mut section = config.section_mut_or_create_new("remote", Some(name.into()))?;
+            section.push("url".try_into()?, Some(url.into()));
+            Ok(())
+        })?;
         Ok(())
     }
 

crates/gitbutler-repo/tests/mod.rs

@@ -5,3 +5,4 @@ mod managed_hooks_tests;
 mod merge_base_octopussy;
 mod read_file_from_workspace_security;
 mod rebase;
+mod remotes;

crates/gitbutler-repo/tests/remotes.rs

@@ -0,0 +1,75 @@
+use but_ctx::{Context, RepoOpenMode};
+use but_settings::AppSettings;
+use but_testsupport::legacy::test_repository;
+use gitbutler_project as projects;
+use gitbutler_repo::RepoCommands;
+use tempfile::TempDir;
+
+struct TestCtx {
+    ctx: Context,
+    _tmp: TempDir,
+}
+
+fn ctx() -> TestCtx {
+    let (repo, tmp) = test_repository();
+    let project = projects::Project::new_for_gitbutler_repo(
+        repo.workdir().unwrap().to_path_buf(),
+        projects::AuthKey::SystemExecutable,
+    );
+    TestCtx {
+        ctx: Context::new_from_legacy_project_and_settings_with_repo_open_mode(
+            &project,
+            AppSettings::default(),
+            RepoOpenMode::Isolated,
+        )
+        .expect("can create context"),
+        _tmp: tmp,
+    }
+}
+
+#[test]
+fn add_remote_writes_fetch_url_to_local_config() -> anyhow::Result<()> {
+    let test = ctx();
+    let ctx = &test.ctx;
+
+    ctx.add_remote("origin", "https://example.com/repo.git")?;
+
+    let repo = ctx.open_isolated_repo()?;
+    let remote = repo.find_remote("origin")?;
+    assert_eq!(
+        remote
+            .url(gix::remote::Direction::Fetch)
+            .map(|url| url.to_bstring().to_string()),
+        Some("https://example.com/repo.git".to_owned())
+    );
+    Ok(())
+}
+
+#[test]
+fn add_remote_rejects_duplicate_name() {
+    let test = ctx();
+    let ctx = &test.ctx;
+    ctx.add_remote("origin", "https://example.com/repo.git")
+        .expect("first add succeeds");
+
+    let err = ctx
+        .add_remote("origin", "https://example.com/other.git")
+        .expect_err("duplicate name should fail");
+    assert_eq!(err.to_string(), "Remote name 'origin' already exists");
+}
+
+#[test]
+fn add_remote_rejects_duplicate_url() {
+    let test = ctx();
+    let ctx = &test.ctx;
+    ctx.add_remote("origin", "https://example.com/repo.git")
+        .expect("first add succeeds");
+
+    let err = ctx
+        .add_remote("upstream", "https://example.com/repo.git")
+        .expect_err("duplicate url should fail");
+    assert_eq!(
+        err.to_string(),
+        "Remote with url 'https://example.com/repo.git' already exists at 'origin'"
+    );
+}