
Modified version of #25950. We still use worktree paths, but repo paths with a status that lie outside the worktree are not excluded; instead, we relativize them by adding `..`. This makes the list in the git panel match what you'd get from running `git status` (with the repo's worktree root as the working directory). - [x] Implement + test new unrelativization logic - [x] ~~When collecting repositories, dedup by .git abs path, so worktrees can share a repo at the project level~~ dedup repos at the repository selector layer, with repos coming from larger worktrees being preferred - [x] Open single-file worktree with diff when activating a path not in the worktree Release Notes: - N/A
214 lines
6.6 KiB
Rust
214 lines
6.6 KiB
Rust
use gpui::{
|
|
AnyElement, App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Task, WeakEntity,
|
|
};
|
|
use itertools::Itertools;
|
|
use picker::{Picker, PickerDelegate};
|
|
use project::{
|
|
git::{GitStore, Repository},
|
|
Project,
|
|
};
|
|
use std::sync::Arc;
|
|
use ui::{prelude::*, ListItem, ListItemSpacing};
|
|
|
|
pub struct RepositorySelector {
|
|
picker: Entity<Picker<RepositorySelectorDelegate>>,
|
|
}
|
|
|
|
impl RepositorySelector {
|
|
pub fn new(
|
|
project_handle: Entity<Project>,
|
|
window: &mut Window,
|
|
cx: &mut Context<Self>,
|
|
) -> Self {
|
|
let git_store = project_handle.read(cx).git_store().clone();
|
|
let repository_entries = git_store.update(cx, |git_store, cx| {
|
|
filtered_repository_entries(git_store, cx)
|
|
});
|
|
let project = project_handle.read(cx);
|
|
let filtered_repositories = repository_entries.clone();
|
|
|
|
let widest_item_ix = repository_entries.iter().position_max_by(|a, b| {
|
|
a.read(cx)
|
|
.display_name(project, cx)
|
|
.len()
|
|
.cmp(&b.read(cx).display_name(project, cx).len())
|
|
});
|
|
|
|
let delegate = RepositorySelectorDelegate {
|
|
project: project_handle.downgrade(),
|
|
repository_selector: cx.entity().downgrade(),
|
|
repository_entries,
|
|
filtered_repositories,
|
|
selected_index: 0,
|
|
};
|
|
|
|
let picker = cx.new(|cx| {
|
|
Picker::nonsearchable_uniform_list(delegate, window, cx)
|
|
.widest_item(widest_item_ix)
|
|
.max_height(Some(rems(20.).into()))
|
|
});
|
|
|
|
RepositorySelector { picker }
|
|
}
|
|
}
|
|
|
|
pub(crate) fn filtered_repository_entries(
|
|
git_store: &GitStore,
|
|
cx: &App,
|
|
) -> Vec<Entity<Repository>> {
|
|
let mut repository_entries = git_store.all_repositories();
|
|
repository_entries.sort_by_key(|repo| {
|
|
let repo = repo.read(cx);
|
|
(
|
|
repo.dot_git_abs_path.clone(),
|
|
repo.worktree_abs_path.clone(),
|
|
)
|
|
});
|
|
// Remove any entry that comes from a single file worktree and represents a repository that is also represented by a non-single-file worktree.
|
|
repository_entries
|
|
.chunk_by(|a, b| a.read(cx).dot_git_abs_path == b.read(cx).dot_git_abs_path)
|
|
.flat_map(|chunk| {
|
|
let has_non_single_file_worktree = chunk
|
|
.iter()
|
|
.any(|repo| !repo.read(cx).is_from_single_file_worktree);
|
|
chunk
|
|
.iter()
|
|
.filter(move |repo| {
|
|
!repo.read(cx).is_from_single_file_worktree || !has_non_single_file_worktree
|
|
})
|
|
.cloned()
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
impl EventEmitter<DismissEvent> for RepositorySelector {}
|
|
|
|
impl Focusable for RepositorySelector {
|
|
fn focus_handle(&self, cx: &App) -> FocusHandle {
|
|
self.picker.focus_handle(cx)
|
|
}
|
|
}
|
|
|
|
impl Render for RepositorySelector {
|
|
fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
|
|
self.picker.clone()
|
|
}
|
|
}
|
|
|
|
pub struct RepositorySelectorDelegate {
|
|
project: WeakEntity<Project>,
|
|
repository_selector: WeakEntity<RepositorySelector>,
|
|
repository_entries: Vec<Entity<Repository>>,
|
|
filtered_repositories: Vec<Entity<Repository>>,
|
|
selected_index: usize,
|
|
}
|
|
|
|
impl RepositorySelectorDelegate {
|
|
pub fn update_repository_entries(&mut self, all_repositories: Vec<Entity<Repository>>) {
|
|
self.repository_entries = all_repositories.clone();
|
|
self.filtered_repositories = all_repositories;
|
|
self.selected_index = 0;
|
|
}
|
|
}
|
|
|
|
impl PickerDelegate for RepositorySelectorDelegate {
|
|
type ListItem = ListItem;
|
|
|
|
fn match_count(&self) -> usize {
|
|
self.filtered_repositories.len()
|
|
}
|
|
|
|
fn selected_index(&self) -> usize {
|
|
self.selected_index
|
|
}
|
|
|
|
fn set_selected_index(
|
|
&mut self,
|
|
ix: usize,
|
|
_window: &mut Window,
|
|
cx: &mut Context<Picker<Self>>,
|
|
) {
|
|
self.selected_index = ix.min(self.filtered_repositories.len().saturating_sub(1));
|
|
cx.notify();
|
|
}
|
|
|
|
fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
|
|
"Select a repository...".into()
|
|
}
|
|
|
|
fn update_matches(
|
|
&mut self,
|
|
query: String,
|
|
window: &mut Window,
|
|
cx: &mut Context<Picker<Self>>,
|
|
) -> Task<()> {
|
|
let all_repositories = self.repository_entries.clone();
|
|
|
|
cx.spawn_in(window, |this, mut cx| async move {
|
|
let filtered_repositories = cx
|
|
.background_spawn(async move {
|
|
if query.is_empty() {
|
|
all_repositories
|
|
} else {
|
|
all_repositories
|
|
.into_iter()
|
|
.filter(|_repo_info| {
|
|
// TODO: Implement repository filtering logic
|
|
true
|
|
})
|
|
.collect()
|
|
}
|
|
})
|
|
.await;
|
|
|
|
this.update_in(&mut cx, |this, window, cx| {
|
|
this.delegate.filtered_repositories = filtered_repositories;
|
|
this.delegate.set_selected_index(0, window, cx);
|
|
cx.notify();
|
|
})
|
|
.ok();
|
|
})
|
|
}
|
|
|
|
fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context<Picker<Self>>) {
|
|
let Some(selected_repo) = self.filtered_repositories.get(self.selected_index) else {
|
|
return;
|
|
};
|
|
selected_repo.update(cx, |selected_repo, cx| selected_repo.activate(cx));
|
|
self.dismissed(window, cx);
|
|
}
|
|
|
|
fn dismissed(&mut self, _window: &mut Window, cx: &mut Context<Picker<Self>>) {
|
|
self.repository_selector
|
|
.update(cx, |_this, cx| cx.emit(DismissEvent))
|
|
.ok();
|
|
}
|
|
|
|
fn render_header(
|
|
&self,
|
|
_window: &mut Window,
|
|
_cx: &mut Context<Picker<Self>>,
|
|
) -> Option<AnyElement> {
|
|
// TODO: Implement header rendering if needed
|
|
None
|
|
}
|
|
|
|
fn render_match(
|
|
&self,
|
|
ix: usize,
|
|
selected: bool,
|
|
_window: &mut Window,
|
|
cx: &mut Context<Picker<Self>>,
|
|
) -> Option<Self::ListItem> {
|
|
let project = self.project.upgrade()?;
|
|
let repo_info = self.filtered_repositories.get(ix)?;
|
|
let display_name = repo_info.read(cx).display_name(project.read(cx), cx);
|
|
Some(
|
|
ListItem::new(ix)
|
|
.inset(true)
|
|
.spacing(ListItemSpacing::Sparse)
|
|
.toggle_state(selected)
|
|
.child(Label::new(display_name)),
|
|
)
|
|
}
|
|
}
|