jj-lib 0.3.0 - removes libgit2, needs tokio's exts (but not its runtime)

Author: gulbanana

.github/prompts/cargo-dedupe.prompt.md

@@ -0,0 +1,4 @@
+---
+agent: agent
+---
+In **src-tauri/**, run `cargo tree -d` to see duplicate crate dependencies. Some of these will be due to a dependency version used by jj-lib or jj-cli differing from what's in Cargo.toml. Update Cargo.toml to match jj's versions.

src-tauri/Cargo.lock

@@ -26,15 +26,12 @@ tauri-plugin-shell = "~2.2.0"
 tauri-plugin-window-state = "2.0.0"
 tauri-plugin-log = "2.0.0"
 
-jj-lib = { version = "0.29", features = ["vendored-openssl", "watchman"] }
-jj-cli = { version = "0.29", default-features = false, features = [
-    "git",
-    "vendored-openssl",
-] }
+jj-lib = { version = "0.30", features = ["watchman"] }
+jj-cli = { version = "0.30" }
 
 # deps shared with JJ, which we try to keep on the same version
-anyhow = "1.0.93"
-clap = { version = "4.5.20", features = [
+anyhow = "1.0.100"
+clap = { version = "4.5.53", features = [
     "derive",
     "deprecated",
     "wrap_help",
@@ -44,25 +41,25 @@ config = { version = "0.13.4", default-features = false, features = ["toml"] }
 dirs = "5.0.1"
 dunce = "1.0.5"
 itertools = "0.14"
-indexmap = "2.6"
+indexmap = "2.12"
 gix = { version = "0.71", default-features = false, features = [
     "index",
     "max-performance-safe",
     "blob-diff",
 ] }
 pollster = "0.4"
 serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0.132"
-toml_edit = { version = "0.22.23", features = ["serde"] }
-thiserror = "1.0.68"
+serde_json = "1.0.145"
+toml_edit = { version = "0.22.27", features = ["serde"] }
+thiserror = "2.0.17"
 
 # deps used by JJ but with different features
-chrono = { version = "0.4.38", features = ["serde"] }
-git2 = { version = "0.20.1", features = ["vendored-libgit2"] }
+chrono = { version = "0.4.42", features = ["serde"] }
 
 # extra deps not used by JJ
 log = "0.4"
 futures-util = "0.3.31"
+tokio = { version = "1.48", features = ["io-util"] }
 ts-rs = { version = "7.1.1", features = ["chrono-impl"], optional = true }
 
 [target."cfg(windows)".dependencies]

src-tauri/Cargo.toml

@@ -13,7 +13,6 @@ use std::{
 
 use anyhow::{Context, Result, anyhow};
 use chrono::TimeZone;
-use git2::Repository;
 use itertools::Itertools;
 use jj_cli::{cli_util::short_operation_hash, git_util::is_colocated_git_workspace, revset_util};
 use jj_lib::{
@@ -171,11 +170,10 @@ impl WorkspaceSession<'_> {
         Ok(self.operation.repo.store().get_commit(id)?)
     }
 
-    pub fn git_repo(&self) -> Result<Option<Repository>> {
-        match self.operation.git_backend() {
-            Some(backend) => Ok(Some(Repository::open(backend.git_repo_path())?)),
-            None => Ok(None),
-        }
+    pub fn git_repo(&self) -> Option<gix::Repository> {
+        self.operation
+            .git_backend()
+            .map(|backend| backend.git_repo())
     }
 
     pub fn load_at_head(&mut self) -> Result<bool> {
@@ -420,12 +418,11 @@ impl WorkspaceSession<'_> {
     pub fn format_config(&self) -> Result<messages::RepoConfig> {
         let absolute_path = self.workspace.workspace_root().into();
 
-        let git_remotes = match self.git_repo()? {
+        let git_remotes = match self.git_repo() {
             Some(repo) => repo
-                .remotes()?
-                .iter()
-                .flatten()
-                .map(|s| s.to_owned())
+                .remote_names()
+                .into_iter()
+                .map(|s| s.to_string())
                 .collect(),
             None => vec![],
         };

src-tauri/src/worker/gui_util.rs

@@ -4,7 +4,8 @@ use std::sync::Arc;
 use anyhow::{Context, Result, anyhow};
 use indexmap::IndexMap;
 use itertools::Itertools;
-use jj_lib::backend::{FileId, MergedTreeId, TreeValue};
+use jj_lib::backend::{CopyId, FileId, MergedTreeId, TreeValue};
+use jj_lib::conflicts::{self, ConflictMarkerStyle, MaterializedTreeValue};
 use jj_lib::merge::Merge;
 use jj_lib::merged_tree::{MergedTree, MergedTreeBuilder};
 use jj_lib::ref_name::{RefNameBuf, RemoteName, RemoteNameBuf, RemoteRefSymbol};
@@ -26,6 +27,7 @@ use jj_lib::{
     str_util::StringPattern,
 };
 use pollster::block_on;
+use tokio::io::AsyncReadExt;
 
 use crate::messages::{
     AbandonRevisions, BackoutRevisions, CheckoutRevision, CopyChanges, CopyHunk, CreateRef,
@@ -1422,7 +1424,7 @@ impl Mutation for GitFetch {
     fn execute(self: Box<Self>, ws: &mut WorkspaceSession) -> Result<MutationResult> {
         let mut tx = ws.start_transaction()?;
 
-        let git_repo = match ws.git_repo()? {
+        let git_repo = match ws.git_repo() {
             Some(git_repo) => git_repo,
             None => precondition!("No git backend"),
         };
@@ -1435,9 +1437,9 @@ impl Mutation for GitFetch {
             GitFetch::AllRemotes { branch_ref } => {
                 let branch_name = branch_ref.as_branch()?;
                 for remote_name in git_repo
-                    .remotes()?
+                    .remote_names()
                     .into_iter()
-                    .filter_map(|remote| remote.map(|remote| remote.to_owned()))
+                    .map(|remote| remote.to_string())
                 {
                     remote_patterns.push((remote_name, Some(branch_name.to_owned())));
                 }
@@ -1570,14 +1572,12 @@ fn classify_branch_push(
 }
 
 fn read_file_content(store: &Arc<Store>, tree: &MergedTree, path: &RepoPath) -> Result<Vec<u8>> {
-    use jj_lib::conflicts::{self, ConflictMarkerStyle, MaterializedTreeValue};
-
     let entry = tree.path_value(path)?;
     match entry.into_resolved() {
         Ok(Some(TreeValue::File { id, .. })) => {
-            let mut reader = store.read_file(path, &id)?;
+            let mut reader = block_on(store.read_file(path, &id))?;
             let mut content = Vec::new();
-            reader.read_to_end(&mut content)?;
+            block_on(reader.read_to_end(&mut content))?;
             Ok(content)
         }
         Ok(Some(_)) => Ok(Vec::new()),
@@ -1718,6 +1718,7 @@ fn update_tree_entry(
         Merge::normal(TreeValue::File {
             id: new_blob,
             executable,
+            copy_id: CopyId::placeholder(),
         }),
     );
     let new_tree_id = builder.write_tree(store)?;