Merge pull request #11430 from Byron/fix

Update to `gix@main` to see URL related fixes (#11419)

Author: Byron

Cargo.lock

@@ -65,7 +65,7 @@ gitbutler-workspace = { path = "crates/gitbutler-workspace" }
 
 bstr = "1.12.1"
 # Add the `tracing` or `tracing-detail` features to see more of gitoxide in the logs. Useful to see which programs it invokes.
-gix = { version = "0.75.0", default-features = false, features = [] }
+gix = { version = "0.75.0", git = "https://github.com/GitoxideLabs/gitoxide", branch = "main", default-features = false, features = [] }
 ts-rs = { version = "11.1.0", features = ["serde-compat", "no-serde-warnings"] }
 gix-testtools = "0.16.1"
 insta = "1.44.3"

Cargo.toml

@@ -191,7 +191,11 @@ impl TreeKind {
 impl<'repo> Commit<'repo> {
     /// Decode the object at `commit_id` and keep its data for later query.
     pub fn from_id(commit_id: gix::Id<'repo>) -> anyhow::Result<Self> {
-        let commit = commit_id.object()?.try_into_commit()?.decode()?.into();
+        let commit = commit_id
+            .object()?
+            .try_into_commit()?
+            .decode()?
+            .try_into()?;
         Ok(Commit {
             id: commit_id,
             inner: commit,

crates/but-core/src/commit.rs

@@ -18,7 +18,7 @@ mod utils {
                 tree: editor.write()?.detach(),
                 parents: [head_commit.id].into(),
                 message: message.into(),
-                ..head_commit.decode()?.to_owned()
+                ..head_commit.decode()?.to_owned()?
             })?
             .detach();
         Ok((head_commit, repo.find_commit(new_commit_id)?))

crates/but-core/tests/core/worktree/mod.rs

@@ -315,7 +315,7 @@ fn rebase(
                 )?;
 
                 // Now, lets pretend the base didn't exist by swapping parent with the parent of the base
-                let mut new_commit = repo.find_commit(new_commit)?.decode()?.to_owned();
+                let mut new_commit = repo.find_commit(new_commit)?.decode()?.to_owned()?;
                 new_commit.parents = base_commit.parent_ids().map(|id| id.detach()).collect();
                 if let Some(new_message) = new_message {
                     new_commit.message = new_message;
@@ -350,15 +350,15 @@ fn to_commit(repo: &gix::Repository, commit_id: gix::ObjectId) -> Result<gix::ob
         .object()?
         .into_commit()
         .decode()?
-        .into())
+        .try_into()?)
 }
 
 fn reword_commit(
     repo: &gix::Repository,
     oid: gix::ObjectId,
     new_message: BString,
 ) -> Result<gix::ObjectId> {
-    let mut new_commit = repo.find_commit(oid)?.decode()?.to_owned();
+    let mut new_commit = repo.find_commit(oid)?.decode()?.to_owned()?;
     new_commit.message = new_message;
     Ok(commit::create(
         repo,
@@ -373,7 +373,7 @@ pub fn replace_commit_tree(
     oid: gix::ObjectId,
     new_tree: gix::ObjectId,
 ) -> Result<gix::ObjectId> {
-    let mut new_commit = repo.find_commit(oid)?.decode()?.to_owned();
+    let mut new_commit = repo.find_commit(oid)?.decode()?.to_owned()?;
     new_commit.tree = new_tree;
     Ok(commit::create(
         repo,

crates/but-rebase/src/lib.rs

@@ -190,14 +190,14 @@ fn upstream_commits_gix(
         let id = id?.to_gix().attach(upstream_id.repo);
         let commit = id.object()?.into_commit();
         let commit = commit.decode()?;
-        let author: ui::Author = commit.author().into();
-        let commiter: ui::Author = commit.committer().into();
+        let author: ui::Author = commit.author()?.into();
+        let commiter: ui::Author = commit.committer()?.into();
         authors.insert(author.clone());
         authors.insert(commiter);
         out.push(UpstreamCommit {
             id: id.detach(),
             message: commit.message.into(),
-            created_at: i128::from(commit.time().seconds) * 1000,
+            created_at: i128::from(commit.time()?.seconds) * 1000,
             author,
         });
     }

crates/but-workspace/src/branch_details.rs

@@ -436,7 +436,11 @@ impl<'repo> WorkspaceCommit<'repo> {
 
     /// Decode the object at `commit_id` and keep its data for later query.
     pub fn from_id(commit_id: gix::Id<'repo>) -> anyhow::Result<Self> {
-        let commit = commit_id.object()?.try_into_commit()?.decode()?.into();
+        let commit = commit_id
+            .object()?
+            .try_into_commit()?
+            .decode()?
+            .try_into()?;
         Ok(WorkspaceCommit {
             id: commit_id,
             inner: commit,

crates/but-workspace/src/commit.rs

@@ -20,7 +20,7 @@ impl ReferenceFrame {
         mode: InferenceMode,
     ) -> anyhow::Result<Self> {
         let head_id = repo.head_id()?;
-        let workspace_commit = head_id.object()?.into_commit().decode()?.to_owned();
+        let workspace_commit = head_id.object()?.into_commit().decode()?.to_owned()?;
 
         let cache = repo.commit_graph_if_enabled()?;
         let mut graph = repo.revision_graph(cache.as_ref());

crates/but-workspace/src/legacy/commit_engine/reference_frame.rs

@@ -216,7 +216,7 @@ fn signatures_are_redone() -> anyhow::Result<()> {
     let (mut repo, _tmp) = writable_scenario_with_ssh_key("two-signed-commits-with-line-offset");
 
     let head_id = repo.head_id()?;
-    let head_commit = head_id.object()?.into_commit().decode()?.to_owned();
+    let head_commit = head_id.object()?.into_commit().decode()?.to_owned()?;
     let head_id = head_id.detach();
     let previous_signature = head_commit
         .extra_headers()

crates/but-workspace/tests/workspace/commit_engine/amend_commit.rs

@@ -1182,7 +1182,7 @@ fn signatures_are_redone() -> anyhow::Result<()> {
     let (repo, _tmp) = writable_scenario_with_ssh_key("two-signed-commits-with-line-offset");
 
     let head_id = repo.head_id()?;
-    let head_commit = head_id.object()?.into_commit().decode()?.to_owned();
+    let head_commit = head_id.object()?.into_commit().decode()?.to_owned()?;
     let head_id = head_id.detach();
     let previous_signature = head_commit
         .extra_headers()