Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
git_ui: Improve discard tracked changes context menu option (#62872)
Dinof1cdbaad04ae
diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rsindex 74169922cdd..2667af19faf 100644--- a/crates/git_ui/src/git_panel.rs+++ b/crates/git_ui/src/git_panel.rs@@ -300,6 +300,7 @@ impl Render for StashMessageModal {fn git_panel_context_menu(has_tracked_changes: bool,+ has_staged_tracked_changes: bool,has_staged_changes: bool,has_unstaged_changes: bool,has_new_changes: bool,@@ -316,7 +317,7 @@ fn git_panel_context_menu(.action_disabled_when(!has_unstaged_changes, "Stage All", StageAll.boxed_clone()).action_disabled_when(!has_staged_changes, "Unstage All", UnstageAll.boxed_clone()).action_disabled_when(- !has_tracked_changes,+ !has_staged_tracked_changes,"Restore All Changes",RestoreTrackedFiles.boxed_clone(),)@@ -352,7 +353,7 @@ fn git_panel_context_menu(}).separator().action_disabled_when(- !has_tracked_changes,+ !has_staged_tracked_changes,"Discard Tracked Changes",RestoreTrackedFiles.boxed_clone(),)@@ -2058,6 +2059,45 @@ impl GitPanel {.unique_by(|entry| entry.repo_path.clone())}+ fn directory_descendants(&self, entry_index: usize) -> Option<&[GitStatusEntry]> {+ let GitListEntry::Directory(directory) = self.entries.get(entry_index)? else {+ return None;+ };++ self.view_mode+ .tree_state()?+ .directory_descendants+ .get(&directory.key)+ .map(Vec::as_slice)+ }++ /// Returns the list of entries that are children of the directory where the+ /// context menu is deployed, if deployed.+ fn directory_context_descendants(&self) -> Option<&[GitStatusEntry]> {+ let entry_index = self.context_menu.as_ref()?.target_entry_index?;+ self.directory_descendants(entry_index)+ }++ fn is_staged_tracked(entry: &GitStatusEntry) -> bool {+ !entry.status.is_created() && entry.staging.has_staged()+ }++ fn contains_staged_tracked_entry<'a>(+ entries: impl IntoIterator<Item = &'a GitStatusEntry>,+ ) -> bool {+ entries.into_iter().any(Self::is_staged_tracked)+ }++ fn staged_tracked_entries<'a>(+ entries: impl IntoIterator<Item = &'a GitStatusEntry>,+ ) -> Vec<GitStatusEntry> {+ entries+ .into_iter()+ .filter(|entry| Self::is_staged_tracked(entry))+ .cloned()+ .collect()+ }+fn open_diff(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {if self.active_tab == GitPanelTab::History {self.open_selected_history_commit(window, cx);@@ -2475,12 +2515,9 @@ impl GitPanel {cx: &mut Context<Self>,) {let entries = self- .change_entries_by_path()- .filter(|status_entry| {- !status_entry.status.is_created() && status_entry.status.staging().has_staged()- })- .cloned()- .collect::<Vec<_>>();+ .directory_context_descendants()+ .map(Self::staged_tracked_entries)+ .unwrap_or_else(|| Self::staged_tracked_entries(self.change_entries_by_path()));match entries.len() {0 => return,@@ -5336,6 +5373,10 @@ impl GitPanel {self.tracked_count > 0}+ fn has_staged_tracked_changes(&self) -> bool {+ Self::contains_staged_tracked_entry(self.change_entries_by_path())+ }+pub fn has_unstaged_conflicts(&self) -> bool {self.change_entries_by_path().any(|entry| entry.status.is_conflicted() && entry.staging.has_unstaged())@@ -5875,6 +5916,7 @@ impl GitPanel {cx: &mut Context<Self>,) -> impl IntoElement {let has_tracked_changes = self.has_tracked_changes();+ let has_staged_tracked_changes = self.has_staged_tracked_changes();let has_staged_changes = self.has_staged_changes();let has_unstaged_changes = self.has_unstaged_changes();let has_new_changes = self.new_count > 0;@@ -5893,6 +5935,7 @@ impl GitPanel {.menu(move |window, cx| {Some(git_panel_context_menu(has_tracked_changes,+ has_staged_tracked_changes,has_staged_changes,has_unstaged_changes,has_new_changes,@@ -7409,7 +7452,7 @@ impl GitPanel {.on_mouse_down(MouseButton::Right,cx.listener(move |this, event: &MouseDownEvent, window, cx| {- this.deploy_panel_context_menu(event.position, false, window, cx)+ this.deploy_panel_context_menu(event.position, None, false, window, cx)}),).custom_scrollbars(@@ -7584,7 +7627,7 @@ impl GitPanel {) {if matches!(self.entries.get(ix), Some(GitListEntry::Directory(_))) {self.selected_entry = Some(ix);- self.deploy_panel_context_menu(position, true, window, cx);+ self.deploy_panel_context_menu(position, Some(ix), true, window, cx);return;}@@ -7650,18 +7693,26 @@ impl GitPanel {fn deploy_panel_context_menu(&mut self,position: Point<Pixels>,+ target_entry_index: Option<usize>,include_copy_paths: bool,window: &mut Window,cx: &mut Context<Self>,) {+ let has_stash_items = self.stash_entries.entries.len() > 0;let has_tracked_changes = self.has_tracked_changes();let has_staged_changes = self.has_staged_changes();let has_unstaged_changes = self.has_unstaged_changes();let has_new_changes = self.new_count > 0;- let has_stash_items = self.stash_entries.entries.len() > 0;+ let has_staged_tracked_changes = target_entry_index+ .and_then(|entry_index| self.directory_descendants(entry_index))+ .map_or_else(+ || self.has_staged_tracked_changes(),+ |entries| Self::contains_staged_tracked_entry(entries),+ );let context_menu = git_panel_context_menu(has_tracked_changes,+ has_staged_tracked_changes,has_staged_changes,has_unstaged_changes,has_new_changes,@@ -7672,7 +7723,8 @@ impl GitPanel {window,cx,);- self.set_context_menu(context_menu, position, None, window, cx);++ self.set_context_menu(context_menu, position, target_entry_index, window, cx);}fn set_context_menu(@@ -12968,6 +13020,70 @@ mod tests {);}+ #[test]+ fn test_directory_discard_tracked_changes() {+ let entry = |path, status: FileStatus| GitStatusEntry {+ repo_path: repo_path(path),+ staging: status.staging(),+ status,+ diff_stat: None,+ };++ // 1. Single tracked file that is staged.+ let entries = vec![entry(+ "directory/tracked.rs",+ FileStatus::index(StatusCode::Modified),+ )];+ let has_staged_tracked_changes = GitPanel::contains_staged_tracked_entry(&entries);+ assert!(has_staged_tracked_changes);+ assert_eq!(GitPanel::staged_tracked_entries(&entries).len(), 1);++ // 2. Single untracked file that is staged.+ let entries = vec![entry(+ "directory/new.rs",+ FileStatus::index(StatusCode::Added),+ )];+ let has_staged_tracked_changes = GitPanel::contains_staged_tracked_entry(&entries);+ assert!(!has_staged_tracked_changes);+ assert_eq!(GitPanel::staged_tracked_entries(&entries).len(), 0);++ // 3. Single tracked file that is unstaged.+ let entries = vec![entry(+ "directory/tracked.rs",+ StatusCode::Modified.worktree(),+ )];+ let has_staged_tracked_changes = GitPanel::contains_staged_tracked_entry(&entries);+ assert!(!has_staged_tracked_changes);+ assert_eq!(GitPanel::staged_tracked_entries(&entries).len(), 0);++ // 4. Single untracked file that is unstaged.+ let entries = vec![entry("directory/new.rs", FileStatus::Untracked)];+ let has_staged_tracked_changes = GitPanel::contains_staged_tracked_entry(&entries);+ assert!(!has_staged_tracked_changes);+ assert_eq!(GitPanel::staged_tracked_entries(&entries).len(), 0);++ // 5. Mixed tracked and untracked files that are both staged and+ // unstaged.+ let entries = vec![+ entry(+ "directory/staged_tracked.rs",+ FileStatus::index(StatusCode::Modified),+ ),+ entry(+ "directory/staged_new.rs",+ FileStatus::index(StatusCode::Added),+ ),+ entry(+ "directory/unstaged_tracked.rs",+ StatusCode::Modified.worktree(),+ ),+ entry("directory/unstaged_new.rs", FileStatus::Untracked),+ ];+ let has_staged_tracked_changes = GitPanel::contains_staged_tracked_entry(&entries);+ assert!(has_staged_tracked_changes);+ assert_eq!(GitPanel::staged_tracked_entries(&entries).len(), 1);+ }+#[gpui::test]async fn test_discard_tracked_changes_respects_staging(cx: &mut TestAppContext) {init_test(cx);