Add support for jujutsu

uses jj-lib crate

This adds a config option `vcs_providers`, where both `git` and `jj`
can be added. By default only git is enabled.
Providers are used lazily in order, so if jujutsu is configured before git,
git will not find a colocated jj repository if jj found it first.

Worktrees/workspaces are handled differently depending on vcs provider.
Git should behave the same as before, with the exception that on non-bare
repos worktrees will be opened as new windows as well.
jj doesn't have bare repos, and so far there doesn't seem to be a reliable
way to refer from the "base" repo to its workspaces, so instead tms will
scan all configured search paths for workspaces belonging to the base
workspace that is opened, and then open a new window for each of them.
(jj workspaces are identified by `.jj/repo` not being the actual repo,
but instead a file that points to the main workspace where the repo is
stored)

Author: junglerobba

Cargo.lock

@@ -18,6 +18,7 @@ exclude = ["images/*"]
 [dependencies]
 
 gix = { version = "0.70.0", features = ["attributes"] }
+jj-lib = "0.28.2"
 clap = { version = "4.5", features = ["cargo", "derive"] }
 clap_complete = { version = "4.5", features = [ "unstable-dynamic" ] }
 serde_derive = "1.0"

Cargo.toml

@@ -14,15 +14,14 @@ use crate::{
     execute_command, get_single_selection,
     marks::{marks_command, MarksCommand},
     picker::Preview,
-    repos::Prunable,
+    repos::RepoProvider,
     session::{create_sessions, SessionContainer},
     tmux::Tmux,
     Result, TmsError,
 };
 use clap::{Args, Parser, Subcommand};
 use clap_complete::{ArgValueCandidates, CompletionCandidate};
 use error_stack::ResultExt;
-use gix::Repository;
 use ratatui::style::Color;
 
 #[derive(Debug, Parser)]
@@ -230,7 +229,7 @@ impl Cli {
                 Ok(SubCommandGiven::Yes)
             }
             Some(CliCommand::Refresh(args)) => {
-                refresh_command(args, tmux)?;
+                refresh_command(args, config, tmux)?;
                 Ok(SubCommandGiven::Yes)
             }
 
@@ -610,7 +609,7 @@ fn rename_subcommand(args: &RenameCommand, tmux: &Tmux) -> Result<()> {
     Ok(())
 }
 
-fn refresh_command(args: &RefreshCommand, tmux: &Tmux) -> Result<()> {
+fn refresh_command(args: &RefreshCommand, config: Config, tmux: &Tmux) -> Result<()> {
     let session_name = args
         .name
         .clone()
@@ -629,11 +628,11 @@ fn refresh_command(args: &RefreshCommand, tmux: &Tmux) -> Result<()> {
         .map(|line| line.replace('\'', ""))
         .collect();
 
-    if let Ok(repository) = gix::open(&session_path) {
+    if let Ok(repository) = RepoProvider::open(Path::new(&session_path), &config) {
         let mut num_worktree_windows = 0;
-        if let Ok(worktrees) = repository.worktrees() {
+        if let Ok(worktrees) = repository.worktrees(&config) {
             for worktree in worktrees.iter() {
-                let worktree_name = worktree.id().to_string();
+                let worktree_name = worktree.name();
                 if existing_window_names.contains(&worktree_name) {
                     num_worktree_windows += 1;
                     continue;
@@ -645,12 +644,7 @@ fn refresh_command(args: &RefreshCommand, tmux: &Tmux) -> Result<()> {
                 num_worktree_windows += 1;
                 tmux.new_window(
                     Some(&worktree_name),
-                    Some(
-                        &worktree
-                            .base()
-                            .change_context(TmsError::GitError)?
-                            .to_string()?,
-                    ),
+                    Some(&worktree.path()?.to_string()?),
                     Some(&session_name),
                 );
             }
@@ -713,13 +707,11 @@ fn clone_repo_command(args: &CloneRepoCommand, config: Config, tmux: &Tmux) -> R
 
     let previous_session = tmux.current_session("#{session_name}");
 
-    let repo = git_clone(&args.repository, &path)?;
+    let repo = RepoProvider::open(git_clone(&args.repository, &path)?, &config)?;
 
     let mut session_name = repo_name.to_string();
 
-    let switch_config = config.clone_repo_switch.unwrap_or_default();
-
-    let switch = match switch_config {
+    let switch = match config.clone_repo_switch.unwrap_or_default() {
         CloneRepoSwitchConfig::Always => true,
         CloneRepoSwitchConfig::Never => false,
         CloneRepoSwitchConfig::Foreground => {
@@ -741,15 +733,15 @@ fn clone_repo_command(args: &CloneRepoCommand, config: Config, tmux: &Tmux) -> R
     }
 
     tmux.new_session(Some(&session_name), Some(&path.display().to_string()));
-    tmux.set_up_tmux_env(&repo, &session_name)?;
+    tmux.set_up_tmux_env(&repo, &session_name, &config)?;
     if switch {
         tmux.switch_to_session(&session_name);
     }
 
     Ok(())
 }
 
-fn git_clone(repo: &str, target: &Path) -> Result<Repository> {
+fn git_clone<'a>(repo: &str, target: &'a Path) -> Result<&'a Path> {
     std::fs::create_dir_all(target).change_context(TmsError::IoError)?;
     let mut cmd = Command::new("git")
         .current_dir(target.parent().ok_or(TmsError::IoError)?)
@@ -760,8 +752,7 @@ fn git_clone(repo: &str, target: &Path) -> Result<Repository> {
         .change_context(TmsError::GitError)?;
 
     cmd.wait().change_context(TmsError::GitError)?;
-    let repo = gix::open(target).change_context(TmsError::GitError)?;
-    Ok(repo)
+    Ok(target)
 }
 
 fn init_repo_command(args: &InitRepoCommand, config: Config, tmux: &Tmux) -> Result<()> {
@@ -771,6 +762,7 @@ fn init_repo_command(args: &InitRepoCommand, config: Config, tmux: &Tmux) -> Res
     path.push(&args.repository);
 
     let repo = gix::init(&path).change_context(TmsError::GitError)?;
+    let repo = RepoProvider::Git(repo);
 
     let mut session_name = args.repository.to_string();
 
@@ -787,7 +779,7 @@ fn init_repo_command(args: &InitRepoCommand, config: Config, tmux: &Tmux) -> Res
     }
 
     tmux.new_session(Some(&session_name), Some(&path.display().to_string()));
-    tmux.set_up_tmux_env(&repo, &session_name)?;
+    tmux.set_up_tmux_env(&repo, &session_name, &config)?;
     tmux.switch_to_session(&session_name);
 
     Ok(())

src/cli.rs

@@ -52,6 +52,17 @@ pub struct Config {
     pub session_configs: Option<HashMap<String, SessionConfig>>,
     pub marks: Option<HashMap<String, String>>,
     pub clone_repo_switch: Option<CloneRepoSwitchConfig>,
+    pub vcs_providers: Option<Vec<VcsProviders>>,
+}
+
+pub const DEFAULT_VCS_PROVIDERS: &[VcsProviders] = &[VcsProviders::Git];
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "lowercase")]
+pub enum VcsProviders {
+    Git,
+    #[serde(alias = "jj")]
+    Jujutsu,
 }
 
 #[derive(Default, Debug, Serialize, Deserialize, PartialEq, Eq)]
@@ -71,6 +82,7 @@ pub struct ConfigExport {
     pub session_configs: HashMap<String, SessionConfig>,
     pub marks: HashMap<String, String>,
     pub clone_repo_switch: CloneRepoSwitchConfig,
+    pub vcs_providers: Vec<VcsProviders>,
 }
 
 impl From<Config> for ConfigExport {
@@ -97,6 +109,7 @@ impl From<Config> for ConfigExport {
             session_configs: value.session_configs.unwrap_or_default(),
             marks: value.marks.unwrap_or_default(),
             clone_repo_switch: value.clone_repo_switch.unwrap_or_default(),
+            vcs_providers: value.vcs_providers.unwrap_or(DEFAULT_VCS_PROVIDERS.into()),
         }
     }
 }
@@ -433,7 +446,7 @@ impl ValueEnum for SessionSortOrderConfig {
     }
 }
 
-#[derive(Debug, Default, Serialize, Deserialize, Clone, PartialEq, Eq)]
+#[derive(Debug, Default, Serialize, Deserialize, Copy, Clone, PartialEq, Eq)]
 pub enum CloneRepoSwitchConfig {
     #[default]
     Always,