1use crate::askpass_modal::AskPassModal;
2use crate::commit_modal::CommitModal;
3use crate::commit_tooltip::CommitTooltip;
4use crate::commit_view::CommitView;
5use crate::project_diff::{self, Diff, ProjectDiff};
6use crate::remote_output::{self, RemoteAction, SuccessMessage};
7use crate::{branch_picker, picker_prompt, render_remote_button};
8use crate::{
9 file_history_view::FileHistoryView, git_panel_settings::GitPanelSettings, git_status_icon,
10 repository_selector::RepositorySelector,
11};
12use agent_settings::AgentSettings;
13use anyhow::Context as _;
14use askpass::AskPassDelegate;
15use cloud_llm_client::CompletionIntent;
16use collections::{BTreeMap, HashMap, HashSet};
17use db::kvp::KEY_VALUE_STORE;
18use editor::RewrapOptions;
19use editor::{
20 Direction, Editor, EditorElement, EditorMode, MultiBuffer, MultiBufferOffset,
21 actions::ExpandAllDiffHunks,
22};
23use futures::StreamExt as _;
24use git::commit::ParsedCommitMessage;
25use git::repository::{
26 Branch, CommitDetails, CommitOptions, CommitSummary, DiffType, FetchOptions, GitCommitter,
27 PushOptions, Remote, RemoteCommandOutput, ResetMode, Upstream, UpstreamTracking,
28 UpstreamTrackingStatus, get_git_committer,
29};
30use git::stash::GitStash;
31use git::status::StageStatus;
32use git::{Amend, Signoff, ToggleStaged, repository::RepoPath, status::FileStatus};
33use git::{
34 ExpandCommitEditor, GitHostingProviderRegistry, RestoreTrackedFiles, StageAll, StashAll,
35 StashApply, StashPop, TrashUntrackedFiles, UnstageAll,
36};
37use gpui::{
38 Action, AsyncApp, AsyncWindowContext, Bounds, ClickEvent, Corner, DismissEvent, Entity,
39 EventEmitter, FocusHandle, Focusable, KeyContext, MouseButton, MouseDownEvent, Point,
40 PromptLevel, ScrollStrategy, Subscription, Task, UniformListScrollHandle, WeakEntity, actions,
41 anchored, deferred, point, size, uniform_list,
42};
43use itertools::Itertools;
44use language::{Buffer, File};
45use language_model::{
46 ConfiguredModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
47 Role, ZED_CLOUD_PROVIDER_ID,
48};
49use menu;
50use multi_buffer::ExcerptInfo;
51use notifications::status_toast::{StatusToast, ToastIcon};
52use panel::{
53 PanelHeader, panel_button, panel_editor_container, panel_editor_style, panel_filled_button,
54 panel_icon_button,
55};
56use project::{
57 Fs, Project, ProjectPath,
58 git_store::{GitStoreEvent, Repository, RepositoryEvent, RepositoryId, pending_op},
59 project_settings::{GitPathStyle, ProjectSettings},
60};
61use prompt_store::{PromptId, PromptStore, RULES_FILE_NAMES};
62use serde::{Deserialize, Serialize};
63use settings::{Settings, SettingsStore, StatusStyle};
64use std::future::Future;
65use std::ops::Range;
66use std::path::Path;
67use std::{sync::Arc, time::Duration, usize};
68use strum::{IntoEnumIterator, VariantNames};
69use time::OffsetDateTime;
70use ui::{
71 ButtonLike, Checkbox, CommonAnimationExt, ContextMenu, ElevationIndex, IndentGuideColors,
72 PopoverMenu, RenderedIndentGuide, ScrollAxes, Scrollbars, SplitButton, Tooltip, WithScrollbar,
73 prelude::*,
74};
75use util::paths::PathStyle;
76use util::{ResultExt, TryFutureExt, maybe, rel_path::RelPath};
77use workspace::SERIALIZATION_THROTTLE_TIME;
78use workspace::{
79 Workspace,
80 dock::{DockPosition, Panel, PanelEvent},
81 notifications::{DetachAndPromptErr, ErrorMessagePrompt, NotificationId, NotifyResultExt},
82};
83actions!(
84 git_panel,
85 [
86 /// Closes the git panel.
87 Close,
88 /// Toggles focus on the git panel.
89 ToggleFocus,
90 /// Opens the git panel menu.
91 OpenMenu,
92 /// Focuses on the commit message editor.
93 FocusEditor,
94 /// Focuses on the changes list.
95 FocusChanges,
96 /// Select next git panel menu item, and show it in the diff view
97 NextEntry,
98 /// Select previous git panel menu item, and show it in the diff view
99 PreviousEntry,
100 /// Select first git panel menu item, and show it in the diff view
101 FirstEntry,
102 /// Select last git panel menu item, and show it in the diff view
103 LastEntry,
104 /// Toggles automatic co-author suggestions.
105 ToggleFillCoAuthors,
106 /// Toggles sorting entries by path vs status.
107 ToggleSortByPath,
108 /// Toggles showing entries in tree vs flat view.
109 ToggleTreeView,
110 /// Expands the selected entry to show its children.
111 ExpandSelectedEntry,
112 /// Collapses the selected entry to hide its children.
113 CollapseSelectedEntry,
114 ]
115);
116
117fn prompt<T>(
118 msg: &str,
119 detail: Option<&str>,
120 window: &mut Window,
121 cx: &mut App,
122) -> Task<anyhow::Result<T>>
123where
124 T: IntoEnumIterator + VariantNames + 'static,
125{
126 let rx = window.prompt(PromptLevel::Info, msg, detail, T::VARIANTS, cx);
127 cx.spawn(async move |_| Ok(T::iter().nth(rx.await?).unwrap()))
128}
129
130#[derive(strum::EnumIter, strum::VariantNames)]
131#[strum(serialize_all = "title_case")]
132enum TrashCancel {
133 Trash,
134 Cancel,
135}
136
137struct GitMenuState {
138 has_tracked_changes: bool,
139 has_staged_changes: bool,
140 has_unstaged_changes: bool,
141 has_new_changes: bool,
142 sort_by_path: bool,
143 has_stash_items: bool,
144 tree_view: bool,
145}
146
147fn git_panel_context_menu(
148 focus_handle: FocusHandle,
149 state: GitMenuState,
150 window: &mut Window,
151 cx: &mut App,
152) -> Entity<ContextMenu> {
153 ContextMenu::build(window, cx, move |context_menu, _, _| {
154 context_menu
155 .context(focus_handle)
156 .action_disabled_when(
157 !state.has_unstaged_changes,
158 "Stage All",
159 StageAll.boxed_clone(),
160 )
161 .action_disabled_when(
162 !state.has_staged_changes,
163 "Unstage All",
164 UnstageAll.boxed_clone(),
165 )
166 .separator()
167 .action_disabled_when(
168 !(state.has_new_changes || state.has_tracked_changes),
169 "Stash All",
170 StashAll.boxed_clone(),
171 )
172 .action_disabled_when(!state.has_stash_items, "Stash Pop", StashPop.boxed_clone())
173 .action("View Stash", zed_actions::git::ViewStash.boxed_clone())
174 .separator()
175 .action("Open Diff", project_diff::Diff.boxed_clone())
176 .separator()
177 .action_disabled_when(
178 !state.has_tracked_changes,
179 "Discard Tracked Changes",
180 RestoreTrackedFiles.boxed_clone(),
181 )
182 .action_disabled_when(
183 !state.has_new_changes,
184 "Trash Untracked Files",
185 TrashUntrackedFiles.boxed_clone(),
186 )
187 .separator()
188 .entry(
189 if state.tree_view {
190 "Flat View"
191 } else {
192 "Tree View"
193 },
194 Some(Box::new(ToggleTreeView)),
195 move |window, cx| window.dispatch_action(Box::new(ToggleTreeView), cx),
196 )
197 .when(!state.tree_view, |this| {
198 this.entry(
199 if state.sort_by_path {
200 "Sort by Status"
201 } else {
202 "Sort by Path"
203 },
204 Some(Box::new(ToggleSortByPath)),
205 move |window, cx| window.dispatch_action(Box::new(ToggleSortByPath), cx),
206 )
207 })
208 })
209}
210
211const GIT_PANEL_KEY: &str = "GitPanel";
212
213const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
214// TODO: We should revise this part. It seems the indentation width is not aligned with the one in project panel
215const TREE_INDENT: f32 = 16.0;
216
217pub fn register(workspace: &mut Workspace) {
218 workspace.register_action(|workspace, _: &ToggleFocus, window, cx| {
219 workspace.toggle_panel_focus::<GitPanel>(window, cx);
220 });
221 workspace.register_action(|workspace, _: &ExpandCommitEditor, window, cx| {
222 CommitModal::toggle(workspace, None, window, cx)
223 });
224}
225
226#[derive(Debug, Clone)]
227pub enum Event {
228 Focus,
229}
230
231#[derive(Serialize, Deserialize)]
232struct SerializedGitPanel {
233 width: Option<Pixels>,
234 #[serde(default)]
235 amend_pending: bool,
236 #[serde(default)]
237 signoff_enabled: bool,
238}
239
240#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
241enum Section {
242 Conflict,
243 Tracked,
244 New,
245}
246
247#[derive(Debug, PartialEq, Eq, Clone)]
248struct GitHeaderEntry {
249 header: Section,
250}
251
252impl GitHeaderEntry {
253 pub fn contains(&self, status_entry: &GitStatusEntry, repo: &Repository) -> bool {
254 let this = &self.header;
255 let status = status_entry.status;
256 match this {
257 Section::Conflict => {
258 repo.had_conflict_on_last_merge_head_change(&status_entry.repo_path)
259 }
260 Section::Tracked => !status.is_created(),
261 Section::New => status.is_created(),
262 }
263 }
264 pub fn title(&self) -> &'static str {
265 match self.header {
266 Section::Conflict => "Conflicts",
267 Section::Tracked => "Tracked",
268 Section::New => "Untracked",
269 }
270 }
271}
272
273#[derive(Debug, PartialEq, Eq, Clone)]
274enum GitListEntry {
275 Status(GitStatusEntry),
276 TreeStatus(GitTreeStatusEntry),
277 Directory(GitTreeDirEntry),
278 Header(GitHeaderEntry),
279}
280
281impl GitListEntry {
282 fn status_entry(&self) -> Option<&GitStatusEntry> {
283 match self {
284 GitListEntry::Status(entry) => Some(entry),
285 GitListEntry::TreeStatus(entry) => Some(&entry.entry),
286 _ => None,
287 }
288 }
289
290 fn directory_entry(&self) -> Option<&GitTreeDirEntry> {
291 match self {
292 GitListEntry::Directory(entry) => Some(entry),
293 _ => None,
294 }
295 }
296}
297
298enum GitPanelViewMode {
299 Flat,
300 Tree(TreeViewState),
301}
302
303impl GitPanelViewMode {
304 fn from_settings(cx: &App) -> Self {
305 if GitPanelSettings::get_global(cx).tree_view {
306 GitPanelViewMode::Tree(TreeViewState::default())
307 } else {
308 GitPanelViewMode::Flat
309 }
310 }
311
312 fn tree_state(&self) -> Option<&TreeViewState> {
313 match self {
314 GitPanelViewMode::Tree(state) => Some(state),
315 GitPanelViewMode::Flat => None,
316 }
317 }
318
319 fn tree_state_mut(&mut self) -> Option<&mut TreeViewState> {
320 match self {
321 GitPanelViewMode::Tree(state) => Some(state),
322 GitPanelViewMode::Flat => None,
323 }
324 }
325}
326
327#[derive(Default)]
328struct TreeViewState {
329 // Maps visible index to actual entry index.
330 // Length equals the number of visible entries.
331 // This is needed because some entries (like collapsed directories) may be hidden.
332 logical_indices: Vec<usize>,
333 expanded_dirs: HashMap<TreeKey, bool>,
334 directory_descendants: HashMap<TreeKey, Vec<GitStatusEntry>>,
335}
336
337impl TreeViewState {
338 fn build_tree_entries(
339 &mut self,
340 section: Section,
341 mut entries: Vec<GitStatusEntry>,
342 seen_directories: &mut HashSet<TreeKey>,
343 ) -> Vec<(GitListEntry, bool)> {
344 if entries.is_empty() {
345 return Vec::new();
346 }
347
348 entries.sort_by(|a, b| a.repo_path.cmp(&b.repo_path));
349
350 let mut root = TreeNode::default();
351 for entry in entries {
352 let components: Vec<&str> = entry.repo_path.components().collect();
353 if components.is_empty() {
354 root.files.push(entry);
355 continue;
356 }
357
358 let mut current = &mut root;
359 let mut current_path = String::new();
360
361 for (ix, component) in components.iter().enumerate() {
362 if ix == components.len() - 1 {
363 current.files.push(entry.clone());
364 } else {
365 if !current_path.is_empty() {
366 current_path.push('/');
367 }
368 current_path.push_str(component);
369 let dir_path = RepoPath::new(¤t_path)
370 .expect("repo path from status entry component");
371
372 let component = SharedString::from(component.to_string());
373
374 current = current
375 .children
376 .entry(component.clone())
377 .or_insert_with(|| TreeNode {
378 name: component,
379 path: Some(dir_path),
380 ..Default::default()
381 });
382 }
383 }
384 }
385
386 let (flattened, _) = self.flatten_tree(&root, section, 0, seen_directories);
387 flattened
388 }
389
390 fn flatten_tree(
391 &mut self,
392 node: &TreeNode,
393 section: Section,
394 depth: usize,
395 seen_directories: &mut HashSet<TreeKey>,
396 ) -> (Vec<(GitListEntry, bool)>, Vec<GitStatusEntry>) {
397 let mut all_statuses = Vec::new();
398 let mut flattened = Vec::new();
399
400 for child in node.children.values() {
401 let (terminal, name) = Self::compact_directory_chain(child);
402 let Some(path) = terminal.path.clone().or_else(|| child.path.clone()) else {
403 continue;
404 };
405 let (child_flattened, mut child_statuses) =
406 self.flatten_tree(terminal, section, depth + 1, seen_directories);
407 let key = TreeKey { section, path };
408 let expanded = *self.expanded_dirs.get(&key).unwrap_or(&true);
409 self.expanded_dirs.entry(key.clone()).or_insert(true);
410 seen_directories.insert(key.clone());
411
412 self.directory_descendants
413 .insert(key.clone(), child_statuses.clone());
414
415 flattened.push((
416 GitListEntry::Directory(GitTreeDirEntry {
417 key,
418 name,
419 depth,
420 expanded,
421 }),
422 true,
423 ));
424
425 if expanded {
426 flattened.extend(child_flattened);
427 } else {
428 flattened.extend(child_flattened.into_iter().map(|(child, _)| (child, false)));
429 }
430
431 all_statuses.append(&mut child_statuses);
432 }
433
434 for file in &node.files {
435 all_statuses.push(file.clone());
436 flattened.push((
437 GitListEntry::TreeStatus(GitTreeStatusEntry {
438 entry: file.clone(),
439 depth,
440 }),
441 true,
442 ));
443 }
444
445 (flattened, all_statuses)
446 }
447
448 fn compact_directory_chain(mut node: &TreeNode) -> (&TreeNode, SharedString) {
449 let mut parts = vec![node.name.clone()];
450 while node.files.is_empty() && node.children.len() == 1 {
451 let Some(child) = node.children.values().next() else {
452 continue;
453 };
454 if child.path.is_none() {
455 break;
456 }
457 parts.push(child.name.clone());
458 node = child;
459 }
460 let name = parts.join("/");
461 (node, SharedString::from(name))
462 }
463}
464
465#[derive(Debug, PartialEq, Eq, Clone)]
466struct GitTreeStatusEntry {
467 entry: GitStatusEntry,
468 depth: usize,
469}
470
471#[derive(Debug, PartialEq, Eq, Clone, Hash)]
472struct TreeKey {
473 section: Section,
474 path: RepoPath,
475}
476
477#[derive(Debug, PartialEq, Eq, Clone)]
478struct GitTreeDirEntry {
479 key: TreeKey,
480 name: SharedString,
481 depth: usize,
482 // staged_state: ToggleState,
483 expanded: bool,
484}
485
486#[derive(Default)]
487struct TreeNode {
488 name: SharedString,
489 path: Option<RepoPath>,
490 children: BTreeMap<SharedString, TreeNode>,
491 files: Vec<GitStatusEntry>,
492}
493
494#[derive(Debug, PartialEq, Eq, Clone)]
495pub struct GitStatusEntry {
496 pub(crate) repo_path: RepoPath,
497 pub(crate) status: FileStatus,
498 pub(crate) staging: StageStatus,
499}
500
501impl GitStatusEntry {
502 fn display_name(&self, path_style: PathStyle) -> String {
503 self.repo_path
504 .file_name()
505 .map(|name| name.to_owned())
506 .unwrap_or_else(|| self.repo_path.display(path_style).to_string())
507 }
508
509 fn parent_dir(&self, path_style: PathStyle) -> Option<String> {
510 self.repo_path
511 .parent()
512 .map(|parent| parent.display(path_style).to_string())
513 }
514}
515
516struct TruncatedPatch {
517 header: String,
518 hunks: Vec<String>,
519 hunks_to_keep: usize,
520}
521
522impl TruncatedPatch {
523 fn from_unified_diff(patch_str: &str) -> Option<Self> {
524 let lines: Vec<&str> = patch_str.lines().collect();
525 if lines.len() < 2 {
526 return None;
527 }
528 let header = format!("{}\n{}\n", lines[0], lines[1]);
529 let mut hunks = Vec::new();
530 let mut current_hunk = String::new();
531 for line in &lines[2..] {
532 if line.starts_with("@@") {
533 if !current_hunk.is_empty() {
534 hunks.push(current_hunk);
535 }
536 current_hunk = format!("{}\n", line);
537 } else if !current_hunk.is_empty() {
538 current_hunk.push_str(line);
539 current_hunk.push('\n');
540 }
541 }
542 if !current_hunk.is_empty() {
543 hunks.push(current_hunk);
544 }
545 if hunks.is_empty() {
546 return None;
547 }
548 let hunks_to_keep = hunks.len();
549 Some(TruncatedPatch {
550 header,
551 hunks,
552 hunks_to_keep,
553 })
554 }
555 fn calculate_size(&self) -> usize {
556 let mut size = self.header.len();
557 for (i, hunk) in self.hunks.iter().enumerate() {
558 if i < self.hunks_to_keep {
559 size += hunk.len();
560 }
561 }
562 size
563 }
564 fn to_string(&self) -> String {
565 let mut out = self.header.clone();
566 for (i, hunk) in self.hunks.iter().enumerate() {
567 if i < self.hunks_to_keep {
568 out.push_str(hunk);
569 }
570 }
571 let skipped_hunks = self.hunks.len() - self.hunks_to_keep;
572 if skipped_hunks > 0 {
573 out.push_str(&format!("[...skipped {} hunks...]\n", skipped_hunks));
574 }
575 out
576 }
577}
578
579pub struct GitPanel {
580 pub(crate) active_repository: Option<Entity<Repository>>,
581 pub(crate) commit_editor: Entity<Editor>,
582 conflicted_count: usize,
583 conflicted_staged_count: usize,
584 add_coauthors: bool,
585 generate_commit_message_task: Option<Task<Option<()>>>,
586 entries: Vec<GitListEntry>,
587 view_mode: GitPanelViewMode,
588 entries_indices: HashMap<RepoPath, usize>,
589 single_staged_entry: Option<GitStatusEntry>,
590 single_tracked_entry: Option<GitStatusEntry>,
591 focus_handle: FocusHandle,
592 fs: Arc<dyn Fs>,
593 new_count: usize,
594 entry_count: usize,
595 changes_count: usize,
596 new_staged_count: usize,
597 pending_commit: Option<Task<()>>,
598 amend_pending: bool,
599 original_commit_message: Option<String>,
600 signoff_enabled: bool,
601 pending_serialization: Task<()>,
602 pub(crate) project: Entity<Project>,
603 scroll_handle: UniformListScrollHandle,
604 max_width_item_index: Option<usize>,
605 selected_entry: Option<usize>,
606 marked_entries: Vec<usize>,
607 tracked_count: usize,
608 tracked_staged_count: usize,
609 update_visible_entries_task: Task<()>,
610 width: Option<Pixels>,
611 pub(crate) workspace: WeakEntity<Workspace>,
612 context_menu: Option<(Entity<ContextMenu>, Point<Pixels>, Subscription)>,
613 modal_open: bool,
614 show_placeholders: bool,
615 local_committer: Option<GitCommitter>,
616 local_committer_task: Option<Task<()>>,
617 bulk_staging: Option<BulkStaging>,
618 stash_entries: GitStash,
619 _settings_subscription: Subscription,
620}
621
622#[derive(Clone, Debug, PartialEq, Eq)]
623struct BulkStaging {
624 repo_id: RepositoryId,
625 anchor: RepoPath,
626}
627
628const MAX_PANEL_EDITOR_LINES: usize = 6;
629
630pub(crate) fn commit_message_editor(
631 commit_message_buffer: Entity<Buffer>,
632 placeholder: Option<SharedString>,
633 project: Entity<Project>,
634 in_panel: bool,
635 window: &mut Window,
636 cx: &mut Context<Editor>,
637) -> Editor {
638 let buffer = cx.new(|cx| MultiBuffer::singleton(commit_message_buffer, cx));
639 let max_lines = if in_panel { MAX_PANEL_EDITOR_LINES } else { 18 };
640 let mut commit_editor = Editor::new(
641 EditorMode::AutoHeight {
642 min_lines: max_lines,
643 max_lines: Some(max_lines),
644 },
645 buffer,
646 None,
647 window,
648 cx,
649 );
650 commit_editor.set_collaboration_hub(Box::new(project));
651 commit_editor.set_use_autoclose(false);
652 commit_editor.set_show_gutter(false, cx);
653 commit_editor.set_use_modal_editing(true);
654 commit_editor.set_show_wrap_guides(false, cx);
655 commit_editor.set_show_indent_guides(false, cx);
656 let placeholder = placeholder.unwrap_or("Enter commit message".into());
657 commit_editor.set_placeholder_text(&placeholder, window, cx);
658 commit_editor
659}
660
661impl GitPanel {
662 fn new(
663 workspace: &mut Workspace,
664 window: &mut Window,
665 cx: &mut Context<Workspace>,
666 ) -> Entity<Self> {
667 let project = workspace.project().clone();
668 let app_state = workspace.app_state().clone();
669 let fs = app_state.fs.clone();
670 let git_store = project.read(cx).git_store().clone();
671 let active_repository = project.read(cx).active_repository(cx);
672
673 cx.new(|cx| {
674 let focus_handle = cx.focus_handle();
675 cx.on_focus(&focus_handle, window, Self::focus_in).detach();
676
677 let mut was_sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
678 let mut was_tree_view = GitPanelSettings::get_global(cx).tree_view;
679 cx.observe_global_in::<SettingsStore>(window, move |this, window, cx| {
680 let sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
681 let tree_view = GitPanelSettings::get_global(cx).tree_view;
682 if tree_view != was_tree_view {
683 this.view_mode = GitPanelViewMode::from_settings(cx);
684 }
685 if sort_by_path != was_sort_by_path || tree_view != was_tree_view {
686 this.bulk_staging.take();
687 this.update_visible_entries(window, cx);
688 }
689 was_sort_by_path = sort_by_path;
690 was_tree_view = tree_view;
691 })
692 .detach();
693
694 // just to let us render a placeholder editor.
695 // Once the active git repo is set, this buffer will be replaced.
696 let temporary_buffer = cx.new(|cx| Buffer::local("", cx));
697 let commit_editor = cx.new(|cx| {
698 commit_message_editor(temporary_buffer, None, project.clone(), true, window, cx)
699 });
700
701 commit_editor.update(cx, |editor, cx| {
702 editor.clear(window, cx);
703 });
704
705 let scroll_handle = UniformListScrollHandle::new();
706
707 let mut was_ai_enabled = AgentSettings::get_global(cx).enabled(cx);
708 let _settings_subscription = cx.observe_global::<SettingsStore>(move |_, cx| {
709 let is_ai_enabled = AgentSettings::get_global(cx).enabled(cx);
710 if was_ai_enabled != is_ai_enabled {
711 was_ai_enabled = is_ai_enabled;
712 cx.notify();
713 }
714 });
715
716 cx.subscribe_in(
717 &git_store,
718 window,
719 move |this, _git_store, event, window, cx| match event {
720 GitStoreEvent::ActiveRepositoryChanged(_) => {
721 this.active_repository = this.project.read(cx).active_repository(cx);
722 this.schedule_update(window, cx);
723 }
724 GitStoreEvent::RepositoryUpdated(
725 _,
726 RepositoryEvent::StatusesChanged
727 | RepositoryEvent::BranchChanged
728 | RepositoryEvent::MergeHeadsChanged,
729 true,
730 )
731 | GitStoreEvent::RepositoryAdded
732 | GitStoreEvent::RepositoryRemoved(_) => {
733 this.schedule_update(window, cx);
734 }
735 GitStoreEvent::IndexWriteError(error) => {
736 this.workspace
737 .update(cx, |workspace, cx| {
738 workspace.show_error(error, cx);
739 })
740 .ok();
741 }
742 GitStoreEvent::RepositoryUpdated(_, _, _) => {}
743 GitStoreEvent::JobsUpdated | GitStoreEvent::ConflictsUpdated => {}
744 },
745 )
746 .detach();
747
748 let mut this = Self {
749 active_repository,
750 commit_editor,
751 conflicted_count: 0,
752 conflicted_staged_count: 0,
753 add_coauthors: true,
754 generate_commit_message_task: None,
755 entries: Vec::new(),
756 view_mode: GitPanelViewMode::from_settings(cx),
757 entries_indices: HashMap::default(),
758 focus_handle: cx.focus_handle(),
759 fs,
760 new_count: 0,
761 new_staged_count: 0,
762 changes_count: 0,
763 pending_commit: None,
764 amend_pending: false,
765 original_commit_message: None,
766 signoff_enabled: false,
767 pending_serialization: Task::ready(()),
768 single_staged_entry: None,
769 single_tracked_entry: None,
770 project,
771 scroll_handle,
772 max_width_item_index: None,
773 selected_entry: None,
774 marked_entries: Vec::new(),
775 tracked_count: 0,
776 tracked_staged_count: 0,
777 update_visible_entries_task: Task::ready(()),
778 width: None,
779 show_placeholders: false,
780 local_committer: None,
781 local_committer_task: None,
782 context_menu: None,
783 workspace: workspace.weak_handle(),
784 modal_open: false,
785 entry_count: 0,
786 bulk_staging: None,
787 stash_entries: Default::default(),
788 _settings_subscription,
789 };
790
791 this.schedule_update(window, cx);
792 this
793 })
794 }
795
796 pub fn entry_by_path(&self, path: &RepoPath) -> Option<usize> {
797 self.entries_indices.get(path).copied()
798 }
799
800 pub fn select_entry_by_path(
801 &mut self,
802 path: ProjectPath,
803 window: &mut Window,
804 cx: &mut Context<Self>,
805 ) {
806 let Some(git_repo) = self.active_repository.as_ref() else {
807 return;
808 };
809
810 let (repo_path, section) = {
811 let repo = git_repo.read(cx);
812 let Some(repo_path) = repo.project_path_to_repo_path(&path, cx) else {
813 return;
814 };
815
816 let section = repo
817 .status_for_path(&repo_path)
818 .map(|status| status.status)
819 .map(|status| {
820 if repo.had_conflict_on_last_merge_head_change(&repo_path) {
821 Section::Conflict
822 } else if status.is_created() {
823 Section::New
824 } else {
825 Section::Tracked
826 }
827 });
828
829 (repo_path, section)
830 };
831
832 let mut needs_rebuild = false;
833 if let (Some(section), Some(tree_state)) = (section, self.view_mode.tree_state_mut()) {
834 let mut current_dir = repo_path.parent();
835 while let Some(dir) = current_dir {
836 let key = TreeKey {
837 section,
838 path: RepoPath::from_rel_path(dir),
839 };
840
841 if tree_state.expanded_dirs.get(&key) == Some(&false) {
842 tree_state.expanded_dirs.insert(key, true);
843 needs_rebuild = true;
844 }
845
846 current_dir = dir.parent();
847 }
848 }
849
850 if needs_rebuild {
851 self.update_visible_entries(window, cx);
852 }
853
854 let Some(ix) = self.entry_by_path(&repo_path) else {
855 return;
856 };
857
858 self.selected_entry = Some(ix);
859 self.scroll_to_selected_entry(cx);
860 }
861
862 fn serialization_key(workspace: &Workspace) -> Option<String> {
863 workspace
864 .database_id()
865 .map(|id| i64::from(id).to_string())
866 .or(workspace.session_id())
867 .map(|id| format!("{}-{:?}", GIT_PANEL_KEY, id))
868 }
869
870 fn serialize(&mut self, cx: &mut Context<Self>) {
871 let width = self.width;
872 let amend_pending = self.amend_pending;
873 let signoff_enabled = self.signoff_enabled;
874
875 self.pending_serialization = cx.spawn(async move |git_panel, cx| {
876 cx.background_executor()
877 .timer(SERIALIZATION_THROTTLE_TIME)
878 .await;
879 let Some(serialization_key) = git_panel
880 .update(cx, |git_panel, cx| {
881 git_panel
882 .workspace
883 .read_with(cx, |workspace, _| Self::serialization_key(workspace))
884 .ok()
885 .flatten()
886 })
887 .ok()
888 .flatten()
889 else {
890 return;
891 };
892 cx.background_spawn(
893 async move {
894 KEY_VALUE_STORE
895 .write_kvp(
896 serialization_key,
897 serde_json::to_string(&SerializedGitPanel {
898 width,
899 amend_pending,
900 signoff_enabled,
901 })?,
902 )
903 .await?;
904 anyhow::Ok(())
905 }
906 .log_err(),
907 )
908 .await;
909 });
910 }
911
912 pub(crate) fn set_modal_open(&mut self, open: bool, cx: &mut Context<Self>) {
913 self.modal_open = open;
914 cx.notify();
915 }
916
917 fn dispatch_context(&self, window: &mut Window, cx: &Context<Self>) -> KeyContext {
918 let mut dispatch_context = KeyContext::new_with_defaults();
919 dispatch_context.add("GitPanel");
920
921 if window
922 .focused(cx)
923 .is_some_and(|focused| self.focus_handle == focused)
924 {
925 dispatch_context.add("menu");
926 dispatch_context.add("ChangesList");
927 }
928
929 if self.commit_editor.read(cx).is_focused(window) {
930 dispatch_context.add("CommitEditor");
931 }
932
933 dispatch_context
934 }
935
936 fn close_panel(&mut self, _: &Close, _window: &mut Window, cx: &mut Context<Self>) {
937 cx.emit(PanelEvent::Close);
938 }
939
940 fn focus_in(&mut self, window: &mut Window, cx: &mut Context<Self>) {
941 if !self.focus_handle.contains_focused(window, cx) {
942 cx.emit(Event::Focus);
943 }
944 }
945
946 fn scroll_to_selected_entry(&mut self, cx: &mut Context<Self>) {
947 let Some(selected_entry) = self.selected_entry else {
948 cx.notify();
949 return;
950 };
951
952 let visible_index = match &self.view_mode {
953 GitPanelViewMode::Flat => Some(selected_entry),
954 GitPanelViewMode::Tree(state) => state
955 .logical_indices
956 .iter()
957 .position(|&ix| ix == selected_entry),
958 };
959
960 if let Some(visible_index) = visible_index {
961 self.scroll_handle
962 .scroll_to_item(visible_index, ScrollStrategy::Center);
963 }
964
965 cx.notify();
966 }
967
968 fn expand_selected_entry(
969 &mut self,
970 _: &ExpandSelectedEntry,
971 window: &mut Window,
972 cx: &mut Context<Self>,
973 ) {
974 let Some(entry) = self.get_selected_entry().cloned() else {
975 return;
976 };
977
978 if let GitListEntry::Directory(dir_entry) = entry {
979 if dir_entry.expanded {
980 self.select_next(&menu::SelectNext, window, cx);
981 } else {
982 self.toggle_directory(&dir_entry.key, window, cx);
983 }
984 } else {
985 self.select_next(&menu::SelectNext, window, cx);
986 }
987 }
988
989 fn collapse_selected_entry(
990 &mut self,
991 _: &CollapseSelectedEntry,
992 window: &mut Window,
993 cx: &mut Context<Self>,
994 ) {
995 let Some(entry) = self.get_selected_entry().cloned() else {
996 return;
997 };
998
999 if let GitListEntry::Directory(dir_entry) = entry {
1000 if dir_entry.expanded {
1001 self.toggle_directory(&dir_entry.key, window, cx);
1002 } else {
1003 self.select_previous(&menu::SelectPrevious, window, cx);
1004 }
1005 } else {
1006 self.select_previous(&menu::SelectPrevious, window, cx);
1007 }
1008 }
1009
1010 fn select_first(
1011 &mut self,
1012 _: &menu::SelectFirst,
1013 _window: &mut Window,
1014 cx: &mut Context<Self>,
1015 ) {
1016 let first_entry = match &self.view_mode {
1017 GitPanelViewMode::Flat => self
1018 .entries
1019 .iter()
1020 .position(|entry| entry.status_entry().is_some()),
1021 GitPanelViewMode::Tree(state) => {
1022 let index = self.entries.iter().position(|entry| {
1023 entry.status_entry().is_some() || entry.directory_entry().is_some()
1024 });
1025
1026 index.map(|index| state.logical_indices[index])
1027 }
1028 };
1029
1030 if let Some(first_entry) = first_entry {
1031 self.selected_entry = Some(first_entry);
1032 self.scroll_to_selected_entry(cx);
1033 }
1034 }
1035
1036 fn select_previous(
1037 &mut self,
1038 _: &menu::SelectPrevious,
1039 _window: &mut Window,
1040 cx: &mut Context<Self>,
1041 ) {
1042 let item_count = self.entries.len();
1043 if item_count == 0 {
1044 return;
1045 }
1046
1047 let Some(selected_entry) = self.selected_entry else {
1048 return;
1049 };
1050
1051 let new_index = match &self.view_mode {
1052 GitPanelViewMode::Flat => selected_entry.saturating_sub(1),
1053 GitPanelViewMode::Tree(state) => {
1054 let Some(current_logical_index) = state
1055 .logical_indices
1056 .iter()
1057 .position(|&i| i == selected_entry)
1058 else {
1059 return;
1060 };
1061
1062 state.logical_indices[current_logical_index.saturating_sub(1)]
1063 }
1064 };
1065
1066 if selected_entry == 0 && new_index == 0 {
1067 return;
1068 }
1069
1070 if matches!(
1071 self.entries.get(new_index.saturating_sub(1)),
1072 Some(GitListEntry::Header(..))
1073 ) && new_index == 0
1074 {
1075 return;
1076 }
1077
1078 if matches!(self.entries.get(new_index), Some(GitListEntry::Header(..))) {
1079 self.selected_entry = Some(new_index.saturating_sub(1));
1080 } else {
1081 self.selected_entry = Some(new_index);
1082 }
1083
1084 self.scroll_to_selected_entry(cx);
1085 }
1086
1087 fn select_next(&mut self, _: &menu::SelectNext, _window: &mut Window, cx: &mut Context<Self>) {
1088 let item_count = self.entries.len();
1089 if item_count == 0 {
1090 return;
1091 }
1092
1093 let Some(selected_entry) = self.selected_entry else {
1094 return;
1095 };
1096
1097 if selected_entry == item_count - 1 {
1098 return;
1099 }
1100
1101 let new_index = match &self.view_mode {
1102 GitPanelViewMode::Flat => selected_entry.saturating_add(1),
1103 GitPanelViewMode::Tree(state) => {
1104 let Some(current_logical_index) = state
1105 .logical_indices
1106 .iter()
1107 .position(|&i| i == selected_entry)
1108 else {
1109 return;
1110 };
1111
1112 state.logical_indices[current_logical_index.saturating_add(1)]
1113 }
1114 };
1115
1116 if matches!(self.entries.get(new_index), Some(GitListEntry::Header(..))) {
1117 self.selected_entry = Some(new_index.saturating_add(1));
1118 } else {
1119 self.selected_entry = Some(new_index);
1120 }
1121
1122 self.scroll_to_selected_entry(cx);
1123 }
1124
1125 fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
1126 if self.entries.last().is_some() {
1127 self.selected_entry = Some(self.entries.len() - 1);
1128 self.scroll_to_selected_entry(cx);
1129 }
1130 }
1131
1132 /// Show diff view at selected entry, only if the diff view is open
1133 fn move_diff_to_entry(&mut self, window: &mut Window, cx: &mut Context<Self>) {
1134 maybe!({
1135 let workspace = self.workspace.upgrade()?;
1136
1137 if let Some(project_diff) = workspace.read(cx).item_of_type::<ProjectDiff>(cx) {
1138 let entry = self.entries.get(self.selected_entry?)?.status_entry()?;
1139
1140 project_diff.update(cx, |project_diff, cx| {
1141 project_diff.move_to_entry(entry.clone(), window, cx);
1142 });
1143 }
1144
1145 Some(())
1146 });
1147 }
1148
1149 fn first_entry(&mut self, _: &FirstEntry, window: &mut Window, cx: &mut Context<Self>) {
1150 self.select_first(&menu::SelectFirst, window, cx);
1151 self.move_diff_to_entry(window, cx);
1152 }
1153
1154 fn last_entry(&mut self, _: &LastEntry, window: &mut Window, cx: &mut Context<Self>) {
1155 self.select_last(&menu::SelectLast, window, cx);
1156 self.move_diff_to_entry(window, cx);
1157 }
1158
1159 fn next_entry(&mut self, _: &NextEntry, window: &mut Window, cx: &mut Context<Self>) {
1160 self.select_next(&menu::SelectNext, window, cx);
1161 self.move_diff_to_entry(window, cx);
1162 }
1163
1164 fn previous_entry(&mut self, _: &PreviousEntry, window: &mut Window, cx: &mut Context<Self>) {
1165 self.select_previous(&menu::SelectPrevious, window, cx);
1166 self.move_diff_to_entry(window, cx);
1167 }
1168
1169 fn focus_editor(&mut self, _: &FocusEditor, window: &mut Window, cx: &mut Context<Self>) {
1170 self.commit_editor.update(cx, |editor, cx| {
1171 window.focus(&editor.focus_handle(cx), cx);
1172 });
1173 cx.notify();
1174 }
1175
1176 fn select_first_entry_if_none(&mut self, window: &mut Window, cx: &mut Context<Self>) {
1177 let have_entries = self
1178 .active_repository
1179 .as_ref()
1180 .is_some_and(|active_repository| active_repository.read(cx).status_summary().count > 0);
1181 if have_entries && self.selected_entry.is_none() {
1182 self.select_first(&menu::SelectFirst, window, cx);
1183 }
1184 }
1185
1186 fn focus_changes_list(
1187 &mut self,
1188 _: &FocusChanges,
1189 window: &mut Window,
1190 cx: &mut Context<Self>,
1191 ) {
1192 self.focus_handle.focus(window, cx);
1193 self.select_first_entry_if_none(window, cx);
1194 }
1195
1196 fn get_selected_entry(&self) -> Option<&GitListEntry> {
1197 self.selected_entry.and_then(|i| self.entries.get(i))
1198 }
1199
1200 fn open_diff(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
1201 maybe!({
1202 let entry = self.entries.get(self.selected_entry?)?.status_entry()?;
1203 let workspace = self.workspace.upgrade()?;
1204 let git_repo = self.active_repository.as_ref()?;
1205
1206 if let Some(project_diff) = workspace.read(cx).active_item_as::<ProjectDiff>(cx)
1207 && let Some(project_path) = project_diff.read(cx).active_path(cx)
1208 && Some(&entry.repo_path)
1209 == git_repo
1210 .read(cx)
1211 .project_path_to_repo_path(&project_path, cx)
1212 .as_ref()
1213 {
1214 project_diff.focus_handle(cx).focus(window, cx);
1215 project_diff.update(cx, |project_diff, cx| project_diff.autoscroll(cx));
1216 return None;
1217 };
1218
1219 self.workspace
1220 .update(cx, |workspace, cx| {
1221 ProjectDiff::deploy_at(workspace, Some(entry.clone()), window, cx);
1222 })
1223 .ok();
1224 self.focus_handle.focus(window, cx);
1225
1226 Some(())
1227 });
1228 }
1229
1230 fn file_history(&mut self, _: &git::FileHistory, window: &mut Window, cx: &mut Context<Self>) {
1231 maybe!({
1232 let entry = self.entries.get(self.selected_entry?)?.status_entry()?;
1233 let active_repo = self.active_repository.as_ref()?;
1234 let repo_path = entry.repo_path.clone();
1235 let git_store = self.project.read(cx).git_store();
1236
1237 FileHistoryView::open(
1238 repo_path,
1239 git_store.downgrade(),
1240 active_repo.downgrade(),
1241 self.workspace.clone(),
1242 window,
1243 cx,
1244 );
1245
1246 Some(())
1247 });
1248 }
1249
1250 fn open_file(
1251 &mut self,
1252 _: &menu::SecondaryConfirm,
1253 window: &mut Window,
1254 cx: &mut Context<Self>,
1255 ) {
1256 maybe!({
1257 let entry = self.entries.get(self.selected_entry?)?.status_entry()?;
1258 let active_repo = self.active_repository.as_ref()?;
1259 let path = active_repo
1260 .read(cx)
1261 .repo_path_to_project_path(&entry.repo_path, cx)?;
1262 if entry.status.is_deleted() {
1263 return None;
1264 }
1265
1266 let open_task = self
1267 .workspace
1268 .update(cx, |workspace, cx| {
1269 workspace.open_path_preview(path, None, false, false, true, window, cx)
1270 })
1271 .ok()?;
1272
1273 cx.spawn_in(window, async move |_, mut cx| {
1274 let item = open_task
1275 .await
1276 .notify_async_err(&mut cx)
1277 .ok_or_else(|| anyhow::anyhow!("Failed to open file"))?;
1278 if let Some(active_editor) = item.downcast::<Editor>() {
1279 if let Some(diff_task) =
1280 active_editor.update(cx, |editor, _cx| editor.wait_for_diff_to_load())?
1281 {
1282 diff_task.await;
1283 }
1284
1285 cx.update(|window, cx| {
1286 active_editor.update(cx, |editor, cx| {
1287 editor.expand_all_diff_hunks(&ExpandAllDiffHunks, window, cx);
1288
1289 let snapshot = editor.snapshot(window, cx);
1290 editor.go_to_hunk_before_or_after_position(
1291 &snapshot,
1292 language::Point::new(0, 0),
1293 Direction::Next,
1294 window,
1295 cx,
1296 );
1297 })
1298 })?;
1299 }
1300
1301 anyhow::Ok(())
1302 })
1303 .detach();
1304
1305 Some(())
1306 });
1307 }
1308
1309 fn revert_selected(
1310 &mut self,
1311 action: &git::RestoreFile,
1312 window: &mut Window,
1313 cx: &mut Context<Self>,
1314 ) {
1315 let path_style = self.project.read(cx).path_style(cx);
1316 maybe!({
1317 let list_entry = self.entries.get(self.selected_entry?)?.clone();
1318 let entry = list_entry.status_entry()?.to_owned();
1319 let skip_prompt = action.skip_prompt || entry.status.is_created();
1320
1321 let prompt = if skip_prompt {
1322 Task::ready(Ok(0))
1323 } else {
1324 let prompt = window.prompt(
1325 PromptLevel::Warning,
1326 &format!(
1327 "Are you sure you want to discard changes to {}?",
1328 entry
1329 .repo_path
1330 .file_name()
1331 .unwrap_or(entry.repo_path.display(path_style).as_ref()),
1332 ),
1333 None,
1334 &["Discard Changes", "Cancel"],
1335 cx,
1336 );
1337 cx.background_spawn(prompt)
1338 };
1339
1340 let this = cx.weak_entity();
1341 window
1342 .spawn(cx, async move |cx| {
1343 if prompt.await? != 0 {
1344 return anyhow::Ok(());
1345 }
1346
1347 this.update_in(cx, |this, window, cx| {
1348 this.revert_entry(&entry, window, cx);
1349 })?;
1350
1351 Ok(())
1352 })
1353 .detach();
1354 Some(())
1355 });
1356 }
1357
1358 fn add_to_gitignore(
1359 &mut self,
1360 _: &git::AddToGitignore,
1361 _window: &mut Window,
1362 cx: &mut Context<Self>,
1363 ) {
1364 maybe!({
1365 let list_entry = self.entries.get(self.selected_entry?)?.clone();
1366 let entry = list_entry.status_entry()?.to_owned();
1367
1368 if !entry.status.is_created() {
1369 return Some(());
1370 }
1371
1372 let project = self.project.downgrade();
1373 let repo_path = entry.repo_path;
1374 let active_repository = self.active_repository.as_ref()?.downgrade();
1375
1376 cx.spawn(async move |_, cx| {
1377 let file_path_str = repo_path.as_ref().display(PathStyle::Posix);
1378
1379 let repo_root = active_repository.read_with(cx, |repository, _| {
1380 repository.snapshot().work_directory_abs_path
1381 })?;
1382
1383 let gitignore_abs_path = repo_root.join(".gitignore");
1384
1385 let buffer = project
1386 .update(cx, |project, cx| {
1387 project.open_local_buffer(gitignore_abs_path, cx)
1388 })?
1389 .await?;
1390
1391 let mut should_save = false;
1392 buffer.update(cx, |buffer, cx| {
1393 let existing_content = buffer.text();
1394
1395 if existing_content
1396 .lines()
1397 .any(|line| line.trim() == file_path_str)
1398 {
1399 return;
1400 }
1401
1402 let insert_position = existing_content.len();
1403 let new_entry = if existing_content.is_empty() {
1404 format!("{}\n", file_path_str)
1405 } else if existing_content.ends_with('\n') {
1406 format!("{}\n", file_path_str)
1407 } else {
1408 format!("\n{}\n", file_path_str)
1409 };
1410
1411 buffer.edit([(insert_position..insert_position, new_entry)], None, cx);
1412 should_save = true;
1413 })?;
1414
1415 if should_save {
1416 project
1417 .update(cx, |project, cx| project.save_buffer(buffer, cx))?
1418 .await?;
1419 }
1420
1421 anyhow::Ok(())
1422 })
1423 .detach_and_log_err(cx);
1424
1425 Some(())
1426 });
1427 }
1428
1429 fn revert_entry(
1430 &mut self,
1431 entry: &GitStatusEntry,
1432 window: &mut Window,
1433 cx: &mut Context<Self>,
1434 ) {
1435 maybe!({
1436 let active_repo = self.active_repository.clone()?;
1437 let path = active_repo
1438 .read(cx)
1439 .repo_path_to_project_path(&entry.repo_path, cx)?;
1440 let workspace = self.workspace.clone();
1441
1442 if entry.status.staging().has_staged() {
1443 self.change_file_stage(false, vec![entry.clone()], cx);
1444 }
1445 let filename = path.path.file_name()?.to_string();
1446
1447 if !entry.status.is_created() {
1448 self.perform_checkout(vec![entry.clone()], window, cx);
1449 } else {
1450 let prompt = prompt(&format!("Trash {}?", filename), None, window, cx);
1451 cx.spawn_in(window, async move |_, cx| {
1452 match prompt.await? {
1453 TrashCancel::Trash => {}
1454 TrashCancel::Cancel => return Ok(()),
1455 }
1456 let task = workspace.update(cx, |workspace, cx| {
1457 workspace
1458 .project()
1459 .update(cx, |project, cx| project.delete_file(path, true, cx))
1460 })?;
1461 if let Some(task) = task {
1462 task.await?;
1463 }
1464 Ok(())
1465 })
1466 .detach_and_prompt_err(
1467 "Failed to trash file",
1468 window,
1469 cx,
1470 |e, _, _| Some(format!("{e}")),
1471 );
1472 }
1473 Some(())
1474 });
1475 }
1476
1477 fn perform_checkout(
1478 &mut self,
1479 entries: Vec<GitStatusEntry>,
1480 window: &mut Window,
1481 cx: &mut Context<Self>,
1482 ) {
1483 let workspace = self.workspace.clone();
1484 let Some(active_repository) = self.active_repository.clone() else {
1485 return;
1486 };
1487
1488 let task = cx.spawn_in(window, async move |this, cx| {
1489 let tasks: Vec<_> = workspace.update(cx, |workspace, cx| {
1490 workspace.project().update(cx, |project, cx| {
1491 entries
1492 .iter()
1493 .filter_map(|entry| {
1494 let path = active_repository
1495 .read(cx)
1496 .repo_path_to_project_path(&entry.repo_path, cx)?;
1497 Some(project.open_buffer(path, cx))
1498 })
1499 .collect()
1500 })
1501 })?;
1502
1503 let buffers = futures::future::join_all(tasks).await;
1504
1505 this.update_in(cx, |this, window, cx| {
1506 let task = active_repository.update(cx, |repo, cx| {
1507 repo.checkout_files(
1508 "HEAD",
1509 entries
1510 .into_iter()
1511 .map(|entries| entries.repo_path)
1512 .collect(),
1513 cx,
1514 )
1515 });
1516 this.update_visible_entries(window, cx);
1517 cx.notify();
1518 task
1519 })?
1520 .await?;
1521
1522 let tasks: Vec<_> = cx.update(|_, cx| {
1523 buffers
1524 .iter()
1525 .filter_map(|buffer| {
1526 buffer.as_ref().ok()?.update(cx, |buffer, cx| {
1527 buffer.is_dirty().then(|| buffer.reload(cx))
1528 })
1529 })
1530 .collect()
1531 })?;
1532
1533 futures::future::join_all(tasks).await;
1534
1535 Ok(())
1536 });
1537
1538 cx.spawn_in(window, async move |this, cx| {
1539 let result = task.await;
1540
1541 this.update_in(cx, |this, window, cx| {
1542 if let Err(err) = result {
1543 this.update_visible_entries(window, cx);
1544 this.show_error_toast("checkout", err, cx);
1545 }
1546 })
1547 .ok();
1548 })
1549 .detach();
1550 }
1551
1552 fn restore_tracked_files(
1553 &mut self,
1554 _: &RestoreTrackedFiles,
1555 window: &mut Window,
1556 cx: &mut Context<Self>,
1557 ) {
1558 let entries = self
1559 .entries
1560 .iter()
1561 .filter_map(|entry| entry.status_entry().cloned())
1562 .filter(|status_entry| !status_entry.status.is_created())
1563 .collect::<Vec<_>>();
1564
1565 match entries.len() {
1566 0 => return,
1567 1 => return self.revert_entry(&entries[0], window, cx),
1568 _ => {}
1569 }
1570 let mut details = entries
1571 .iter()
1572 .filter_map(|entry| entry.repo_path.as_ref().file_name())
1573 .map(|filename| filename.to_string())
1574 .take(5)
1575 .join("\n");
1576 if entries.len() > 5 {
1577 details.push_str(&format!("\nand {} more…", entries.len() - 5))
1578 }
1579
1580 #[derive(strum::EnumIter, strum::VariantNames)]
1581 #[strum(serialize_all = "title_case")]
1582 enum RestoreCancel {
1583 RestoreTrackedFiles,
1584 Cancel,
1585 }
1586 let prompt = prompt(
1587 "Discard changes to these files?",
1588 Some(&details),
1589 window,
1590 cx,
1591 );
1592 cx.spawn_in(window, async move |this, cx| {
1593 if let Ok(RestoreCancel::RestoreTrackedFiles) = prompt.await {
1594 this.update_in(cx, |this, window, cx| {
1595 this.perform_checkout(entries, window, cx);
1596 })
1597 .ok();
1598 }
1599 })
1600 .detach();
1601 }
1602
1603 fn clean_all(&mut self, _: &TrashUntrackedFiles, window: &mut Window, cx: &mut Context<Self>) {
1604 let workspace = self.workspace.clone();
1605 let Some(active_repo) = self.active_repository.clone() else {
1606 return;
1607 };
1608 let to_delete = self
1609 .entries
1610 .iter()
1611 .filter_map(|entry| entry.status_entry())
1612 .filter(|status_entry| status_entry.status.is_created())
1613 .cloned()
1614 .collect::<Vec<_>>();
1615
1616 match to_delete.len() {
1617 0 => return,
1618 1 => return self.revert_entry(&to_delete[0], window, cx),
1619 _ => {}
1620 };
1621
1622 let mut details = to_delete
1623 .iter()
1624 .map(|entry| {
1625 entry
1626 .repo_path
1627 .as_ref()
1628 .file_name()
1629 .map(|f| f.to_string())
1630 .unwrap_or_default()
1631 })
1632 .take(5)
1633 .join("\n");
1634
1635 if to_delete.len() > 5 {
1636 details.push_str(&format!("\nand {} more…", to_delete.len() - 5))
1637 }
1638
1639 let prompt = prompt("Trash these files?", Some(&details), window, cx);
1640 cx.spawn_in(window, async move |this, cx| {
1641 match prompt.await? {
1642 TrashCancel::Trash => {}
1643 TrashCancel::Cancel => return Ok(()),
1644 }
1645 let tasks = workspace.update(cx, |workspace, cx| {
1646 to_delete
1647 .iter()
1648 .filter_map(|entry| {
1649 workspace.project().update(cx, |project, cx| {
1650 let project_path = active_repo
1651 .read(cx)
1652 .repo_path_to_project_path(&entry.repo_path, cx)?;
1653 project.delete_file(project_path, true, cx)
1654 })
1655 })
1656 .collect::<Vec<_>>()
1657 })?;
1658 let to_unstage = to_delete
1659 .into_iter()
1660 .filter(|entry| !entry.status.staging().is_fully_unstaged())
1661 .collect();
1662 this.update(cx, |this, cx| this.change_file_stage(false, to_unstage, cx))?;
1663 for task in tasks {
1664 task.await?;
1665 }
1666 Ok(())
1667 })
1668 .detach_and_prompt_err("Failed to trash files", window, cx, |e, _, _| {
1669 Some(format!("{e}"))
1670 });
1671 }
1672
1673 fn change_all_files_stage(&mut self, stage: bool, cx: &mut Context<Self>) {
1674 let Some(active_repository) = self.active_repository.clone() else {
1675 return;
1676 };
1677 cx.spawn({
1678 async move |this, cx| {
1679 let result = this
1680 .update(cx, |this, cx| {
1681 let task = active_repository.update(cx, |repo, cx| {
1682 if stage {
1683 repo.stage_all(cx)
1684 } else {
1685 repo.unstage_all(cx)
1686 }
1687 });
1688 this.update_counts(active_repository.read(cx));
1689 cx.notify();
1690 task
1691 })?
1692 .await;
1693
1694 this.update(cx, |this, cx| {
1695 if let Err(err) = result {
1696 this.show_error_toast(if stage { "add" } else { "reset" }, err, cx);
1697 }
1698 cx.notify()
1699 })
1700 }
1701 })
1702 .detach();
1703 }
1704
1705 fn stage_status_for_entry(entry: &GitStatusEntry, repo: &Repository) -> StageStatus {
1706 // Checking for current staged/unstaged file status is a chained operation:
1707 // 1. first, we check for any pending operation recorded in repository
1708 // 2. if there are no pending ops either running or finished, we then ask the repository
1709 // for the most up-to-date file status read from disk - we do this since `entry` arg to this function `render_entry`
1710 // is likely to be staled, and may lead to weird artifacts in the form of subsecond auto-uncheck/check on
1711 // the checkbox's state (or flickering) which is undesirable.
1712 // 3. finally, if there is no info about this `entry` in the repo, we fall back to whatever status is encoded
1713 // in `entry` arg.
1714 repo.pending_ops_for_path(&entry.repo_path)
1715 .map(|ops| {
1716 if ops.staging() || ops.staged() {
1717 StageStatus::Staged
1718 } else {
1719 StageStatus::Unstaged
1720 }
1721 })
1722 .or_else(|| {
1723 repo.status_for_path(&entry.repo_path)
1724 .map(|status| status.status.staging())
1725 })
1726 .unwrap_or(entry.staging)
1727 }
1728
1729 fn stage_status_for_directory(
1730 &self,
1731 entry: &GitTreeDirEntry,
1732 repo: &Repository,
1733 ) -> StageStatus {
1734 let GitPanelViewMode::Tree(tree_state) = &self.view_mode else {
1735 util::debug_panic!("We should never render a directory entry while in flat view mode");
1736 return StageStatus::Unstaged;
1737 };
1738
1739 let Some(descendants) = tree_state.directory_descendants.get(&entry.key) else {
1740 return StageStatus::Unstaged;
1741 };
1742
1743 let mut fully_staged_count = 0usize;
1744 let mut any_staged_or_partially_staged = false;
1745
1746 for descendant in descendants {
1747 match GitPanel::stage_status_for_entry(descendant, repo) {
1748 StageStatus::Staged => {
1749 fully_staged_count += 1;
1750 any_staged_or_partially_staged = true;
1751 }
1752 StageStatus::PartiallyStaged => {
1753 any_staged_or_partially_staged = true;
1754 }
1755 StageStatus::Unstaged => {}
1756 }
1757 }
1758
1759 if descendants.is_empty() {
1760 StageStatus::Unstaged
1761 } else if fully_staged_count == descendants.len() {
1762 StageStatus::Staged
1763 } else if any_staged_or_partially_staged {
1764 StageStatus::PartiallyStaged
1765 } else {
1766 StageStatus::Unstaged
1767 }
1768 }
1769
1770 pub fn stage_all(&mut self, _: &StageAll, _window: &mut Window, cx: &mut Context<Self>) {
1771 self.change_all_files_stage(true, cx);
1772 }
1773
1774 pub fn unstage_all(&mut self, _: &UnstageAll, _window: &mut Window, cx: &mut Context<Self>) {
1775 self.change_all_files_stage(false, cx);
1776 }
1777
1778 fn toggle_staged_for_entry(
1779 &mut self,
1780 entry: &GitListEntry,
1781 _window: &mut Window,
1782 cx: &mut Context<Self>,
1783 ) {
1784 let Some(active_repository) = self.active_repository.clone() else {
1785 return;
1786 };
1787 let mut set_anchor: Option<RepoPath> = None;
1788 let mut clear_anchor = None;
1789
1790 let (stage, repo_paths) = {
1791 let repo = active_repository.read(cx);
1792 match entry {
1793 GitListEntry::Status(status_entry) => {
1794 let repo_paths = vec![status_entry.clone()];
1795 let stage = match GitPanel::stage_status_for_entry(status_entry, &repo) {
1796 StageStatus::Staged => {
1797 if let Some(op) = self.bulk_staging.clone()
1798 && op.anchor == status_entry.repo_path
1799 {
1800 clear_anchor = Some(op.anchor);
1801 }
1802 false
1803 }
1804 StageStatus::Unstaged | StageStatus::PartiallyStaged => {
1805 set_anchor = Some(status_entry.repo_path.clone());
1806 true
1807 }
1808 };
1809 (stage, repo_paths)
1810 }
1811 GitListEntry::TreeStatus(status_entry) => {
1812 let repo_paths = vec![status_entry.entry.clone()];
1813 let stage = match GitPanel::stage_status_for_entry(&status_entry.entry, &repo) {
1814 StageStatus::Staged => {
1815 if let Some(op) = self.bulk_staging.clone()
1816 && op.anchor == status_entry.entry.repo_path
1817 {
1818 clear_anchor = Some(op.anchor);
1819 }
1820 false
1821 }
1822 StageStatus::Unstaged | StageStatus::PartiallyStaged => {
1823 set_anchor = Some(status_entry.entry.repo_path.clone());
1824 true
1825 }
1826 };
1827 (stage, repo_paths)
1828 }
1829 GitListEntry::Header(section) => {
1830 let goal_staged_state = !self.header_state(section.header).selected();
1831 let entries = self
1832 .entries
1833 .iter()
1834 .filter_map(|entry| entry.status_entry())
1835 .filter(|status_entry| {
1836 section.contains(status_entry, &repo)
1837 && GitPanel::stage_status_for_entry(status_entry, &repo).as_bool()
1838 != Some(goal_staged_state)
1839 })
1840 .cloned()
1841 .collect::<Vec<_>>();
1842
1843 (goal_staged_state, entries)
1844 }
1845 GitListEntry::Directory(entry) => {
1846 let goal_staged_state = match self.stage_status_for_directory(entry, repo) {
1847 StageStatus::Staged => StageStatus::Unstaged,
1848 StageStatus::Unstaged | StageStatus::PartiallyStaged => StageStatus::Staged,
1849 };
1850 let goal_stage = goal_staged_state == StageStatus::Staged;
1851
1852 let entries = self
1853 .view_mode
1854 .tree_state()
1855 .and_then(|state| state.directory_descendants.get(&entry.key))
1856 .cloned()
1857 .unwrap_or_default()
1858 .into_iter()
1859 .filter(|status_entry| {
1860 GitPanel::stage_status_for_entry(status_entry, &repo)
1861 != goal_staged_state
1862 })
1863 .collect::<Vec<_>>();
1864 (goal_stage, entries)
1865 }
1866 }
1867 };
1868 if let Some(anchor) = clear_anchor {
1869 if let Some(op) = self.bulk_staging.clone()
1870 && op.anchor == anchor
1871 {
1872 self.bulk_staging = None;
1873 }
1874 }
1875 if let Some(anchor) = set_anchor {
1876 self.set_bulk_staging_anchor(anchor, cx);
1877 }
1878
1879 self.change_file_stage(stage, repo_paths, cx);
1880 }
1881
1882 fn change_file_stage(
1883 &mut self,
1884 stage: bool,
1885 entries: Vec<GitStatusEntry>,
1886 cx: &mut Context<Self>,
1887 ) {
1888 let Some(active_repository) = self.active_repository.clone() else {
1889 return;
1890 };
1891 cx.spawn({
1892 async move |this, cx| {
1893 let result = this
1894 .update(cx, |this, cx| {
1895 let task = active_repository.update(cx, |repo, cx| {
1896 let repo_paths = entries
1897 .iter()
1898 .map(|entry| entry.repo_path.clone())
1899 .collect();
1900 if stage {
1901 repo.stage_entries(repo_paths, cx)
1902 } else {
1903 repo.unstage_entries(repo_paths, cx)
1904 }
1905 });
1906 this.update_counts(active_repository.read(cx));
1907 cx.notify();
1908 task
1909 })?
1910 .await;
1911
1912 this.update(cx, |this, cx| {
1913 if let Err(err) = result {
1914 this.show_error_toast(if stage { "add" } else { "reset" }, err, cx);
1915 }
1916 cx.notify();
1917 })
1918 }
1919 })
1920 .detach();
1921 }
1922
1923 pub fn total_staged_count(&self) -> usize {
1924 self.tracked_staged_count + self.new_staged_count + self.conflicted_staged_count
1925 }
1926
1927 pub fn stash_pop(&mut self, _: &StashPop, _window: &mut Window, cx: &mut Context<Self>) {
1928 let Some(active_repository) = self.active_repository.clone() else {
1929 return;
1930 };
1931
1932 cx.spawn({
1933 async move |this, cx| {
1934 let stash_task = active_repository
1935 .update(cx, |repo, cx| repo.stash_pop(None, cx))?
1936 .await;
1937 this.update(cx, |this, cx| {
1938 stash_task
1939 .map_err(|e| {
1940 this.show_error_toast("stash pop", e, cx);
1941 })
1942 .ok();
1943 cx.notify();
1944 })
1945 }
1946 })
1947 .detach();
1948 }
1949
1950 pub fn stash_apply(&mut self, _: &StashApply, _window: &mut Window, cx: &mut Context<Self>) {
1951 let Some(active_repository) = self.active_repository.clone() else {
1952 return;
1953 };
1954
1955 cx.spawn({
1956 async move |this, cx| {
1957 let stash_task = active_repository
1958 .update(cx, |repo, cx| repo.stash_apply(None, cx))?
1959 .await;
1960 this.update(cx, |this, cx| {
1961 stash_task
1962 .map_err(|e| {
1963 this.show_error_toast("stash apply", e, cx);
1964 })
1965 .ok();
1966 cx.notify();
1967 })
1968 }
1969 })
1970 .detach();
1971 }
1972
1973 pub fn stash_all(&mut self, _: &StashAll, _window: &mut Window, cx: &mut Context<Self>) {
1974 let Some(active_repository) = self.active_repository.clone() else {
1975 return;
1976 };
1977
1978 cx.spawn({
1979 async move |this, cx| {
1980 let stash_task = active_repository
1981 .update(cx, |repo, cx| repo.stash_all(cx))?
1982 .await;
1983 this.update(cx, |this, cx| {
1984 stash_task
1985 .map_err(|e| {
1986 this.show_error_toast("stash", e, cx);
1987 })
1988 .ok();
1989 cx.notify();
1990 })
1991 }
1992 })
1993 .detach();
1994 }
1995
1996 pub fn commit_message_buffer(&self, cx: &App) -> Entity<Buffer> {
1997 self.commit_editor
1998 .read(cx)
1999 .buffer()
2000 .read(cx)
2001 .as_singleton()
2002 .unwrap()
2003 }
2004
2005 fn toggle_staged_for_selected(
2006 &mut self,
2007 _: &git::ToggleStaged,
2008 window: &mut Window,
2009 cx: &mut Context<Self>,
2010 ) {
2011 if let Some(selected_entry) = self.get_selected_entry().cloned() {
2012 self.toggle_staged_for_entry(&selected_entry, window, cx);
2013 }
2014 }
2015
2016 fn stage_range(&mut self, _: &git::StageRange, _window: &mut Window, cx: &mut Context<Self>) {
2017 let Some(index) = self.selected_entry else {
2018 return;
2019 };
2020 self.stage_bulk(index, cx);
2021 }
2022
2023 fn stage_selected(&mut self, _: &git::StageFile, _window: &mut Window, cx: &mut Context<Self>) {
2024 let Some(selected_entry) = self.get_selected_entry() else {
2025 return;
2026 };
2027 let Some(status_entry) = selected_entry.status_entry() else {
2028 return;
2029 };
2030 if status_entry.staging != StageStatus::Staged {
2031 self.change_file_stage(true, vec![status_entry.clone()], cx);
2032 }
2033 }
2034
2035 fn unstage_selected(
2036 &mut self,
2037 _: &git::UnstageFile,
2038 _window: &mut Window,
2039 cx: &mut Context<Self>,
2040 ) {
2041 let Some(selected_entry) = self.get_selected_entry() else {
2042 return;
2043 };
2044 let Some(status_entry) = selected_entry.status_entry() else {
2045 return;
2046 };
2047 if status_entry.staging != StageStatus::Unstaged {
2048 self.change_file_stage(false, vec![status_entry.clone()], cx);
2049 }
2050 }
2051
2052 fn on_commit(&mut self, _: &git::Commit, window: &mut Window, cx: &mut Context<Self>) {
2053 if self.commit(&self.commit_editor.focus_handle(cx), window, cx) {
2054 telemetry::event!("Git Committed", source = "Git Panel");
2055 }
2056 }
2057
2058 /// Commits staged changes with the current commit message.
2059 ///
2060 /// Returns `true` if the commit was executed, `false` otherwise.
2061 pub(crate) fn commit(
2062 &mut self,
2063 commit_editor_focus_handle: &FocusHandle,
2064 window: &mut Window,
2065 cx: &mut Context<Self>,
2066 ) -> bool {
2067 if self.amend_pending {
2068 return false;
2069 }
2070
2071 if commit_editor_focus_handle.contains_focused(window, cx) {
2072 self.commit_changes(
2073 CommitOptions {
2074 amend: false,
2075 signoff: self.signoff_enabled,
2076 },
2077 window,
2078 cx,
2079 );
2080 true
2081 } else {
2082 cx.propagate();
2083 false
2084 }
2085 }
2086
2087 fn on_amend(&mut self, _: &git::Amend, window: &mut Window, cx: &mut Context<Self>) {
2088 if self.amend(&self.commit_editor.focus_handle(cx), window, cx) {
2089 telemetry::event!("Git Amended", source = "Git Panel");
2090 }
2091 }
2092
2093 /// Amends the most recent commit with staged changes and/or an updated commit message.
2094 ///
2095 /// Uses a two-stage workflow where the first invocation loads the commit
2096 /// message for editing, second invocation performs the amend. Returns
2097 /// `true` if the amend was executed, `false` otherwise.
2098 pub(crate) fn amend(
2099 &mut self,
2100 commit_editor_focus_handle: &FocusHandle,
2101 window: &mut Window,
2102 cx: &mut Context<Self>,
2103 ) -> bool {
2104 if commit_editor_focus_handle.contains_focused(window, cx) {
2105 if self.head_commit(cx).is_some() {
2106 if !self.amend_pending {
2107 self.set_amend_pending(true, cx);
2108 self.load_last_commit_message(cx);
2109
2110 return false;
2111 } else {
2112 self.commit_changes(
2113 CommitOptions {
2114 amend: true,
2115 signoff: self.signoff_enabled,
2116 },
2117 window,
2118 cx,
2119 );
2120
2121 return true;
2122 }
2123 }
2124 return false;
2125 } else {
2126 cx.propagate();
2127 return false;
2128 }
2129 }
2130 pub fn head_commit(&self, cx: &App) -> Option<CommitDetails> {
2131 self.active_repository
2132 .as_ref()
2133 .and_then(|repo| repo.read(cx).head_commit.as_ref())
2134 .cloned()
2135 }
2136
2137 pub fn load_last_commit_message(&mut self, cx: &mut Context<Self>) {
2138 let Some(head_commit) = self.head_commit(cx) else {
2139 return;
2140 };
2141
2142 let recent_sha = head_commit.sha.to_string();
2143 let detail_task = self.load_commit_details(recent_sha, cx);
2144 cx.spawn(async move |this, cx| {
2145 if let Ok(message) = detail_task.await.map(|detail| detail.message) {
2146 this.update(cx, |this, cx| {
2147 this.commit_message_buffer(cx).update(cx, |buffer, cx| {
2148 let start = buffer.anchor_before(0);
2149 let end = buffer.anchor_after(buffer.len());
2150 buffer.edit([(start..end, message)], None, cx);
2151 });
2152 })
2153 .log_err();
2154 }
2155 })
2156 .detach();
2157 }
2158
2159 fn custom_or_suggested_commit_message(
2160 &self,
2161 window: &mut Window,
2162 cx: &mut Context<Self>,
2163 ) -> Option<String> {
2164 let git_commit_language = self
2165 .commit_editor
2166 .read(cx)
2167 .language_at(MultiBufferOffset(0), cx);
2168 let message = self.commit_editor.read(cx).text(cx);
2169 if message.is_empty() {
2170 return self
2171 .suggest_commit_message(cx)
2172 .filter(|message| !message.trim().is_empty());
2173 } else if message.trim().is_empty() {
2174 return None;
2175 }
2176 let buffer = cx.new(|cx| {
2177 let mut buffer = Buffer::local(message, cx);
2178 buffer.set_language(git_commit_language, cx);
2179 buffer
2180 });
2181 let editor = cx.new(|cx| Editor::for_buffer(buffer, None, window, cx));
2182 let wrapped_message = editor.update(cx, |editor, cx| {
2183 editor.select_all(&Default::default(), window, cx);
2184 editor.rewrap_impl(
2185 RewrapOptions {
2186 override_language_settings: false,
2187 preserve_existing_whitespace: true,
2188 },
2189 cx,
2190 );
2191 editor.text(cx)
2192 });
2193 if wrapped_message.trim().is_empty() {
2194 return None;
2195 }
2196 Some(wrapped_message)
2197 }
2198
2199 fn has_commit_message(&self, cx: &mut Context<Self>) -> bool {
2200 let text = self.commit_editor.read(cx).text(cx);
2201 if !text.trim().is_empty() {
2202 true
2203 } else if text.is_empty() {
2204 self.suggest_commit_message(cx)
2205 .is_some_and(|text| !text.trim().is_empty())
2206 } else {
2207 false
2208 }
2209 }
2210
2211 pub(crate) fn commit_changes(
2212 &mut self,
2213 options: CommitOptions,
2214 window: &mut Window,
2215 cx: &mut Context<Self>,
2216 ) {
2217 let Some(active_repository) = self.active_repository.clone() else {
2218 return;
2219 };
2220 let error_spawn = |message, window: &mut Window, cx: &mut App| {
2221 let prompt = window.prompt(PromptLevel::Warning, message, None, &["Ok"], cx);
2222 cx.spawn(async move |_| {
2223 prompt.await.ok();
2224 })
2225 .detach();
2226 };
2227
2228 if self.has_unstaged_conflicts() {
2229 error_spawn(
2230 "There are still conflicts. You must stage these before committing",
2231 window,
2232 cx,
2233 );
2234 return;
2235 }
2236
2237 let askpass = self.askpass_delegate("git commit", window, cx);
2238 let commit_message = self.custom_or_suggested_commit_message(window, cx);
2239
2240 let Some(mut message) = commit_message else {
2241 self.commit_editor
2242 .read(cx)
2243 .focus_handle(cx)
2244 .focus(window, cx);
2245 return;
2246 };
2247
2248 if self.add_coauthors {
2249 self.fill_co_authors(&mut message, cx);
2250 }
2251
2252 let task = if self.has_staged_changes() {
2253 // Repository serializes all git operations, so we can just send a commit immediately
2254 let commit_task = active_repository.update(cx, |repo, cx| {
2255 repo.commit(message.into(), None, options, askpass, cx)
2256 });
2257 cx.background_spawn(async move { commit_task.await? })
2258 } else {
2259 let changed_files = self
2260 .entries
2261 .iter()
2262 .filter_map(|entry| entry.status_entry())
2263 .filter(|status_entry| !status_entry.status.is_created())
2264 .map(|status_entry| status_entry.repo_path.clone())
2265 .collect::<Vec<_>>();
2266
2267 if changed_files.is_empty() && !options.amend {
2268 error_spawn("No changes to commit", window, cx);
2269 return;
2270 }
2271
2272 let stage_task =
2273 active_repository.update(cx, |repo, cx| repo.stage_entries(changed_files, cx));
2274 cx.spawn(async move |_, cx| {
2275 stage_task.await?;
2276 let commit_task = active_repository.update(cx, |repo, cx| {
2277 repo.commit(message.into(), None, options, askpass, cx)
2278 })?;
2279 commit_task.await?
2280 })
2281 };
2282 let task = cx.spawn_in(window, async move |this, cx| {
2283 let result = task.await;
2284 this.update_in(cx, |this, window, cx| {
2285 this.pending_commit.take();
2286
2287 match result {
2288 Ok(()) => {
2289 if options.amend {
2290 this.set_amend_pending(false, cx);
2291 } else {
2292 this.commit_editor
2293 .update(cx, |editor, cx| editor.clear(window, cx));
2294 this.original_commit_message = None;
2295 }
2296 }
2297 Err(e) => this.show_error_toast("commit", e, cx),
2298 }
2299 })
2300 .ok();
2301 });
2302
2303 self.pending_commit = Some(task);
2304 }
2305
2306 pub(crate) fn uncommit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
2307 let Some(repo) = self.active_repository.clone() else {
2308 return;
2309 };
2310 telemetry::event!("Git Uncommitted");
2311
2312 let confirmation = self.check_for_pushed_commits(window, cx);
2313 let prior_head = self.load_commit_details("HEAD".to_string(), cx);
2314
2315 let task = cx.spawn_in(window, async move |this, cx| {
2316 let result = maybe!(async {
2317 if let Ok(true) = confirmation.await {
2318 let prior_head = prior_head.await?;
2319
2320 repo.update(cx, |repo, cx| {
2321 repo.reset("HEAD^".to_string(), ResetMode::Soft, cx)
2322 })?
2323 .await??;
2324
2325 Ok(Some(prior_head))
2326 } else {
2327 Ok(None)
2328 }
2329 })
2330 .await;
2331
2332 this.update_in(cx, |this, window, cx| {
2333 this.pending_commit.take();
2334 match result {
2335 Ok(None) => {}
2336 Ok(Some(prior_commit)) => {
2337 this.commit_editor.update(cx, |editor, cx| {
2338 editor.set_text(prior_commit.message, window, cx)
2339 });
2340 }
2341 Err(e) => this.show_error_toast("reset", e, cx),
2342 }
2343 })
2344 .ok();
2345 });
2346
2347 self.pending_commit = Some(task);
2348 }
2349
2350 fn check_for_pushed_commits(
2351 &mut self,
2352 window: &mut Window,
2353 cx: &mut Context<Self>,
2354 ) -> impl Future<Output = anyhow::Result<bool>> + use<> {
2355 let repo = self.active_repository.clone();
2356 let mut cx = window.to_async(cx);
2357
2358 async move {
2359 let repo = repo.context("No active repository")?;
2360
2361 let pushed_to: Vec<SharedString> = repo
2362 .update(&mut cx, |repo, _| repo.check_for_pushed_commits())?
2363 .await??;
2364
2365 if pushed_to.is_empty() {
2366 Ok(true)
2367 } else {
2368 #[derive(strum::EnumIter, strum::VariantNames)]
2369 #[strum(serialize_all = "title_case")]
2370 enum CancelUncommit {
2371 Uncommit,
2372 Cancel,
2373 }
2374 let detail = format!(
2375 "This commit was already pushed to {}.",
2376 pushed_to.into_iter().join(", ")
2377 );
2378 let result = cx
2379 .update(|window, cx| prompt("Are you sure?", Some(&detail), window, cx))?
2380 .await?;
2381
2382 match result {
2383 CancelUncommit::Cancel => Ok(false),
2384 CancelUncommit::Uncommit => Ok(true),
2385 }
2386 }
2387 }
2388 }
2389
2390 /// Suggests a commit message based on the changed files and their statuses
2391 pub fn suggest_commit_message(&self, cx: &App) -> Option<String> {
2392 if let Some(merge_message) = self
2393 .active_repository
2394 .as_ref()
2395 .and_then(|repo| repo.read(cx).merge.message.as_ref())
2396 {
2397 return Some(merge_message.to_string());
2398 }
2399
2400 let git_status_entry = if let Some(staged_entry) = &self.single_staged_entry {
2401 Some(staged_entry)
2402 } else if self.total_staged_count() == 0
2403 && let Some(single_tracked_entry) = &self.single_tracked_entry
2404 {
2405 Some(single_tracked_entry)
2406 } else {
2407 None
2408 }?;
2409
2410 let action_text = if git_status_entry.status.is_deleted() {
2411 Some("Delete")
2412 } else if git_status_entry.status.is_created() {
2413 Some("Create")
2414 } else if git_status_entry.status.is_modified() {
2415 Some("Update")
2416 } else {
2417 None
2418 }?;
2419
2420 let file_name = git_status_entry
2421 .repo_path
2422 .file_name()
2423 .unwrap_or_default()
2424 .to_string();
2425
2426 Some(format!("{} {}", action_text, file_name))
2427 }
2428
2429 fn generate_commit_message_action(
2430 &mut self,
2431 _: &git::GenerateCommitMessage,
2432 _window: &mut Window,
2433 cx: &mut Context<Self>,
2434 ) {
2435 self.generate_commit_message(cx);
2436 }
2437
2438 fn split_patch(patch: &str) -> Vec<String> {
2439 let mut result = Vec::new();
2440 let mut current_patch = String::new();
2441
2442 for line in patch.lines() {
2443 if line.starts_with("---") && !current_patch.is_empty() {
2444 result.push(current_patch.trim_end_matches('\n').into());
2445 current_patch = String::new();
2446 }
2447 current_patch.push_str(line);
2448 current_patch.push('\n');
2449 }
2450
2451 if !current_patch.is_empty() {
2452 result.push(current_patch.trim_end_matches('\n').into());
2453 }
2454
2455 result
2456 }
2457 fn truncate_iteratively(patch: &str, max_bytes: usize) -> String {
2458 let mut current_size = patch.len();
2459 if current_size <= max_bytes {
2460 return patch.to_string();
2461 }
2462 let file_patches = Self::split_patch(patch);
2463 let mut file_infos: Vec<TruncatedPatch> = file_patches
2464 .iter()
2465 .filter_map(|patch| TruncatedPatch::from_unified_diff(patch))
2466 .collect();
2467
2468 if file_infos.is_empty() {
2469 return patch.to_string();
2470 }
2471
2472 current_size = file_infos.iter().map(|f| f.calculate_size()).sum::<usize>();
2473 while current_size > max_bytes {
2474 let file_idx = file_infos
2475 .iter()
2476 .enumerate()
2477 .filter(|(_, f)| f.hunks_to_keep > 1)
2478 .max_by_key(|(_, f)| f.hunks_to_keep)
2479 .map(|(idx, _)| idx);
2480 match file_idx {
2481 Some(idx) => {
2482 let file = &mut file_infos[idx];
2483 let size_before = file.calculate_size();
2484 file.hunks_to_keep -= 1;
2485 let size_after = file.calculate_size();
2486 let saved = size_before.saturating_sub(size_after);
2487 current_size = current_size.saturating_sub(saved);
2488 }
2489 None => {
2490 break;
2491 }
2492 }
2493 }
2494
2495 file_infos
2496 .iter()
2497 .map(|info| info.to_string())
2498 .collect::<Vec<_>>()
2499 .join("\n")
2500 }
2501
2502 pub fn compress_commit_diff(diff_text: &str, max_bytes: usize) -> String {
2503 if diff_text.len() <= max_bytes {
2504 return diff_text.to_string();
2505 }
2506
2507 let mut compressed = diff_text
2508 .lines()
2509 .map(|line| {
2510 if line.len() > 256 {
2511 format!("{}...[truncated]\n", &line[..line.floor_char_boundary(256)])
2512 } else {
2513 format!("{}\n", line)
2514 }
2515 })
2516 .collect::<Vec<_>>()
2517 .join("");
2518
2519 if compressed.len() <= max_bytes {
2520 return compressed;
2521 }
2522
2523 compressed = Self::truncate_iteratively(&compressed, max_bytes);
2524
2525 compressed
2526 }
2527
2528 async fn load_project_rules(
2529 project: &Entity<Project>,
2530 repo_work_dir: &Arc<Path>,
2531 cx: &mut AsyncApp,
2532 ) -> Option<String> {
2533 let rules_path = cx
2534 .update(|cx| {
2535 for worktree in project.read(cx).worktrees(cx) {
2536 let worktree_abs_path = worktree.read(cx).abs_path();
2537 if !worktree_abs_path.starts_with(&repo_work_dir) {
2538 continue;
2539 }
2540
2541 let worktree_snapshot = worktree.read(cx).snapshot();
2542 for rules_name in RULES_FILE_NAMES {
2543 if let Ok(rel_path) = RelPath::unix(rules_name) {
2544 if let Some(entry) = worktree_snapshot.entry_for_path(rel_path) {
2545 if entry.is_file() {
2546 return Some(ProjectPath {
2547 worktree_id: worktree.read(cx).id(),
2548 path: entry.path.clone(),
2549 });
2550 }
2551 }
2552 }
2553 }
2554 }
2555 None
2556 })
2557 .ok()??;
2558
2559 let buffer = project
2560 .update(cx, |project, cx| project.open_buffer(rules_path, cx))
2561 .ok()?
2562 .await
2563 .ok()?;
2564
2565 let content = buffer
2566 .read_with(cx, |buffer, _| buffer.text())
2567 .ok()?
2568 .trim()
2569 .to_string();
2570
2571 if content.is_empty() {
2572 None
2573 } else {
2574 Some(content)
2575 }
2576 }
2577
2578 async fn load_commit_message_prompt(
2579 is_using_legacy_zed_pro: bool,
2580 cx: &mut AsyncApp,
2581 ) -> String {
2582 const DEFAULT_PROMPT: &str = include_str!("commit_message_prompt.txt");
2583
2584 // Remove this once we stop supporting legacy Zed Pro
2585 // In legacy Zed Pro, Git commit summary generation did not count as a
2586 // prompt. If the user changes the prompt, our classification will fail,
2587 // meaning that users will be charged for generating commit messages.
2588 if is_using_legacy_zed_pro {
2589 return DEFAULT_PROMPT.to_string();
2590 }
2591
2592 let load = async {
2593 let store = cx.update(|cx| PromptStore::global(cx)).ok()?.await.ok()?;
2594 store
2595 .update(cx, |s, cx| s.load(PromptId::CommitMessage, cx))
2596 .ok()?
2597 .await
2598 .ok()
2599 };
2600 load.await.unwrap_or_else(|| DEFAULT_PROMPT.to_string())
2601 }
2602
2603 /// Generates a commit message using an LLM.
2604 pub fn generate_commit_message(&mut self, cx: &mut Context<Self>) {
2605 if !self.can_commit() || !AgentSettings::get_global(cx).enabled(cx) {
2606 return;
2607 }
2608
2609 let Some(ConfiguredModel { provider, model }) =
2610 LanguageModelRegistry::read_global(cx).commit_message_model()
2611 else {
2612 return;
2613 };
2614
2615 let Some(repo) = self.active_repository.as_ref() else {
2616 return;
2617 };
2618
2619 telemetry::event!("Git Commit Message Generated");
2620
2621 let diff = repo.update(cx, |repo, cx| {
2622 if self.has_staged_changes() {
2623 repo.diff(DiffType::HeadToIndex, cx)
2624 } else {
2625 repo.diff(DiffType::HeadToWorktree, cx)
2626 }
2627 });
2628
2629 let temperature = AgentSettings::temperature_for_model(&model, cx);
2630 let project = self.project.clone();
2631 let repo_work_dir = repo.read(cx).work_directory_abs_path.clone();
2632
2633 // Remove this once we stop supporting legacy Zed Pro
2634 let is_using_legacy_zed_pro = provider.id() == ZED_CLOUD_PROVIDER_ID
2635 && self.workspace.upgrade().map_or(false, |workspace| {
2636 workspace.read(cx).user_store().read(cx).plan()
2637 == Some(cloud_llm_client::Plan::V1(cloud_llm_client::PlanV1::ZedPro))
2638 });
2639
2640 self.generate_commit_message_task = Some(cx.spawn(async move |this, mut cx| {
2641 async move {
2642 let _defer = cx.on_drop(&this, |this, _cx| {
2643 this.generate_commit_message_task.take();
2644 });
2645
2646 if let Some(task) = cx.update(|cx| {
2647 if !provider.is_authenticated(cx) {
2648 Some(provider.authenticate(cx))
2649 } else {
2650 None
2651 }
2652 })? {
2653 task.await.log_err();
2654 };
2655
2656 let mut diff_text = match diff.await {
2657 Ok(result) => match result {
2658 Ok(text) => text,
2659 Err(e) => {
2660 Self::show_commit_message_error(&this, &e, cx);
2661 return anyhow::Ok(());
2662 }
2663 },
2664 Err(e) => {
2665 Self::show_commit_message_error(&this, &e, cx);
2666 return anyhow::Ok(());
2667 }
2668 };
2669
2670 const MAX_DIFF_BYTES: usize = 20_000;
2671 diff_text = Self::compress_commit_diff(&diff_text, MAX_DIFF_BYTES);
2672
2673 let rules_content = Self::load_project_rules(&project, &repo_work_dir, &mut cx).await;
2674
2675 let prompt = Self::load_commit_message_prompt(is_using_legacy_zed_pro, &mut cx).await;
2676
2677 let subject = this.update(cx, |this, cx| {
2678 this.commit_editor.read(cx).text(cx).lines().next().map(ToOwned::to_owned).unwrap_or_default()
2679 })?;
2680
2681 let text_empty = subject.trim().is_empty();
2682
2683 let rules_section = match &rules_content {
2684 Some(rules) => format!(
2685 "\n\nThe user has provided the following project rules that you should follow when writing the commit message:\n\
2686 <project_rules>\n{rules}\n</project_rules>\n"
2687 ),
2688 None => String::new(),
2689 };
2690
2691 let subject_section = if text_empty {
2692 String::new()
2693 } else {
2694 format!("\nHere is the user's subject line:\n{subject}")
2695 };
2696
2697 let content = format!(
2698 "{prompt}{rules_section}{subject_section}\nHere are the changes in this commit:\n{diff_text}"
2699 );
2700
2701 let request = LanguageModelRequest {
2702 thread_id: None,
2703 prompt_id: None,
2704 intent: Some(CompletionIntent::GenerateGitCommitMessage),
2705 mode: None,
2706 messages: vec![LanguageModelRequestMessage {
2707 role: Role::User,
2708 content: vec![content.into()],
2709 cache: false,
2710 reasoning_details: None,
2711 }],
2712 tools: Vec::new(),
2713 tool_choice: None,
2714 stop: Vec::new(),
2715 temperature,
2716 thinking_allowed: false,
2717 };
2718
2719 let stream = model.stream_completion_text(request, cx);
2720 match stream.await {
2721 Ok(mut messages) => {
2722 if !text_empty {
2723 this.update(cx, |this, cx| {
2724 this.commit_message_buffer(cx).update(cx, |buffer, cx| {
2725 let insert_position = buffer.anchor_before(buffer.len());
2726 buffer.edit([(insert_position..insert_position, "\n")], None, cx)
2727 });
2728 })?;
2729 }
2730
2731 while let Some(message) = messages.stream.next().await {
2732 match message {
2733 Ok(text) => {
2734 this.update(cx, |this, cx| {
2735 this.commit_message_buffer(cx).update(cx, |buffer, cx| {
2736 let insert_position = buffer.anchor_before(buffer.len());
2737 buffer.edit([(insert_position..insert_position, text)], None, cx);
2738 });
2739 })?;
2740 }
2741 Err(e) => {
2742 Self::show_commit_message_error(&this, &e, cx);
2743 break;
2744 }
2745 }
2746 }
2747 }
2748 Err(e) => {
2749 Self::show_commit_message_error(&this, &e, cx);
2750 }
2751 }
2752
2753 anyhow::Ok(())
2754 }
2755 .log_err().await
2756 }));
2757 }
2758
2759 fn get_fetch_options(
2760 &self,
2761 window: &mut Window,
2762 cx: &mut Context<Self>,
2763 ) -> Task<Option<FetchOptions>> {
2764 let repo = self.active_repository.clone();
2765 let workspace = self.workspace.clone();
2766
2767 cx.spawn_in(window, async move |_, cx| {
2768 let repo = repo?;
2769 let remotes = repo
2770 .update(cx, |repo, _| repo.get_remotes(None, false))
2771 .ok()?
2772 .await
2773 .ok()?
2774 .log_err()?;
2775
2776 let mut remotes: Vec<_> = remotes.into_iter().map(FetchOptions::Remote).collect();
2777 if remotes.len() > 1 {
2778 remotes.push(FetchOptions::All);
2779 }
2780 let selection = cx
2781 .update(|window, cx| {
2782 picker_prompt::prompt(
2783 "Pick which remote to fetch",
2784 remotes.iter().map(|r| r.name()).collect(),
2785 workspace,
2786 window,
2787 cx,
2788 )
2789 })
2790 .ok()?
2791 .await?;
2792 remotes.get(selection).cloned()
2793 })
2794 }
2795
2796 pub(crate) fn fetch(
2797 &mut self,
2798 is_fetch_all: bool,
2799 window: &mut Window,
2800 cx: &mut Context<Self>,
2801 ) {
2802 if !self.can_push_and_pull(cx) {
2803 return;
2804 }
2805
2806 let Some(repo) = self.active_repository.clone() else {
2807 return;
2808 };
2809 telemetry::event!("Git Fetched");
2810 let askpass = self.askpass_delegate("git fetch", window, cx);
2811 let this = cx.weak_entity();
2812
2813 let fetch_options = if is_fetch_all {
2814 Task::ready(Some(FetchOptions::All))
2815 } else {
2816 self.get_fetch_options(window, cx)
2817 };
2818
2819 window
2820 .spawn(cx, async move |cx| {
2821 let Some(fetch_options) = fetch_options.await else {
2822 return Ok(());
2823 };
2824 let fetch = repo.update(cx, |repo, cx| {
2825 repo.fetch(fetch_options.clone(), askpass, cx)
2826 })?;
2827
2828 let remote_message = fetch.await?;
2829 this.update(cx, |this, cx| {
2830 let action = match fetch_options {
2831 FetchOptions::All => RemoteAction::Fetch(None),
2832 FetchOptions::Remote(remote) => RemoteAction::Fetch(Some(remote)),
2833 };
2834 match remote_message {
2835 Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
2836 Err(e) => {
2837 log::error!("Error while fetching {:?}", e);
2838 this.show_error_toast(action.name(), e, cx)
2839 }
2840 }
2841
2842 anyhow::Ok(())
2843 })
2844 .ok();
2845 anyhow::Ok(())
2846 })
2847 .detach_and_log_err(cx);
2848 }
2849
2850 pub(crate) fn git_clone(&mut self, repo: String, window: &mut Window, cx: &mut Context<Self>) {
2851 let workspace = self.workspace.clone();
2852
2853 crate::clone::clone_and_open(
2854 repo.into(),
2855 workspace,
2856 window,
2857 cx,
2858 Arc::new(|_workspace: &mut workspace::Workspace, _window, _cx| {}),
2859 );
2860 }
2861
2862 pub(crate) fn git_init(&mut self, window: &mut Window, cx: &mut Context<Self>) {
2863 let worktrees = self
2864 .project
2865 .read(cx)
2866 .visible_worktrees(cx)
2867 .collect::<Vec<_>>();
2868
2869 let worktree = if worktrees.len() == 1 {
2870 Task::ready(Some(worktrees.first().unwrap().clone()))
2871 } else if worktrees.is_empty() {
2872 let result = window.prompt(
2873 PromptLevel::Warning,
2874 "Unable to initialize a git repository",
2875 Some("Open a directory first"),
2876 &["Ok"],
2877 cx,
2878 );
2879 cx.background_executor()
2880 .spawn(async move {
2881 result.await.ok();
2882 })
2883 .detach();
2884 return;
2885 } else {
2886 let worktree_directories = worktrees
2887 .iter()
2888 .map(|worktree| worktree.read(cx).abs_path())
2889 .map(|worktree_abs_path| {
2890 if let Ok(path) = worktree_abs_path.strip_prefix(util::paths::home_dir()) {
2891 Path::new("~")
2892 .join(path)
2893 .to_string_lossy()
2894 .to_string()
2895 .into()
2896 } else {
2897 worktree_abs_path.to_string_lossy().into_owned().into()
2898 }
2899 })
2900 .collect_vec();
2901 let prompt = picker_prompt::prompt(
2902 "Where would you like to initialize this git repository?",
2903 worktree_directories,
2904 self.workspace.clone(),
2905 window,
2906 cx,
2907 );
2908
2909 cx.spawn(async move |_, _| prompt.await.map(|ix| worktrees[ix].clone()))
2910 };
2911
2912 cx.spawn_in(window, async move |this, cx| {
2913 let worktree = match worktree.await {
2914 Some(worktree) => worktree,
2915 None => {
2916 return;
2917 }
2918 };
2919
2920 let Ok(result) = this.update(cx, |this, cx| {
2921 let fallback_branch_name = GitPanelSettings::get_global(cx)
2922 .fallback_branch_name
2923 .clone();
2924 this.project.read(cx).git_init(
2925 worktree.read(cx).abs_path(),
2926 fallback_branch_name,
2927 cx,
2928 )
2929 }) else {
2930 return;
2931 };
2932
2933 let result = result.await;
2934
2935 this.update_in(cx, |this, _, cx| match result {
2936 Ok(()) => {}
2937 Err(e) => this.show_error_toast("init", e, cx),
2938 })
2939 .ok();
2940 })
2941 .detach();
2942 }
2943
2944 pub(crate) fn pull(&mut self, rebase: bool, window: &mut Window, cx: &mut Context<Self>) {
2945 if !self.can_push_and_pull(cx) {
2946 return;
2947 }
2948 let Some(repo) = self.active_repository.clone() else {
2949 return;
2950 };
2951 let Some(branch) = repo.read(cx).branch.as_ref() else {
2952 return;
2953 };
2954 telemetry::event!("Git Pulled");
2955 let branch = branch.clone();
2956 let remote = self.get_remote(false, false, window, cx);
2957 cx.spawn_in(window, async move |this, cx| {
2958 let remote = match remote.await {
2959 Ok(Some(remote)) => remote,
2960 Ok(None) => {
2961 return Ok(());
2962 }
2963 Err(e) => {
2964 log::error!("Failed to get current remote: {}", e);
2965 this.update(cx, |this, cx| this.show_error_toast("pull", e, cx))
2966 .ok();
2967 return Ok(());
2968 }
2969 };
2970
2971 let askpass = this.update_in(cx, |this, window, cx| {
2972 this.askpass_delegate(format!("git pull {}", remote.name), window, cx)
2973 })?;
2974
2975 let branch_name = branch
2976 .upstream
2977 .is_none()
2978 .then(|| branch.name().to_owned().into());
2979
2980 let pull = repo.update(cx, |repo, cx| {
2981 repo.pull(branch_name, remote.name.clone(), rebase, askpass, cx)
2982 })?;
2983
2984 let remote_message = pull.await?;
2985
2986 let action = RemoteAction::Pull(remote);
2987 this.update(cx, |this, cx| match remote_message {
2988 Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
2989 Err(e) => {
2990 log::error!("Error while pulling {:?}", e);
2991 this.show_error_toast(action.name(), e, cx)
2992 }
2993 })
2994 .ok();
2995
2996 anyhow::Ok(())
2997 })
2998 .detach_and_log_err(cx);
2999 }
3000
3001 pub(crate) fn push(
3002 &mut self,
3003 force_push: bool,
3004 select_remote: bool,
3005 window: &mut Window,
3006 cx: &mut Context<Self>,
3007 ) {
3008 if !self.can_push_and_pull(cx) {
3009 return;
3010 }
3011 let Some(repo) = self.active_repository.clone() else {
3012 return;
3013 };
3014 let Some(branch) = repo.read(cx).branch.as_ref() else {
3015 return;
3016 };
3017 telemetry::event!("Git Pushed");
3018 let branch = branch.clone();
3019
3020 let options = if force_push {
3021 Some(PushOptions::Force)
3022 } else {
3023 match branch.upstream {
3024 Some(Upstream {
3025 tracking: UpstreamTracking::Gone,
3026 ..
3027 })
3028 | None => Some(PushOptions::SetUpstream),
3029 _ => None,
3030 }
3031 };
3032 let remote = self.get_remote(select_remote, true, window, cx);
3033
3034 cx.spawn_in(window, async move |this, cx| {
3035 let remote = match remote.await {
3036 Ok(Some(remote)) => remote,
3037 Ok(None) => {
3038 return Ok(());
3039 }
3040 Err(e) => {
3041 log::error!("Failed to get current remote: {}", e);
3042 this.update(cx, |this, cx| this.show_error_toast("push", e, cx))
3043 .ok();
3044 return Ok(());
3045 }
3046 };
3047
3048 let askpass_delegate = this.update_in(cx, |this, window, cx| {
3049 this.askpass_delegate(format!("git push {}", remote.name), window, cx)
3050 })?;
3051
3052 let push = repo.update(cx, |repo, cx| {
3053 repo.push(
3054 branch.name().to_owned().into(),
3055 remote.name.clone(),
3056 options,
3057 askpass_delegate,
3058 cx,
3059 )
3060 })?;
3061
3062 let remote_output = push.await?;
3063
3064 let action = RemoteAction::Push(branch.name().to_owned().into(), remote);
3065 this.update(cx, |this, cx| match remote_output {
3066 Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
3067 Err(e) => {
3068 log::error!("Error while pushing {:?}", e);
3069 this.show_error_toast(action.name(), e, cx)
3070 }
3071 })?;
3072
3073 anyhow::Ok(())
3074 })
3075 .detach_and_log_err(cx);
3076 }
3077
3078 fn askpass_delegate(
3079 &self,
3080 operation: impl Into<SharedString>,
3081 window: &mut Window,
3082 cx: &mut Context<Self>,
3083 ) -> AskPassDelegate {
3084 let this = cx.weak_entity();
3085 let operation = operation.into();
3086 let window = window.window_handle();
3087 AskPassDelegate::new(&mut cx.to_async(), move |prompt, tx, cx| {
3088 window
3089 .update(cx, |_, window, cx| {
3090 this.update(cx, |this, cx| {
3091 this.workspace.update(cx, |workspace, cx| {
3092 workspace.toggle_modal(window, cx, |window, cx| {
3093 AskPassModal::new(operation.clone(), prompt.into(), tx, window, cx)
3094 });
3095 })
3096 })
3097 })
3098 .ok();
3099 })
3100 }
3101
3102 fn can_push_and_pull(&self, cx: &App) -> bool {
3103 !self.project.read(cx).is_via_collab()
3104 }
3105
3106 fn get_remote(
3107 &mut self,
3108 always_select: bool,
3109 is_push: bool,
3110 window: &mut Window,
3111 cx: &mut Context<Self>,
3112 ) -> impl Future<Output = anyhow::Result<Option<Remote>>> + use<> {
3113 let repo = self.active_repository.clone();
3114 let workspace = self.workspace.clone();
3115 let mut cx = window.to_async(cx);
3116
3117 async move {
3118 let repo = repo.context("No active repository")?;
3119 let current_remotes: Vec<Remote> = repo
3120 .update(&mut cx, |repo, _| {
3121 let current_branch = if always_select {
3122 None
3123 } else {
3124 let current_branch = repo.branch.as_ref().context("No active branch")?;
3125 Some(current_branch.name().to_string())
3126 };
3127 anyhow::Ok(repo.get_remotes(current_branch, is_push))
3128 })??
3129 .await??;
3130
3131 let current_remotes: Vec<_> = current_remotes
3132 .into_iter()
3133 .map(|remotes| remotes.name)
3134 .collect();
3135 let selection = cx
3136 .update(|window, cx| {
3137 picker_prompt::prompt(
3138 "Pick which remote to push to",
3139 current_remotes.clone(),
3140 workspace,
3141 window,
3142 cx,
3143 )
3144 })?
3145 .await;
3146
3147 Ok(selection.map(|selection| Remote {
3148 name: current_remotes[selection].clone(),
3149 }))
3150 }
3151 }
3152
3153 pub fn load_local_committer(&mut self, cx: &Context<Self>) {
3154 if self.local_committer_task.is_none() {
3155 self.local_committer_task = Some(cx.spawn(async move |this, cx| {
3156 let committer = get_git_committer(cx).await;
3157 this.update(cx, |this, cx| {
3158 this.local_committer = Some(committer);
3159 cx.notify()
3160 })
3161 .ok();
3162 }));
3163 }
3164 }
3165
3166 fn potential_co_authors(&self, cx: &App) -> Vec<(String, String)> {
3167 let mut new_co_authors = Vec::new();
3168 let project = self.project.read(cx);
3169
3170 let Some(room) = self
3171 .workspace
3172 .upgrade()
3173 .and_then(|workspace| workspace.read(cx).active_call()?.read(cx).room().cloned())
3174 else {
3175 return Vec::default();
3176 };
3177
3178 let room = room.read(cx);
3179
3180 for (peer_id, collaborator) in project.collaborators() {
3181 if collaborator.is_host {
3182 continue;
3183 }
3184
3185 let Some(participant) = room.remote_participant_for_peer_id(*peer_id) else {
3186 continue;
3187 };
3188 if !participant.can_write() {
3189 continue;
3190 }
3191 if let Some(email) = &collaborator.committer_email {
3192 let name = collaborator
3193 .committer_name
3194 .clone()
3195 .or_else(|| participant.user.name.clone())
3196 .unwrap_or_else(|| participant.user.github_login.clone().to_string());
3197 new_co_authors.push((name.clone(), email.clone()))
3198 }
3199 }
3200 if !project.is_local()
3201 && !project.is_read_only(cx)
3202 && let Some(local_committer) = self.local_committer(room, cx)
3203 {
3204 new_co_authors.push(local_committer);
3205 }
3206 new_co_authors
3207 }
3208
3209 fn local_committer(&self, room: &call::Room, cx: &App) -> Option<(String, String)> {
3210 let user = room.local_participant_user(cx)?;
3211 let committer = self.local_committer.as_ref()?;
3212 let email = committer.email.clone()?;
3213 let name = committer
3214 .name
3215 .clone()
3216 .or_else(|| user.name.clone())
3217 .unwrap_or_else(|| user.github_login.clone().to_string());
3218 Some((name, email))
3219 }
3220
3221 fn toggle_fill_co_authors(
3222 &mut self,
3223 _: &ToggleFillCoAuthors,
3224 _: &mut Window,
3225 cx: &mut Context<Self>,
3226 ) {
3227 self.add_coauthors = !self.add_coauthors;
3228 cx.notify();
3229 }
3230
3231 fn toggle_sort_by_path(
3232 &mut self,
3233 _: &ToggleSortByPath,
3234 _: &mut Window,
3235 cx: &mut Context<Self>,
3236 ) {
3237 let current_setting = GitPanelSettings::get_global(cx).sort_by_path;
3238 if let Some(workspace) = self.workspace.upgrade() {
3239 let workspace = workspace.read(cx);
3240 let fs = workspace.app_state().fs.clone();
3241 cx.update_global::<SettingsStore, _>(|store, _cx| {
3242 store.update_settings_file(fs, move |settings, _cx| {
3243 settings.git_panel.get_or_insert_default().sort_by_path =
3244 Some(!current_setting);
3245 });
3246 });
3247 }
3248 }
3249
3250 fn toggle_tree_view(&mut self, _: &ToggleTreeView, _: &mut Window, cx: &mut Context<Self>) {
3251 let current_setting = GitPanelSettings::get_global(cx).tree_view;
3252 if let Some(workspace) = self.workspace.upgrade() {
3253 let workspace = workspace.read(cx);
3254 let fs = workspace.app_state().fs.clone();
3255 cx.update_global::<SettingsStore, _>(|store, _cx| {
3256 store.update_settings_file(fs, move |settings, _cx| {
3257 settings.git_panel.get_or_insert_default().tree_view = Some(!current_setting);
3258 });
3259 })
3260 }
3261 }
3262
3263 fn toggle_directory(&mut self, key: &TreeKey, window: &mut Window, cx: &mut Context<Self>) {
3264 if let Some(state) = self.view_mode.tree_state_mut() {
3265 let expanded = state.expanded_dirs.entry(key.clone()).or_insert(true);
3266 *expanded = !*expanded;
3267 self.update_visible_entries(window, cx);
3268 } else {
3269 util::debug_panic!("Attempted to toggle directory in flat Git Panel state");
3270 }
3271 }
3272
3273 fn fill_co_authors(&mut self, message: &mut String, cx: &mut Context<Self>) {
3274 const CO_AUTHOR_PREFIX: &str = "Co-authored-by: ";
3275
3276 let existing_text = message.to_ascii_lowercase();
3277 let lowercase_co_author_prefix = CO_AUTHOR_PREFIX.to_lowercase();
3278 let mut ends_with_co_authors = false;
3279 let existing_co_authors = existing_text
3280 .lines()
3281 .filter_map(|line| {
3282 let line = line.trim();
3283 if line.starts_with(&lowercase_co_author_prefix) {
3284 ends_with_co_authors = true;
3285 Some(line)
3286 } else {
3287 ends_with_co_authors = false;
3288 None
3289 }
3290 })
3291 .collect::<HashSet<_>>();
3292
3293 let new_co_authors = self
3294 .potential_co_authors(cx)
3295 .into_iter()
3296 .filter(|(_, email)| {
3297 !existing_co_authors
3298 .iter()
3299 .any(|existing| existing.contains(email.as_str()))
3300 })
3301 .collect::<Vec<_>>();
3302
3303 if new_co_authors.is_empty() {
3304 return;
3305 }
3306
3307 if !ends_with_co_authors {
3308 message.push('\n');
3309 }
3310 for (name, email) in new_co_authors {
3311 message.push('\n');
3312 message.push_str(CO_AUTHOR_PREFIX);
3313 message.push_str(&name);
3314 message.push_str(" <");
3315 message.push_str(&email);
3316 message.push('>');
3317 }
3318 message.push('\n');
3319 }
3320
3321 fn schedule_update(&mut self, window: &mut Window, cx: &mut Context<Self>) {
3322 let handle = cx.entity().downgrade();
3323 self.reopen_commit_buffer(window, cx);
3324 self.update_visible_entries_task = cx.spawn_in(window, async move |_, cx| {
3325 cx.background_executor().timer(UPDATE_DEBOUNCE).await;
3326 if let Some(git_panel) = handle.upgrade() {
3327 git_panel
3328 .update_in(cx, |git_panel, window, cx| {
3329 git_panel.update_visible_entries(window, cx);
3330 })
3331 .ok();
3332 }
3333 });
3334 }
3335
3336 fn reopen_commit_buffer(&mut self, window: &mut Window, cx: &mut Context<Self>) {
3337 let Some(active_repo) = self.active_repository.as_ref() else {
3338 return;
3339 };
3340 let load_buffer = active_repo.update(cx, |active_repo, cx| {
3341 let project = self.project.read(cx);
3342 active_repo.open_commit_buffer(
3343 Some(project.languages().clone()),
3344 project.buffer_store().clone(),
3345 cx,
3346 )
3347 });
3348
3349 cx.spawn_in(window, async move |git_panel, cx| {
3350 let buffer = load_buffer.await?;
3351 git_panel.update_in(cx, |git_panel, window, cx| {
3352 if git_panel
3353 .commit_editor
3354 .read(cx)
3355 .buffer()
3356 .read(cx)
3357 .as_singleton()
3358 .as_ref()
3359 != Some(&buffer)
3360 {
3361 git_panel.commit_editor = cx.new(|cx| {
3362 commit_message_editor(
3363 buffer,
3364 git_panel.suggest_commit_message(cx).map(SharedString::from),
3365 git_panel.project.clone(),
3366 true,
3367 window,
3368 cx,
3369 )
3370 });
3371 }
3372 })
3373 })
3374 .detach_and_log_err(cx);
3375 }
3376
3377 fn update_visible_entries(&mut self, window: &mut Window, cx: &mut Context<Self>) {
3378 let path_style = self.project.read(cx).path_style(cx);
3379 let bulk_staging = self.bulk_staging.take();
3380 let last_staged_path_prev_index = bulk_staging
3381 .as_ref()
3382 .and_then(|op| self.entry_by_path(&op.anchor));
3383
3384 self.entries.clear();
3385 self.entries_indices.clear();
3386 self.single_staged_entry.take();
3387 self.single_tracked_entry.take();
3388 self.conflicted_count = 0;
3389 self.conflicted_staged_count = 0;
3390 self.changes_count = 0;
3391 self.new_count = 0;
3392 self.tracked_count = 0;
3393 self.new_staged_count = 0;
3394 self.tracked_staged_count = 0;
3395 self.entry_count = 0;
3396 self.max_width_item_index = None;
3397
3398 let sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
3399 let is_tree_view = matches!(self.view_mode, GitPanelViewMode::Tree(_));
3400 let group_by_status = is_tree_view || !sort_by_path;
3401
3402 let mut changed_entries = Vec::new();
3403 let mut new_entries = Vec::new();
3404 let mut conflict_entries = Vec::new();
3405 let mut single_staged_entry = None;
3406 let mut staged_count = 0;
3407 let mut seen_directories = HashSet::default();
3408 let mut max_width_estimate = 0usize;
3409 let mut max_width_item_index = None;
3410
3411 let Some(repo) = self.active_repository.as_ref() else {
3412 // Just clear entries if no repository is active.
3413 cx.notify();
3414 return;
3415 };
3416
3417 let repo = repo.read(cx);
3418
3419 self.stash_entries = repo.cached_stash();
3420
3421 for entry in repo.cached_status() {
3422 self.changes_count += 1;
3423 let is_conflict = repo.had_conflict_on_last_merge_head_change(&entry.repo_path);
3424 let is_new = entry.status.is_created();
3425 let staging = entry.status.staging();
3426
3427 if let Some(pending) = repo.pending_ops_for_path(&entry.repo_path)
3428 && pending
3429 .ops
3430 .iter()
3431 .any(|op| op.git_status == pending_op::GitStatus::Reverted && op.finished())
3432 {
3433 continue;
3434 }
3435
3436 let entry = GitStatusEntry {
3437 repo_path: entry.repo_path.clone(),
3438 status: entry.status,
3439 staging,
3440 };
3441
3442 if staging.has_staged() {
3443 staged_count += 1;
3444 single_staged_entry = Some(entry.clone());
3445 }
3446
3447 if group_by_status && is_conflict {
3448 conflict_entries.push(entry);
3449 } else if group_by_status && is_new {
3450 new_entries.push(entry);
3451 } else {
3452 changed_entries.push(entry);
3453 }
3454 }
3455
3456 if conflict_entries.is_empty() {
3457 if staged_count == 1
3458 && let Some(entry) = single_staged_entry.as_ref()
3459 {
3460 if let Some(ops) = repo.pending_ops_for_path(&entry.repo_path) {
3461 if ops.staged() {
3462 self.single_staged_entry = single_staged_entry;
3463 }
3464 } else {
3465 self.single_staged_entry = single_staged_entry;
3466 }
3467 } else if repo.pending_ops_summary().item_summary.staging_count == 1
3468 && let Some(ops) = repo.pending_ops().find(|ops| ops.staging())
3469 {
3470 self.single_staged_entry =
3471 repo.status_for_path(&ops.repo_path)
3472 .map(|status| GitStatusEntry {
3473 repo_path: ops.repo_path.clone(),
3474 status: status.status,
3475 staging: StageStatus::Staged,
3476 });
3477 }
3478 }
3479
3480 if conflict_entries.is_empty() && changed_entries.len() == 1 {
3481 self.single_tracked_entry = changed_entries.first().cloned();
3482 }
3483
3484 let mut push_entry =
3485 |this: &mut Self,
3486 entry: GitListEntry,
3487 is_visible: bool,
3488 logical_indices: Option<&mut Vec<usize>>| {
3489 if let Some(estimate) =
3490 this.width_estimate_for_list_entry(is_tree_view, &entry, path_style)
3491 {
3492 if estimate > max_width_estimate {
3493 max_width_estimate = estimate;
3494 max_width_item_index = Some(this.entries.len());
3495 }
3496 }
3497
3498 if let Some(repo_path) = entry.status_entry().map(|status| status.repo_path.clone())
3499 {
3500 this.entries_indices.insert(repo_path, this.entries.len());
3501 }
3502
3503 if let (Some(indices), true) = (logical_indices, is_visible) {
3504 indices.push(this.entries.len());
3505 }
3506
3507 this.entries.push(entry);
3508 };
3509
3510 macro_rules! take_section_entries {
3511 () => {
3512 [
3513 (Section::Conflict, std::mem::take(&mut conflict_entries)),
3514 (Section::Tracked, std::mem::take(&mut changed_entries)),
3515 (Section::New, std::mem::take(&mut new_entries)),
3516 ]
3517 };
3518 }
3519
3520 match &mut self.view_mode {
3521 GitPanelViewMode::Tree(tree_state) => {
3522 tree_state.logical_indices.clear();
3523 tree_state.directory_descendants.clear();
3524
3525 // This is just to get around the borrow checker
3526 // because push_entry mutably borrows self
3527 let mut tree_state = std::mem::take(tree_state);
3528
3529 for (section, entries) in take_section_entries!() {
3530 if entries.is_empty() {
3531 continue;
3532 }
3533
3534 push_entry(
3535 self,
3536 GitListEntry::Header(GitHeaderEntry { header: section }),
3537 true,
3538 Some(&mut tree_state.logical_indices),
3539 );
3540
3541 for (entry, is_visible) in
3542 tree_state.build_tree_entries(section, entries, &mut seen_directories)
3543 {
3544 push_entry(
3545 self,
3546 entry,
3547 is_visible,
3548 Some(&mut tree_state.logical_indices),
3549 );
3550 }
3551 }
3552
3553 tree_state
3554 .expanded_dirs
3555 .retain(|key, _| seen_directories.contains(key));
3556 self.view_mode = GitPanelViewMode::Tree(tree_state);
3557 }
3558 GitPanelViewMode::Flat => {
3559 for (section, entries) in take_section_entries!() {
3560 if entries.is_empty() {
3561 continue;
3562 }
3563
3564 if section != Section::Tracked || !sort_by_path {
3565 push_entry(
3566 self,
3567 GitListEntry::Header(GitHeaderEntry { header: section }),
3568 true,
3569 None,
3570 );
3571 }
3572
3573 for entry in entries {
3574 push_entry(self, GitListEntry::Status(entry), true, None);
3575 }
3576 }
3577 }
3578 }
3579
3580 self.max_width_item_index = max_width_item_index;
3581
3582 self.update_counts(repo);
3583
3584 let bulk_staging_anchor_new_index = bulk_staging
3585 .as_ref()
3586 .filter(|op| op.repo_id == repo.id)
3587 .and_then(|op| self.entry_by_path(&op.anchor));
3588 if bulk_staging_anchor_new_index == last_staged_path_prev_index
3589 && let Some(index) = bulk_staging_anchor_new_index
3590 && let Some(entry) = self.entries.get(index)
3591 && let Some(entry) = entry.status_entry()
3592 && GitPanel::stage_status_for_entry(entry, &repo)
3593 .as_bool()
3594 .unwrap_or(false)
3595 {
3596 self.bulk_staging = bulk_staging;
3597 }
3598
3599 self.select_first_entry_if_none(window, cx);
3600
3601 let suggested_commit_message = self.suggest_commit_message(cx);
3602 let placeholder_text = suggested_commit_message.unwrap_or("Enter commit message".into());
3603
3604 self.commit_editor.update(cx, |editor, cx| {
3605 editor.set_placeholder_text(&placeholder_text, window, cx)
3606 });
3607
3608 cx.notify();
3609 }
3610
3611 fn header_state(&self, header_type: Section) -> ToggleState {
3612 let (staged_count, count) = match header_type {
3613 Section::New => (self.new_staged_count, self.new_count),
3614 Section::Tracked => (self.tracked_staged_count, self.tracked_count),
3615 Section::Conflict => (self.conflicted_staged_count, self.conflicted_count),
3616 };
3617 if staged_count == 0 {
3618 ToggleState::Unselected
3619 } else if count == staged_count {
3620 ToggleState::Selected
3621 } else {
3622 ToggleState::Indeterminate
3623 }
3624 }
3625
3626 fn update_counts(&mut self, repo: &Repository) {
3627 self.show_placeholders = false;
3628 self.conflicted_count = 0;
3629 self.conflicted_staged_count = 0;
3630 self.new_count = 0;
3631 self.tracked_count = 0;
3632 self.new_staged_count = 0;
3633 self.tracked_staged_count = 0;
3634 self.entry_count = 0;
3635
3636 for status_entry in self.entries.iter().filter_map(|entry| entry.status_entry()) {
3637 self.entry_count += 1;
3638 let is_staging_or_staged = GitPanel::stage_status_for_entry(status_entry, repo)
3639 .as_bool()
3640 .unwrap_or(false);
3641
3642 if repo.had_conflict_on_last_merge_head_change(&status_entry.repo_path) {
3643 self.conflicted_count += 1;
3644 if is_staging_or_staged {
3645 self.conflicted_staged_count += 1;
3646 }
3647 } else if status_entry.status.is_created() {
3648 self.new_count += 1;
3649 if is_staging_or_staged {
3650 self.new_staged_count += 1;
3651 }
3652 } else {
3653 self.tracked_count += 1;
3654 if is_staging_or_staged {
3655 self.tracked_staged_count += 1;
3656 }
3657 }
3658 }
3659 }
3660
3661 pub(crate) fn has_staged_changes(&self) -> bool {
3662 self.tracked_staged_count > 0
3663 || self.new_staged_count > 0
3664 || self.conflicted_staged_count > 0
3665 }
3666
3667 pub(crate) fn has_unstaged_changes(&self) -> bool {
3668 self.tracked_count > self.tracked_staged_count
3669 || self.new_count > self.new_staged_count
3670 || self.conflicted_count > self.conflicted_staged_count
3671 }
3672
3673 fn has_tracked_changes(&self) -> bool {
3674 self.tracked_count > 0
3675 }
3676
3677 pub fn has_unstaged_conflicts(&self) -> bool {
3678 self.conflicted_count > 0 && self.conflicted_count != self.conflicted_staged_count
3679 }
3680
3681 fn show_error_toast(&self, action: impl Into<SharedString>, e: anyhow::Error, cx: &mut App) {
3682 let Some(workspace) = self.workspace.upgrade() else {
3683 return;
3684 };
3685 show_error_toast(workspace, action, e, cx)
3686 }
3687
3688 fn show_commit_message_error<E>(weak_this: &WeakEntity<Self>, err: &E, cx: &mut AsyncApp)
3689 where
3690 E: std::fmt::Debug + std::fmt::Display,
3691 {
3692 if let Ok(Some(workspace)) = weak_this.update(cx, |this, _cx| this.workspace.upgrade()) {
3693 let _ = workspace.update(cx, |workspace, cx| {
3694 struct CommitMessageError;
3695 let notification_id = NotificationId::unique::<CommitMessageError>();
3696 workspace.show_notification(notification_id, cx, |cx| {
3697 cx.new(|cx| {
3698 ErrorMessagePrompt::new(
3699 format!("Failed to generate commit message: {err}"),
3700 cx,
3701 )
3702 })
3703 });
3704 });
3705 }
3706 }
3707
3708 fn show_remote_output(&self, action: RemoteAction, info: RemoteCommandOutput, cx: &mut App) {
3709 let Some(workspace) = self.workspace.upgrade() else {
3710 return;
3711 };
3712
3713 workspace.update(cx, |workspace, cx| {
3714 let SuccessMessage { message, style } = remote_output::format_output(&action, info);
3715 let workspace_weak = cx.weak_entity();
3716 let operation = action.name();
3717
3718 let status_toast = StatusToast::new(message, cx, move |this, _cx| {
3719 use remote_output::SuccessStyle::*;
3720 match style {
3721 Toast => this.icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted)),
3722 ToastWithLog { output } => this
3723 .icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted))
3724 .action("View Log", move |window, cx| {
3725 let output = output.clone();
3726 let output =
3727 format!("stdout:\n{}\nstderr:\n{}", output.stdout, output.stderr);
3728 workspace_weak
3729 .update(cx, move |workspace, cx| {
3730 open_output(operation, workspace, &output, window, cx)
3731 })
3732 .ok();
3733 }),
3734 PushPrLink { text, link } => this
3735 .icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted))
3736 .action(text, move |_, cx| cx.open_url(&link)),
3737 }
3738 .dismiss_button(true)
3739 });
3740 workspace.toggle_status_toast(status_toast, cx)
3741 });
3742 }
3743
3744 pub fn can_commit(&self) -> bool {
3745 (self.has_staged_changes() || self.has_tracked_changes()) && !self.has_unstaged_conflicts()
3746 }
3747
3748 pub fn can_stage_all(&self) -> bool {
3749 self.has_unstaged_changes()
3750 }
3751
3752 pub fn can_unstage_all(&self) -> bool {
3753 self.has_staged_changes()
3754 }
3755
3756 fn status_width_estimate(
3757 tree_view: bool,
3758 entry: &GitStatusEntry,
3759 path_style: PathStyle,
3760 depth: usize,
3761 ) -> usize {
3762 if tree_view {
3763 Self::item_width_estimate(0, entry.display_name(path_style).len(), depth)
3764 } else {
3765 Self::item_width_estimate(
3766 entry.parent_dir(path_style).map(|s| s.len()).unwrap_or(0),
3767 entry.display_name(path_style).len(),
3768 0,
3769 )
3770 }
3771 }
3772
3773 fn width_estimate_for_list_entry(
3774 &self,
3775 tree_view: bool,
3776 entry: &GitListEntry,
3777 path_style: PathStyle,
3778 ) -> Option<usize> {
3779 match entry {
3780 GitListEntry::Status(status) => Some(Self::status_width_estimate(
3781 tree_view, status, path_style, 0,
3782 )),
3783 GitListEntry::TreeStatus(status) => Some(Self::status_width_estimate(
3784 tree_view,
3785 &status.entry,
3786 path_style,
3787 status.depth,
3788 )),
3789 GitListEntry::Directory(dir) => {
3790 Some(Self::item_width_estimate(0, dir.name.len(), dir.depth))
3791 }
3792 GitListEntry::Header(_) => None,
3793 }
3794 }
3795
3796 fn item_width_estimate(path: usize, file_name: usize, depth: usize) -> usize {
3797 path + file_name + depth * 2
3798 }
3799
3800 fn render_overflow_menu(&self, id: impl Into<ElementId>) -> impl IntoElement {
3801 let focus_handle = self.focus_handle.clone();
3802 let has_tracked_changes = self.has_tracked_changes();
3803 let has_staged_changes = self.has_staged_changes();
3804 let has_unstaged_changes = self.has_unstaged_changes();
3805 let has_new_changes = self.new_count > 0;
3806 let has_stash_items = self.stash_entries.entries.len() > 0;
3807
3808 PopoverMenu::new(id.into())
3809 .trigger(
3810 IconButton::new("overflow-menu-trigger", IconName::Ellipsis)
3811 .icon_size(IconSize::Small)
3812 .icon_color(Color::Muted),
3813 )
3814 .menu(move |window, cx| {
3815 Some(git_panel_context_menu(
3816 focus_handle.clone(),
3817 GitMenuState {
3818 has_tracked_changes,
3819 has_staged_changes,
3820 has_unstaged_changes,
3821 has_new_changes,
3822 sort_by_path: GitPanelSettings::get_global(cx).sort_by_path,
3823 has_stash_items,
3824 tree_view: GitPanelSettings::get_global(cx).tree_view,
3825 },
3826 window,
3827 cx,
3828 ))
3829 })
3830 .anchor(Corner::TopRight)
3831 }
3832
3833 pub(crate) fn render_generate_commit_message_button(
3834 &self,
3835 cx: &Context<Self>,
3836 ) -> Option<AnyElement> {
3837 if !agent_settings::AgentSettings::get_global(cx).enabled(cx)
3838 || LanguageModelRegistry::read_global(cx)
3839 .commit_message_model()
3840 .is_none()
3841 {
3842 return None;
3843 }
3844
3845 if self.generate_commit_message_task.is_some() {
3846 return Some(
3847 h_flex()
3848 .gap_1()
3849 .child(
3850 Icon::new(IconName::ArrowCircle)
3851 .size(IconSize::XSmall)
3852 .color(Color::Info)
3853 .with_rotate_animation(2),
3854 )
3855 .child(
3856 Label::new("Generating Commit...")
3857 .size(LabelSize::Small)
3858 .color(Color::Muted),
3859 )
3860 .into_any_element(),
3861 );
3862 }
3863
3864 let can_commit = self.can_commit();
3865 let editor_focus_handle = self.commit_editor.focus_handle(cx);
3866 Some(
3867 IconButton::new("generate-commit-message", IconName::AiEdit)
3868 .shape(ui::IconButtonShape::Square)
3869 .icon_color(Color::Muted)
3870 .tooltip(move |_window, cx| {
3871 if can_commit {
3872 Tooltip::for_action_in(
3873 "Generate Commit Message",
3874 &git::GenerateCommitMessage,
3875 &editor_focus_handle,
3876 cx,
3877 )
3878 } else {
3879 Tooltip::simple("No changes to commit", cx)
3880 }
3881 })
3882 .disabled(!can_commit)
3883 .on_click(cx.listener(move |this, _event, _window, cx| {
3884 this.generate_commit_message(cx);
3885 }))
3886 .into_any_element(),
3887 )
3888 }
3889
3890 pub(crate) fn render_co_authors(&self, cx: &Context<Self>) -> Option<AnyElement> {
3891 let potential_co_authors = self.potential_co_authors(cx);
3892
3893 let (tooltip_label, icon) = if self.add_coauthors {
3894 ("Remove co-authored-by", IconName::Person)
3895 } else {
3896 ("Add co-authored-by", IconName::UserCheck)
3897 };
3898
3899 if potential_co_authors.is_empty() {
3900 None
3901 } else {
3902 Some(
3903 IconButton::new("co-authors", icon)
3904 .shape(ui::IconButtonShape::Square)
3905 .icon_color(Color::Disabled)
3906 .selected_icon_color(Color::Selected)
3907 .toggle_state(self.add_coauthors)
3908 .tooltip(move |_, cx| {
3909 let title = format!(
3910 "{}:{}{}",
3911 tooltip_label,
3912 if potential_co_authors.len() == 1 {
3913 ""
3914 } else {
3915 "\n"
3916 },
3917 potential_co_authors
3918 .iter()
3919 .map(|(name, email)| format!(" {} <{}>", name, email))
3920 .join("\n")
3921 );
3922 Tooltip::simple(title, cx)
3923 })
3924 .on_click(cx.listener(|this, _, _, cx| {
3925 this.add_coauthors = !this.add_coauthors;
3926 cx.notify();
3927 }))
3928 .into_any_element(),
3929 )
3930 }
3931 }
3932
3933 fn render_git_commit_menu(
3934 &self,
3935 id: impl Into<ElementId>,
3936 keybinding_target: Option<FocusHandle>,
3937 cx: &mut Context<Self>,
3938 ) -> impl IntoElement {
3939 PopoverMenu::new(id.into())
3940 .trigger(
3941 ui::ButtonLike::new_rounded_right("commit-split-button-right")
3942 .layer(ui::ElevationIndex::ModalSurface)
3943 .size(ButtonSize::None)
3944 .child(
3945 h_flex()
3946 .px_1()
3947 .h_full()
3948 .justify_center()
3949 .border_l_1()
3950 .border_color(cx.theme().colors().border)
3951 .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
3952 ),
3953 )
3954 .menu({
3955 let git_panel = cx.entity();
3956 let has_previous_commit = self.head_commit(cx).is_some();
3957 let amend = self.amend_pending();
3958 let signoff = self.signoff_enabled;
3959
3960 move |window, cx| {
3961 Some(ContextMenu::build(window, cx, |context_menu, _, _| {
3962 context_menu
3963 .when_some(keybinding_target.clone(), |el, keybinding_target| {
3964 el.context(keybinding_target)
3965 })
3966 .when(has_previous_commit, |this| {
3967 this.toggleable_entry(
3968 "Amend",
3969 amend,
3970 IconPosition::Start,
3971 Some(Box::new(Amend)),
3972 {
3973 let git_panel = git_panel.downgrade();
3974 move |_, cx| {
3975 git_panel
3976 .update(cx, |git_panel, cx| {
3977 git_panel.toggle_amend_pending(cx);
3978 })
3979 .ok();
3980 }
3981 },
3982 )
3983 })
3984 .toggleable_entry(
3985 "Signoff",
3986 signoff,
3987 IconPosition::Start,
3988 Some(Box::new(Signoff)),
3989 move |window, cx| window.dispatch_action(Box::new(Signoff), cx),
3990 )
3991 }))
3992 }
3993 })
3994 .anchor(Corner::TopRight)
3995 }
3996
3997 pub fn configure_commit_button(&self, cx: &mut Context<Self>) -> (bool, &'static str) {
3998 if self.has_unstaged_conflicts() {
3999 (false, "You must resolve conflicts before committing")
4000 } else if !self.has_staged_changes() && !self.has_tracked_changes() && !self.amend_pending {
4001 (false, "No changes to commit")
4002 } else if self.pending_commit.is_some() {
4003 (false, "Commit in progress")
4004 } else if !self.has_commit_message(cx) {
4005 (false, "No commit message")
4006 } else if !self.has_write_access(cx) {
4007 (false, "You do not have write access to this project")
4008 } else {
4009 (true, self.commit_button_title())
4010 }
4011 }
4012
4013 pub fn commit_button_title(&self) -> &'static str {
4014 if self.amend_pending {
4015 if self.has_staged_changes() {
4016 "Amend"
4017 } else if self.has_tracked_changes() {
4018 "Amend Tracked"
4019 } else {
4020 "Amend"
4021 }
4022 } else if self.has_staged_changes() {
4023 "Commit"
4024 } else {
4025 "Commit Tracked"
4026 }
4027 }
4028
4029 fn expand_commit_editor(
4030 &mut self,
4031 _: &git::ExpandCommitEditor,
4032 window: &mut Window,
4033 cx: &mut Context<Self>,
4034 ) {
4035 let workspace = self.workspace.clone();
4036 window.defer(cx, move |window, cx| {
4037 workspace
4038 .update(cx, |workspace, cx| {
4039 CommitModal::toggle(workspace, None, window, cx)
4040 })
4041 .ok();
4042 })
4043 }
4044
4045 fn render_panel_header(
4046 &self,
4047 window: &mut Window,
4048 cx: &mut Context<Self>,
4049 ) -> Option<impl IntoElement> {
4050 self.active_repository.as_ref()?;
4051
4052 let (text, action, stage, tooltip) =
4053 if self.total_staged_count() == self.entry_count && self.entry_count > 0 {
4054 ("Unstage All", UnstageAll.boxed_clone(), false, "git reset")
4055 } else {
4056 ("Stage All", StageAll.boxed_clone(), true, "git add --all")
4057 };
4058
4059 let change_string = match self.changes_count {
4060 0 => "No Changes".to_string(),
4061 1 => "1 Change".to_string(),
4062 count => format!("{} Changes", count),
4063 };
4064
4065 Some(
4066 self.panel_header_container(window, cx)
4067 .px_2()
4068 .justify_between()
4069 .child(
4070 panel_button(change_string)
4071 .color(Color::Muted)
4072 .tooltip(Tooltip::for_action_title_in(
4073 "Open Diff",
4074 &Diff,
4075 &self.focus_handle,
4076 ))
4077 .on_click(|_, _, cx| {
4078 cx.defer(|cx| {
4079 cx.dispatch_action(&Diff);
4080 })
4081 }),
4082 )
4083 .child(
4084 h_flex()
4085 .gap_1()
4086 .child(self.render_overflow_menu("overflow_menu"))
4087 .child(
4088 panel_filled_button(text)
4089 .tooltip(Tooltip::for_action_title_in(
4090 tooltip,
4091 action.as_ref(),
4092 &self.focus_handle,
4093 ))
4094 .disabled(self.entry_count == 0)
4095 .on_click({
4096 let git_panel = cx.weak_entity();
4097 move |_, _, cx| {
4098 git_panel
4099 .update(cx, |git_panel, cx| {
4100 git_panel.change_all_files_stage(stage, cx);
4101 })
4102 .ok();
4103 }
4104 }),
4105 ),
4106 ),
4107 )
4108 }
4109
4110 pub(crate) fn render_remote_button(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
4111 let branch = self.active_repository.as_ref()?.read(cx).branch.clone();
4112 if !self.can_push_and_pull(cx) {
4113 return None;
4114 }
4115 Some(
4116 h_flex()
4117 .gap_1()
4118 .flex_shrink_0()
4119 .when_some(branch, |this, branch| {
4120 let focus_handle = Some(self.focus_handle(cx));
4121
4122 this.children(render_remote_button(
4123 "remote-button",
4124 &branch,
4125 focus_handle,
4126 true,
4127 ))
4128 })
4129 .into_any_element(),
4130 )
4131 }
4132
4133 pub fn render_footer(
4134 &self,
4135 window: &mut Window,
4136 cx: &mut Context<Self>,
4137 ) -> Option<impl IntoElement> {
4138 let active_repository = self.active_repository.clone()?;
4139 let panel_editor_style = panel_editor_style(true, window, cx);
4140 let enable_coauthors = self.render_co_authors(cx);
4141
4142 let editor_focus_handle = self.commit_editor.focus_handle(cx);
4143 let expand_tooltip_focus_handle = editor_focus_handle;
4144
4145 let branch = active_repository.read(cx).branch.clone();
4146 let head_commit = active_repository.read(cx).head_commit.clone();
4147
4148 let footer_size = px(32.);
4149 let gap = px(9.0);
4150 let max_height = panel_editor_style
4151 .text
4152 .line_height_in_pixels(window.rem_size())
4153 * MAX_PANEL_EDITOR_LINES
4154 + gap;
4155
4156 let git_panel = cx.entity();
4157 let display_name = SharedString::from(Arc::from(
4158 active_repository
4159 .read(cx)
4160 .display_name()
4161 .trim_end_matches("/"),
4162 ));
4163 let editor_is_long = self.commit_editor.update(cx, |editor, cx| {
4164 editor.max_point(cx).row().0 >= MAX_PANEL_EDITOR_LINES as u32
4165 });
4166
4167 let footer = v_flex()
4168 .child(PanelRepoFooter::new(
4169 display_name,
4170 branch,
4171 head_commit,
4172 Some(git_panel),
4173 ))
4174 .child(
4175 panel_editor_container(window, cx)
4176 .id("commit-editor-container")
4177 .relative()
4178 .w_full()
4179 .h(max_height + footer_size)
4180 .border_t_1()
4181 .border_color(cx.theme().colors().border)
4182 .cursor_text()
4183 .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
4184 window.focus(&this.commit_editor.focus_handle(cx), cx);
4185 }))
4186 .child(
4187 h_flex()
4188 .id("commit-footer")
4189 .border_t_1()
4190 .when(editor_is_long, |el| {
4191 el.border_color(cx.theme().colors().border_variant)
4192 })
4193 .absolute()
4194 .bottom_0()
4195 .left_0()
4196 .w_full()
4197 .px_2()
4198 .h(footer_size)
4199 .flex_none()
4200 .justify_between()
4201 .child(
4202 self.render_generate_commit_message_button(cx)
4203 .unwrap_or_else(|| div().into_any_element()),
4204 )
4205 .child(
4206 h_flex()
4207 .gap_0p5()
4208 .children(enable_coauthors)
4209 .child(self.render_commit_button(cx)),
4210 ),
4211 )
4212 .child(
4213 div()
4214 .pr_2p5()
4215 .on_action(|&editor::actions::MoveUp, _, cx| {
4216 cx.stop_propagation();
4217 })
4218 .on_action(|&editor::actions::MoveDown, _, cx| {
4219 cx.stop_propagation();
4220 })
4221 .child(EditorElement::new(&self.commit_editor, panel_editor_style)),
4222 )
4223 .child(
4224 h_flex()
4225 .absolute()
4226 .top_2()
4227 .right_2()
4228 .opacity(0.5)
4229 .hover(|this| this.opacity(1.0))
4230 .child(
4231 panel_icon_button("expand-commit-editor", IconName::Maximize)
4232 .icon_size(IconSize::Small)
4233 .size(ui::ButtonSize::Default)
4234 .tooltip(move |_window, cx| {
4235 Tooltip::for_action_in(
4236 "Open Commit Modal",
4237 &git::ExpandCommitEditor,
4238 &expand_tooltip_focus_handle,
4239 cx,
4240 )
4241 })
4242 .on_click(cx.listener({
4243 move |_, _, window, cx| {
4244 window.dispatch_action(
4245 git::ExpandCommitEditor.boxed_clone(),
4246 cx,
4247 )
4248 }
4249 })),
4250 ),
4251 ),
4252 );
4253
4254 Some(footer)
4255 }
4256
4257 fn render_commit_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
4258 let (can_commit, tooltip) = self.configure_commit_button(cx);
4259 let title = self.commit_button_title();
4260 let commit_tooltip_focus_handle = self.commit_editor.focus_handle(cx);
4261 let amend = self.amend_pending();
4262 let signoff = self.signoff_enabled;
4263
4264 let label_color = if self.pending_commit.is_some() {
4265 Color::Disabled
4266 } else {
4267 Color::Default
4268 };
4269
4270 div()
4271 .id("commit-wrapper")
4272 .on_hover(cx.listener(move |this, hovered, _, cx| {
4273 this.show_placeholders =
4274 *hovered && !this.has_staged_changes() && !this.has_unstaged_conflicts();
4275 cx.notify()
4276 }))
4277 .child(SplitButton::new(
4278 ButtonLike::new_rounded_left(ElementId::Name(
4279 format!("split-button-left-{}", title).into(),
4280 ))
4281 .layer(ElevationIndex::ModalSurface)
4282 .size(ButtonSize::Compact)
4283 .child(
4284 Label::new(title)
4285 .size(LabelSize::Small)
4286 .color(label_color)
4287 .mr_0p5(),
4288 )
4289 .on_click({
4290 let git_panel = cx.weak_entity();
4291 move |_, window, cx| {
4292 telemetry::event!("Git Committed", source = "Git Panel");
4293 git_panel
4294 .update(cx, |git_panel, cx| {
4295 git_panel.commit_changes(
4296 CommitOptions { amend, signoff },
4297 window,
4298 cx,
4299 );
4300 })
4301 .ok();
4302 }
4303 })
4304 .disabled(!can_commit || self.modal_open)
4305 .tooltip({
4306 let handle = commit_tooltip_focus_handle.clone();
4307 move |_window, cx| {
4308 if can_commit {
4309 Tooltip::with_meta_in(
4310 tooltip,
4311 Some(if amend { &git::Amend } else { &git::Commit }),
4312 format!(
4313 "git commit{}{}",
4314 if amend { " --amend" } else { "" },
4315 if signoff { " --signoff" } else { "" }
4316 ),
4317 &handle.clone(),
4318 cx,
4319 )
4320 } else {
4321 Tooltip::simple(tooltip, cx)
4322 }
4323 }
4324 }),
4325 self.render_git_commit_menu(
4326 ElementId::Name(format!("split-button-right-{}", title).into()),
4327 Some(commit_tooltip_focus_handle),
4328 cx,
4329 )
4330 .into_any_element(),
4331 ))
4332 }
4333
4334 fn render_pending_amend(&self, cx: &mut Context<Self>) -> impl IntoElement {
4335 h_flex()
4336 .py_1p5()
4337 .px_2()
4338 .gap_1p5()
4339 .justify_between()
4340 .border_t_1()
4341 .border_color(cx.theme().colors().border.opacity(0.8))
4342 .child(
4343 div()
4344 .flex_grow()
4345 .overflow_hidden()
4346 .max_w(relative(0.85))
4347 .child(
4348 Label::new("This will update your most recent commit.")
4349 .size(LabelSize::Small)
4350 .truncate(),
4351 ),
4352 )
4353 .child(
4354 panel_button("Cancel")
4355 .size(ButtonSize::Default)
4356 .on_click(cx.listener(|this, _, _, cx| this.set_amend_pending(false, cx))),
4357 )
4358 }
4359
4360 fn render_previous_commit(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> {
4361 let active_repository = self.active_repository.as_ref()?;
4362 let branch = active_repository.read(cx).branch.as_ref()?;
4363 let commit = branch.most_recent_commit.as_ref()?.clone();
4364 let workspace = self.workspace.clone();
4365 let this = cx.entity();
4366
4367 Some(
4368 h_flex()
4369 .py_1p5()
4370 .px_2()
4371 .gap_1p5()
4372 .justify_between()
4373 .border_t_1()
4374 .border_color(cx.theme().colors().border.opacity(0.8))
4375 .child(
4376 div()
4377 .cursor_pointer()
4378 .overflow_hidden()
4379 .line_clamp(1)
4380 .child(
4381 Label::new(commit.subject.clone())
4382 .size(LabelSize::Small)
4383 .truncate(),
4384 )
4385 .id("commit-msg-hover")
4386 .on_click({
4387 let commit = commit.clone();
4388 let repo = active_repository.downgrade();
4389 move |_, window, cx| {
4390 CommitView::open(
4391 commit.sha.to_string(),
4392 repo.clone(),
4393 workspace.clone(),
4394 None,
4395 None,
4396 window,
4397 cx,
4398 );
4399 }
4400 })
4401 .hoverable_tooltip({
4402 let repo = active_repository.clone();
4403 move |window, cx| {
4404 GitPanelMessageTooltip::new(
4405 this.clone(),
4406 commit.sha.clone(),
4407 repo.clone(),
4408 window,
4409 cx,
4410 )
4411 .into()
4412 }
4413 }),
4414 )
4415 .when(commit.has_parent, |this| {
4416 let has_unstaged = self.has_unstaged_changes();
4417 this.child(
4418 panel_icon_button("undo", IconName::Undo)
4419 .icon_size(IconSize::XSmall)
4420 .icon_color(Color::Muted)
4421 .tooltip(move |_window, cx| {
4422 Tooltip::with_meta(
4423 "Uncommit",
4424 Some(&git::Uncommit),
4425 if has_unstaged {
4426 "git reset HEAD^ --soft"
4427 } else {
4428 "git reset HEAD^"
4429 },
4430 cx,
4431 )
4432 })
4433 .on_click(cx.listener(|this, _, window, cx| this.uncommit(window, cx))),
4434 )
4435 }),
4436 )
4437 }
4438
4439 fn render_empty_state(&self, cx: &mut Context<Self>) -> impl IntoElement {
4440 h_flex().h_full().flex_grow().justify_center().child(
4441 v_flex()
4442 .gap_2()
4443 .child(h_flex().w_full().justify_around().child(
4444 if self.active_repository.is_some() {
4445 "No changes to commit"
4446 } else {
4447 "No Git repositories"
4448 },
4449 ))
4450 .children({
4451 let worktree_count = self.project.read(cx).visible_worktrees(cx).count();
4452 (worktree_count > 0 && self.active_repository.is_none()).then(|| {
4453 h_flex().w_full().justify_around().child(
4454 panel_filled_button("Initialize Repository")
4455 .tooltip(Tooltip::for_action_title_in(
4456 "git init",
4457 &git::Init,
4458 &self.focus_handle,
4459 ))
4460 .on_click(move |_, _, cx| {
4461 cx.defer(move |cx| {
4462 cx.dispatch_action(&git::Init);
4463 })
4464 }),
4465 )
4466 })
4467 })
4468 .text_ui_sm(cx)
4469 .mx_auto()
4470 .text_color(Color::Placeholder.color(cx)),
4471 )
4472 }
4473
4474 fn render_buffer_header_controls(
4475 &self,
4476 entity: &Entity<Self>,
4477 file: &Arc<dyn File>,
4478 _: &Window,
4479 cx: &App,
4480 ) -> Option<AnyElement> {
4481 let repo = self.active_repository.as_ref()?.read(cx);
4482 let project_path = (file.worktree_id(cx), file.path().clone()).into();
4483 let repo_path = repo.project_path_to_repo_path(&project_path, cx)?;
4484 let ix = self.entry_by_path(&repo_path)?;
4485 let entry = self.entries.get(ix)?;
4486
4487 let is_staging_or_staged = repo
4488 .pending_ops_for_path(&repo_path)
4489 .map(|ops| ops.staging() || ops.staged())
4490 .or_else(|| {
4491 repo.status_for_path(&repo_path)
4492 .and_then(|status| status.status.staging().as_bool())
4493 })
4494 .or_else(|| {
4495 entry
4496 .status_entry()
4497 .and_then(|entry| entry.staging.as_bool())
4498 });
4499
4500 let checkbox = Checkbox::new("stage-file", is_staging_or_staged.into())
4501 .disabled(!self.has_write_access(cx))
4502 .fill()
4503 .elevation(ElevationIndex::Surface)
4504 .on_click({
4505 let entry = entry.clone();
4506 let git_panel = entity.downgrade();
4507 move |_, window, cx| {
4508 git_panel
4509 .update(cx, |this, cx| {
4510 this.toggle_staged_for_entry(&entry, window, cx);
4511 cx.stop_propagation();
4512 })
4513 .ok();
4514 }
4515 });
4516 Some(
4517 h_flex()
4518 .id("start-slot")
4519 .text_lg()
4520 .child(checkbox)
4521 .on_mouse_down(MouseButton::Left, |_, _, cx| {
4522 // prevent the list item active state triggering when toggling checkbox
4523 cx.stop_propagation();
4524 })
4525 .into_any_element(),
4526 )
4527 }
4528
4529 fn render_entries(
4530 &self,
4531 has_write_access: bool,
4532 window: &mut Window,
4533 cx: &mut Context<Self>,
4534 ) -> impl IntoElement {
4535 let (is_tree_view, entry_count) = match &self.view_mode {
4536 GitPanelViewMode::Tree(state) => (true, state.logical_indices.len()),
4537 GitPanelViewMode::Flat => (false, self.entries.len()),
4538 };
4539
4540 v_flex()
4541 .flex_1()
4542 .size_full()
4543 .overflow_hidden()
4544 .relative()
4545 .child(
4546 h_flex()
4547 .flex_1()
4548 .size_full()
4549 .relative()
4550 .overflow_hidden()
4551 .child(
4552 uniform_list(
4553 "entries",
4554 entry_count,
4555 cx.processor(move |this, range: Range<usize>, window, cx| {
4556 let mut items = Vec::with_capacity(range.end - range.start);
4557
4558 for ix in range.into_iter().map(|ix| match &this.view_mode {
4559 GitPanelViewMode::Tree(state) => state.logical_indices[ix],
4560 GitPanelViewMode::Flat => ix,
4561 }) {
4562 match &this.entries.get(ix) {
4563 Some(GitListEntry::Status(entry)) => {
4564 items.push(this.render_status_entry(
4565 ix,
4566 entry,
4567 0,
4568 has_write_access,
4569 window,
4570 cx,
4571 ));
4572 }
4573 Some(GitListEntry::TreeStatus(entry)) => {
4574 items.push(this.render_status_entry(
4575 ix,
4576 &entry.entry,
4577 entry.depth,
4578 has_write_access,
4579 window,
4580 cx,
4581 ));
4582 }
4583 Some(GitListEntry::Directory(entry)) => {
4584 items.push(this.render_directory_entry(
4585 ix,
4586 entry,
4587 has_write_access,
4588 window,
4589 cx,
4590 ));
4591 }
4592 Some(GitListEntry::Header(header)) => {
4593 items.push(this.render_list_header(
4594 ix,
4595 header,
4596 has_write_access,
4597 window,
4598 cx,
4599 ));
4600 }
4601 None => {}
4602 }
4603 }
4604
4605 items
4606 }),
4607 )
4608 .when(is_tree_view, |list| {
4609 let indent_size = px(TREE_INDENT);
4610 list.with_decoration(
4611 ui::indent_guides(indent_size, IndentGuideColors::panel(cx))
4612 .with_compute_indents_fn(
4613 cx.entity(),
4614 |this, range, _window, _cx| {
4615 range
4616 .map(|ix| match this.entries.get(ix) {
4617 Some(GitListEntry::Directory(dir)) => dir.depth,
4618 Some(GitListEntry::TreeStatus(status)) => {
4619 status.depth
4620 }
4621 _ => 0,
4622 })
4623 .collect()
4624 },
4625 )
4626 .with_render_fn(cx.entity(), |_, params, _, _| {
4627 // Magic number to align the tree item is 3 here
4628 // because we're using 12px as the left-side padding
4629 // and 3 makes the alignment work with the bounding box of the icon
4630 let left_offset = px(TREE_INDENT + 3_f32);
4631 let indent_size = params.indent_size;
4632 let item_height = params.item_height;
4633
4634 params
4635 .indent_guides
4636 .into_iter()
4637 .map(|layout| {
4638 let bounds = Bounds::new(
4639 point(
4640 layout.offset.x * indent_size + left_offset,
4641 layout.offset.y * item_height,
4642 ),
4643 size(px(1.), layout.length * item_height),
4644 );
4645 RenderedIndentGuide {
4646 bounds,
4647 layout,
4648 is_active: false,
4649 hitbox: None,
4650 }
4651 })
4652 .collect()
4653 }),
4654 )
4655 })
4656 .size_full()
4657 .flex_grow()
4658 .with_width_from_item(self.max_width_item_index)
4659 .track_scroll(&self.scroll_handle),
4660 )
4661 .on_mouse_down(
4662 MouseButton::Right,
4663 cx.listener(move |this, event: &MouseDownEvent, window, cx| {
4664 this.deploy_panel_context_menu(event.position, window, cx)
4665 }),
4666 )
4667 .custom_scrollbars(
4668 Scrollbars::for_settings::<GitPanelSettings>()
4669 .tracked_scroll_handle(&self.scroll_handle)
4670 .with_track_along(
4671 ScrollAxes::Horizontal,
4672 cx.theme().colors().panel_background,
4673 ),
4674 window,
4675 cx,
4676 ),
4677 )
4678 }
4679
4680 fn entry_label(&self, label: impl Into<SharedString>, color: Color) -> Label {
4681 Label::new(label.into()).color(color)
4682 }
4683
4684 fn list_item_height(&self) -> Rems {
4685 rems(1.75)
4686 }
4687
4688 fn render_list_header(
4689 &self,
4690 ix: usize,
4691 header: &GitHeaderEntry,
4692 _: bool,
4693 _: &Window,
4694 _: &Context<Self>,
4695 ) -> AnyElement {
4696 let id: ElementId = ElementId::Name(format!("header_{}", ix).into());
4697
4698 h_flex()
4699 .id(id)
4700 .h(self.list_item_height())
4701 .w_full()
4702 .items_end()
4703 .px_3()
4704 .pb_1()
4705 .child(
4706 Label::new(header.title())
4707 .color(Color::Muted)
4708 .size(LabelSize::Small)
4709 .line_height_style(LineHeightStyle::UiLabel)
4710 .single_line(),
4711 )
4712 .into_any_element()
4713 }
4714
4715 pub fn load_commit_details(
4716 &self,
4717 sha: String,
4718 cx: &mut Context<Self>,
4719 ) -> Task<anyhow::Result<CommitDetails>> {
4720 let Some(repo) = self.active_repository.clone() else {
4721 return Task::ready(Err(anyhow::anyhow!("no active repo")));
4722 };
4723 repo.update(cx, |repo, cx| {
4724 let show = repo.show(sha);
4725 cx.spawn(async move |_, _| show.await?)
4726 })
4727 }
4728
4729 fn deploy_entry_context_menu(
4730 &mut self,
4731 position: Point<Pixels>,
4732 ix: usize,
4733 window: &mut Window,
4734 cx: &mut Context<Self>,
4735 ) {
4736 let Some(entry) = self.entries.get(ix).and_then(|e| e.status_entry()) else {
4737 return;
4738 };
4739 let stage_title = if entry.status.staging().is_fully_staged() {
4740 "Unstage File"
4741 } else {
4742 "Stage File"
4743 };
4744 let restore_title = if entry.status.is_created() {
4745 "Trash File"
4746 } else {
4747 "Discard Changes"
4748 };
4749 let context_menu = ContextMenu::build(window, cx, |context_menu, _, _| {
4750 let is_created = entry.status.is_created();
4751 context_menu
4752 .context(self.focus_handle.clone())
4753 .action(stage_title, ToggleStaged.boxed_clone())
4754 .action(restore_title, git::RestoreFile::default().boxed_clone())
4755 .action_disabled_when(
4756 !is_created,
4757 "Add to .gitignore",
4758 git::AddToGitignore.boxed_clone(),
4759 )
4760 .separator()
4761 .action("Open Diff", menu::Confirm.boxed_clone())
4762 .action("Open File", menu::SecondaryConfirm.boxed_clone())
4763 .separator()
4764 .action_disabled_when(is_created, "View File History", Box::new(git::FileHistory))
4765 });
4766 self.selected_entry = Some(ix);
4767 self.set_context_menu(context_menu, position, window, cx);
4768 }
4769
4770 fn deploy_panel_context_menu(
4771 &mut self,
4772 position: Point<Pixels>,
4773 window: &mut Window,
4774 cx: &mut Context<Self>,
4775 ) {
4776 let context_menu = git_panel_context_menu(
4777 self.focus_handle.clone(),
4778 GitMenuState {
4779 has_tracked_changes: self.has_tracked_changes(),
4780 has_staged_changes: self.has_staged_changes(),
4781 has_unstaged_changes: self.has_unstaged_changes(),
4782 has_new_changes: self.new_count > 0,
4783 sort_by_path: GitPanelSettings::get_global(cx).sort_by_path,
4784 has_stash_items: self.stash_entries.entries.len() > 0,
4785 tree_view: GitPanelSettings::get_global(cx).tree_view,
4786 },
4787 window,
4788 cx,
4789 );
4790 self.set_context_menu(context_menu, position, window, cx);
4791 }
4792
4793 fn set_context_menu(
4794 &mut self,
4795 context_menu: Entity<ContextMenu>,
4796 position: Point<Pixels>,
4797 window: &Window,
4798 cx: &mut Context<Self>,
4799 ) {
4800 let subscription = cx.subscribe_in(
4801 &context_menu,
4802 window,
4803 |this, _, _: &DismissEvent, window, cx| {
4804 if this.context_menu.as_ref().is_some_and(|context_menu| {
4805 context_menu.0.focus_handle(cx).contains_focused(window, cx)
4806 }) {
4807 cx.focus_self(window);
4808 }
4809 this.context_menu.take();
4810 cx.notify();
4811 },
4812 );
4813 self.context_menu = Some((context_menu, position, subscription));
4814 cx.notify();
4815 }
4816
4817 fn render_status_entry(
4818 &self,
4819 ix: usize,
4820 entry: &GitStatusEntry,
4821 depth: usize,
4822 has_write_access: bool,
4823 window: &Window,
4824 cx: &Context<Self>,
4825 ) -> AnyElement {
4826 let tree_view = GitPanelSettings::get_global(cx).tree_view;
4827 let path_style = self.project.read(cx).path_style(cx);
4828 let git_path_style = ProjectSettings::get_global(cx).git.path_style;
4829 let display_name = entry.display_name(path_style);
4830
4831 let selected = self.selected_entry == Some(ix);
4832 let marked = self.marked_entries.contains(&ix);
4833 let status_style = GitPanelSettings::get_global(cx).status_style;
4834 let status = entry.status;
4835
4836 let has_conflict = status.is_conflicted();
4837 let is_modified = status.is_modified();
4838 let is_deleted = status.is_deleted();
4839 let is_created = status.is_created();
4840
4841 let label_color = if status_style == StatusStyle::LabelColor {
4842 if has_conflict {
4843 Color::VersionControlConflict
4844 } else if is_created {
4845 Color::VersionControlAdded
4846 } else if is_modified {
4847 Color::VersionControlModified
4848 } else if is_deleted {
4849 // We don't want a bunch of red labels in the list
4850 Color::Disabled
4851 } else {
4852 Color::VersionControlAdded
4853 }
4854 } else {
4855 Color::Default
4856 };
4857
4858 let path_color = if status.is_deleted() {
4859 Color::Disabled
4860 } else {
4861 Color::Muted
4862 };
4863
4864 let id: ElementId = ElementId::Name(format!("entry_{}_{}", display_name, ix).into());
4865 let checkbox_wrapper_id: ElementId =
4866 ElementId::Name(format!("entry_{}_{}_checkbox_wrapper", display_name, ix).into());
4867 let checkbox_id: ElementId =
4868 ElementId::Name(format!("entry_{}_{}_checkbox", display_name, ix).into());
4869
4870 let active_repo = self
4871 .project
4872 .read(cx)
4873 .active_repository(cx)
4874 .expect("active repository must be set");
4875 let repo = active_repo.read(cx);
4876 let stage_status = GitPanel::stage_status_for_entry(entry, &repo);
4877 let mut is_staged: ToggleState = match stage_status {
4878 StageStatus::Staged => ToggleState::Selected,
4879 StageStatus::Unstaged => ToggleState::Unselected,
4880 StageStatus::PartiallyStaged => ToggleState::Indeterminate,
4881 };
4882 if self.show_placeholders && !self.has_staged_changes() && !entry.status.is_created() {
4883 is_staged = ToggleState::Selected;
4884 }
4885
4886 let handle = cx.weak_entity();
4887
4888 let selected_bg_alpha = 0.08;
4889 let marked_bg_alpha = 0.12;
4890 let state_opacity_step = 0.04;
4891
4892 let info_color = cx.theme().status().info;
4893
4894 let base_bg = match (selected, marked) {
4895 (true, true) => info_color.alpha(selected_bg_alpha + marked_bg_alpha),
4896 (true, false) => info_color.alpha(selected_bg_alpha),
4897 (false, true) => info_color.alpha(marked_bg_alpha),
4898 _ => cx.theme().colors().ghost_element_background,
4899 };
4900
4901 let (hover_bg, active_bg) = if selected {
4902 (
4903 info_color.alpha(selected_bg_alpha + state_opacity_step),
4904 info_color.alpha(selected_bg_alpha + state_opacity_step * 2.0),
4905 )
4906 } else {
4907 (
4908 cx.theme().colors().ghost_element_hover,
4909 cx.theme().colors().ghost_element_active,
4910 )
4911 };
4912
4913 let name_row = h_flex()
4914 .min_w_0()
4915 .flex_1()
4916 .gap_1()
4917 .child(git_status_icon(status))
4918 .map(|this| {
4919 if tree_view {
4920 this.pl(px(depth as f32 * TREE_INDENT)).child(
4921 self.entry_label(display_name, label_color)
4922 .when(status.is_deleted(), Label::strikethrough)
4923 .truncate(),
4924 )
4925 } else {
4926 this.child(self.path_formatted(
4927 entry.parent_dir(path_style),
4928 path_color,
4929 display_name,
4930 label_color,
4931 path_style,
4932 git_path_style,
4933 status.is_deleted(),
4934 ))
4935 }
4936 });
4937
4938 h_flex()
4939 .id(id)
4940 .h(self.list_item_height())
4941 .w_full()
4942 .pl_3()
4943 .pr_1()
4944 .gap_1p5()
4945 .border_1()
4946 .border_r_2()
4947 .when(selected && self.focus_handle.is_focused(window), |el| {
4948 el.border_color(cx.theme().colors().panel_focused_border)
4949 })
4950 .bg(base_bg)
4951 .hover(|s| s.bg(hover_bg))
4952 .active(|s| s.bg(active_bg))
4953 .child(name_row)
4954 .child(
4955 div()
4956 .id(checkbox_wrapper_id)
4957 .flex_none()
4958 .occlude()
4959 .cursor_pointer()
4960 .child(
4961 Checkbox::new(checkbox_id, is_staged)
4962 .disabled(!has_write_access)
4963 .fill()
4964 .elevation(ElevationIndex::Surface)
4965 .on_click_ext({
4966 let entry = entry.clone();
4967 let this = cx.weak_entity();
4968 move |_, click, window, cx| {
4969 this.update(cx, |this, cx| {
4970 if !has_write_access {
4971 return;
4972 }
4973 if click.modifiers().shift {
4974 this.stage_bulk(ix, cx);
4975 } else {
4976 let list_entry =
4977 if GitPanelSettings::get_global(cx).tree_view {
4978 GitListEntry::TreeStatus(GitTreeStatusEntry {
4979 entry: entry.clone(),
4980 depth,
4981 })
4982 } else {
4983 GitListEntry::Status(entry.clone())
4984 };
4985 this.toggle_staged_for_entry(&list_entry, window, cx);
4986 }
4987 cx.stop_propagation();
4988 })
4989 .ok();
4990 }
4991 })
4992 .tooltip(move |_window, cx| {
4993 let action = match stage_status {
4994 StageStatus::Staged => "Unstage",
4995 StageStatus::Unstaged | StageStatus::PartiallyStaged => "Stage",
4996 };
4997 let tooltip_name = action.to_string();
4998
4999 Tooltip::for_action(tooltip_name, &ToggleStaged, cx)
5000 }),
5001 ),
5002 )
5003 .on_click({
5004 cx.listener(move |this, event: &ClickEvent, window, cx| {
5005 this.selected_entry = Some(ix);
5006 cx.notify();
5007 if event.modifiers().secondary() {
5008 this.open_file(&Default::default(), window, cx)
5009 } else {
5010 this.open_diff(&Default::default(), window, cx);
5011 this.focus_handle.focus(window, cx);
5012 }
5013 })
5014 })
5015 .on_mouse_down(
5016 MouseButton::Right,
5017 move |event: &MouseDownEvent, window, cx| {
5018 // why isn't this happening automatically? we are passing MouseButton::Right to `on_mouse_down`?
5019 if event.button != MouseButton::Right {
5020 return;
5021 }
5022
5023 let Some(this) = handle.upgrade() else {
5024 return;
5025 };
5026 this.update(cx, |this, cx| {
5027 this.deploy_entry_context_menu(event.position, ix, window, cx);
5028 });
5029 cx.stop_propagation();
5030 },
5031 )
5032 .into_any_element()
5033 }
5034
5035 fn render_directory_entry(
5036 &self,
5037 ix: usize,
5038 entry: &GitTreeDirEntry,
5039 has_write_access: bool,
5040 window: &Window,
5041 cx: &Context<Self>,
5042 ) -> AnyElement {
5043 // TODO: Have not yet plugin the self.marked_entries. Not sure when and why we need that
5044 let selected = self.selected_entry == Some(ix);
5045 let label_color = Color::Muted;
5046
5047 let id: ElementId = ElementId::Name(format!("dir_{}_{}", entry.name, ix).into());
5048 let checkbox_id: ElementId =
5049 ElementId::Name(format!("dir_checkbox_{}_{}", entry.name, ix).into());
5050 let checkbox_wrapper_id: ElementId =
5051 ElementId::Name(format!("dir_checkbox_wrapper_{}_{}", entry.name, ix).into());
5052
5053 let selected_bg_alpha = 0.08;
5054 let state_opacity_step = 0.04;
5055
5056 let info_color = cx.theme().status().info;
5057 let colors = cx.theme().colors();
5058
5059 let (base_bg, hover_bg, active_bg) = if selected {
5060 (
5061 info_color.alpha(selected_bg_alpha),
5062 info_color.alpha(selected_bg_alpha + state_opacity_step),
5063 info_color.alpha(selected_bg_alpha + state_opacity_step * 2.0),
5064 )
5065 } else {
5066 (
5067 colors.ghost_element_background,
5068 colors.ghost_element_hover,
5069 colors.ghost_element_active,
5070 )
5071 };
5072
5073 let folder_icon = if entry.expanded {
5074 IconName::FolderOpen
5075 } else {
5076 IconName::Folder
5077 };
5078
5079 let stage_status = if let Some(repo) = &self.active_repository {
5080 self.stage_status_for_directory(entry, repo.read(cx))
5081 } else {
5082 util::debug_panic!(
5083 "Won't have entries to render without an active repository in Git Panel"
5084 );
5085 StageStatus::PartiallyStaged
5086 };
5087
5088 let toggle_state: ToggleState = match stage_status {
5089 StageStatus::Staged => ToggleState::Selected,
5090 StageStatus::Unstaged => ToggleState::Unselected,
5091 StageStatus::PartiallyStaged => ToggleState::Indeterminate,
5092 };
5093
5094 let name_row = h_flex()
5095 .min_w_0()
5096 .gap_1()
5097 .pl(px(entry.depth as f32 * TREE_INDENT))
5098 .child(
5099 Icon::new(folder_icon)
5100 .size(IconSize::Small)
5101 .color(Color::Muted),
5102 )
5103 .child(self.entry_label(entry.name.clone(), label_color).truncate());
5104
5105 h_flex()
5106 .id(id)
5107 .h(self.list_item_height())
5108 .min_w_0()
5109 .w_full()
5110 .pl_3()
5111 .pr_1()
5112 .gap_1p5()
5113 .justify_between()
5114 .border_1()
5115 .border_r_2()
5116 .when(selected && self.focus_handle.is_focused(window), |el| {
5117 el.border_color(cx.theme().colors().panel_focused_border)
5118 })
5119 .bg(base_bg)
5120 .hover(|s| s.bg(hover_bg))
5121 .active(|s| s.bg(active_bg))
5122 .child(name_row)
5123 .child(
5124 div()
5125 .id(checkbox_wrapper_id)
5126 .flex_none()
5127 .occlude()
5128 .cursor_pointer()
5129 .child(
5130 Checkbox::new(checkbox_id, toggle_state)
5131 .disabled(!has_write_access)
5132 .fill()
5133 .elevation(ElevationIndex::Surface)
5134 .on_click({
5135 let entry = entry.clone();
5136 let this = cx.weak_entity();
5137 move |_, window, cx| {
5138 this.update(cx, |this, cx| {
5139 if !has_write_access {
5140 return;
5141 }
5142 this.toggle_staged_for_entry(
5143 &GitListEntry::Directory(entry.clone()),
5144 window,
5145 cx,
5146 );
5147 cx.stop_propagation();
5148 })
5149 .ok();
5150 }
5151 })
5152 .tooltip(move |_window, cx| {
5153 let action = match stage_status {
5154 StageStatus::Staged => "Unstage",
5155 StageStatus::Unstaged | StageStatus::PartiallyStaged => "Stage",
5156 };
5157 Tooltip::simple(format!("{action} folder"), cx)
5158 }),
5159 ),
5160 )
5161 .on_click({
5162 let key = entry.key.clone();
5163 cx.listener(move |this, _event: &ClickEvent, window, cx| {
5164 this.selected_entry = Some(ix);
5165 this.toggle_directory(&key, window, cx);
5166 })
5167 })
5168 .into_any_element()
5169 }
5170
5171 fn path_formatted(
5172 &self,
5173 directory: Option<String>,
5174 path_color: Color,
5175 file_name: String,
5176 label_color: Color,
5177 path_style: PathStyle,
5178 git_path_style: GitPathStyle,
5179 strikethrough: bool,
5180 ) -> Div {
5181 let file_name_first = git_path_style == GitPathStyle::FileNameFirst;
5182 let file_path_first = git_path_style == GitPathStyle::FilePathFirst;
5183
5184 let file_name = format!("{} ", file_name);
5185
5186 h_flex()
5187 .min_w_0()
5188 .overflow_hidden()
5189 .when(file_path_first, |this| this.flex_row_reverse())
5190 .child(
5191 div().flex_none().child(
5192 self.entry_label(file_name, label_color)
5193 .when(strikethrough, Label::strikethrough),
5194 ),
5195 )
5196 .when_some(directory, |this, dir| {
5197 let path_name = if file_name_first {
5198 dir
5199 } else {
5200 format!("{dir}{}", path_style.primary_separator())
5201 };
5202
5203 this.child(
5204 self.entry_label(path_name, path_color)
5205 .truncate()
5206 .when(strikethrough, Label::strikethrough),
5207 )
5208 })
5209 }
5210
5211 fn has_write_access(&self, cx: &App) -> bool {
5212 !self.project.read(cx).is_read_only(cx)
5213 }
5214
5215 pub fn amend_pending(&self) -> bool {
5216 self.amend_pending
5217 }
5218
5219 /// Sets the pending amend state, ensuring that the original commit message
5220 /// is either saved, when `value` is `true` and there's no pending amend, or
5221 /// restored, when `value` is `false` and there's a pending amend.
5222 pub fn set_amend_pending(&mut self, value: bool, cx: &mut Context<Self>) {
5223 if value && !self.amend_pending {
5224 let current_message = self.commit_message_buffer(cx).read(cx).text();
5225 self.original_commit_message = if current_message.trim().is_empty() {
5226 None
5227 } else {
5228 Some(current_message)
5229 };
5230 } else if !value && self.amend_pending {
5231 let message = self.original_commit_message.take().unwrap_or_default();
5232 self.commit_message_buffer(cx).update(cx, |buffer, cx| {
5233 let start = buffer.anchor_before(0);
5234 let end = buffer.anchor_after(buffer.len());
5235 buffer.edit([(start..end, message)], None, cx);
5236 });
5237 }
5238
5239 self.amend_pending = value;
5240 self.serialize(cx);
5241 cx.notify();
5242 }
5243
5244 pub fn signoff_enabled(&self) -> bool {
5245 self.signoff_enabled
5246 }
5247
5248 pub fn set_signoff_enabled(&mut self, value: bool, cx: &mut Context<Self>) {
5249 self.signoff_enabled = value;
5250 self.serialize(cx);
5251 cx.notify();
5252 }
5253
5254 pub fn toggle_signoff_enabled(
5255 &mut self,
5256 _: &Signoff,
5257 _window: &mut Window,
5258 cx: &mut Context<Self>,
5259 ) {
5260 self.set_signoff_enabled(!self.signoff_enabled, cx);
5261 }
5262
5263 pub async fn load(
5264 workspace: WeakEntity<Workspace>,
5265 mut cx: AsyncWindowContext,
5266 ) -> anyhow::Result<Entity<Self>> {
5267 let serialized_panel = match workspace
5268 .read_with(&cx, |workspace, _| Self::serialization_key(workspace))
5269 .ok()
5270 .flatten()
5271 {
5272 Some(serialization_key) => cx
5273 .background_spawn(async move { KEY_VALUE_STORE.read_kvp(&serialization_key) })
5274 .await
5275 .context("loading git panel")
5276 .log_err()
5277 .flatten()
5278 .map(|panel| serde_json::from_str::<SerializedGitPanel>(&panel))
5279 .transpose()
5280 .log_err()
5281 .flatten(),
5282 None => None,
5283 };
5284
5285 workspace.update_in(&mut cx, |workspace, window, cx| {
5286 let panel = GitPanel::new(workspace, window, cx);
5287
5288 if let Some(serialized_panel) = serialized_panel {
5289 panel.update(cx, |panel, cx| {
5290 panel.width = serialized_panel.width;
5291 panel.amend_pending = serialized_panel.amend_pending;
5292 panel.signoff_enabled = serialized_panel.signoff_enabled;
5293 cx.notify();
5294 })
5295 }
5296
5297 panel
5298 })
5299 }
5300
5301 fn stage_bulk(&mut self, mut index: usize, cx: &mut Context<'_, Self>) {
5302 let Some(op) = self.bulk_staging.as_ref() else {
5303 return;
5304 };
5305 let Some(mut anchor_index) = self.entry_by_path(&op.anchor) else {
5306 return;
5307 };
5308 if let Some(entry) = self.entries.get(index)
5309 && let Some(entry) = entry.status_entry()
5310 {
5311 self.set_bulk_staging_anchor(entry.repo_path.clone(), cx);
5312 }
5313 if index < anchor_index {
5314 std::mem::swap(&mut index, &mut anchor_index);
5315 }
5316 let entries = self
5317 .entries
5318 .get(anchor_index..=index)
5319 .unwrap_or_default()
5320 .iter()
5321 .filter_map(|entry| entry.status_entry().cloned())
5322 .collect::<Vec<_>>();
5323 self.change_file_stage(true, entries, cx);
5324 }
5325
5326 fn set_bulk_staging_anchor(&mut self, path: RepoPath, cx: &mut Context<'_, GitPanel>) {
5327 let Some(repo) = self.active_repository.as_ref() else {
5328 return;
5329 };
5330 self.bulk_staging = Some(BulkStaging {
5331 repo_id: repo.read(cx).id,
5332 anchor: path,
5333 });
5334 }
5335
5336 pub(crate) fn toggle_amend_pending(&mut self, cx: &mut Context<Self>) {
5337 self.set_amend_pending(!self.amend_pending, cx);
5338 if self.amend_pending {
5339 self.load_last_commit_message(cx);
5340 }
5341 }
5342}
5343
5344impl Render for GitPanel {
5345 fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
5346 let project = self.project.read(cx);
5347 let has_entries = !self.entries.is_empty();
5348 let room = self
5349 .workspace
5350 .upgrade()
5351 .and_then(|workspace| workspace.read(cx).active_call()?.read(cx).room().cloned());
5352
5353 let has_write_access = self.has_write_access(cx);
5354
5355 let has_co_authors = room.is_some_and(|room| {
5356 self.load_local_committer(cx);
5357 let room = room.read(cx);
5358 room.remote_participants()
5359 .values()
5360 .any(|remote_participant| remote_participant.can_write())
5361 });
5362
5363 v_flex()
5364 .id("git_panel")
5365 .key_context(self.dispatch_context(window, cx))
5366 .track_focus(&self.focus_handle)
5367 .when(has_write_access && !project.is_read_only(cx), |this| {
5368 this.on_action(cx.listener(Self::toggle_staged_for_selected))
5369 .on_action(cx.listener(Self::stage_range))
5370 .on_action(cx.listener(GitPanel::on_commit))
5371 .on_action(cx.listener(GitPanel::on_amend))
5372 .on_action(cx.listener(GitPanel::toggle_signoff_enabled))
5373 .on_action(cx.listener(Self::stage_all))
5374 .on_action(cx.listener(Self::unstage_all))
5375 .on_action(cx.listener(Self::stage_selected))
5376 .on_action(cx.listener(Self::unstage_selected))
5377 .on_action(cx.listener(Self::restore_tracked_files))
5378 .on_action(cx.listener(Self::revert_selected))
5379 .on_action(cx.listener(Self::add_to_gitignore))
5380 .on_action(cx.listener(Self::clean_all))
5381 .on_action(cx.listener(Self::generate_commit_message_action))
5382 .on_action(cx.listener(Self::stash_all))
5383 .on_action(cx.listener(Self::stash_pop))
5384 })
5385 .on_action(cx.listener(Self::collapse_selected_entry))
5386 .on_action(cx.listener(Self::expand_selected_entry))
5387 .on_action(cx.listener(Self::select_first))
5388 .on_action(cx.listener(Self::select_next))
5389 .on_action(cx.listener(Self::select_previous))
5390 .on_action(cx.listener(Self::select_last))
5391 .on_action(cx.listener(Self::first_entry))
5392 .on_action(cx.listener(Self::next_entry))
5393 .on_action(cx.listener(Self::previous_entry))
5394 .on_action(cx.listener(Self::last_entry))
5395 .on_action(cx.listener(Self::close_panel))
5396 .on_action(cx.listener(Self::open_diff))
5397 .on_action(cx.listener(Self::open_file))
5398 .on_action(cx.listener(Self::file_history))
5399 .on_action(cx.listener(Self::focus_changes_list))
5400 .on_action(cx.listener(Self::focus_editor))
5401 .on_action(cx.listener(Self::expand_commit_editor))
5402 .when(has_write_access && has_co_authors, |git_panel| {
5403 git_panel.on_action(cx.listener(Self::toggle_fill_co_authors))
5404 })
5405 .on_action(cx.listener(Self::toggle_sort_by_path))
5406 .on_action(cx.listener(Self::toggle_tree_view))
5407 .size_full()
5408 .overflow_hidden()
5409 .bg(cx.theme().colors().panel_background)
5410 .child(
5411 v_flex()
5412 .size_full()
5413 .children(self.render_panel_header(window, cx))
5414 .map(|this| {
5415 if has_entries {
5416 this.child(self.render_entries(has_write_access, window, cx))
5417 } else {
5418 this.child(self.render_empty_state(cx).into_any_element())
5419 }
5420 })
5421 .children(self.render_footer(window, cx))
5422 .when(self.amend_pending, |this| {
5423 this.child(self.render_pending_amend(cx))
5424 })
5425 .when(!self.amend_pending, |this| {
5426 this.children(self.render_previous_commit(cx))
5427 })
5428 .into_any_element(),
5429 )
5430 .children(self.context_menu.as_ref().map(|(menu, position, _)| {
5431 deferred(
5432 anchored()
5433 .position(*position)
5434 .anchor(Corner::TopLeft)
5435 .child(menu.clone()),
5436 )
5437 .with_priority(1)
5438 }))
5439 }
5440}
5441
5442impl Focusable for GitPanel {
5443 fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
5444 if self.entries.is_empty() {
5445 self.commit_editor.focus_handle(cx)
5446 } else {
5447 self.focus_handle.clone()
5448 }
5449 }
5450}
5451
5452impl EventEmitter<Event> for GitPanel {}
5453
5454impl EventEmitter<PanelEvent> for GitPanel {}
5455
5456pub(crate) struct GitPanelAddon {
5457 pub(crate) workspace: WeakEntity<Workspace>,
5458}
5459
5460impl editor::Addon for GitPanelAddon {
5461 fn to_any(&self) -> &dyn std::any::Any {
5462 self
5463 }
5464
5465 fn render_buffer_header_controls(
5466 &self,
5467 excerpt_info: &ExcerptInfo,
5468 window: &Window,
5469 cx: &App,
5470 ) -> Option<AnyElement> {
5471 let file = excerpt_info.buffer.file()?;
5472 let git_panel = self.workspace.upgrade()?.read(cx).panel::<GitPanel>(cx)?;
5473
5474 git_panel
5475 .read(cx)
5476 .render_buffer_header_controls(&git_panel, file, window, cx)
5477 }
5478}
5479
5480impl Panel for GitPanel {
5481 fn persistent_name() -> &'static str {
5482 "GitPanel"
5483 }
5484
5485 fn panel_key() -> &'static str {
5486 GIT_PANEL_KEY
5487 }
5488
5489 fn position(&self, _: &Window, cx: &App) -> DockPosition {
5490 GitPanelSettings::get_global(cx).dock
5491 }
5492
5493 fn position_is_valid(&self, position: DockPosition) -> bool {
5494 matches!(position, DockPosition::Left | DockPosition::Right)
5495 }
5496
5497 fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
5498 settings::update_settings_file(self.fs.clone(), cx, move |settings, _| {
5499 settings.git_panel.get_or_insert_default().dock = Some(position.into())
5500 });
5501 }
5502
5503 fn size(&self, _: &Window, cx: &App) -> Pixels {
5504 self.width
5505 .unwrap_or_else(|| GitPanelSettings::get_global(cx).default_width)
5506 }
5507
5508 fn set_size(&mut self, size: Option<Pixels>, _: &mut Window, cx: &mut Context<Self>) {
5509 self.width = size;
5510 self.serialize(cx);
5511 cx.notify();
5512 }
5513
5514 fn icon(&self, _: &Window, cx: &App) -> Option<ui::IconName> {
5515 Some(ui::IconName::GitBranchAlt).filter(|_| GitPanelSettings::get_global(cx).button)
5516 }
5517
5518 fn icon_tooltip(&self, _window: &Window, _cx: &App) -> Option<&'static str> {
5519 Some("Git Panel")
5520 }
5521
5522 fn toggle_action(&self) -> Box<dyn Action> {
5523 Box::new(ToggleFocus)
5524 }
5525
5526 fn activation_priority(&self) -> u32 {
5527 2
5528 }
5529}
5530
5531impl PanelHeader for GitPanel {}
5532
5533struct GitPanelMessageTooltip {
5534 commit_tooltip: Option<Entity<CommitTooltip>>,
5535}
5536
5537impl GitPanelMessageTooltip {
5538 fn new(
5539 git_panel: Entity<GitPanel>,
5540 sha: SharedString,
5541 repository: Entity<Repository>,
5542 window: &mut Window,
5543 cx: &mut App,
5544 ) -> Entity<Self> {
5545 let remote_url = repository.read(cx).default_remote_url();
5546 cx.new(|cx| {
5547 cx.spawn_in(window, async move |this, cx| {
5548 let (details, workspace) = git_panel.update(cx, |git_panel, cx| {
5549 (
5550 git_panel.load_commit_details(sha.to_string(), cx),
5551 git_panel.workspace.clone(),
5552 )
5553 })?;
5554 let details = details.await?;
5555 let provider_registry = cx
5556 .update(|_, app| GitHostingProviderRegistry::default_global(app))
5557 .ok();
5558
5559 let commit_details = crate::commit_tooltip::CommitDetails {
5560 sha: details.sha.clone(),
5561 author_name: details.author_name.clone(),
5562 author_email: details.author_email.clone(),
5563 commit_time: OffsetDateTime::from_unix_timestamp(details.commit_timestamp)?,
5564 message: Some(ParsedCommitMessage::parse(
5565 details.sha.to_string(),
5566 details.message.to_string(),
5567 remote_url.as_deref(),
5568 provider_registry,
5569 )),
5570 };
5571
5572 this.update(cx, |this: &mut GitPanelMessageTooltip, cx| {
5573 this.commit_tooltip = Some(cx.new(move |cx| {
5574 CommitTooltip::new(commit_details, repository, workspace, cx)
5575 }));
5576 cx.notify();
5577 })
5578 })
5579 .detach();
5580
5581 Self {
5582 commit_tooltip: None,
5583 }
5584 })
5585 }
5586}
5587
5588impl Render for GitPanelMessageTooltip {
5589 fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
5590 if let Some(commit_tooltip) = &self.commit_tooltip {
5591 commit_tooltip.clone().into_any_element()
5592 } else {
5593 gpui::Empty.into_any_element()
5594 }
5595 }
5596}
5597
5598#[derive(IntoElement, RegisterComponent)]
5599pub struct PanelRepoFooter {
5600 active_repository: SharedString,
5601 branch: Option<Branch>,
5602 head_commit: Option<CommitDetails>,
5603
5604 // Getting a GitPanel in previews will be difficult.
5605 //
5606 // For now just take an option here, and we won't bind handlers to buttons in previews.
5607 git_panel: Option<Entity<GitPanel>>,
5608}
5609
5610impl PanelRepoFooter {
5611 pub fn new(
5612 active_repository: SharedString,
5613 branch: Option<Branch>,
5614 head_commit: Option<CommitDetails>,
5615 git_panel: Option<Entity<GitPanel>>,
5616 ) -> Self {
5617 Self {
5618 active_repository,
5619 branch,
5620 head_commit,
5621 git_panel,
5622 }
5623 }
5624
5625 pub fn new_preview(active_repository: SharedString, branch: Option<Branch>) -> Self {
5626 Self {
5627 active_repository,
5628 branch,
5629 head_commit: None,
5630 git_panel: None,
5631 }
5632 }
5633}
5634
5635impl RenderOnce for PanelRepoFooter {
5636 fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
5637 let project = self
5638 .git_panel
5639 .as_ref()
5640 .map(|panel| panel.read(cx).project.clone());
5641
5642 let (workspace, repo) = self
5643 .git_panel
5644 .as_ref()
5645 .map(|panel| {
5646 let panel = panel.read(cx);
5647 (panel.workspace.clone(), panel.active_repository.clone())
5648 })
5649 .unzip();
5650
5651 let single_repo = project
5652 .as_ref()
5653 .map(|project| project.read(cx).git_store().read(cx).repositories().len() == 1)
5654 .unwrap_or(true);
5655
5656 const MAX_BRANCH_LEN: usize = 16;
5657 const MAX_REPO_LEN: usize = 16;
5658 const LABEL_CHARACTER_BUDGET: usize = MAX_BRANCH_LEN + MAX_REPO_LEN;
5659 const MAX_SHORT_SHA_LEN: usize = 8;
5660 let branch_name = self
5661 .branch
5662 .as_ref()
5663 .map(|branch| branch.name().to_owned())
5664 .or_else(|| {
5665 self.head_commit.as_ref().map(|commit| {
5666 commit
5667 .sha
5668 .chars()
5669 .take(MAX_SHORT_SHA_LEN)
5670 .collect::<String>()
5671 })
5672 })
5673 .unwrap_or_else(|| " (no branch)".to_owned());
5674 let show_separator = self.branch.is_some() || self.head_commit.is_some();
5675
5676 let active_repo_name = self.active_repository.clone();
5677
5678 let branch_actual_len = branch_name.len();
5679 let repo_actual_len = active_repo_name.len();
5680
5681 // ideally, show the whole branch and repo names but
5682 // when we can't, use a budget to allocate space between the two
5683 let (repo_display_len, branch_display_len) =
5684 if branch_actual_len + repo_actual_len <= LABEL_CHARACTER_BUDGET {
5685 (repo_actual_len, branch_actual_len)
5686 } else if branch_actual_len <= MAX_BRANCH_LEN {
5687 let repo_space = (LABEL_CHARACTER_BUDGET - branch_actual_len).min(MAX_REPO_LEN);
5688 (repo_space, branch_actual_len)
5689 } else if repo_actual_len <= MAX_REPO_LEN {
5690 let branch_space = (LABEL_CHARACTER_BUDGET - repo_actual_len).min(MAX_BRANCH_LEN);
5691 (repo_actual_len, branch_space)
5692 } else {
5693 (MAX_REPO_LEN, MAX_BRANCH_LEN)
5694 };
5695
5696 let truncated_repo_name = if repo_actual_len <= repo_display_len {
5697 active_repo_name.to_string()
5698 } else {
5699 util::truncate_and_trailoff(active_repo_name.trim_ascii(), repo_display_len)
5700 };
5701
5702 let truncated_branch_name = if branch_actual_len <= branch_display_len {
5703 branch_name
5704 } else {
5705 util::truncate_and_trailoff(branch_name.trim_ascii(), branch_display_len)
5706 };
5707
5708 let repo_selector_trigger = Button::new("repo-selector", truncated_repo_name)
5709 .size(ButtonSize::None)
5710 .label_size(LabelSize::Small)
5711 .color(Color::Muted);
5712
5713 let repo_selector = PopoverMenu::new("repository-switcher")
5714 .menu({
5715 let project = project;
5716 move |window, cx| {
5717 let project = project.clone()?;
5718 Some(cx.new(|cx| RepositorySelector::new(project, rems(16.), window, cx)))
5719 }
5720 })
5721 .trigger_with_tooltip(
5722 repo_selector_trigger.disabled(single_repo).truncate(true),
5723 Tooltip::text("Switch Active Repository"),
5724 )
5725 .anchor(Corner::BottomLeft)
5726 .into_any_element();
5727
5728 let branch_selector_button = Button::new("branch-selector", truncated_branch_name)
5729 .size(ButtonSize::None)
5730 .label_size(LabelSize::Small)
5731 .truncate(true)
5732 .on_click(|_, window, cx| {
5733 window.dispatch_action(zed_actions::git::Switch.boxed_clone(), cx);
5734 });
5735
5736 let branch_selector = PopoverMenu::new("popover-button")
5737 .menu(move |window, cx| {
5738 let workspace = workspace.clone()?;
5739 let repo = repo.clone().flatten();
5740 Some(branch_picker::popover(workspace, repo, window, cx))
5741 })
5742 .trigger_with_tooltip(
5743 branch_selector_button,
5744 Tooltip::for_action_title("Switch Branch", &zed_actions::git::Switch),
5745 )
5746 .anchor(Corner::BottomLeft)
5747 .offset(gpui::Point {
5748 x: px(0.0),
5749 y: px(-2.0),
5750 });
5751
5752 h_flex()
5753 .h(px(36.))
5754 .w_full()
5755 .px_2()
5756 .justify_between()
5757 .gap_1()
5758 .child(
5759 h_flex()
5760 .flex_1()
5761 .overflow_hidden()
5762 .gap_px()
5763 .child(
5764 Icon::new(IconName::GitBranchAlt)
5765 .size(IconSize::Small)
5766 .color(if single_repo {
5767 Color::Disabled
5768 } else {
5769 Color::Muted
5770 }),
5771 )
5772 .child(repo_selector)
5773 .when(show_separator, |this| {
5774 this.child(
5775 div()
5776 .text_sm()
5777 .text_color(cx.theme().colors().icon_muted.opacity(0.5))
5778 .child("/"),
5779 )
5780 })
5781 .child(branch_selector),
5782 )
5783 .children(if let Some(git_panel) = self.git_panel {
5784 git_panel.update(cx, |git_panel, cx| git_panel.render_remote_button(cx))
5785 } else {
5786 None
5787 })
5788 }
5789}
5790
5791impl Component for PanelRepoFooter {
5792 fn scope() -> ComponentScope {
5793 ComponentScope::VersionControl
5794 }
5795
5796 fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
5797 let unknown_upstream = None;
5798 let no_remote_upstream = Some(UpstreamTracking::Gone);
5799 let ahead_of_upstream = Some(
5800 UpstreamTrackingStatus {
5801 ahead: 2,
5802 behind: 0,
5803 }
5804 .into(),
5805 );
5806 let behind_upstream = Some(
5807 UpstreamTrackingStatus {
5808 ahead: 0,
5809 behind: 2,
5810 }
5811 .into(),
5812 );
5813 let ahead_and_behind_upstream = Some(
5814 UpstreamTrackingStatus {
5815 ahead: 3,
5816 behind: 1,
5817 }
5818 .into(),
5819 );
5820
5821 let not_ahead_or_behind_upstream = Some(
5822 UpstreamTrackingStatus {
5823 ahead: 0,
5824 behind: 0,
5825 }
5826 .into(),
5827 );
5828
5829 fn branch(upstream: Option<UpstreamTracking>) -> Branch {
5830 Branch {
5831 is_head: true,
5832 ref_name: "some-branch".into(),
5833 upstream: upstream.map(|tracking| Upstream {
5834 ref_name: "origin/some-branch".into(),
5835 tracking,
5836 }),
5837 most_recent_commit: Some(CommitSummary {
5838 sha: "abc123".into(),
5839 subject: "Modify stuff".into(),
5840 commit_timestamp: 1710932954,
5841 author_name: "John Doe".into(),
5842 has_parent: true,
5843 }),
5844 }
5845 }
5846
5847 fn custom(branch_name: &str, upstream: Option<UpstreamTracking>) -> Branch {
5848 Branch {
5849 is_head: true,
5850 ref_name: branch_name.to_string().into(),
5851 upstream: upstream.map(|tracking| Upstream {
5852 ref_name: format!("zed/{}", branch_name).into(),
5853 tracking,
5854 }),
5855 most_recent_commit: Some(CommitSummary {
5856 sha: "abc123".into(),
5857 subject: "Modify stuff".into(),
5858 commit_timestamp: 1710932954,
5859 author_name: "John Doe".into(),
5860 has_parent: true,
5861 }),
5862 }
5863 }
5864
5865 fn active_repository(id: usize) -> SharedString {
5866 format!("repo-{}", id).into()
5867 }
5868
5869 let example_width = px(340.);
5870 Some(
5871 v_flex()
5872 .gap_6()
5873 .w_full()
5874 .flex_none()
5875 .children(vec![
5876 example_group_with_title(
5877 "Action Button States",
5878 vec![
5879 single_example(
5880 "No Branch",
5881 div()
5882 .w(example_width)
5883 .overflow_hidden()
5884 .child(PanelRepoFooter::new_preview(active_repository(1), None))
5885 .into_any_element(),
5886 ),
5887 single_example(
5888 "Remote status unknown",
5889 div()
5890 .w(example_width)
5891 .overflow_hidden()
5892 .child(PanelRepoFooter::new_preview(
5893 active_repository(2),
5894 Some(branch(unknown_upstream)),
5895 ))
5896 .into_any_element(),
5897 ),
5898 single_example(
5899 "No Remote Upstream",
5900 div()
5901 .w(example_width)
5902 .overflow_hidden()
5903 .child(PanelRepoFooter::new_preview(
5904 active_repository(3),
5905 Some(branch(no_remote_upstream)),
5906 ))
5907 .into_any_element(),
5908 ),
5909 single_example(
5910 "Not Ahead or Behind",
5911 div()
5912 .w(example_width)
5913 .overflow_hidden()
5914 .child(PanelRepoFooter::new_preview(
5915 active_repository(4),
5916 Some(branch(not_ahead_or_behind_upstream)),
5917 ))
5918 .into_any_element(),
5919 ),
5920 single_example(
5921 "Behind remote",
5922 div()
5923 .w(example_width)
5924 .overflow_hidden()
5925 .child(PanelRepoFooter::new_preview(
5926 active_repository(5),
5927 Some(branch(behind_upstream)),
5928 ))
5929 .into_any_element(),
5930 ),
5931 single_example(
5932 "Ahead of remote",
5933 div()
5934 .w(example_width)
5935 .overflow_hidden()
5936 .child(PanelRepoFooter::new_preview(
5937 active_repository(6),
5938 Some(branch(ahead_of_upstream)),
5939 ))
5940 .into_any_element(),
5941 ),
5942 single_example(
5943 "Ahead and behind remote",
5944 div()
5945 .w(example_width)
5946 .overflow_hidden()
5947 .child(PanelRepoFooter::new_preview(
5948 active_repository(7),
5949 Some(branch(ahead_and_behind_upstream)),
5950 ))
5951 .into_any_element(),
5952 ),
5953 ],
5954 )
5955 .grow()
5956 .vertical(),
5957 ])
5958 .children(vec![
5959 example_group_with_title(
5960 "Labels",
5961 vec![
5962 single_example(
5963 "Short Branch & Repo",
5964 div()
5965 .w(example_width)
5966 .overflow_hidden()
5967 .child(PanelRepoFooter::new_preview(
5968 SharedString::from("zed"),
5969 Some(custom("main", behind_upstream)),
5970 ))
5971 .into_any_element(),
5972 ),
5973 single_example(
5974 "Long Branch",
5975 div()
5976 .w(example_width)
5977 .overflow_hidden()
5978 .child(PanelRepoFooter::new_preview(
5979 SharedString::from("zed"),
5980 Some(custom(
5981 "redesign-and-update-git-ui-list-entry-style",
5982 behind_upstream,
5983 )),
5984 ))
5985 .into_any_element(),
5986 ),
5987 single_example(
5988 "Long Repo",
5989 div()
5990 .w(example_width)
5991 .overflow_hidden()
5992 .child(PanelRepoFooter::new_preview(
5993 SharedString::from("zed-industries-community-examples"),
5994 Some(custom("gpui", ahead_of_upstream)),
5995 ))
5996 .into_any_element(),
5997 ),
5998 single_example(
5999 "Long Repo & Branch",
6000 div()
6001 .w(example_width)
6002 .overflow_hidden()
6003 .child(PanelRepoFooter::new_preview(
6004 SharedString::from("zed-industries-community-examples"),
6005 Some(custom(
6006 "redesign-and-update-git-ui-list-entry-style",
6007 behind_upstream,
6008 )),
6009 ))
6010 .into_any_element(),
6011 ),
6012 single_example(
6013 "Uppercase Repo",
6014 div()
6015 .w(example_width)
6016 .overflow_hidden()
6017 .child(PanelRepoFooter::new_preview(
6018 SharedString::from("LICENSES"),
6019 Some(custom("main", ahead_of_upstream)),
6020 ))
6021 .into_any_element(),
6022 ),
6023 single_example(
6024 "Uppercase Branch",
6025 div()
6026 .w(example_width)
6027 .overflow_hidden()
6028 .child(PanelRepoFooter::new_preview(
6029 SharedString::from("zed"),
6030 Some(custom("update-README", behind_upstream)),
6031 ))
6032 .into_any_element(),
6033 ),
6034 ],
6035 )
6036 .grow()
6037 .vertical(),
6038 ])
6039 .into_any_element(),
6040 )
6041 }
6042}
6043
6044fn open_output(
6045 operation: impl Into<SharedString>,
6046 workspace: &mut Workspace,
6047 output: &str,
6048 window: &mut Window,
6049 cx: &mut Context<Workspace>,
6050) {
6051 let operation = operation.into();
6052 let buffer = cx.new(|cx| Buffer::local(output, cx));
6053 buffer.update(cx, |buffer, cx| {
6054 buffer.set_capability(language::Capability::ReadOnly, cx);
6055 });
6056 let editor = cx.new(|cx| {
6057 let mut editor = Editor::for_buffer(buffer, None, window, cx);
6058 editor.buffer().update(cx, |buffer, cx| {
6059 buffer.set_title(format!("Output from git {operation}"), cx);
6060 });
6061 editor.set_read_only(true);
6062 editor
6063 });
6064
6065 workspace.add_item_to_center(Box::new(editor), window, cx);
6066}
6067
6068pub(crate) fn show_error_toast(
6069 workspace: Entity<Workspace>,
6070 action: impl Into<SharedString>,
6071 e: anyhow::Error,
6072 cx: &mut App,
6073) {
6074 let action = action.into();
6075 let message = e.to_string().trim().to_string();
6076 if message
6077 .matches(git::repository::REMOTE_CANCELLED_BY_USER)
6078 .next()
6079 .is_some()
6080 { // Hide the cancelled by user message
6081 } else {
6082 workspace.update(cx, |workspace, cx| {
6083 let workspace_weak = cx.weak_entity();
6084 let toast = StatusToast::new(format!("git {} failed", action), cx, |this, _cx| {
6085 this.icon(ToastIcon::new(IconName::XCircle).color(Color::Error))
6086 .action("View Log", move |window, cx| {
6087 let message = message.clone();
6088 let action = action.clone();
6089 workspace_weak
6090 .update(cx, move |workspace, cx| {
6091 open_output(action, workspace, &message, window, cx)
6092 })
6093 .ok();
6094 })
6095 });
6096 workspace.toggle_status_toast(toast, cx)
6097 });
6098 }
6099}
6100
6101#[cfg(test)]
6102mod tests {
6103 use git::{
6104 repository::repo_path,
6105 status::{StatusCode, UnmergedStatus, UnmergedStatusCode},
6106 };
6107 use gpui::{TestAppContext, UpdateGlobal, VisualTestContext};
6108 use indoc::indoc;
6109 use project::FakeFs;
6110 use serde_json::json;
6111 use settings::SettingsStore;
6112 use theme::LoadThemes;
6113 use util::path;
6114 use util::rel_path::rel_path;
6115
6116 use super::*;
6117
6118 fn init_test(cx: &mut gpui::TestAppContext) {
6119 zlog::init_test();
6120
6121 cx.update(|cx| {
6122 let settings_store = SettingsStore::test(cx);
6123 cx.set_global(settings_store);
6124 theme::init(LoadThemes::JustBase, cx);
6125 editor::init(cx);
6126 crate::init(cx);
6127 });
6128 }
6129
6130 #[gpui::test]
6131 async fn test_entry_worktree_paths(cx: &mut TestAppContext) {
6132 init_test(cx);
6133 let fs = FakeFs::new(cx.background_executor.clone());
6134 fs.insert_tree(
6135 "/root",
6136 json!({
6137 "zed": {
6138 ".git": {},
6139 "crates": {
6140 "gpui": {
6141 "gpui.rs": "fn main() {}"
6142 },
6143 "util": {
6144 "util.rs": "fn do_it() {}"
6145 }
6146 }
6147 },
6148 }),
6149 )
6150 .await;
6151
6152 fs.set_status_for_repo(
6153 Path::new(path!("/root/zed/.git")),
6154 &[
6155 ("crates/gpui/gpui.rs", StatusCode::Modified.worktree()),
6156 ("crates/util/util.rs", StatusCode::Modified.worktree()),
6157 ],
6158 );
6159
6160 let project =
6161 Project::test(fs.clone(), [path!("/root/zed/crates/gpui").as_ref()], cx).await;
6162 let workspace =
6163 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6164 let cx = &mut VisualTestContext::from_window(*workspace, cx);
6165
6166 cx.read(|cx| {
6167 project
6168 .read(cx)
6169 .worktrees(cx)
6170 .next()
6171 .unwrap()
6172 .read(cx)
6173 .as_local()
6174 .unwrap()
6175 .scan_complete()
6176 })
6177 .await;
6178
6179 cx.executor().run_until_parked();
6180
6181 let panel = workspace.update(cx, GitPanel::new).unwrap();
6182
6183 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6184 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6185 });
6186 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6187 handle.await;
6188
6189 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6190 pretty_assertions::assert_eq!(
6191 entries,
6192 [
6193 GitListEntry::Header(GitHeaderEntry {
6194 header: Section::Tracked
6195 }),
6196 GitListEntry::Status(GitStatusEntry {
6197 repo_path: repo_path("crates/gpui/gpui.rs"),
6198 status: StatusCode::Modified.worktree(),
6199 staging: StageStatus::Unstaged,
6200 }),
6201 GitListEntry::Status(GitStatusEntry {
6202 repo_path: repo_path("crates/util/util.rs"),
6203 status: StatusCode::Modified.worktree(),
6204 staging: StageStatus::Unstaged,
6205 },),
6206 ],
6207 );
6208
6209 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6210 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6211 });
6212 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6213 handle.await;
6214 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6215 pretty_assertions::assert_eq!(
6216 entries,
6217 [
6218 GitListEntry::Header(GitHeaderEntry {
6219 header: Section::Tracked
6220 }),
6221 GitListEntry::Status(GitStatusEntry {
6222 repo_path: repo_path("crates/gpui/gpui.rs"),
6223 status: StatusCode::Modified.worktree(),
6224 staging: StageStatus::Unstaged,
6225 }),
6226 GitListEntry::Status(GitStatusEntry {
6227 repo_path: repo_path("crates/util/util.rs"),
6228 status: StatusCode::Modified.worktree(),
6229 staging: StageStatus::Unstaged,
6230 },),
6231 ],
6232 );
6233 }
6234
6235 #[gpui::test]
6236 async fn test_bulk_staging(cx: &mut TestAppContext) {
6237 use GitListEntry::*;
6238
6239 init_test(cx);
6240 let fs = FakeFs::new(cx.background_executor.clone());
6241 fs.insert_tree(
6242 "/root",
6243 json!({
6244 "project": {
6245 ".git": {},
6246 "src": {
6247 "main.rs": "fn main() {}",
6248 "lib.rs": "pub fn hello() {}",
6249 "utils.rs": "pub fn util() {}"
6250 },
6251 "tests": {
6252 "test.rs": "fn test() {}"
6253 },
6254 "new_file.txt": "new content",
6255 "another_new.rs": "// new file",
6256 "conflict.txt": "conflicted content"
6257 }
6258 }),
6259 )
6260 .await;
6261
6262 fs.set_status_for_repo(
6263 Path::new(path!("/root/project/.git")),
6264 &[
6265 ("src/main.rs", StatusCode::Modified.worktree()),
6266 ("src/lib.rs", StatusCode::Modified.worktree()),
6267 ("tests/test.rs", StatusCode::Modified.worktree()),
6268 ("new_file.txt", FileStatus::Untracked),
6269 ("another_new.rs", FileStatus::Untracked),
6270 ("src/utils.rs", FileStatus::Untracked),
6271 (
6272 "conflict.txt",
6273 UnmergedStatus {
6274 first_head: UnmergedStatusCode::Updated,
6275 second_head: UnmergedStatusCode::Updated,
6276 }
6277 .into(),
6278 ),
6279 ],
6280 );
6281
6282 let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
6283 let workspace =
6284 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6285 let cx = &mut VisualTestContext::from_window(*workspace, cx);
6286
6287 cx.read(|cx| {
6288 project
6289 .read(cx)
6290 .worktrees(cx)
6291 .next()
6292 .unwrap()
6293 .read(cx)
6294 .as_local()
6295 .unwrap()
6296 .scan_complete()
6297 })
6298 .await;
6299
6300 cx.executor().run_until_parked();
6301
6302 let panel = workspace.update(cx, GitPanel::new).unwrap();
6303
6304 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6305 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6306 });
6307 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6308 handle.await;
6309
6310 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6311 #[rustfmt::skip]
6312 pretty_assertions::assert_matches!(
6313 entries.as_slice(),
6314 &[
6315 Header(GitHeaderEntry { header: Section::Conflict }),
6316 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6317 Header(GitHeaderEntry { header: Section::Tracked }),
6318 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6319 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6320 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6321 Header(GitHeaderEntry { header: Section::New }),
6322 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6323 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6324 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6325 ],
6326 );
6327
6328 let second_status_entry = entries[3].clone();
6329 panel.update_in(cx, |panel, window, cx| {
6330 panel.toggle_staged_for_entry(&second_status_entry, window, cx);
6331 });
6332
6333 panel.update_in(cx, |panel, window, cx| {
6334 panel.selected_entry = Some(7);
6335 panel.stage_range(&git::StageRange, window, cx);
6336 });
6337
6338 cx.read(|cx| {
6339 project
6340 .read(cx)
6341 .worktrees(cx)
6342 .next()
6343 .unwrap()
6344 .read(cx)
6345 .as_local()
6346 .unwrap()
6347 .scan_complete()
6348 })
6349 .await;
6350
6351 cx.executor().run_until_parked();
6352
6353 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6354 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6355 });
6356 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6357 handle.await;
6358
6359 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6360 #[rustfmt::skip]
6361 pretty_assertions::assert_matches!(
6362 entries.as_slice(),
6363 &[
6364 Header(GitHeaderEntry { header: Section::Conflict }),
6365 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6366 Header(GitHeaderEntry { header: Section::Tracked }),
6367 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6368 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6369 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6370 Header(GitHeaderEntry { header: Section::New }),
6371 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6372 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6373 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6374 ],
6375 );
6376
6377 let third_status_entry = entries[4].clone();
6378 panel.update_in(cx, |panel, window, cx| {
6379 panel.toggle_staged_for_entry(&third_status_entry, window, cx);
6380 });
6381
6382 panel.update_in(cx, |panel, window, cx| {
6383 panel.selected_entry = Some(9);
6384 panel.stage_range(&git::StageRange, window, cx);
6385 });
6386
6387 cx.read(|cx| {
6388 project
6389 .read(cx)
6390 .worktrees(cx)
6391 .next()
6392 .unwrap()
6393 .read(cx)
6394 .as_local()
6395 .unwrap()
6396 .scan_complete()
6397 })
6398 .await;
6399
6400 cx.executor().run_until_parked();
6401
6402 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6403 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6404 });
6405 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6406 handle.await;
6407
6408 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6409 #[rustfmt::skip]
6410 pretty_assertions::assert_matches!(
6411 entries.as_slice(),
6412 &[
6413 Header(GitHeaderEntry { header: Section::Conflict }),
6414 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6415 Header(GitHeaderEntry { header: Section::Tracked }),
6416 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6417 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6418 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6419 Header(GitHeaderEntry { header: Section::New }),
6420 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6421 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6422 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6423 ],
6424 );
6425 }
6426
6427 #[gpui::test]
6428 async fn test_bulk_staging_with_sort_by_paths(cx: &mut TestAppContext) {
6429 use GitListEntry::*;
6430
6431 init_test(cx);
6432 let fs = FakeFs::new(cx.background_executor.clone());
6433 fs.insert_tree(
6434 "/root",
6435 json!({
6436 "project": {
6437 ".git": {},
6438 "src": {
6439 "main.rs": "fn main() {}",
6440 "lib.rs": "pub fn hello() {}",
6441 "utils.rs": "pub fn util() {}"
6442 },
6443 "tests": {
6444 "test.rs": "fn test() {}"
6445 },
6446 "new_file.txt": "new content",
6447 "another_new.rs": "// new file",
6448 "conflict.txt": "conflicted content"
6449 }
6450 }),
6451 )
6452 .await;
6453
6454 fs.set_status_for_repo(
6455 Path::new(path!("/root/project/.git")),
6456 &[
6457 ("src/main.rs", StatusCode::Modified.worktree()),
6458 ("src/lib.rs", StatusCode::Modified.worktree()),
6459 ("tests/test.rs", StatusCode::Modified.worktree()),
6460 ("new_file.txt", FileStatus::Untracked),
6461 ("another_new.rs", FileStatus::Untracked),
6462 ("src/utils.rs", FileStatus::Untracked),
6463 (
6464 "conflict.txt",
6465 UnmergedStatus {
6466 first_head: UnmergedStatusCode::Updated,
6467 second_head: UnmergedStatusCode::Updated,
6468 }
6469 .into(),
6470 ),
6471 ],
6472 );
6473
6474 let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
6475 let workspace =
6476 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6477 let cx = &mut VisualTestContext::from_window(*workspace, cx);
6478
6479 cx.read(|cx| {
6480 project
6481 .read(cx)
6482 .worktrees(cx)
6483 .next()
6484 .unwrap()
6485 .read(cx)
6486 .as_local()
6487 .unwrap()
6488 .scan_complete()
6489 })
6490 .await;
6491
6492 cx.executor().run_until_parked();
6493
6494 let panel = workspace.update(cx, GitPanel::new).unwrap();
6495
6496 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6497 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6498 });
6499 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6500 handle.await;
6501
6502 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6503 #[rustfmt::skip]
6504 pretty_assertions::assert_matches!(
6505 entries.as_slice(),
6506 &[
6507 Header(GitHeaderEntry { header: Section::Conflict }),
6508 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6509 Header(GitHeaderEntry { header: Section::Tracked }),
6510 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6511 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6512 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6513 Header(GitHeaderEntry { header: Section::New }),
6514 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6515 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6516 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6517 ],
6518 );
6519
6520 assert_entry_paths(
6521 &entries,
6522 &[
6523 None,
6524 Some("conflict.txt"),
6525 None,
6526 Some("src/lib.rs"),
6527 Some("src/main.rs"),
6528 Some("tests/test.rs"),
6529 None,
6530 Some("another_new.rs"),
6531 Some("new_file.txt"),
6532 Some("src/utils.rs"),
6533 ],
6534 );
6535
6536 let second_status_entry = entries[3].clone();
6537 panel.update_in(cx, |panel, window, cx| {
6538 panel.toggle_staged_for_entry(&second_status_entry, window, cx);
6539 });
6540
6541 cx.update(|_window, cx| {
6542 SettingsStore::update_global(cx, |store, cx| {
6543 store.update_user_settings(cx, |settings| {
6544 settings.git_panel.get_or_insert_default().sort_by_path = Some(true);
6545 })
6546 });
6547 });
6548
6549 panel.update_in(cx, |panel, window, cx| {
6550 panel.selected_entry = Some(7);
6551 panel.stage_range(&git::StageRange, window, cx);
6552 });
6553
6554 cx.read(|cx| {
6555 project
6556 .read(cx)
6557 .worktrees(cx)
6558 .next()
6559 .unwrap()
6560 .read(cx)
6561 .as_local()
6562 .unwrap()
6563 .scan_complete()
6564 })
6565 .await;
6566
6567 cx.executor().run_until_parked();
6568
6569 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6570 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6571 });
6572 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6573 handle.await;
6574
6575 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6576 #[rustfmt::skip]
6577 pretty_assertions::assert_matches!(
6578 entries.as_slice(),
6579 &[
6580 Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
6581 Status(GitStatusEntry { status: FileStatus::Unmerged(..), staging: StageStatus::Unstaged, .. }),
6582 Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
6583 Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Staged, .. }),
6584 Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Unstaged, .. }),
6585 Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
6586 Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Unstaged, .. }),
6587 ],
6588 );
6589
6590 assert_entry_paths(
6591 &entries,
6592 &[
6593 Some("another_new.rs"),
6594 Some("conflict.txt"),
6595 Some("new_file.txt"),
6596 Some("src/lib.rs"),
6597 Some("src/main.rs"),
6598 Some("src/utils.rs"),
6599 Some("tests/test.rs"),
6600 ],
6601 );
6602
6603 let third_status_entry = entries[4].clone();
6604 panel.update_in(cx, |panel, window, cx| {
6605 panel.toggle_staged_for_entry(&third_status_entry, window, cx);
6606 });
6607
6608 panel.update_in(cx, |panel, window, cx| {
6609 panel.selected_entry = Some(9);
6610 panel.stage_range(&git::StageRange, window, cx);
6611 });
6612
6613 cx.read(|cx| {
6614 project
6615 .read(cx)
6616 .worktrees(cx)
6617 .next()
6618 .unwrap()
6619 .read(cx)
6620 .as_local()
6621 .unwrap()
6622 .scan_complete()
6623 })
6624 .await;
6625
6626 cx.executor().run_until_parked();
6627
6628 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6629 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6630 });
6631 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6632 handle.await;
6633
6634 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6635 #[rustfmt::skip]
6636 pretty_assertions::assert_matches!(
6637 entries.as_slice(),
6638 &[
6639 Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
6640 Status(GitStatusEntry { status: FileStatus::Unmerged(..), staging: StageStatus::Unstaged, .. }),
6641 Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
6642 Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Staged, .. }),
6643 Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Staged, .. }),
6644 Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
6645 Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Unstaged, .. }),
6646 ],
6647 );
6648
6649 assert_entry_paths(
6650 &entries,
6651 &[
6652 Some("another_new.rs"),
6653 Some("conflict.txt"),
6654 Some("new_file.txt"),
6655 Some("src/lib.rs"),
6656 Some("src/main.rs"),
6657 Some("src/utils.rs"),
6658 Some("tests/test.rs"),
6659 ],
6660 );
6661 }
6662
6663 #[gpui::test]
6664 async fn test_amend_commit_message_handling(cx: &mut TestAppContext) {
6665 init_test(cx);
6666 let fs = FakeFs::new(cx.background_executor.clone());
6667 fs.insert_tree(
6668 "/root",
6669 json!({
6670 "project": {
6671 ".git": {},
6672 "src": {
6673 "main.rs": "fn main() {}"
6674 }
6675 }
6676 }),
6677 )
6678 .await;
6679
6680 fs.set_status_for_repo(
6681 Path::new(path!("/root/project/.git")),
6682 &[("src/main.rs", StatusCode::Modified.worktree())],
6683 );
6684
6685 let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
6686 let workspace =
6687 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6688 let cx = &mut VisualTestContext::from_window(*workspace, cx);
6689
6690 let panel = workspace.update(cx, GitPanel::new).unwrap();
6691
6692 // Test: User has commit message, enables amend (saves message), then disables (restores message)
6693 panel.update(cx, |panel, cx| {
6694 panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
6695 let start = buffer.anchor_before(0);
6696 let end = buffer.anchor_after(buffer.len());
6697 buffer.edit([(start..end, "Initial commit message")], None, cx);
6698 });
6699
6700 panel.set_amend_pending(true, cx);
6701 assert!(panel.original_commit_message.is_some());
6702
6703 panel.set_amend_pending(false, cx);
6704 let current_message = panel.commit_message_buffer(cx).read(cx).text();
6705 assert_eq!(current_message, "Initial commit message");
6706 assert!(panel.original_commit_message.is_none());
6707 });
6708
6709 // Test: User has empty commit message, enables amend, then disables (clears message)
6710 panel.update(cx, |panel, cx| {
6711 panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
6712 let start = buffer.anchor_before(0);
6713 let end = buffer.anchor_after(buffer.len());
6714 buffer.edit([(start..end, "")], None, cx);
6715 });
6716
6717 panel.set_amend_pending(true, cx);
6718 assert!(panel.original_commit_message.is_none());
6719
6720 panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
6721 let start = buffer.anchor_before(0);
6722 let end = buffer.anchor_after(buffer.len());
6723 buffer.edit([(start..end, "Previous commit message")], None, cx);
6724 });
6725
6726 panel.set_amend_pending(false, cx);
6727 let current_message = panel.commit_message_buffer(cx).read(cx).text();
6728 assert_eq!(current_message, "");
6729 });
6730 }
6731
6732 #[gpui::test]
6733 async fn test_amend(cx: &mut TestAppContext) {
6734 init_test(cx);
6735 let fs = FakeFs::new(cx.background_executor.clone());
6736 fs.insert_tree(
6737 "/root",
6738 json!({
6739 "project": {
6740 ".git": {},
6741 "src": {
6742 "main.rs": "fn main() {}"
6743 }
6744 }
6745 }),
6746 )
6747 .await;
6748
6749 fs.set_status_for_repo(
6750 Path::new(path!("/root/project/.git")),
6751 &[("src/main.rs", StatusCode::Modified.worktree())],
6752 );
6753
6754 let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
6755 let workspace =
6756 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6757 let cx = &mut VisualTestContext::from_window(*workspace, cx);
6758
6759 // Wait for the project scanning to finish so that `head_commit(cx)` is
6760 // actually set, otherwise no head commit would be available from which
6761 // to fetch the latest commit message from.
6762 cx.executor().run_until_parked();
6763
6764 let panel = workspace.update(cx, GitPanel::new).unwrap();
6765 panel.read_with(cx, |panel, cx| {
6766 assert!(panel.active_repository.is_some());
6767 assert!(panel.head_commit(cx).is_some());
6768 });
6769
6770 panel.update_in(cx, |panel, window, cx| {
6771 // Update the commit editor's message to ensure that its contents
6772 // are later restored, after amending is finished.
6773 panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
6774 buffer.set_text("refactor: update main.rs", cx);
6775 });
6776
6777 // Start amending the previous commit.
6778 panel.focus_editor(&Default::default(), window, cx);
6779 panel.on_amend(&Amend, window, cx);
6780 });
6781
6782 // Since `GitPanel.amend` attempts to fetch the latest commit message in
6783 // a background task, we need to wait for it to complete before being
6784 // able to assert that the commit message editor's state has been
6785 // updated.
6786 cx.run_until_parked();
6787
6788 panel.update_in(cx, |panel, window, cx| {
6789 assert_eq!(
6790 panel.commit_message_buffer(cx).read(cx).text(),
6791 "initial commit"
6792 );
6793 assert_eq!(
6794 panel.original_commit_message,
6795 Some("refactor: update main.rs".to_string())
6796 );
6797
6798 // Finish amending the previous commit.
6799 panel.focus_editor(&Default::default(), window, cx);
6800 panel.on_amend(&Amend, window, cx);
6801 });
6802
6803 // Since the actual commit logic is run in a background task, we need to
6804 // await its completion to actually ensure that the commit message
6805 // editor's contents are set to the original message and haven't been
6806 // cleared.
6807 cx.run_until_parked();
6808
6809 panel.update_in(cx, |panel, _window, cx| {
6810 // After amending, the commit editor's message should be restored to
6811 // the original message.
6812 assert_eq!(
6813 panel.commit_message_buffer(cx).read(cx).text(),
6814 "refactor: update main.rs"
6815 );
6816 assert!(panel.original_commit_message.is_none());
6817 });
6818 }
6819
6820 #[gpui::test]
6821 async fn test_open_diff(cx: &mut TestAppContext) {
6822 init_test(cx);
6823
6824 let fs = FakeFs::new(cx.background_executor.clone());
6825 fs.insert_tree(
6826 path!("/project"),
6827 json!({
6828 ".git": {},
6829 "tracked": "tracked\n",
6830 "untracked": "\n",
6831 }),
6832 )
6833 .await;
6834
6835 fs.set_head_and_index_for_repo(
6836 path!("/project/.git").as_ref(),
6837 &[("tracked", "old tracked\n".into())],
6838 );
6839
6840 let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
6841 let workspace =
6842 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6843 let cx = &mut VisualTestContext::from_window(*workspace, cx);
6844 let panel = workspace.update(cx, GitPanel::new).unwrap();
6845
6846 // Enable the `sort_by_path` setting and wait for entries to be updated,
6847 // as there should no longer be separators between Tracked and Untracked
6848 // files.
6849 cx.update(|_window, cx| {
6850 SettingsStore::update_global(cx, |store, cx| {
6851 store.update_user_settings(cx, |settings| {
6852 settings.git_panel.get_or_insert_default().sort_by_path = Some(true);
6853 })
6854 });
6855 });
6856
6857 cx.update_window_entity(&panel, |panel, _, _| {
6858 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6859 })
6860 .await;
6861
6862 // Confirm that `Open Diff` still works for the untracked file, updating
6863 // the Project Diff's active path.
6864 panel.update_in(cx, |panel, window, cx| {
6865 panel.selected_entry = Some(1);
6866 panel.open_diff(&menu::Confirm, window, cx);
6867 });
6868 cx.run_until_parked();
6869
6870 let _ = workspace.update(cx, |workspace, _window, cx| {
6871 let active_path = workspace
6872 .item_of_type::<ProjectDiff>(cx)
6873 .expect("ProjectDiff should exist")
6874 .read(cx)
6875 .active_path(cx)
6876 .expect("active_path should exist");
6877
6878 assert_eq!(active_path.path, rel_path("untracked").into_arc());
6879 });
6880 }
6881
6882 #[gpui::test]
6883 async fn test_tree_view_reveals_collapsed_parent_on_select_entry_by_path(
6884 cx: &mut TestAppContext,
6885 ) {
6886 init_test(cx);
6887
6888 let fs = FakeFs::new(cx.background_executor.clone());
6889 fs.insert_tree(
6890 path!("/project"),
6891 json!({
6892 ".git": {},
6893 "src": {
6894 "a": {
6895 "foo.rs": "fn foo() {}",
6896 },
6897 "b": {
6898 "bar.rs": "fn bar() {}",
6899 },
6900 },
6901 }),
6902 )
6903 .await;
6904
6905 fs.set_status_for_repo(
6906 path!("/project/.git").as_ref(),
6907 &[
6908 ("src/a/foo.rs", StatusCode::Modified.worktree()),
6909 ("src/b/bar.rs", StatusCode::Modified.worktree()),
6910 ],
6911 );
6912
6913 let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
6914 let workspace =
6915 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6916 let cx = &mut VisualTestContext::from_window(*workspace, cx);
6917
6918 cx.read(|cx| {
6919 project
6920 .read(cx)
6921 .worktrees(cx)
6922 .next()
6923 .unwrap()
6924 .read(cx)
6925 .as_local()
6926 .unwrap()
6927 .scan_complete()
6928 })
6929 .await;
6930
6931 cx.executor().run_until_parked();
6932
6933 cx.update(|_window, cx| {
6934 SettingsStore::update_global(cx, |store, cx| {
6935 store.update_user_settings(cx, |settings| {
6936 settings.git_panel.get_or_insert_default().tree_view = Some(true);
6937 })
6938 });
6939 });
6940
6941 let panel = workspace.update(cx, GitPanel::new).unwrap();
6942
6943 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6944 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6945 });
6946 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6947 handle.await;
6948
6949 let src_key = panel.read_with(cx, |panel, _| {
6950 panel
6951 .entries
6952 .iter()
6953 .find_map(|entry| match entry {
6954 GitListEntry::Directory(dir) if dir.key.path == repo_path("src") => {
6955 Some(dir.key.clone())
6956 }
6957 _ => None,
6958 })
6959 .expect("src directory should exist in tree view")
6960 });
6961
6962 panel.update_in(cx, |panel, window, cx| {
6963 panel.toggle_directory(&src_key, window, cx);
6964 });
6965
6966 panel.read_with(cx, |panel, _| {
6967 let state = panel
6968 .view_mode
6969 .tree_state()
6970 .expect("tree view state should exist");
6971 assert_eq!(state.expanded_dirs.get(&src_key).copied(), Some(false));
6972 });
6973
6974 let worktree_id =
6975 cx.read(|cx| project.read(cx).worktrees(cx).next().unwrap().read(cx).id());
6976 let project_path = ProjectPath {
6977 worktree_id,
6978 path: RelPath::unix("src/a/foo.rs").unwrap().into_arc(),
6979 };
6980
6981 panel.update_in(cx, |panel, window, cx| {
6982 panel.select_entry_by_path(project_path, window, cx);
6983 });
6984
6985 panel.read_with(cx, |panel, _| {
6986 let state = panel
6987 .view_mode
6988 .tree_state()
6989 .expect("tree view state should exist");
6990 assert_eq!(state.expanded_dirs.get(&src_key).copied(), Some(true));
6991
6992 let selected_ix = panel.selected_entry.expect("selection should be set");
6993 assert!(state.logical_indices.contains(&selected_ix));
6994
6995 let selected_entry = panel
6996 .entries
6997 .get(selected_ix)
6998 .and_then(|entry| entry.status_entry())
6999 .expect("selected entry should be a status entry");
7000 assert_eq!(selected_entry.repo_path, repo_path("src/a/foo.rs"));
7001 });
7002 }
7003
7004 fn assert_entry_paths(entries: &[GitListEntry], expected_paths: &[Option<&str>]) {
7005 assert_eq!(entries.len(), expected_paths.len());
7006 for (entry, expected_path) in entries.iter().zip(expected_paths) {
7007 assert_eq!(
7008 entry.status_entry().map(|status| status
7009 .repo_path
7010 .as_ref()
7011 .as_std_path()
7012 .to_string_lossy()
7013 .to_string()),
7014 expected_path.map(|s| s.to_string())
7015 );
7016 }
7017 }
7018
7019 #[test]
7020 fn test_compress_diff_no_truncation() {
7021 let diff = indoc! {"
7022 --- a/file.txt
7023 +++ b/file.txt
7024 @@ -1,2 +1,2 @@
7025 -old
7026 +new
7027 "};
7028 let result = GitPanel::compress_commit_diff(diff, 1000);
7029 assert_eq!(result, diff);
7030 }
7031
7032 #[test]
7033 fn test_compress_diff_truncate_long_lines() {
7034 let long_line = "🦀".repeat(300);
7035 let diff = indoc::formatdoc! {"
7036 --- a/file.txt
7037 +++ b/file.txt
7038 @@ -1,2 +1,3 @@
7039 context
7040 +{}
7041 more context
7042 ", long_line};
7043 let result = GitPanel::compress_commit_diff(&diff, 100);
7044 assert!(result.contains("...[truncated]"));
7045 assert!(result.len() < diff.len());
7046 }
7047
7048 #[test]
7049 fn test_compress_diff_truncate_hunks() {
7050 let diff = indoc! {"
7051 --- a/file.txt
7052 +++ b/file.txt
7053 @@ -1,2 +1,2 @@
7054 context
7055 -old1
7056 +new1
7057 @@ -5,2 +5,2 @@
7058 context 2
7059 -old2
7060 +new2
7061 @@ -10,2 +10,2 @@
7062 context 3
7063 -old3
7064 +new3
7065 "};
7066 let result = GitPanel::compress_commit_diff(diff, 100);
7067 let expected = indoc! {"
7068 --- a/file.txt
7069 +++ b/file.txt
7070 @@ -1,2 +1,2 @@
7071 context
7072 -old1
7073 +new1
7074 [...skipped 2 hunks...]
7075 "};
7076 assert_eq!(result, expected);
7077 }
7078
7079 #[gpui::test]
7080 async fn test_suggest_commit_message(cx: &mut TestAppContext) {
7081 init_test(cx);
7082
7083 let fs = FakeFs::new(cx.background_executor.clone());
7084 fs.insert_tree(
7085 path!("/project"),
7086 json!({
7087 ".git": {},
7088 "tracked": "tracked\n",
7089 "untracked": "\n",
7090 }),
7091 )
7092 .await;
7093
7094 fs.set_head_and_index_for_repo(
7095 path!("/project/.git").as_ref(),
7096 &[("tracked", "old tracked\n".into())],
7097 );
7098
7099 let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
7100 let workspace =
7101 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
7102 let cx = &mut VisualTestContext::from_window(*workspace, cx);
7103 let panel = workspace.update(cx, GitPanel::new).unwrap();
7104
7105 let handle = cx.update_window_entity(&panel, |panel, _, _| {
7106 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
7107 });
7108 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
7109 handle.await;
7110
7111 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
7112
7113 // GitPanel
7114 // - Tracked:
7115 // - [] tracked
7116 // - Untracked
7117 // - [] untracked
7118 //
7119 // The commit message should now read:
7120 // "Update tracked"
7121 let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
7122 assert_eq!(message, Some("Update tracked".to_string()));
7123
7124 let first_status_entry = entries[1].clone();
7125 panel.update_in(cx, |panel, window, cx| {
7126 panel.toggle_staged_for_entry(&first_status_entry, window, cx);
7127 });
7128
7129 cx.read(|cx| {
7130 project
7131 .read(cx)
7132 .worktrees(cx)
7133 .next()
7134 .unwrap()
7135 .read(cx)
7136 .as_local()
7137 .unwrap()
7138 .scan_complete()
7139 })
7140 .await;
7141
7142 cx.executor().run_until_parked();
7143
7144 let handle = cx.update_window_entity(&panel, |panel, _, _| {
7145 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
7146 });
7147 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
7148 handle.await;
7149
7150 // GitPanel
7151 // - Tracked:
7152 // - [x] tracked
7153 // - Untracked
7154 // - [] untracked
7155 //
7156 // The commit message should still read:
7157 // "Update tracked"
7158 let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
7159 assert_eq!(message, Some("Update tracked".to_string()));
7160
7161 let second_status_entry = entries[3].clone();
7162 panel.update_in(cx, |panel, window, cx| {
7163 panel.toggle_staged_for_entry(&second_status_entry, window, cx);
7164 });
7165
7166 cx.read(|cx| {
7167 project
7168 .read(cx)
7169 .worktrees(cx)
7170 .next()
7171 .unwrap()
7172 .read(cx)
7173 .as_local()
7174 .unwrap()
7175 .scan_complete()
7176 })
7177 .await;
7178
7179 cx.executor().run_until_parked();
7180
7181 let handle = cx.update_window_entity(&panel, |panel, _, _| {
7182 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
7183 });
7184 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
7185 handle.await;
7186
7187 // GitPanel
7188 // - Tracked:
7189 // - [x] tracked
7190 // - Untracked
7191 // - [x] untracked
7192 //
7193 // The commit message should now read:
7194 // "Enter commit message"
7195 // (which means we should see None returned).
7196 let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
7197 assert!(message.is_none());
7198
7199 panel.update_in(cx, |panel, window, cx| {
7200 panel.toggle_staged_for_entry(&first_status_entry, window, cx);
7201 });
7202
7203 cx.read(|cx| {
7204 project
7205 .read(cx)
7206 .worktrees(cx)
7207 .next()
7208 .unwrap()
7209 .read(cx)
7210 .as_local()
7211 .unwrap()
7212 .scan_complete()
7213 })
7214 .await;
7215
7216 cx.executor().run_until_parked();
7217
7218 let handle = cx.update_window_entity(&panel, |panel, _, _| {
7219 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
7220 });
7221 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
7222 handle.await;
7223
7224 // GitPanel
7225 // - Tracked:
7226 // - [] tracked
7227 // - Untracked
7228 // - [x] untracked
7229 //
7230 // The commit message should now read:
7231 // "Update untracked"
7232 let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
7233 assert_eq!(message, Some("Create untracked".to_string()));
7234
7235 panel.update_in(cx, |panel, window, cx| {
7236 panel.toggle_staged_for_entry(&second_status_entry, window, cx);
7237 });
7238
7239 cx.read(|cx| {
7240 project
7241 .read(cx)
7242 .worktrees(cx)
7243 .next()
7244 .unwrap()
7245 .read(cx)
7246 .as_local()
7247 .unwrap()
7248 .scan_complete()
7249 })
7250 .await;
7251
7252 cx.executor().run_until_parked();
7253
7254 let handle = cx.update_window_entity(&panel, |panel, _, _| {
7255 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
7256 });
7257 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
7258 handle.await;
7259
7260 // GitPanel
7261 // - Tracked:
7262 // - [] tracked
7263 // - Untracked
7264 // - [] untracked
7265 //
7266 // The commit message should now read:
7267 // "Update tracked"
7268 let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
7269 assert_eq!(message, Some("Update tracked".to_string()));
7270 }
7271}