Add config option for listing worktrees for bare repositories

Also adds a check to set_up_tmux_env so that when opening a worktree
directly, the main repo's other worktrees won't be opened as
windows. Since we're opening one directly, the assumption is that we
specificially want only the one selected.

Co-authored-by: junglerobba <junglerobba@jngl.one>

Author: Swann HERRERA

README.md

@@ -67,7 +67,7 @@ a provided `session_name`.
 Use `tms --help`
 
 ```
-Scan for all git folders in specified directorires, select one and open it as a new tmux session
+Scan for all git folders in specified directories, select one and open it as a new tmux session
 
 Usage: tms [COMMAND]
 
@@ -98,6 +98,11 @@ Options:
 Configure the defaults for search paths and excluded directories
 
 Usage: tms config [OPTIONS]
+       tms config <COMMAND>
+
+Commands:
+  list  List current config including all default values
+  help  Print this message or the help of the given subcommand(s)
 
 Options:
   -p, --paths <search paths>...
@@ -121,15 +126,23 @@ Options:
       --picker-highlight-color <#rrggbb>
           Background color of the highlighted item in the picker
       --picker-highlight-text-color <#rrggbb>
-          Text color of the hightlighted item in the picker
+          Text color of the highlighted item in the picker
       --picker-border-color <#rrggbb>
           Color of the borders between widgets in the picker
       --picker-info-color <#rrggbb>
           Color of the item count in the picker
       --picker-prompt-color <#rrggbb>
           Color of the prompt in the picker
-      --session-sort-order <Alphabetical | LastAttach>
+      --session-sort-order <Alphabetical | LastAttached>
           Set the sort order of the sessions in the switch command [possible values: Alphabetical, LastAttached]
+      --clone-repo-switch <Always | Never | Foreground>
+          Whether to automatically switch to the new session after the `clone-repo` command finishes
+          `Always` will always switch tmux to the new session
+          `Never` will always create the new session in the background
+          When set to `Foreground`, the new session will only be opened in the background if the active
+          tmux session has changed since starting the clone process (for long clone processes on larger repos) [possible values: Always, Never, Foreground]
+      --enable-list-worktrees <true | false>
+          Enable listing of woktrees for bare repositories [possible values: true, false]
   -h, --help
           Print help
 ```

src/cli.rs

@@ -26,7 +26,7 @@ use ratatui::style::Color;
 
 #[derive(Debug, Parser)]
 #[command(author, version)]
-///Scan for all git folders in specified directorires, select one and open it as a new tmux session
+///Scan for all git folders in specified directories, select one and open it as a new tmux session
 pub struct Cli {
     #[command(subcommand)]
     command: Option<CliCommand>,
@@ -120,7 +120,7 @@ pub struct ConfigArgs {
     /// Background color of the highlighted item in the picker
     picker_highlight_color: Option<Color>,
     #[arg(long, value_name = "#rrggbb")]
-    /// Text color of the hightlighted item in the picker
+    /// Text color of the highlighted item in the picker
     picker_highlight_text_color: Option<Color>,
     #[arg(long, value_name = "#rrggbb")]
     /// Color of the borders between widgets in the picker
@@ -141,6 +141,9 @@ pub struct ConfigArgs {
     /// When set to `Foreground`, the new session will only be opened in the background if the active
     /// tmux session has changed since starting the clone process (for long clone processes on larger repos)
     clone_repo_switch: Option<CloneRepoSwitchConfig>,
+    #[arg(long, value_name = "true | false")]
+    /// Enable listing of woktrees for bare repositories
+    enable_list_worktrees: Option<bool>,
 }
 
 #[derive(Debug, Args)]
@@ -428,6 +431,10 @@ fn config_command(cmd: &ConfigCommand, mut config: Config) -> Result<()> {
         config.switch_filter_unknown = Some(switch_filter_unknown.to_owned());
     }
 
+    if let Some(enable_list_worktrees) = args.enable_list_worktrees {
+        config.list_worktrees = Some(enable_list_worktrees.to_owned());
+    }
+
     if let Some(dirs) = &args.excluded_dirs {
         let current_excluded = config.excluded_dirs;
         match current_excluded {

src/configs.rs

@@ -54,6 +54,7 @@ pub struct Config {
     pub marks: Option<HashMap<String, String>>,
     pub clone_repo_switch: Option<CloneRepoSwitchConfig>,
     pub vcs_providers: Option<Vec<VcsProviders>>,
+    pub list_worktrees: Option<bool>,
 }
 
 pub const DEFAULT_VCS_PROVIDERS: &[VcsProviders] = &[VcsProviders::Git];

src/repos.rs

@@ -10,7 +10,7 @@ use jj_lib::{
     workspace::{WorkingCopyFactories, Workspace},
 };
 use std::{
-    collections::{HashMap, VecDeque},
+    collections::{HashMap, HashSet, VecDeque},
     fs::{self},
     path::{Path, PathBuf},
     process::{self, Stdio},
@@ -240,22 +240,20 @@ impl RepoProvider {
                 .collect()),
 
             RepoProvider::Jujutsu(workspace) => {
+                let repo = workspace
+                    .repo_loader()
+                    .load_at_head()
+                    .change_context(TmsError::GitError)?;
+                let mut workspaces: HashSet<&str> = HashSet::from_iter(
+                    repo.view()
+                        .wc_commit_ids()
+                        .keys()
+                        .filter(|name| name.as_str() != workspace.workspace_name().as_str())
+                        .map(|buf| buf.as_str()),
+                );
                 let mut repos: Vec<RepoProvider> = Vec::new();
 
-                search_dirs(config, |_, repo| {
-                    if !repo.is_worktree() {
-                        return Ok(());
-                    }
-                    let Some(path) = repo.main_repo() else {
-                        return Ok(());
-                    };
-                    if workspace.repo_path() == path {
-                        repos.push(repo);
-                    }
-                    Ok(())
-                })?;
-
-                if self.is_bare() {
+                if self.is_bare() && !workspaces.is_empty() {
                     if let Ok(read_dir) = fs::read_dir(self.path()) {
                         let mut sub = read_dir
                             .filter_map(|entry| entry.ok())
@@ -268,10 +266,30 @@ impl RepoProvider {
                                     .is_some_and(|main| main == self.path().join(".jj/repo"))
                             })
                             .collect::<Vec<_>>();
+                        for repo in &sub {
+                            if let RepoProvider::Jujutsu(ws) = repo {
+                                workspaces.remove(ws.workspace_name().as_str());
+                            }
+                        }
                         repos.append(&mut sub);
                     }
                 }
 
+                if !workspaces.is_empty() {
+                    search_dirs(config, |_, repo| {
+                        if !repo.is_worktree() {
+                            return Ok(());
+                        }
+                        let Some(path) = repo.main_repo() else {
+                            return Ok(());
+                        };
+                        if workspace.repo_path() == path {
+                            repos.push(repo);
+                        }
+                        Ok(())
+                    })?;
+                }
+
                 let repos = repos
                     .into_iter()
                     .filter_map(|repo| match repo {
@@ -302,6 +320,26 @@ pub fn find_repos(config: &Config) -> Result<HashMap<String, Vec<Session>>> {
             })?
             .to_string()?;
 
+        if let Some(true) = config.list_worktrees {
+            for worktree in repo.worktrees(config)?.iter() {
+                let Ok(sub) = worktree
+                    .path()
+                    .and_then(|path| RepoProvider::open(&path, config))
+                else {
+                    continue;
+                };
+                let session = Session::new(
+                    format!("{}#{}", session_name, worktree.name()),
+                    SessionType::Git(sub),
+                );
+                if let Some(list) = repos.get_mut(&session.name) {
+                    list.push(session);
+                } else {
+                    repos.insert(session.name.clone(), vec![session]);
+                }
+            }
+        }
+
         let session = Session::new(session_name, SessionType::Git(repo));
         if let Some(list) = repos.get_mut(&session.name) {
             list.push(session);

src/tmux.rs

@@ -255,6 +255,9 @@ impl Tmux {
         repo_name: &str,
         config: &Config,
     ) -> Result<()> {
+        if repo.is_worktree() {
+            return Ok(());
+        }
         let worktrees = repo.worktrees(config).change_context(TmsError::GitError)?;
         let worktrees = worktrees
             .iter()

tests/cli.rs

@@ -69,6 +69,7 @@ fn tms_config() -> anyhow::Result<()> {
         clone_repo_switch: Some(CloneRepoSwitchConfig::Always),
         vcs_providers: None,
         input_position: None,
+        list_worktrees: None,
     };
 
     let mut tms = Command::cargo_bin("tms")?;