1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
use super::*;
impl App {
/// Repo-list administration: pinning and removing repos, sort order,
/// and filesystem-driven rescans. Split from `handle_action_rest` so
/// each dispatch file stays under the line cap.
pub(super) fn handle_repo_admin(&mut self, action: Action) -> Result<()> {
if matches!(
action,
Action::AddRepo(_) | Action::RemoveRepo(_) | Action::RescanRepos
) && let Err(e) = self.refresh_shared_membership()
{
self.error_message = Some((format!("config sync failed: {e}"), Instant::now()));
return Ok(());
}
match action {
Action::OpenAddRepo => {
self.path_input.show();
}
Action::AddRepo(ref path) => {
// Same predicate as pinned discovery: anything accepted here
// must survive the next rescan (and vice versa).
if !scanner::is_repo_root(path) {
// Keep the input open so the path can be corrected in place.
self.path_input.set_error("not a git repository");
} else {
self.path_input.hide();
// Canonicalize so the entry matches the paths discovery
// emits — a symlinked or trailing-slash spelling would
// otherwise duplicate the repo on the next rescan.
let path = path.canonicalize().unwrap_or_else(|_| path.clone());
// Land the user on the result either way: Repos panel
// focused, new (or existing) row selected.
self.focus = FocusPanel::Repos;
if let Some(existing) = self.repo_list.repos.iter().find(|r| r.path == path) {
self.success_message =
Some(("already in list".to_string(), Instant::now()));
self.action_tx
.send(Action::SelectRepo(RepoId(existing.path.clone())))?;
} else {
let name = path
.file_name()
.map(|n| n.to_string_lossy().to_string())
.unwrap_or_else(|| path.to_string_lossy().to_string());
let mut config = self.config.clone();
config.add_pinned_repo(path.clone());
if let Err(e) = config.save() {
tracing::error!("Failed to save config: {}", e);
self.error_message =
Some((format!("save failed: {e}"), Instant::now()));
return Ok(());
}
self.config = config;
let repo_id = RepoId(path.clone());
let display = self.repo_list.display_for(&path);
let gitlink = path.join(".git").is_file();
self.repo_list.repos.push(RepoEntry {
path,
name,
display,
status: None,
git_op: false,
gitlink,
});
// Sort now: it rebuilds `display_rows`, so the
// SelectRepo below can land on the new row instead of
// silently no-op'ing against the stale row model.
self.sort_repos();
self.action_tx.send(Action::RefreshRepo(repo_id.clone()))?;
self.action_tx.send(Action::SelectRepo(repo_id))?;
}
}
}
Action::ConfirmRemoveRepo(ref id) => {
if let Some(idx) = self.repo_list.resolve_index(id) {
let name = self.repo_list.repos[idx].name.clone();
self.confirm_dialog
.show(format!("Remove {name}?"), Action::RemoveRepo(id.clone()));
}
}
Action::RemoveRepo(ref id) => {
if let Some(idx) = self.repo_list.resolve_index(id) {
let mut config = self.config.clone();
let entry = &self.repo_list.repos[idx];
// Remove from pinned if it was pinned
config
.pinned_repos
.retain(|p| p.canonicalize().unwrap_or_else(|_| p.clone()) != entry.path);
// Exclude only repos the walk can rediscover: it
// promotes real `.git` directories (including a plain
// repo nested inside another one) but never gitlink
// checkouts — a pinned submodule's `.git` pointer file —
// and never anything outside every root. Excluding those
// is pure downside: the bare name substring-matches
// unrelated paths forever after.
// Compare against canonicalized roots: entry paths are
// canonical (macOS tempdirs resolve through /private).
let under_root = self.config.effective_root_dirs().iter().any(|root| {
let root = root.canonicalize().unwrap_or_else(|_| root.clone());
entry.path.starts_with(&root)
});
let exclusion = format!("path:{}", entry.path.display());
if under_root
&& entry.path.join(".git").is_dir()
&& !config.excluded_repos.contains(&exclusion)
{
config.excluded_repos.push(exclusion);
}
if let Err(e) = config.save() {
self.error_message = Some((format!("save failed: {e}"), Instant::now()));
return Ok(());
}
self.config = config;
self.pending_status.remove(id);
self.dirty_repos.remove(id);
self.last_refresh.remove(id);
self.refresh_scheduled.remove(id);
// Drop cached graph snapshots for the removed repo.
self.git_graph.invalidate_repo(&entry.path);
// A removed repo can be the graph/changes panels' current
// path context (via "Open in graph"): drop it so the
// panels fall back to the selected repo.
if self
.active_worktree
.as_ref()
.is_some_and(|aw| aw.path.starts_with(&entry.path))
{
self.active_worktree = None;
}
self.repo_list.repos.remove(idx);
self.prune_github_cache(std::slice::from_ref(&id.0));
// Fix selection
if self.repo_list.repos.is_empty() {
self.repo_list.state.select(None);
self.file_list
.set_files(Vec::new(), "", RepoId(std::path::PathBuf::new()));
} else {
let new_idx = idx.min(self.repo_list.repos.len() - 1);
self.repo_list.select_repo_row(new_idx);
let new_id = RepoId(self.repo_list.repos[new_idx].path.clone());
self.action_tx.send(Action::SelectRepo(new_id))?;
}
}
}
Action::CycleSortOrder => {
self.sort_order = self.sort_order.next();
self.success_message =
Some((format!("sort: {}", self.sort_order.label()), Instant::now()));
self.sort_repos();
self.sync_selection();
}
Action::RescanRepos => {
let mut config = self.config.clone();
config.excluded_repos.clear();
if let Err(e) = config.save() {
self.error_message = Some((format!("save failed: {e}"), Instant::now()));
return Ok(());
}
self.config = config;
// Clear tracking sets — old paths are stale after rescan
self.pending_status.clear();
self.dirty_repos.clear();
self.last_refresh.clear();
self.refresh_scheduled.clear();
// The repo set is rebuilt from scratch; cached graphs for
// vanished paths are dead weight.
self.git_graph.invalidate_graph_cache();
// The list is rebuilt from scratch, so carry the selection
// across by identity (a worktree subrow falls back to its
// parent repo row — the fresh list has no statuses yet).
let keep = self.repo_list.selected_row_id();
let repo_paths = scanner::discover_repos(&self.config);
self.repo_list = RepoList::new(
repo_paths,
self.config.effective_root_dirs().into_owned(),
self.config.ui.expand_worktrees,
self.theme.clone(),
);
self.repo_list
.register_action_handler(self.action_tx.clone())?;
self.repo_list.init()?;
self.rebuild_watcher();
self.action_tx.send(Action::PollLocal)?;
self.sort_repos();
self.repo_list.resync_rows(keep);
self.sync_selection();
}
Action::DiscoverNewRepos => {
// Idempotent rescan: re-discover, but only mutate state
// when the set actually changed. Preserves selection,
// exclusions, in-flight queries, and dirty markers.
// Clear the pending-trailing-edge flag and refresh the
// cooldown anchor so back-to-back fires coalesce.
self.discovery_pending = false;
self.last_discovery = Some(Instant::now());
let new_paths = scanner::discover_repos(&self.config);
let diff = self.repo_list.sync_paths(new_paths);
if diff.is_empty() {
// No-op: discovered set matches the current list.
} else {
tracing::debug!(
"DiscoverNewRepos: +{} -{}",
diff.added.len(),
diff.removed.len()
);
// Re-register so newly-added rows hand mouse events back.
self.repo_list
.register_action_handler(self.action_tx.clone())?;
// Prune per-repo state for vanished repos so HashSets
// don't keep growing across the session.
self.prune_github_cache(&diff.removed);
for path in &diff.removed {
let id = RepoId(path.clone());
self.pending_status.remove(&id);
self.dirty_repos.remove(&id);
self.last_refresh.remove(&id);
self.refresh_scheduled.remove(&id);
// Drop cached graph snapshots for vanished repos.
self.git_graph.invalidate_repo(path);
if self
.active_worktree
.as_ref()
.is_some_and(|aw| aw.repo_id == id)
{
self.active_worktree = None;
}
}
// `sync_paths` and `sort_repos` each re-anchor the
// selection by row identity, so no manual restore here.
self.sort_repos();
self.rebuild_watcher();
// Queue status for newly added repos.
for path in &diff.added {
self.action_tx
.send(Action::RefreshRepo(RepoId(path.clone())))?;
}
self.sync_selection();
}
}
_ => {}
}
if matches!(action, Action::AddRepo(_) | Action::RemoveRepo(_)) {
// A concurrent writer may have contributed membership changes
// during save. Apply the merged set in this instance too.
self.handle_repo_admin(Action::DiscoverNewRepos)?;
}
Ok(())
}
}