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::{BuiltInPrompt, 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 // Remove this once we stop supporting legacy Zed Pro
2583 // In legacy Zed Pro, Git commit summary generation did not count as a
2584 // prompt. If the user changes the prompt, our classification will fail,
2585 // meaning that users will be charged for generating commit messages.
2586 if is_using_legacy_zed_pro {
2587 return BuiltInPrompt::CommitMessage.default_content().to_string();
2588 }
2589
2590 let load = async {
2591 let store = cx.update(|cx| PromptStore::global(cx)).ok()?.await.ok()?;
2592 store
2593 .update(cx, |s, cx| {
2594 s.load(PromptId::BuiltIn(BuiltInPrompt::CommitMessage), cx)
2595 })
2596 .ok()?
2597 .await
2598 .ok()
2599 };
2600 load.await
2601 .unwrap_or_else(|| BuiltInPrompt::CommitMessage.default_content().to_string())
2602 }
2603
2604 /// Generates a commit message using an LLM.
2605 pub fn generate_commit_message(&mut self, cx: &mut Context<Self>) {
2606 if !self.can_commit() || !AgentSettings::get_global(cx).enabled(cx) {
2607 return;
2608 }
2609
2610 let Some(ConfiguredModel { provider, model }) =
2611 LanguageModelRegistry::read_global(cx).commit_message_model()
2612 else {
2613 return;
2614 };
2615
2616 let Some(repo) = self.active_repository.as_ref() else {
2617 return;
2618 };
2619
2620 telemetry::event!("Git Commit Message Generated");
2621
2622 let diff = repo.update(cx, |repo, cx| {
2623 if self.has_staged_changes() {
2624 repo.diff(DiffType::HeadToIndex, cx)
2625 } else {
2626 repo.diff(DiffType::HeadToWorktree, cx)
2627 }
2628 });
2629
2630 let temperature = AgentSettings::temperature_for_model(&model, cx);
2631 let project = self.project.clone();
2632 let repo_work_dir = repo.read(cx).work_directory_abs_path.clone();
2633
2634 // Remove this once we stop supporting legacy Zed Pro
2635 let is_using_legacy_zed_pro = provider.id() == ZED_CLOUD_PROVIDER_ID
2636 && self.workspace.upgrade().map_or(false, |workspace| {
2637 workspace.read(cx).user_store().read(cx).plan()
2638 == Some(cloud_llm_client::Plan::V1(cloud_llm_client::PlanV1::ZedPro))
2639 });
2640
2641 self.generate_commit_message_task = Some(cx.spawn(async move |this, mut cx| {
2642 async move {
2643 let _defer = cx.on_drop(&this, |this, _cx| {
2644 this.generate_commit_message_task.take();
2645 });
2646
2647 if let Some(task) = cx.update(|cx| {
2648 if !provider.is_authenticated(cx) {
2649 Some(provider.authenticate(cx))
2650 } else {
2651 None
2652 }
2653 })? {
2654 task.await.log_err();
2655 };
2656
2657 let mut diff_text = match diff.await {
2658 Ok(result) => match result {
2659 Ok(text) => text,
2660 Err(e) => {
2661 Self::show_commit_message_error(&this, &e, cx);
2662 return anyhow::Ok(());
2663 }
2664 },
2665 Err(e) => {
2666 Self::show_commit_message_error(&this, &e, cx);
2667 return anyhow::Ok(());
2668 }
2669 };
2670
2671 const MAX_DIFF_BYTES: usize = 20_000;
2672 diff_text = Self::compress_commit_diff(&diff_text, MAX_DIFF_BYTES);
2673
2674 let rules_content = Self::load_project_rules(&project, &repo_work_dir, &mut cx).await;
2675
2676 let prompt = Self::load_commit_message_prompt(is_using_legacy_zed_pro, &mut cx).await;
2677
2678 let subject = this.update(cx, |this, cx| {
2679 this.commit_editor.read(cx).text(cx).lines().next().map(ToOwned::to_owned).unwrap_or_default()
2680 })?;
2681
2682 let text_empty = subject.trim().is_empty();
2683
2684 let rules_section = match &rules_content {
2685 Some(rules) => format!(
2686 "\n\nThe user has provided the following project rules that you should follow when writing the commit message:\n\
2687 <project_rules>\n{rules}\n</project_rules>\n"
2688 ),
2689 None => String::new(),
2690 };
2691
2692 let subject_section = if text_empty {
2693 String::new()
2694 } else {
2695 format!("\nHere is the user's subject line:\n{subject}")
2696 };
2697
2698 let content = format!(
2699 "{prompt}{rules_section}{subject_section}\nHere are the changes in this commit:\n{diff_text}"
2700 );
2701
2702 let request = LanguageModelRequest {
2703 thread_id: None,
2704 prompt_id: None,
2705 intent: Some(CompletionIntent::GenerateGitCommitMessage),
2706 mode: None,
2707 messages: vec![LanguageModelRequestMessage {
2708 role: Role::User,
2709 content: vec![content.into()],
2710 cache: false,
2711 reasoning_details: None,
2712 }],
2713 tools: Vec::new(),
2714 tool_choice: None,
2715 stop: Vec::new(),
2716 temperature,
2717 thinking_allowed: false,
2718 };
2719
2720 let stream = model.stream_completion_text(request, cx);
2721 match stream.await {
2722 Ok(mut messages) => {
2723 if !text_empty {
2724 this.update(cx, |this, cx| {
2725 this.commit_message_buffer(cx).update(cx, |buffer, cx| {
2726 let insert_position = buffer.anchor_before(buffer.len());
2727 buffer.edit([(insert_position..insert_position, "\n")], None, cx)
2728 });
2729 })?;
2730 }
2731
2732 while let Some(message) = messages.stream.next().await {
2733 match message {
2734 Ok(text) => {
2735 this.update(cx, |this, cx| {
2736 this.commit_message_buffer(cx).update(cx, |buffer, cx| {
2737 let insert_position = buffer.anchor_before(buffer.len());
2738 buffer.edit([(insert_position..insert_position, text)], None, cx);
2739 });
2740 })?;
2741 }
2742 Err(e) => {
2743 Self::show_commit_message_error(&this, &e, cx);
2744 break;
2745 }
2746 }
2747 }
2748 }
2749 Err(e) => {
2750 Self::show_commit_message_error(&this, &e, cx);
2751 }
2752 }
2753
2754 anyhow::Ok(())
2755 }
2756 .log_err().await
2757 }));
2758 }
2759
2760 fn get_fetch_options(
2761 &self,
2762 window: &mut Window,
2763 cx: &mut Context<Self>,
2764 ) -> Task<Option<FetchOptions>> {
2765 let repo = self.active_repository.clone();
2766 let workspace = self.workspace.clone();
2767
2768 cx.spawn_in(window, async move |_, cx| {
2769 let repo = repo?;
2770 let remotes = repo
2771 .update(cx, |repo, _| repo.get_remotes(None, false))
2772 .ok()?
2773 .await
2774 .ok()?
2775 .log_err()?;
2776
2777 let mut remotes: Vec<_> = remotes.into_iter().map(FetchOptions::Remote).collect();
2778 if remotes.len() > 1 {
2779 remotes.push(FetchOptions::All);
2780 }
2781 let selection = cx
2782 .update(|window, cx| {
2783 picker_prompt::prompt(
2784 "Pick which remote to fetch",
2785 remotes.iter().map(|r| r.name()).collect(),
2786 workspace,
2787 window,
2788 cx,
2789 )
2790 })
2791 .ok()?
2792 .await?;
2793 remotes.get(selection).cloned()
2794 })
2795 }
2796
2797 pub(crate) fn fetch(
2798 &mut self,
2799 is_fetch_all: bool,
2800 window: &mut Window,
2801 cx: &mut Context<Self>,
2802 ) {
2803 if !self.can_push_and_pull(cx) {
2804 return;
2805 }
2806
2807 let Some(repo) = self.active_repository.clone() else {
2808 return;
2809 };
2810 telemetry::event!("Git Fetched");
2811 let askpass = self.askpass_delegate("git fetch", window, cx);
2812 let this = cx.weak_entity();
2813
2814 let fetch_options = if is_fetch_all {
2815 Task::ready(Some(FetchOptions::All))
2816 } else {
2817 self.get_fetch_options(window, cx)
2818 };
2819
2820 window
2821 .spawn(cx, async move |cx| {
2822 let Some(fetch_options) = fetch_options.await else {
2823 return Ok(());
2824 };
2825 let fetch = repo.update(cx, |repo, cx| {
2826 repo.fetch(fetch_options.clone(), askpass, cx)
2827 })?;
2828
2829 let remote_message = fetch.await?;
2830 this.update(cx, |this, cx| {
2831 let action = match fetch_options {
2832 FetchOptions::All => RemoteAction::Fetch(None),
2833 FetchOptions::Remote(remote) => RemoteAction::Fetch(Some(remote)),
2834 };
2835 match remote_message {
2836 Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
2837 Err(e) => {
2838 log::error!("Error while fetching {:?}", e);
2839 this.show_error_toast(action.name(), e, cx)
2840 }
2841 }
2842
2843 anyhow::Ok(())
2844 })
2845 .ok();
2846 anyhow::Ok(())
2847 })
2848 .detach_and_log_err(cx);
2849 }
2850
2851 pub(crate) fn git_clone(&mut self, repo: String, window: &mut Window, cx: &mut Context<Self>) {
2852 let workspace = self.workspace.clone();
2853
2854 crate::clone::clone_and_open(
2855 repo.into(),
2856 workspace,
2857 window,
2858 cx,
2859 Arc::new(|_workspace: &mut workspace::Workspace, _window, _cx| {}),
2860 );
2861 }
2862
2863 pub(crate) fn git_init(&mut self, window: &mut Window, cx: &mut Context<Self>) {
2864 let worktrees = self
2865 .project
2866 .read(cx)
2867 .visible_worktrees(cx)
2868 .collect::<Vec<_>>();
2869
2870 let worktree = if worktrees.len() == 1 {
2871 Task::ready(Some(worktrees.first().unwrap().clone()))
2872 } else if worktrees.is_empty() {
2873 let result = window.prompt(
2874 PromptLevel::Warning,
2875 "Unable to initialize a git repository",
2876 Some("Open a directory first"),
2877 &["Ok"],
2878 cx,
2879 );
2880 cx.background_executor()
2881 .spawn(async move {
2882 result.await.ok();
2883 })
2884 .detach();
2885 return;
2886 } else {
2887 let worktree_directories = worktrees
2888 .iter()
2889 .map(|worktree| worktree.read(cx).abs_path())
2890 .map(|worktree_abs_path| {
2891 if let Ok(path) = worktree_abs_path.strip_prefix(util::paths::home_dir()) {
2892 Path::new("~")
2893 .join(path)
2894 .to_string_lossy()
2895 .to_string()
2896 .into()
2897 } else {
2898 worktree_abs_path.to_string_lossy().into_owned().into()
2899 }
2900 })
2901 .collect_vec();
2902 let prompt = picker_prompt::prompt(
2903 "Where would you like to initialize this git repository?",
2904 worktree_directories,
2905 self.workspace.clone(),
2906 window,
2907 cx,
2908 );
2909
2910 cx.spawn(async move |_, _| prompt.await.map(|ix| worktrees[ix].clone()))
2911 };
2912
2913 cx.spawn_in(window, async move |this, cx| {
2914 let worktree = match worktree.await {
2915 Some(worktree) => worktree,
2916 None => {
2917 return;
2918 }
2919 };
2920
2921 let Ok(result) = this.update(cx, |this, cx| {
2922 let fallback_branch_name = GitPanelSettings::get_global(cx)
2923 .fallback_branch_name
2924 .clone();
2925 this.project.read(cx).git_init(
2926 worktree.read(cx).abs_path(),
2927 fallback_branch_name,
2928 cx,
2929 )
2930 }) else {
2931 return;
2932 };
2933
2934 let result = result.await;
2935
2936 this.update_in(cx, |this, _, cx| match result {
2937 Ok(()) => {}
2938 Err(e) => this.show_error_toast("init", e, cx),
2939 })
2940 .ok();
2941 })
2942 .detach();
2943 }
2944
2945 pub(crate) fn pull(&mut self, rebase: bool, window: &mut Window, cx: &mut Context<Self>) {
2946 if !self.can_push_and_pull(cx) {
2947 return;
2948 }
2949 let Some(repo) = self.active_repository.clone() else {
2950 return;
2951 };
2952 let Some(branch) = repo.read(cx).branch.as_ref() else {
2953 return;
2954 };
2955 telemetry::event!("Git Pulled");
2956 let branch = branch.clone();
2957 let remote = self.get_remote(false, false, window, cx);
2958 cx.spawn_in(window, async move |this, cx| {
2959 let remote = match remote.await {
2960 Ok(Some(remote)) => remote,
2961 Ok(None) => {
2962 return Ok(());
2963 }
2964 Err(e) => {
2965 log::error!("Failed to get current remote: {}", e);
2966 this.update(cx, |this, cx| this.show_error_toast("pull", e, cx))
2967 .ok();
2968 return Ok(());
2969 }
2970 };
2971
2972 let askpass = this.update_in(cx, |this, window, cx| {
2973 this.askpass_delegate(format!("git pull {}", remote.name), window, cx)
2974 })?;
2975
2976 let branch_name = branch
2977 .upstream
2978 .is_none()
2979 .then(|| branch.name().to_owned().into());
2980
2981 let pull = repo.update(cx, |repo, cx| {
2982 repo.pull(branch_name, remote.name.clone(), rebase, askpass, cx)
2983 })?;
2984
2985 let remote_message = pull.await?;
2986
2987 let action = RemoteAction::Pull(remote);
2988 this.update(cx, |this, cx| match remote_message {
2989 Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
2990 Err(e) => {
2991 log::error!("Error while pulling {:?}", e);
2992 this.show_error_toast(action.name(), e, cx)
2993 }
2994 })
2995 .ok();
2996
2997 anyhow::Ok(())
2998 })
2999 .detach_and_log_err(cx);
3000 }
3001
3002 pub(crate) fn push(
3003 &mut self,
3004 force_push: bool,
3005 select_remote: bool,
3006 window: &mut Window,
3007 cx: &mut Context<Self>,
3008 ) {
3009 if !self.can_push_and_pull(cx) {
3010 return;
3011 }
3012 let Some(repo) = self.active_repository.clone() else {
3013 return;
3014 };
3015 let Some(branch) = repo.read(cx).branch.as_ref() else {
3016 return;
3017 };
3018 telemetry::event!("Git Pushed");
3019 let branch = branch.clone();
3020
3021 let options = if force_push {
3022 Some(PushOptions::Force)
3023 } else {
3024 match branch.upstream {
3025 Some(Upstream {
3026 tracking: UpstreamTracking::Gone,
3027 ..
3028 })
3029 | None => Some(PushOptions::SetUpstream),
3030 _ => None,
3031 }
3032 };
3033 let remote = self.get_remote(select_remote, true, window, cx);
3034
3035 cx.spawn_in(window, async move |this, cx| {
3036 let remote = match remote.await {
3037 Ok(Some(remote)) => remote,
3038 Ok(None) => {
3039 return Ok(());
3040 }
3041 Err(e) => {
3042 log::error!("Failed to get current remote: {}", e);
3043 this.update(cx, |this, cx| this.show_error_toast("push", e, cx))
3044 .ok();
3045 return Ok(());
3046 }
3047 };
3048
3049 let askpass_delegate = this.update_in(cx, |this, window, cx| {
3050 this.askpass_delegate(format!("git push {}", remote.name), window, cx)
3051 })?;
3052
3053 let push = repo.update(cx, |repo, cx| {
3054 repo.push(
3055 branch.name().to_owned().into(),
3056 remote.name.clone(),
3057 options,
3058 askpass_delegate,
3059 cx,
3060 )
3061 })?;
3062
3063 let remote_output = push.await?;
3064
3065 let action = RemoteAction::Push(branch.name().to_owned().into(), remote);
3066 this.update(cx, |this, cx| match remote_output {
3067 Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
3068 Err(e) => {
3069 log::error!("Error while pushing {:?}", e);
3070 this.show_error_toast(action.name(), e, cx)
3071 }
3072 })?;
3073
3074 anyhow::Ok(())
3075 })
3076 .detach_and_log_err(cx);
3077 }
3078
3079 fn askpass_delegate(
3080 &self,
3081 operation: impl Into<SharedString>,
3082 window: &mut Window,
3083 cx: &mut Context<Self>,
3084 ) -> AskPassDelegate {
3085 let this = cx.weak_entity();
3086 let operation = operation.into();
3087 let window = window.window_handle();
3088 AskPassDelegate::new(&mut cx.to_async(), move |prompt, tx, cx| {
3089 window
3090 .update(cx, |_, window, cx| {
3091 this.update(cx, |this, cx| {
3092 this.workspace.update(cx, |workspace, cx| {
3093 workspace.toggle_modal(window, cx, |window, cx| {
3094 AskPassModal::new(operation.clone(), prompt.into(), tx, window, cx)
3095 });
3096 })
3097 })
3098 })
3099 .ok();
3100 })
3101 }
3102
3103 fn can_push_and_pull(&self, cx: &App) -> bool {
3104 !self.project.read(cx).is_via_collab()
3105 }
3106
3107 fn get_remote(
3108 &mut self,
3109 always_select: bool,
3110 is_push: bool,
3111 window: &mut Window,
3112 cx: &mut Context<Self>,
3113 ) -> impl Future<Output = anyhow::Result<Option<Remote>>> + use<> {
3114 let repo = self.active_repository.clone();
3115 let workspace = self.workspace.clone();
3116 let mut cx = window.to_async(cx);
3117
3118 async move {
3119 let repo = repo.context("No active repository")?;
3120 let current_remotes: Vec<Remote> = repo
3121 .update(&mut cx, |repo, _| {
3122 let current_branch = if always_select {
3123 None
3124 } else {
3125 let current_branch = repo.branch.as_ref().context("No active branch")?;
3126 Some(current_branch.name().to_string())
3127 };
3128 anyhow::Ok(repo.get_remotes(current_branch, is_push))
3129 })??
3130 .await??;
3131
3132 let current_remotes: Vec<_> = current_remotes
3133 .into_iter()
3134 .map(|remotes| remotes.name)
3135 .collect();
3136 let selection = cx
3137 .update(|window, cx| {
3138 picker_prompt::prompt(
3139 "Pick which remote to push to",
3140 current_remotes.clone(),
3141 workspace,
3142 window,
3143 cx,
3144 )
3145 })?
3146 .await;
3147
3148 Ok(selection.map(|selection| Remote {
3149 name: current_remotes[selection].clone(),
3150 }))
3151 }
3152 }
3153
3154 pub fn load_local_committer(&mut self, cx: &Context<Self>) {
3155 if self.local_committer_task.is_none() {
3156 self.local_committer_task = Some(cx.spawn(async move |this, cx| {
3157 let committer = get_git_committer(cx).await;
3158 this.update(cx, |this, cx| {
3159 this.local_committer = Some(committer);
3160 cx.notify()
3161 })
3162 .ok();
3163 }));
3164 }
3165 }
3166
3167 fn potential_co_authors(&self, cx: &App) -> Vec<(String, String)> {
3168 let mut new_co_authors = Vec::new();
3169 let project = self.project.read(cx);
3170
3171 let Some(room) = self
3172 .workspace
3173 .upgrade()
3174 .and_then(|workspace| workspace.read(cx).active_call()?.read(cx).room().cloned())
3175 else {
3176 return Vec::default();
3177 };
3178
3179 let room = room.read(cx);
3180
3181 for (peer_id, collaborator) in project.collaborators() {
3182 if collaborator.is_host {
3183 continue;
3184 }
3185
3186 let Some(participant) = room.remote_participant_for_peer_id(*peer_id) else {
3187 continue;
3188 };
3189 if !participant.can_write() {
3190 continue;
3191 }
3192 if let Some(email) = &collaborator.committer_email {
3193 let name = collaborator
3194 .committer_name
3195 .clone()
3196 .or_else(|| participant.user.name.clone())
3197 .unwrap_or_else(|| participant.user.github_login.clone().to_string());
3198 new_co_authors.push((name.clone(), email.clone()))
3199 }
3200 }
3201 if !project.is_local()
3202 && !project.is_read_only(cx)
3203 && let Some(local_committer) = self.local_committer(room, cx)
3204 {
3205 new_co_authors.push(local_committer);
3206 }
3207 new_co_authors
3208 }
3209
3210 fn local_committer(&self, room: &call::Room, cx: &App) -> Option<(String, String)> {
3211 let user = room.local_participant_user(cx)?;
3212 let committer = self.local_committer.as_ref()?;
3213 let email = committer.email.clone()?;
3214 let name = committer
3215 .name
3216 .clone()
3217 .or_else(|| user.name.clone())
3218 .unwrap_or_else(|| user.github_login.clone().to_string());
3219 Some((name, email))
3220 }
3221
3222 fn toggle_fill_co_authors(
3223 &mut self,
3224 _: &ToggleFillCoAuthors,
3225 _: &mut Window,
3226 cx: &mut Context<Self>,
3227 ) {
3228 self.add_coauthors = !self.add_coauthors;
3229 cx.notify();
3230 }
3231
3232 fn toggle_sort_by_path(
3233 &mut self,
3234 _: &ToggleSortByPath,
3235 _: &mut Window,
3236 cx: &mut Context<Self>,
3237 ) {
3238 let current_setting = GitPanelSettings::get_global(cx).sort_by_path;
3239 if let Some(workspace) = self.workspace.upgrade() {
3240 let workspace = workspace.read(cx);
3241 let fs = workspace.app_state().fs.clone();
3242 cx.update_global::<SettingsStore, _>(|store, _cx| {
3243 store.update_settings_file(fs, move |settings, _cx| {
3244 settings.git_panel.get_or_insert_default().sort_by_path =
3245 Some(!current_setting);
3246 });
3247 });
3248 }
3249 }
3250
3251 fn toggle_tree_view(&mut self, _: &ToggleTreeView, _: &mut Window, cx: &mut Context<Self>) {
3252 let current_setting = GitPanelSettings::get_global(cx).tree_view;
3253 if let Some(workspace) = self.workspace.upgrade() {
3254 let workspace = workspace.read(cx);
3255 let fs = workspace.app_state().fs.clone();
3256 cx.update_global::<SettingsStore, _>(|store, _cx| {
3257 store.update_settings_file(fs, move |settings, _cx| {
3258 settings.git_panel.get_or_insert_default().tree_view = Some(!current_setting);
3259 });
3260 })
3261 }
3262 }
3263
3264 fn toggle_directory(&mut self, key: &TreeKey, window: &mut Window, cx: &mut Context<Self>) {
3265 if let Some(state) = self.view_mode.tree_state_mut() {
3266 let expanded = state.expanded_dirs.entry(key.clone()).or_insert(true);
3267 *expanded = !*expanded;
3268 self.update_visible_entries(window, cx);
3269 } else {
3270 util::debug_panic!("Attempted to toggle directory in flat Git Panel state");
3271 }
3272 }
3273
3274 fn fill_co_authors(&mut self, message: &mut String, cx: &mut Context<Self>) {
3275 const CO_AUTHOR_PREFIX: &str = "Co-authored-by: ";
3276
3277 let existing_text = message.to_ascii_lowercase();
3278 let lowercase_co_author_prefix = CO_AUTHOR_PREFIX.to_lowercase();
3279 let mut ends_with_co_authors = false;
3280 let existing_co_authors = existing_text
3281 .lines()
3282 .filter_map(|line| {
3283 let line = line.trim();
3284 if line.starts_with(&lowercase_co_author_prefix) {
3285 ends_with_co_authors = true;
3286 Some(line)
3287 } else {
3288 ends_with_co_authors = false;
3289 None
3290 }
3291 })
3292 .collect::<HashSet<_>>();
3293
3294 let new_co_authors = self
3295 .potential_co_authors(cx)
3296 .into_iter()
3297 .filter(|(_, email)| {
3298 !existing_co_authors
3299 .iter()
3300 .any(|existing| existing.contains(email.as_str()))
3301 })
3302 .collect::<Vec<_>>();
3303
3304 if new_co_authors.is_empty() {
3305 return;
3306 }
3307
3308 if !ends_with_co_authors {
3309 message.push('\n');
3310 }
3311 for (name, email) in new_co_authors {
3312 message.push('\n');
3313 message.push_str(CO_AUTHOR_PREFIX);
3314 message.push_str(&name);
3315 message.push_str(" <");
3316 message.push_str(&email);
3317 message.push('>');
3318 }
3319 message.push('\n');
3320 }
3321
3322 fn schedule_update(&mut self, window: &mut Window, cx: &mut Context<Self>) {
3323 let handle = cx.entity().downgrade();
3324 self.reopen_commit_buffer(window, cx);
3325 self.update_visible_entries_task = cx.spawn_in(window, async move |_, cx| {
3326 cx.background_executor().timer(UPDATE_DEBOUNCE).await;
3327 if let Some(git_panel) = handle.upgrade() {
3328 git_panel
3329 .update_in(cx, |git_panel, window, cx| {
3330 git_panel.update_visible_entries(window, cx);
3331 })
3332 .ok();
3333 }
3334 });
3335 }
3336
3337 fn reopen_commit_buffer(&mut self, window: &mut Window, cx: &mut Context<Self>) {
3338 let Some(active_repo) = self.active_repository.as_ref() else {
3339 return;
3340 };
3341 let load_buffer = active_repo.update(cx, |active_repo, cx| {
3342 let project = self.project.read(cx);
3343 active_repo.open_commit_buffer(
3344 Some(project.languages().clone()),
3345 project.buffer_store().clone(),
3346 cx,
3347 )
3348 });
3349
3350 cx.spawn_in(window, async move |git_panel, cx| {
3351 let buffer = load_buffer.await?;
3352 git_panel.update_in(cx, |git_panel, window, cx| {
3353 if git_panel
3354 .commit_editor
3355 .read(cx)
3356 .buffer()
3357 .read(cx)
3358 .as_singleton()
3359 .as_ref()
3360 != Some(&buffer)
3361 {
3362 git_panel.commit_editor = cx.new(|cx| {
3363 commit_message_editor(
3364 buffer,
3365 git_panel.suggest_commit_message(cx).map(SharedString::from),
3366 git_panel.project.clone(),
3367 true,
3368 window,
3369 cx,
3370 )
3371 });
3372 }
3373 })
3374 })
3375 .detach_and_log_err(cx);
3376 }
3377
3378 fn update_visible_entries(&mut self, window: &mut Window, cx: &mut Context<Self>) {
3379 let path_style = self.project.read(cx).path_style(cx);
3380 let bulk_staging = self.bulk_staging.take();
3381 let last_staged_path_prev_index = bulk_staging
3382 .as_ref()
3383 .and_then(|op| self.entry_by_path(&op.anchor));
3384
3385 self.entries.clear();
3386 self.entries_indices.clear();
3387 self.single_staged_entry.take();
3388 self.single_tracked_entry.take();
3389 self.conflicted_count = 0;
3390 self.conflicted_staged_count = 0;
3391 self.changes_count = 0;
3392 self.new_count = 0;
3393 self.tracked_count = 0;
3394 self.new_staged_count = 0;
3395 self.tracked_staged_count = 0;
3396 self.entry_count = 0;
3397 self.max_width_item_index = None;
3398
3399 let sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
3400 let is_tree_view = matches!(self.view_mode, GitPanelViewMode::Tree(_));
3401 let group_by_status = is_tree_view || !sort_by_path;
3402
3403 let mut changed_entries = Vec::new();
3404 let mut new_entries = Vec::new();
3405 let mut conflict_entries = Vec::new();
3406 let mut single_staged_entry = None;
3407 let mut staged_count = 0;
3408 let mut seen_directories = HashSet::default();
3409 let mut max_width_estimate = 0usize;
3410 let mut max_width_item_index = None;
3411
3412 let Some(repo) = self.active_repository.as_ref() else {
3413 // Just clear entries if no repository is active.
3414 cx.notify();
3415 return;
3416 };
3417
3418 let repo = repo.read(cx);
3419
3420 self.stash_entries = repo.cached_stash();
3421
3422 for entry in repo.cached_status() {
3423 self.changes_count += 1;
3424 let is_conflict = repo.had_conflict_on_last_merge_head_change(&entry.repo_path);
3425 let is_new = entry.status.is_created();
3426 let staging = entry.status.staging();
3427
3428 if let Some(pending) = repo.pending_ops_for_path(&entry.repo_path)
3429 && pending
3430 .ops
3431 .iter()
3432 .any(|op| op.git_status == pending_op::GitStatus::Reverted && op.finished())
3433 {
3434 continue;
3435 }
3436
3437 let entry = GitStatusEntry {
3438 repo_path: entry.repo_path.clone(),
3439 status: entry.status,
3440 staging,
3441 };
3442
3443 if staging.has_staged() {
3444 staged_count += 1;
3445 single_staged_entry = Some(entry.clone());
3446 }
3447
3448 if group_by_status && is_conflict {
3449 conflict_entries.push(entry);
3450 } else if group_by_status && is_new {
3451 new_entries.push(entry);
3452 } else {
3453 changed_entries.push(entry);
3454 }
3455 }
3456
3457 if conflict_entries.is_empty() {
3458 if staged_count == 1
3459 && let Some(entry) = single_staged_entry.as_ref()
3460 {
3461 if let Some(ops) = repo.pending_ops_for_path(&entry.repo_path) {
3462 if ops.staged() {
3463 self.single_staged_entry = single_staged_entry;
3464 }
3465 } else {
3466 self.single_staged_entry = single_staged_entry;
3467 }
3468 } else if repo.pending_ops_summary().item_summary.staging_count == 1
3469 && let Some(ops) = repo.pending_ops().find(|ops| ops.staging())
3470 {
3471 self.single_staged_entry =
3472 repo.status_for_path(&ops.repo_path)
3473 .map(|status| GitStatusEntry {
3474 repo_path: ops.repo_path.clone(),
3475 status: status.status,
3476 staging: StageStatus::Staged,
3477 });
3478 }
3479 }
3480
3481 if conflict_entries.is_empty() && changed_entries.len() == 1 {
3482 self.single_tracked_entry = changed_entries.first().cloned();
3483 }
3484
3485 let mut push_entry =
3486 |this: &mut Self,
3487 entry: GitListEntry,
3488 is_visible: bool,
3489 logical_indices: Option<&mut Vec<usize>>| {
3490 if let Some(estimate) =
3491 this.width_estimate_for_list_entry(is_tree_view, &entry, path_style)
3492 {
3493 if estimate > max_width_estimate {
3494 max_width_estimate = estimate;
3495 max_width_item_index = Some(this.entries.len());
3496 }
3497 }
3498
3499 if let Some(repo_path) = entry.status_entry().map(|status| status.repo_path.clone())
3500 {
3501 this.entries_indices.insert(repo_path, this.entries.len());
3502 }
3503
3504 if let (Some(indices), true) = (logical_indices, is_visible) {
3505 indices.push(this.entries.len());
3506 }
3507
3508 this.entries.push(entry);
3509 };
3510
3511 macro_rules! take_section_entries {
3512 () => {
3513 [
3514 (Section::Conflict, std::mem::take(&mut conflict_entries)),
3515 (Section::Tracked, std::mem::take(&mut changed_entries)),
3516 (Section::New, std::mem::take(&mut new_entries)),
3517 ]
3518 };
3519 }
3520
3521 match &mut self.view_mode {
3522 GitPanelViewMode::Tree(tree_state) => {
3523 tree_state.logical_indices.clear();
3524 tree_state.directory_descendants.clear();
3525
3526 // This is just to get around the borrow checker
3527 // because push_entry mutably borrows self
3528 let mut tree_state = std::mem::take(tree_state);
3529
3530 for (section, entries) in take_section_entries!() {
3531 if entries.is_empty() {
3532 continue;
3533 }
3534
3535 push_entry(
3536 self,
3537 GitListEntry::Header(GitHeaderEntry { header: section }),
3538 true,
3539 Some(&mut tree_state.logical_indices),
3540 );
3541
3542 for (entry, is_visible) in
3543 tree_state.build_tree_entries(section, entries, &mut seen_directories)
3544 {
3545 push_entry(
3546 self,
3547 entry,
3548 is_visible,
3549 Some(&mut tree_state.logical_indices),
3550 );
3551 }
3552 }
3553
3554 tree_state
3555 .expanded_dirs
3556 .retain(|key, _| seen_directories.contains(key));
3557 self.view_mode = GitPanelViewMode::Tree(tree_state);
3558 }
3559 GitPanelViewMode::Flat => {
3560 for (section, entries) in take_section_entries!() {
3561 if entries.is_empty() {
3562 continue;
3563 }
3564
3565 if section != Section::Tracked || !sort_by_path {
3566 push_entry(
3567 self,
3568 GitListEntry::Header(GitHeaderEntry { header: section }),
3569 true,
3570 None,
3571 );
3572 }
3573
3574 for entry in entries {
3575 push_entry(self, GitListEntry::Status(entry), true, None);
3576 }
3577 }
3578 }
3579 }
3580
3581 self.max_width_item_index = max_width_item_index;
3582
3583 self.update_counts(repo);
3584
3585 let bulk_staging_anchor_new_index = bulk_staging
3586 .as_ref()
3587 .filter(|op| op.repo_id == repo.id)
3588 .and_then(|op| self.entry_by_path(&op.anchor));
3589 if bulk_staging_anchor_new_index == last_staged_path_prev_index
3590 && let Some(index) = bulk_staging_anchor_new_index
3591 && let Some(entry) = self.entries.get(index)
3592 && let Some(entry) = entry.status_entry()
3593 && GitPanel::stage_status_for_entry(entry, &repo)
3594 .as_bool()
3595 .unwrap_or(false)
3596 {
3597 self.bulk_staging = bulk_staging;
3598 }
3599
3600 self.select_first_entry_if_none(window, cx);
3601
3602 let suggested_commit_message = self.suggest_commit_message(cx);
3603 let placeholder_text = suggested_commit_message.unwrap_or("Enter commit message".into());
3604
3605 self.commit_editor.update(cx, |editor, cx| {
3606 editor.set_placeholder_text(&placeholder_text, window, cx)
3607 });
3608
3609 cx.notify();
3610 }
3611
3612 fn header_state(&self, header_type: Section) -> ToggleState {
3613 let (staged_count, count) = match header_type {
3614 Section::New => (self.new_staged_count, self.new_count),
3615 Section::Tracked => (self.tracked_staged_count, self.tracked_count),
3616 Section::Conflict => (self.conflicted_staged_count, self.conflicted_count),
3617 };
3618 if staged_count == 0 {
3619 ToggleState::Unselected
3620 } else if count == staged_count {
3621 ToggleState::Selected
3622 } else {
3623 ToggleState::Indeterminate
3624 }
3625 }
3626
3627 fn update_counts(&mut self, repo: &Repository) {
3628 self.show_placeholders = false;
3629 self.conflicted_count = 0;
3630 self.conflicted_staged_count = 0;
3631 self.new_count = 0;
3632 self.tracked_count = 0;
3633 self.new_staged_count = 0;
3634 self.tracked_staged_count = 0;
3635 self.entry_count = 0;
3636
3637 for status_entry in self.entries.iter().filter_map(|entry| entry.status_entry()) {
3638 self.entry_count += 1;
3639 let is_staging_or_staged = GitPanel::stage_status_for_entry(status_entry, repo)
3640 .as_bool()
3641 .unwrap_or(false);
3642
3643 if repo.had_conflict_on_last_merge_head_change(&status_entry.repo_path) {
3644 self.conflicted_count += 1;
3645 if is_staging_or_staged {
3646 self.conflicted_staged_count += 1;
3647 }
3648 } else if status_entry.status.is_created() {
3649 self.new_count += 1;
3650 if is_staging_or_staged {
3651 self.new_staged_count += 1;
3652 }
3653 } else {
3654 self.tracked_count += 1;
3655 if is_staging_or_staged {
3656 self.tracked_staged_count += 1;
3657 }
3658 }
3659 }
3660 }
3661
3662 pub(crate) fn has_staged_changes(&self) -> bool {
3663 self.tracked_staged_count > 0
3664 || self.new_staged_count > 0
3665 || self.conflicted_staged_count > 0
3666 }
3667
3668 pub(crate) fn has_unstaged_changes(&self) -> bool {
3669 self.tracked_count > self.tracked_staged_count
3670 || self.new_count > self.new_staged_count
3671 || self.conflicted_count > self.conflicted_staged_count
3672 }
3673
3674 fn has_tracked_changes(&self) -> bool {
3675 self.tracked_count > 0
3676 }
3677
3678 pub fn has_unstaged_conflicts(&self) -> bool {
3679 self.conflicted_count > 0 && self.conflicted_count != self.conflicted_staged_count
3680 }
3681
3682 fn show_error_toast(&self, action: impl Into<SharedString>, e: anyhow::Error, cx: &mut App) {
3683 let Some(workspace) = self.workspace.upgrade() else {
3684 return;
3685 };
3686 show_error_toast(workspace, action, e, cx)
3687 }
3688
3689 fn show_commit_message_error<E>(weak_this: &WeakEntity<Self>, err: &E, cx: &mut AsyncApp)
3690 where
3691 E: std::fmt::Debug + std::fmt::Display,
3692 {
3693 if let Ok(Some(workspace)) = weak_this.update(cx, |this, _cx| this.workspace.upgrade()) {
3694 let _ = workspace.update(cx, |workspace, cx| {
3695 struct CommitMessageError;
3696 let notification_id = NotificationId::unique::<CommitMessageError>();
3697 workspace.show_notification(notification_id, cx, |cx| {
3698 cx.new(|cx| {
3699 ErrorMessagePrompt::new(
3700 format!("Failed to generate commit message: {err}"),
3701 cx,
3702 )
3703 })
3704 });
3705 });
3706 }
3707 }
3708
3709 fn show_remote_output(&self, action: RemoteAction, info: RemoteCommandOutput, cx: &mut App) {
3710 let Some(workspace) = self.workspace.upgrade() else {
3711 return;
3712 };
3713
3714 workspace.update(cx, |workspace, cx| {
3715 let SuccessMessage { message, style } = remote_output::format_output(&action, info);
3716 let workspace_weak = cx.weak_entity();
3717 let operation = action.name();
3718
3719 let status_toast = StatusToast::new(message, cx, move |this, _cx| {
3720 use remote_output::SuccessStyle::*;
3721 match style {
3722 Toast => this.icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted)),
3723 ToastWithLog { output } => this
3724 .icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted))
3725 .action("View Log", move |window, cx| {
3726 let output = output.clone();
3727 let output =
3728 format!("stdout:\n{}\nstderr:\n{}", output.stdout, output.stderr);
3729 workspace_weak
3730 .update(cx, move |workspace, cx| {
3731 open_output(operation, workspace, &output, window, cx)
3732 })
3733 .ok();
3734 }),
3735 PushPrLink { text, link } => this
3736 .icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted))
3737 .action(text, move |_, cx| cx.open_url(&link)),
3738 }
3739 .dismiss_button(true)
3740 });
3741 workspace.toggle_status_toast(status_toast, cx)
3742 });
3743 }
3744
3745 pub fn can_commit(&self) -> bool {
3746 (self.has_staged_changes() || self.has_tracked_changes()) && !self.has_unstaged_conflicts()
3747 }
3748
3749 pub fn can_stage_all(&self) -> bool {
3750 self.has_unstaged_changes()
3751 }
3752
3753 pub fn can_unstage_all(&self) -> bool {
3754 self.has_staged_changes()
3755 }
3756
3757 fn status_width_estimate(
3758 tree_view: bool,
3759 entry: &GitStatusEntry,
3760 path_style: PathStyle,
3761 depth: usize,
3762 ) -> usize {
3763 if tree_view {
3764 Self::item_width_estimate(0, entry.display_name(path_style).len(), depth)
3765 } else {
3766 Self::item_width_estimate(
3767 entry.parent_dir(path_style).map(|s| s.len()).unwrap_or(0),
3768 entry.display_name(path_style).len(),
3769 0,
3770 )
3771 }
3772 }
3773
3774 fn width_estimate_for_list_entry(
3775 &self,
3776 tree_view: bool,
3777 entry: &GitListEntry,
3778 path_style: PathStyle,
3779 ) -> Option<usize> {
3780 match entry {
3781 GitListEntry::Status(status) => Some(Self::status_width_estimate(
3782 tree_view, status, path_style, 0,
3783 )),
3784 GitListEntry::TreeStatus(status) => Some(Self::status_width_estimate(
3785 tree_view,
3786 &status.entry,
3787 path_style,
3788 status.depth,
3789 )),
3790 GitListEntry::Directory(dir) => {
3791 Some(Self::item_width_estimate(0, dir.name.len(), dir.depth))
3792 }
3793 GitListEntry::Header(_) => None,
3794 }
3795 }
3796
3797 fn item_width_estimate(path: usize, file_name: usize, depth: usize) -> usize {
3798 path + file_name + depth * 2
3799 }
3800
3801 fn render_overflow_menu(&self, id: impl Into<ElementId>) -> impl IntoElement {
3802 let focus_handle = self.focus_handle.clone();
3803 let has_tracked_changes = self.has_tracked_changes();
3804 let has_staged_changes = self.has_staged_changes();
3805 let has_unstaged_changes = self.has_unstaged_changes();
3806 let has_new_changes = self.new_count > 0;
3807 let has_stash_items = self.stash_entries.entries.len() > 0;
3808
3809 PopoverMenu::new(id.into())
3810 .trigger(
3811 IconButton::new("overflow-menu-trigger", IconName::Ellipsis)
3812 .icon_size(IconSize::Small)
3813 .icon_color(Color::Muted),
3814 )
3815 .menu(move |window, cx| {
3816 Some(git_panel_context_menu(
3817 focus_handle.clone(),
3818 GitMenuState {
3819 has_tracked_changes,
3820 has_staged_changes,
3821 has_unstaged_changes,
3822 has_new_changes,
3823 sort_by_path: GitPanelSettings::get_global(cx).sort_by_path,
3824 has_stash_items,
3825 tree_view: GitPanelSettings::get_global(cx).tree_view,
3826 },
3827 window,
3828 cx,
3829 ))
3830 })
3831 .anchor(Corner::TopRight)
3832 }
3833
3834 pub(crate) fn render_generate_commit_message_button(
3835 &self,
3836 cx: &Context<Self>,
3837 ) -> Option<AnyElement> {
3838 if !agent_settings::AgentSettings::get_global(cx).enabled(cx)
3839 || LanguageModelRegistry::read_global(cx)
3840 .commit_message_model()
3841 .is_none()
3842 {
3843 return None;
3844 }
3845
3846 if self.generate_commit_message_task.is_some() {
3847 return Some(
3848 h_flex()
3849 .gap_1()
3850 .child(
3851 Icon::new(IconName::ArrowCircle)
3852 .size(IconSize::XSmall)
3853 .color(Color::Info)
3854 .with_rotate_animation(2),
3855 )
3856 .child(
3857 Label::new("Generating Commit...")
3858 .size(LabelSize::Small)
3859 .color(Color::Muted),
3860 )
3861 .into_any_element(),
3862 );
3863 }
3864
3865 let can_commit = self.can_commit();
3866 let editor_focus_handle = self.commit_editor.focus_handle(cx);
3867 Some(
3868 IconButton::new("generate-commit-message", IconName::AiEdit)
3869 .shape(ui::IconButtonShape::Square)
3870 .icon_color(Color::Muted)
3871 .tooltip(move |_window, cx| {
3872 if can_commit {
3873 Tooltip::for_action_in(
3874 "Generate Commit Message",
3875 &git::GenerateCommitMessage,
3876 &editor_focus_handle,
3877 cx,
3878 )
3879 } else {
3880 Tooltip::simple("No changes to commit", cx)
3881 }
3882 })
3883 .disabled(!can_commit)
3884 .on_click(cx.listener(move |this, _event, _window, cx| {
3885 this.generate_commit_message(cx);
3886 }))
3887 .into_any_element(),
3888 )
3889 }
3890
3891 pub(crate) fn render_co_authors(&self, cx: &Context<Self>) -> Option<AnyElement> {
3892 let potential_co_authors = self.potential_co_authors(cx);
3893
3894 let (tooltip_label, icon) = if self.add_coauthors {
3895 ("Remove co-authored-by", IconName::Person)
3896 } else {
3897 ("Add co-authored-by", IconName::UserCheck)
3898 };
3899
3900 if potential_co_authors.is_empty() {
3901 None
3902 } else {
3903 Some(
3904 IconButton::new("co-authors", icon)
3905 .shape(ui::IconButtonShape::Square)
3906 .icon_color(Color::Disabled)
3907 .selected_icon_color(Color::Selected)
3908 .toggle_state(self.add_coauthors)
3909 .tooltip(move |_, cx| {
3910 let title = format!(
3911 "{}:{}{}",
3912 tooltip_label,
3913 if potential_co_authors.len() == 1 {
3914 ""
3915 } else {
3916 "\n"
3917 },
3918 potential_co_authors
3919 .iter()
3920 .map(|(name, email)| format!(" {} <{}>", name, email))
3921 .join("\n")
3922 );
3923 Tooltip::simple(title, cx)
3924 })
3925 .on_click(cx.listener(|this, _, _, cx| {
3926 this.add_coauthors = !this.add_coauthors;
3927 cx.notify();
3928 }))
3929 .into_any_element(),
3930 )
3931 }
3932 }
3933
3934 fn render_git_commit_menu(
3935 &self,
3936 id: impl Into<ElementId>,
3937 keybinding_target: Option<FocusHandle>,
3938 cx: &mut Context<Self>,
3939 ) -> impl IntoElement {
3940 PopoverMenu::new(id.into())
3941 .trigger(
3942 ui::ButtonLike::new_rounded_right("commit-split-button-right")
3943 .layer(ui::ElevationIndex::ModalSurface)
3944 .size(ButtonSize::None)
3945 .child(
3946 h_flex()
3947 .px_1()
3948 .h_full()
3949 .justify_center()
3950 .border_l_1()
3951 .border_color(cx.theme().colors().border)
3952 .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
3953 ),
3954 )
3955 .menu({
3956 let git_panel = cx.entity();
3957 let has_previous_commit = self.head_commit(cx).is_some();
3958 let amend = self.amend_pending();
3959 let signoff = self.signoff_enabled;
3960
3961 move |window, cx| {
3962 Some(ContextMenu::build(window, cx, |context_menu, _, _| {
3963 context_menu
3964 .when_some(keybinding_target.clone(), |el, keybinding_target| {
3965 el.context(keybinding_target)
3966 })
3967 .when(has_previous_commit, |this| {
3968 this.toggleable_entry(
3969 "Amend",
3970 amend,
3971 IconPosition::Start,
3972 Some(Box::new(Amend)),
3973 {
3974 let git_panel = git_panel.downgrade();
3975 move |_, cx| {
3976 git_panel
3977 .update(cx, |git_panel, cx| {
3978 git_panel.toggle_amend_pending(cx);
3979 })
3980 .ok();
3981 }
3982 },
3983 )
3984 })
3985 .toggleable_entry(
3986 "Signoff",
3987 signoff,
3988 IconPosition::Start,
3989 Some(Box::new(Signoff)),
3990 move |window, cx| window.dispatch_action(Box::new(Signoff), cx),
3991 )
3992 }))
3993 }
3994 })
3995 .anchor(Corner::TopRight)
3996 }
3997
3998 pub fn configure_commit_button(&self, cx: &mut Context<Self>) -> (bool, &'static str) {
3999 if self.has_unstaged_conflicts() {
4000 (false, "You must resolve conflicts before committing")
4001 } else if !self.has_staged_changes() && !self.has_tracked_changes() && !self.amend_pending {
4002 (false, "No changes to commit")
4003 } else if self.pending_commit.is_some() {
4004 (false, "Commit in progress")
4005 } else if !self.has_commit_message(cx) {
4006 (false, "No commit message")
4007 } else if !self.has_write_access(cx) {
4008 (false, "You do not have write access to this project")
4009 } else {
4010 (true, self.commit_button_title())
4011 }
4012 }
4013
4014 pub fn commit_button_title(&self) -> &'static str {
4015 if self.amend_pending {
4016 if self.has_staged_changes() {
4017 "Amend"
4018 } else if self.has_tracked_changes() {
4019 "Amend Tracked"
4020 } else {
4021 "Amend"
4022 }
4023 } else if self.has_staged_changes() {
4024 "Commit"
4025 } else {
4026 "Commit Tracked"
4027 }
4028 }
4029
4030 fn expand_commit_editor(
4031 &mut self,
4032 _: &git::ExpandCommitEditor,
4033 window: &mut Window,
4034 cx: &mut Context<Self>,
4035 ) {
4036 let workspace = self.workspace.clone();
4037 window.defer(cx, move |window, cx| {
4038 workspace
4039 .update(cx, |workspace, cx| {
4040 CommitModal::toggle(workspace, None, window, cx)
4041 })
4042 .ok();
4043 })
4044 }
4045
4046 fn render_panel_header(
4047 &self,
4048 window: &mut Window,
4049 cx: &mut Context<Self>,
4050 ) -> Option<impl IntoElement> {
4051 self.active_repository.as_ref()?;
4052
4053 let (text, action, stage, tooltip) =
4054 if self.total_staged_count() == self.entry_count && self.entry_count > 0 {
4055 ("Unstage All", UnstageAll.boxed_clone(), false, "git reset")
4056 } else {
4057 ("Stage All", StageAll.boxed_clone(), true, "git add --all")
4058 };
4059
4060 let change_string = match self.changes_count {
4061 0 => "No Changes".to_string(),
4062 1 => "1 Change".to_string(),
4063 count => format!("{} Changes", count),
4064 };
4065
4066 Some(
4067 self.panel_header_container(window, cx)
4068 .px_2()
4069 .justify_between()
4070 .child(
4071 panel_button(change_string)
4072 .color(Color::Muted)
4073 .tooltip(Tooltip::for_action_title_in(
4074 "Open Diff",
4075 &Diff,
4076 &self.focus_handle,
4077 ))
4078 .on_click(|_, _, cx| {
4079 cx.defer(|cx| {
4080 cx.dispatch_action(&Diff);
4081 })
4082 }),
4083 )
4084 .child(
4085 h_flex()
4086 .gap_1()
4087 .child(self.render_overflow_menu("overflow_menu"))
4088 .child(
4089 panel_filled_button(text)
4090 .tooltip(Tooltip::for_action_title_in(
4091 tooltip,
4092 action.as_ref(),
4093 &self.focus_handle,
4094 ))
4095 .disabled(self.entry_count == 0)
4096 .on_click({
4097 let git_panel = cx.weak_entity();
4098 move |_, _, cx| {
4099 git_panel
4100 .update(cx, |git_panel, cx| {
4101 git_panel.change_all_files_stage(stage, cx);
4102 })
4103 .ok();
4104 }
4105 }),
4106 ),
4107 ),
4108 )
4109 }
4110
4111 pub(crate) fn render_remote_button(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
4112 let branch = self.active_repository.as_ref()?.read(cx).branch.clone();
4113 if !self.can_push_and_pull(cx) {
4114 return None;
4115 }
4116 Some(
4117 h_flex()
4118 .gap_1()
4119 .flex_shrink_0()
4120 .when_some(branch, |this, branch| {
4121 let focus_handle = Some(self.focus_handle(cx));
4122
4123 this.children(render_remote_button(
4124 "remote-button",
4125 &branch,
4126 focus_handle,
4127 true,
4128 ))
4129 })
4130 .into_any_element(),
4131 )
4132 }
4133
4134 pub fn render_footer(
4135 &self,
4136 window: &mut Window,
4137 cx: &mut Context<Self>,
4138 ) -> Option<impl IntoElement> {
4139 let active_repository = self.active_repository.clone()?;
4140 let panel_editor_style = panel_editor_style(true, window, cx);
4141 let enable_coauthors = self.render_co_authors(cx);
4142
4143 let editor_focus_handle = self.commit_editor.focus_handle(cx);
4144 let expand_tooltip_focus_handle = editor_focus_handle;
4145
4146 let branch = active_repository.read(cx).branch.clone();
4147 let head_commit = active_repository.read(cx).head_commit.clone();
4148
4149 let footer_size = px(32.);
4150 let gap = px(9.0);
4151 let max_height = panel_editor_style
4152 .text
4153 .line_height_in_pixels(window.rem_size())
4154 * MAX_PANEL_EDITOR_LINES
4155 + gap;
4156
4157 let git_panel = cx.entity();
4158 let display_name = SharedString::from(Arc::from(
4159 active_repository
4160 .read(cx)
4161 .display_name()
4162 .trim_end_matches("/"),
4163 ));
4164 let editor_is_long = self.commit_editor.update(cx, |editor, cx| {
4165 editor.max_point(cx).row().0 >= MAX_PANEL_EDITOR_LINES as u32
4166 });
4167
4168 let footer = v_flex()
4169 .child(PanelRepoFooter::new(
4170 display_name,
4171 branch,
4172 head_commit,
4173 Some(git_panel),
4174 ))
4175 .child(
4176 panel_editor_container(window, cx)
4177 .id("commit-editor-container")
4178 .relative()
4179 .w_full()
4180 .h(max_height + footer_size)
4181 .border_t_1()
4182 .border_color(cx.theme().colors().border)
4183 .cursor_text()
4184 .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
4185 window.focus(&this.commit_editor.focus_handle(cx), cx);
4186 }))
4187 .child(
4188 h_flex()
4189 .id("commit-footer")
4190 .border_t_1()
4191 .when(editor_is_long, |el| {
4192 el.border_color(cx.theme().colors().border_variant)
4193 })
4194 .absolute()
4195 .bottom_0()
4196 .left_0()
4197 .w_full()
4198 .px_2()
4199 .h(footer_size)
4200 .flex_none()
4201 .justify_between()
4202 .child(
4203 self.render_generate_commit_message_button(cx)
4204 .unwrap_or_else(|| div().into_any_element()),
4205 )
4206 .child(
4207 h_flex()
4208 .gap_0p5()
4209 .children(enable_coauthors)
4210 .child(self.render_commit_button(cx)),
4211 ),
4212 )
4213 .child(
4214 div()
4215 .pr_2p5()
4216 .on_action(|&editor::actions::MoveUp, _, cx| {
4217 cx.stop_propagation();
4218 })
4219 .on_action(|&editor::actions::MoveDown, _, cx| {
4220 cx.stop_propagation();
4221 })
4222 .child(EditorElement::new(&self.commit_editor, panel_editor_style)),
4223 )
4224 .child(
4225 h_flex()
4226 .absolute()
4227 .top_2()
4228 .right_2()
4229 .opacity(0.5)
4230 .hover(|this| this.opacity(1.0))
4231 .child(
4232 panel_icon_button("expand-commit-editor", IconName::Maximize)
4233 .icon_size(IconSize::Small)
4234 .size(ui::ButtonSize::Default)
4235 .tooltip(move |_window, cx| {
4236 Tooltip::for_action_in(
4237 "Open Commit Modal",
4238 &git::ExpandCommitEditor,
4239 &expand_tooltip_focus_handle,
4240 cx,
4241 )
4242 })
4243 .on_click(cx.listener({
4244 move |_, _, window, cx| {
4245 window.dispatch_action(
4246 git::ExpandCommitEditor.boxed_clone(),
4247 cx,
4248 )
4249 }
4250 })),
4251 ),
4252 ),
4253 );
4254
4255 Some(footer)
4256 }
4257
4258 fn render_commit_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
4259 let (can_commit, tooltip) = self.configure_commit_button(cx);
4260 let title = self.commit_button_title();
4261 let commit_tooltip_focus_handle = self.commit_editor.focus_handle(cx);
4262 let amend = self.amend_pending();
4263 let signoff = self.signoff_enabled;
4264
4265 let label_color = if self.pending_commit.is_some() {
4266 Color::Disabled
4267 } else {
4268 Color::Default
4269 };
4270
4271 div()
4272 .id("commit-wrapper")
4273 .on_hover(cx.listener(move |this, hovered, _, cx| {
4274 this.show_placeholders =
4275 *hovered && !this.has_staged_changes() && !this.has_unstaged_conflicts();
4276 cx.notify()
4277 }))
4278 .child(SplitButton::new(
4279 ButtonLike::new_rounded_left(ElementId::Name(
4280 format!("split-button-left-{}", title).into(),
4281 ))
4282 .layer(ElevationIndex::ModalSurface)
4283 .size(ButtonSize::Compact)
4284 .child(
4285 Label::new(title)
4286 .size(LabelSize::Small)
4287 .color(label_color)
4288 .mr_0p5(),
4289 )
4290 .on_click({
4291 let git_panel = cx.weak_entity();
4292 move |_, window, cx| {
4293 telemetry::event!("Git Committed", source = "Git Panel");
4294 git_panel
4295 .update(cx, |git_panel, cx| {
4296 git_panel.commit_changes(
4297 CommitOptions { amend, signoff },
4298 window,
4299 cx,
4300 );
4301 })
4302 .ok();
4303 }
4304 })
4305 .disabled(!can_commit || self.modal_open)
4306 .tooltip({
4307 let handle = commit_tooltip_focus_handle.clone();
4308 move |_window, cx| {
4309 if can_commit {
4310 Tooltip::with_meta_in(
4311 tooltip,
4312 Some(if amend { &git::Amend } else { &git::Commit }),
4313 format!(
4314 "git commit{}{}",
4315 if amend { " --amend" } else { "" },
4316 if signoff { " --signoff" } else { "" }
4317 ),
4318 &handle.clone(),
4319 cx,
4320 )
4321 } else {
4322 Tooltip::simple(tooltip, cx)
4323 }
4324 }
4325 }),
4326 self.render_git_commit_menu(
4327 ElementId::Name(format!("split-button-right-{}", title).into()),
4328 Some(commit_tooltip_focus_handle),
4329 cx,
4330 )
4331 .into_any_element(),
4332 ))
4333 }
4334
4335 fn render_pending_amend(&self, cx: &mut Context<Self>) -> impl IntoElement {
4336 h_flex()
4337 .py_1p5()
4338 .px_2()
4339 .gap_1p5()
4340 .justify_between()
4341 .border_t_1()
4342 .border_color(cx.theme().colors().border.opacity(0.8))
4343 .child(
4344 div()
4345 .flex_grow()
4346 .overflow_hidden()
4347 .max_w(relative(0.85))
4348 .child(
4349 Label::new("This will update your most recent commit.")
4350 .size(LabelSize::Small)
4351 .truncate(),
4352 ),
4353 )
4354 .child(
4355 panel_button("Cancel")
4356 .size(ButtonSize::Default)
4357 .on_click(cx.listener(|this, _, _, cx| this.set_amend_pending(false, cx))),
4358 )
4359 }
4360
4361 fn render_previous_commit(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> {
4362 let active_repository = self.active_repository.as_ref()?;
4363 let branch = active_repository.read(cx).branch.as_ref()?;
4364 let commit = branch.most_recent_commit.as_ref()?.clone();
4365 let workspace = self.workspace.clone();
4366 let this = cx.entity();
4367
4368 Some(
4369 h_flex()
4370 .py_1p5()
4371 .px_2()
4372 .gap_1p5()
4373 .justify_between()
4374 .border_t_1()
4375 .border_color(cx.theme().colors().border.opacity(0.8))
4376 .child(
4377 div()
4378 .cursor_pointer()
4379 .overflow_hidden()
4380 .line_clamp(1)
4381 .child(
4382 Label::new(commit.subject.clone())
4383 .size(LabelSize::Small)
4384 .truncate(),
4385 )
4386 .id("commit-msg-hover")
4387 .on_click({
4388 let commit = commit.clone();
4389 let repo = active_repository.downgrade();
4390 move |_, window, cx| {
4391 CommitView::open(
4392 commit.sha.to_string(),
4393 repo.clone(),
4394 workspace.clone(),
4395 None,
4396 None,
4397 window,
4398 cx,
4399 );
4400 }
4401 })
4402 .hoverable_tooltip({
4403 let repo = active_repository.clone();
4404 move |window, cx| {
4405 GitPanelMessageTooltip::new(
4406 this.clone(),
4407 commit.sha.clone(),
4408 repo.clone(),
4409 window,
4410 cx,
4411 )
4412 .into()
4413 }
4414 }),
4415 )
4416 .when(commit.has_parent, |this| {
4417 let has_unstaged = self.has_unstaged_changes();
4418 this.child(
4419 panel_icon_button("undo", IconName::Undo)
4420 .icon_size(IconSize::XSmall)
4421 .icon_color(Color::Muted)
4422 .tooltip(move |_window, cx| {
4423 Tooltip::with_meta(
4424 "Uncommit",
4425 Some(&git::Uncommit),
4426 if has_unstaged {
4427 "git reset HEAD^ --soft"
4428 } else {
4429 "git reset HEAD^"
4430 },
4431 cx,
4432 )
4433 })
4434 .on_click(cx.listener(|this, _, window, cx| this.uncommit(window, cx))),
4435 )
4436 }),
4437 )
4438 }
4439
4440 fn render_empty_state(&self, cx: &mut Context<Self>) -> impl IntoElement {
4441 h_flex().h_full().flex_grow().justify_center().child(
4442 v_flex()
4443 .gap_2()
4444 .child(h_flex().w_full().justify_around().child(
4445 if self.active_repository.is_some() {
4446 "No changes to commit"
4447 } else {
4448 "No Git repositories"
4449 },
4450 ))
4451 .children({
4452 let worktree_count = self.project.read(cx).visible_worktrees(cx).count();
4453 (worktree_count > 0 && self.active_repository.is_none()).then(|| {
4454 h_flex().w_full().justify_around().child(
4455 panel_filled_button("Initialize Repository")
4456 .tooltip(Tooltip::for_action_title_in(
4457 "git init",
4458 &git::Init,
4459 &self.focus_handle,
4460 ))
4461 .on_click(move |_, _, cx| {
4462 cx.defer(move |cx| {
4463 cx.dispatch_action(&git::Init);
4464 })
4465 }),
4466 )
4467 })
4468 })
4469 .text_ui_sm(cx)
4470 .mx_auto()
4471 .text_color(Color::Placeholder.color(cx)),
4472 )
4473 }
4474
4475 fn render_buffer_header_controls(
4476 &self,
4477 entity: &Entity<Self>,
4478 file: &Arc<dyn File>,
4479 _: &Window,
4480 cx: &App,
4481 ) -> Option<AnyElement> {
4482 let repo = self.active_repository.as_ref()?.read(cx);
4483 let project_path = (file.worktree_id(cx), file.path().clone()).into();
4484 let repo_path = repo.project_path_to_repo_path(&project_path, cx)?;
4485 let ix = self.entry_by_path(&repo_path)?;
4486 let entry = self.entries.get(ix)?;
4487
4488 let is_staging_or_staged = repo
4489 .pending_ops_for_path(&repo_path)
4490 .map(|ops| ops.staging() || ops.staged())
4491 .or_else(|| {
4492 repo.status_for_path(&repo_path)
4493 .and_then(|status| status.status.staging().as_bool())
4494 })
4495 .or_else(|| {
4496 entry
4497 .status_entry()
4498 .and_then(|entry| entry.staging.as_bool())
4499 });
4500
4501 let checkbox = Checkbox::new("stage-file", is_staging_or_staged.into())
4502 .disabled(!self.has_write_access(cx))
4503 .fill()
4504 .elevation(ElevationIndex::Surface)
4505 .on_click({
4506 let entry = entry.clone();
4507 let git_panel = entity.downgrade();
4508 move |_, window, cx| {
4509 git_panel
4510 .update(cx, |this, cx| {
4511 this.toggle_staged_for_entry(&entry, window, cx);
4512 cx.stop_propagation();
4513 })
4514 .ok();
4515 }
4516 });
4517 Some(
4518 h_flex()
4519 .id("start-slot")
4520 .text_lg()
4521 .child(checkbox)
4522 .on_mouse_down(MouseButton::Left, |_, _, cx| {
4523 // prevent the list item active state triggering when toggling checkbox
4524 cx.stop_propagation();
4525 })
4526 .into_any_element(),
4527 )
4528 }
4529
4530 fn render_entries(
4531 &self,
4532 has_write_access: bool,
4533 window: &mut Window,
4534 cx: &mut Context<Self>,
4535 ) -> impl IntoElement {
4536 let (is_tree_view, entry_count) = match &self.view_mode {
4537 GitPanelViewMode::Tree(state) => (true, state.logical_indices.len()),
4538 GitPanelViewMode::Flat => (false, self.entries.len()),
4539 };
4540
4541 v_flex()
4542 .flex_1()
4543 .size_full()
4544 .overflow_hidden()
4545 .relative()
4546 .child(
4547 h_flex()
4548 .flex_1()
4549 .size_full()
4550 .relative()
4551 .overflow_hidden()
4552 .child(
4553 uniform_list(
4554 "entries",
4555 entry_count,
4556 cx.processor(move |this, range: Range<usize>, window, cx| {
4557 let mut items = Vec::with_capacity(range.end - range.start);
4558
4559 for ix in range.into_iter().map(|ix| match &this.view_mode {
4560 GitPanelViewMode::Tree(state) => state.logical_indices[ix],
4561 GitPanelViewMode::Flat => ix,
4562 }) {
4563 match &this.entries.get(ix) {
4564 Some(GitListEntry::Status(entry)) => {
4565 items.push(this.render_status_entry(
4566 ix,
4567 entry,
4568 0,
4569 has_write_access,
4570 window,
4571 cx,
4572 ));
4573 }
4574 Some(GitListEntry::TreeStatus(entry)) => {
4575 items.push(this.render_status_entry(
4576 ix,
4577 &entry.entry,
4578 entry.depth,
4579 has_write_access,
4580 window,
4581 cx,
4582 ));
4583 }
4584 Some(GitListEntry::Directory(entry)) => {
4585 items.push(this.render_directory_entry(
4586 ix,
4587 entry,
4588 has_write_access,
4589 window,
4590 cx,
4591 ));
4592 }
4593 Some(GitListEntry::Header(header)) => {
4594 items.push(this.render_list_header(
4595 ix,
4596 header,
4597 has_write_access,
4598 window,
4599 cx,
4600 ));
4601 }
4602 None => {}
4603 }
4604 }
4605
4606 items
4607 }),
4608 )
4609 .when(is_tree_view, |list| {
4610 let indent_size = px(TREE_INDENT);
4611 list.with_decoration(
4612 ui::indent_guides(indent_size, IndentGuideColors::panel(cx))
4613 .with_compute_indents_fn(
4614 cx.entity(),
4615 |this, range, _window, _cx| {
4616 range
4617 .map(|ix| match this.entries.get(ix) {
4618 Some(GitListEntry::Directory(dir)) => dir.depth,
4619 Some(GitListEntry::TreeStatus(status)) => {
4620 status.depth
4621 }
4622 _ => 0,
4623 })
4624 .collect()
4625 },
4626 )
4627 .with_render_fn(cx.entity(), |_, params, _, _| {
4628 // Magic number to align the tree item is 3 here
4629 // because we're using 12px as the left-side padding
4630 // and 3 makes the alignment work with the bounding box of the icon
4631 let left_offset = px(TREE_INDENT + 3_f32);
4632 let indent_size = params.indent_size;
4633 let item_height = params.item_height;
4634
4635 params
4636 .indent_guides
4637 .into_iter()
4638 .map(|layout| {
4639 let bounds = Bounds::new(
4640 point(
4641 layout.offset.x * indent_size + left_offset,
4642 layout.offset.y * item_height,
4643 ),
4644 size(px(1.), layout.length * item_height),
4645 );
4646 RenderedIndentGuide {
4647 bounds,
4648 layout,
4649 is_active: false,
4650 hitbox: None,
4651 }
4652 })
4653 .collect()
4654 }),
4655 )
4656 })
4657 .size_full()
4658 .flex_grow()
4659 .with_width_from_item(self.max_width_item_index)
4660 .track_scroll(&self.scroll_handle),
4661 )
4662 .on_mouse_down(
4663 MouseButton::Right,
4664 cx.listener(move |this, event: &MouseDownEvent, window, cx| {
4665 this.deploy_panel_context_menu(event.position, window, cx)
4666 }),
4667 )
4668 .custom_scrollbars(
4669 Scrollbars::for_settings::<GitPanelSettings>()
4670 .tracked_scroll_handle(&self.scroll_handle)
4671 .with_track_along(
4672 ScrollAxes::Horizontal,
4673 cx.theme().colors().panel_background,
4674 ),
4675 window,
4676 cx,
4677 ),
4678 )
4679 }
4680
4681 fn entry_label(&self, label: impl Into<SharedString>, color: Color) -> Label {
4682 Label::new(label.into()).color(color)
4683 }
4684
4685 fn list_item_height(&self) -> Rems {
4686 rems(1.75)
4687 }
4688
4689 fn render_list_header(
4690 &self,
4691 ix: usize,
4692 header: &GitHeaderEntry,
4693 _: bool,
4694 _: &Window,
4695 _: &Context<Self>,
4696 ) -> AnyElement {
4697 let id: ElementId = ElementId::Name(format!("header_{}", ix).into());
4698
4699 h_flex()
4700 .id(id)
4701 .h(self.list_item_height())
4702 .w_full()
4703 .items_end()
4704 .px_3()
4705 .pb_1()
4706 .child(
4707 Label::new(header.title())
4708 .color(Color::Muted)
4709 .size(LabelSize::Small)
4710 .line_height_style(LineHeightStyle::UiLabel)
4711 .single_line(),
4712 )
4713 .into_any_element()
4714 }
4715
4716 pub fn load_commit_details(
4717 &self,
4718 sha: String,
4719 cx: &mut Context<Self>,
4720 ) -> Task<anyhow::Result<CommitDetails>> {
4721 let Some(repo) = self.active_repository.clone() else {
4722 return Task::ready(Err(anyhow::anyhow!("no active repo")));
4723 };
4724 repo.update(cx, |repo, cx| {
4725 let show = repo.show(sha);
4726 cx.spawn(async move |_, _| show.await?)
4727 })
4728 }
4729
4730 fn deploy_entry_context_menu(
4731 &mut self,
4732 position: Point<Pixels>,
4733 ix: usize,
4734 window: &mut Window,
4735 cx: &mut Context<Self>,
4736 ) {
4737 let Some(entry) = self.entries.get(ix).and_then(|e| e.status_entry()) else {
4738 return;
4739 };
4740 let stage_title = if entry.status.staging().is_fully_staged() {
4741 "Unstage File"
4742 } else {
4743 "Stage File"
4744 };
4745 let restore_title = if entry.status.is_created() {
4746 "Trash File"
4747 } else {
4748 "Discard Changes"
4749 };
4750 let context_menu = ContextMenu::build(window, cx, |context_menu, _, _| {
4751 let is_created = entry.status.is_created();
4752 context_menu
4753 .context(self.focus_handle.clone())
4754 .action(stage_title, ToggleStaged.boxed_clone())
4755 .action(restore_title, git::RestoreFile::default().boxed_clone())
4756 .action_disabled_when(
4757 !is_created,
4758 "Add to .gitignore",
4759 git::AddToGitignore.boxed_clone(),
4760 )
4761 .separator()
4762 .action("Open Diff", menu::Confirm.boxed_clone())
4763 .action("Open File", menu::SecondaryConfirm.boxed_clone())
4764 .separator()
4765 .action_disabled_when(is_created, "View File History", Box::new(git::FileHistory))
4766 });
4767 self.selected_entry = Some(ix);
4768 self.set_context_menu(context_menu, position, window, cx);
4769 }
4770
4771 fn deploy_panel_context_menu(
4772 &mut self,
4773 position: Point<Pixels>,
4774 window: &mut Window,
4775 cx: &mut Context<Self>,
4776 ) {
4777 let context_menu = git_panel_context_menu(
4778 self.focus_handle.clone(),
4779 GitMenuState {
4780 has_tracked_changes: self.has_tracked_changes(),
4781 has_staged_changes: self.has_staged_changes(),
4782 has_unstaged_changes: self.has_unstaged_changes(),
4783 has_new_changes: self.new_count > 0,
4784 sort_by_path: GitPanelSettings::get_global(cx).sort_by_path,
4785 has_stash_items: self.stash_entries.entries.len() > 0,
4786 tree_view: GitPanelSettings::get_global(cx).tree_view,
4787 },
4788 window,
4789 cx,
4790 );
4791 self.set_context_menu(context_menu, position, window, cx);
4792 }
4793
4794 fn set_context_menu(
4795 &mut self,
4796 context_menu: Entity<ContextMenu>,
4797 position: Point<Pixels>,
4798 window: &Window,
4799 cx: &mut Context<Self>,
4800 ) {
4801 let subscription = cx.subscribe_in(
4802 &context_menu,
4803 window,
4804 |this, _, _: &DismissEvent, window, cx| {
4805 if this.context_menu.as_ref().is_some_and(|context_menu| {
4806 context_menu.0.focus_handle(cx).contains_focused(window, cx)
4807 }) {
4808 cx.focus_self(window);
4809 }
4810 this.context_menu.take();
4811 cx.notify();
4812 },
4813 );
4814 self.context_menu = Some((context_menu, position, subscription));
4815 cx.notify();
4816 }
4817
4818 fn render_status_entry(
4819 &self,
4820 ix: usize,
4821 entry: &GitStatusEntry,
4822 depth: usize,
4823 has_write_access: bool,
4824 window: &Window,
4825 cx: &Context<Self>,
4826 ) -> AnyElement {
4827 let tree_view = GitPanelSettings::get_global(cx).tree_view;
4828 let path_style = self.project.read(cx).path_style(cx);
4829 let git_path_style = ProjectSettings::get_global(cx).git.path_style;
4830 let display_name = entry.display_name(path_style);
4831
4832 let selected = self.selected_entry == Some(ix);
4833 let marked = self.marked_entries.contains(&ix);
4834 let status_style = GitPanelSettings::get_global(cx).status_style;
4835 let status = entry.status;
4836
4837 let has_conflict = status.is_conflicted();
4838 let is_modified = status.is_modified();
4839 let is_deleted = status.is_deleted();
4840 let is_created = status.is_created();
4841
4842 let label_color = if status_style == StatusStyle::LabelColor {
4843 if has_conflict {
4844 Color::VersionControlConflict
4845 } else if is_created {
4846 Color::VersionControlAdded
4847 } else if is_modified {
4848 Color::VersionControlModified
4849 } else if is_deleted {
4850 // We don't want a bunch of red labels in the list
4851 Color::Disabled
4852 } else {
4853 Color::VersionControlAdded
4854 }
4855 } else {
4856 Color::Default
4857 };
4858
4859 let path_color = if status.is_deleted() {
4860 Color::Disabled
4861 } else {
4862 Color::Muted
4863 };
4864
4865 let id: ElementId = ElementId::Name(format!("entry_{}_{}", display_name, ix).into());
4866 let checkbox_wrapper_id: ElementId =
4867 ElementId::Name(format!("entry_{}_{}_checkbox_wrapper", display_name, ix).into());
4868 let checkbox_id: ElementId =
4869 ElementId::Name(format!("entry_{}_{}_checkbox", display_name, ix).into());
4870
4871 let active_repo = self
4872 .project
4873 .read(cx)
4874 .active_repository(cx)
4875 .expect("active repository must be set");
4876 let repo = active_repo.read(cx);
4877 let stage_status = GitPanel::stage_status_for_entry(entry, &repo);
4878 let mut is_staged: ToggleState = match stage_status {
4879 StageStatus::Staged => ToggleState::Selected,
4880 StageStatus::Unstaged => ToggleState::Unselected,
4881 StageStatus::PartiallyStaged => ToggleState::Indeterminate,
4882 };
4883 if self.show_placeholders && !self.has_staged_changes() && !entry.status.is_created() {
4884 is_staged = ToggleState::Selected;
4885 }
4886
4887 let handle = cx.weak_entity();
4888
4889 let selected_bg_alpha = 0.08;
4890 let marked_bg_alpha = 0.12;
4891 let state_opacity_step = 0.04;
4892
4893 let info_color = cx.theme().status().info;
4894
4895 let base_bg = match (selected, marked) {
4896 (true, true) => info_color.alpha(selected_bg_alpha + marked_bg_alpha),
4897 (true, false) => info_color.alpha(selected_bg_alpha),
4898 (false, true) => info_color.alpha(marked_bg_alpha),
4899 _ => cx.theme().colors().ghost_element_background,
4900 };
4901
4902 let (hover_bg, active_bg) = if selected {
4903 (
4904 info_color.alpha(selected_bg_alpha + state_opacity_step),
4905 info_color.alpha(selected_bg_alpha + state_opacity_step * 2.0),
4906 )
4907 } else {
4908 (
4909 cx.theme().colors().ghost_element_hover,
4910 cx.theme().colors().ghost_element_active,
4911 )
4912 };
4913
4914 let name_row = h_flex()
4915 .min_w_0()
4916 .flex_1()
4917 .gap_1()
4918 .child(git_status_icon(status))
4919 .map(|this| {
4920 if tree_view {
4921 this.pl(px(depth as f32 * TREE_INDENT)).child(
4922 self.entry_label(display_name, label_color)
4923 .when(status.is_deleted(), Label::strikethrough)
4924 .truncate(),
4925 )
4926 } else {
4927 this.child(self.path_formatted(
4928 entry.parent_dir(path_style),
4929 path_color,
4930 display_name,
4931 label_color,
4932 path_style,
4933 git_path_style,
4934 status.is_deleted(),
4935 ))
4936 }
4937 });
4938
4939 h_flex()
4940 .id(id)
4941 .h(self.list_item_height())
4942 .w_full()
4943 .pl_3()
4944 .pr_1()
4945 .gap_1p5()
4946 .border_1()
4947 .border_r_2()
4948 .when(selected && self.focus_handle.is_focused(window), |el| {
4949 el.border_color(cx.theme().colors().panel_focused_border)
4950 })
4951 .bg(base_bg)
4952 .hover(|s| s.bg(hover_bg))
4953 .active(|s| s.bg(active_bg))
4954 .child(name_row)
4955 .child(
4956 div()
4957 .id(checkbox_wrapper_id)
4958 .flex_none()
4959 .occlude()
4960 .cursor_pointer()
4961 .child(
4962 Checkbox::new(checkbox_id, is_staged)
4963 .disabled(!has_write_access)
4964 .fill()
4965 .elevation(ElevationIndex::Surface)
4966 .on_click_ext({
4967 let entry = entry.clone();
4968 let this = cx.weak_entity();
4969 move |_, click, window, cx| {
4970 this.update(cx, |this, cx| {
4971 if !has_write_access {
4972 return;
4973 }
4974 if click.modifiers().shift {
4975 this.stage_bulk(ix, cx);
4976 } else {
4977 let list_entry =
4978 if GitPanelSettings::get_global(cx).tree_view {
4979 GitListEntry::TreeStatus(GitTreeStatusEntry {
4980 entry: entry.clone(),
4981 depth,
4982 })
4983 } else {
4984 GitListEntry::Status(entry.clone())
4985 };
4986 this.toggle_staged_for_entry(&list_entry, window, cx);
4987 }
4988 cx.stop_propagation();
4989 })
4990 .ok();
4991 }
4992 })
4993 .tooltip(move |_window, cx| {
4994 let action = match stage_status {
4995 StageStatus::Staged => "Unstage",
4996 StageStatus::Unstaged | StageStatus::PartiallyStaged => "Stage",
4997 };
4998 let tooltip_name = action.to_string();
4999
5000 Tooltip::for_action(tooltip_name, &ToggleStaged, cx)
5001 }),
5002 ),
5003 )
5004 .on_click({
5005 cx.listener(move |this, event: &ClickEvent, window, cx| {
5006 this.selected_entry = Some(ix);
5007 cx.notify();
5008 if event.modifiers().secondary() {
5009 this.open_file(&Default::default(), window, cx)
5010 } else {
5011 this.open_diff(&Default::default(), window, cx);
5012 this.focus_handle.focus(window, cx);
5013 }
5014 })
5015 })
5016 .on_mouse_down(
5017 MouseButton::Right,
5018 move |event: &MouseDownEvent, window, cx| {
5019 // why isn't this happening automatically? we are passing MouseButton::Right to `on_mouse_down`?
5020 if event.button != MouseButton::Right {
5021 return;
5022 }
5023
5024 let Some(this) = handle.upgrade() else {
5025 return;
5026 };
5027 this.update(cx, |this, cx| {
5028 this.deploy_entry_context_menu(event.position, ix, window, cx);
5029 });
5030 cx.stop_propagation();
5031 },
5032 )
5033 .into_any_element()
5034 }
5035
5036 fn render_directory_entry(
5037 &self,
5038 ix: usize,
5039 entry: &GitTreeDirEntry,
5040 has_write_access: bool,
5041 window: &Window,
5042 cx: &Context<Self>,
5043 ) -> AnyElement {
5044 // TODO: Have not yet plugin the self.marked_entries. Not sure when and why we need that
5045 let selected = self.selected_entry == Some(ix);
5046 let label_color = Color::Muted;
5047
5048 let id: ElementId = ElementId::Name(format!("dir_{}_{}", entry.name, ix).into());
5049 let checkbox_id: ElementId =
5050 ElementId::Name(format!("dir_checkbox_{}_{}", entry.name, ix).into());
5051 let checkbox_wrapper_id: ElementId =
5052 ElementId::Name(format!("dir_checkbox_wrapper_{}_{}", entry.name, ix).into());
5053
5054 let selected_bg_alpha = 0.08;
5055 let state_opacity_step = 0.04;
5056
5057 let info_color = cx.theme().status().info;
5058 let colors = cx.theme().colors();
5059
5060 let (base_bg, hover_bg, active_bg) = if selected {
5061 (
5062 info_color.alpha(selected_bg_alpha),
5063 info_color.alpha(selected_bg_alpha + state_opacity_step),
5064 info_color.alpha(selected_bg_alpha + state_opacity_step * 2.0),
5065 )
5066 } else {
5067 (
5068 colors.ghost_element_background,
5069 colors.ghost_element_hover,
5070 colors.ghost_element_active,
5071 )
5072 };
5073
5074 let folder_icon = if entry.expanded {
5075 IconName::FolderOpen
5076 } else {
5077 IconName::Folder
5078 };
5079
5080 let stage_status = if let Some(repo) = &self.active_repository {
5081 self.stage_status_for_directory(entry, repo.read(cx))
5082 } else {
5083 util::debug_panic!(
5084 "Won't have entries to render without an active repository in Git Panel"
5085 );
5086 StageStatus::PartiallyStaged
5087 };
5088
5089 let toggle_state: ToggleState = match stage_status {
5090 StageStatus::Staged => ToggleState::Selected,
5091 StageStatus::Unstaged => ToggleState::Unselected,
5092 StageStatus::PartiallyStaged => ToggleState::Indeterminate,
5093 };
5094
5095 let name_row = h_flex()
5096 .min_w_0()
5097 .gap_1()
5098 .pl(px(entry.depth as f32 * TREE_INDENT))
5099 .child(
5100 Icon::new(folder_icon)
5101 .size(IconSize::Small)
5102 .color(Color::Muted),
5103 )
5104 .child(self.entry_label(entry.name.clone(), label_color).truncate());
5105
5106 h_flex()
5107 .id(id)
5108 .h(self.list_item_height())
5109 .min_w_0()
5110 .w_full()
5111 .pl_3()
5112 .pr_1()
5113 .gap_1p5()
5114 .justify_between()
5115 .border_1()
5116 .border_r_2()
5117 .when(selected && self.focus_handle.is_focused(window), |el| {
5118 el.border_color(cx.theme().colors().panel_focused_border)
5119 })
5120 .bg(base_bg)
5121 .hover(|s| s.bg(hover_bg))
5122 .active(|s| s.bg(active_bg))
5123 .child(name_row)
5124 .child(
5125 div()
5126 .id(checkbox_wrapper_id)
5127 .flex_none()
5128 .occlude()
5129 .cursor_pointer()
5130 .child(
5131 Checkbox::new(checkbox_id, toggle_state)
5132 .disabled(!has_write_access)
5133 .fill()
5134 .elevation(ElevationIndex::Surface)
5135 .on_click({
5136 let entry = entry.clone();
5137 let this = cx.weak_entity();
5138 move |_, window, cx| {
5139 this.update(cx, |this, cx| {
5140 if !has_write_access {
5141 return;
5142 }
5143 this.toggle_staged_for_entry(
5144 &GitListEntry::Directory(entry.clone()),
5145 window,
5146 cx,
5147 );
5148 cx.stop_propagation();
5149 })
5150 .ok();
5151 }
5152 })
5153 .tooltip(move |_window, cx| {
5154 let action = match stage_status {
5155 StageStatus::Staged => "Unstage",
5156 StageStatus::Unstaged | StageStatus::PartiallyStaged => "Stage",
5157 };
5158 Tooltip::simple(format!("{action} folder"), cx)
5159 }),
5160 ),
5161 )
5162 .on_click({
5163 let key = entry.key.clone();
5164 cx.listener(move |this, _event: &ClickEvent, window, cx| {
5165 this.selected_entry = Some(ix);
5166 this.toggle_directory(&key, window, cx);
5167 })
5168 })
5169 .into_any_element()
5170 }
5171
5172 fn path_formatted(
5173 &self,
5174 directory: Option<String>,
5175 path_color: Color,
5176 file_name: String,
5177 label_color: Color,
5178 path_style: PathStyle,
5179 git_path_style: GitPathStyle,
5180 strikethrough: bool,
5181 ) -> Div {
5182 let file_name_first = git_path_style == GitPathStyle::FileNameFirst;
5183 let file_path_first = git_path_style == GitPathStyle::FilePathFirst;
5184
5185 let file_name = format!("{} ", file_name);
5186
5187 h_flex()
5188 .min_w_0()
5189 .overflow_hidden()
5190 .when(file_path_first, |this| this.flex_row_reverse())
5191 .child(
5192 div().flex_none().child(
5193 self.entry_label(file_name, label_color)
5194 .when(strikethrough, Label::strikethrough),
5195 ),
5196 )
5197 .when_some(directory, |this, dir| {
5198 let path_name = if file_name_first {
5199 dir
5200 } else {
5201 format!("{dir}{}", path_style.primary_separator())
5202 };
5203
5204 this.child(
5205 self.entry_label(path_name, path_color)
5206 .truncate_start()
5207 .when(strikethrough, Label::strikethrough),
5208 )
5209 })
5210 }
5211
5212 fn has_write_access(&self, cx: &App) -> bool {
5213 !self.project.read(cx).is_read_only(cx)
5214 }
5215
5216 pub fn amend_pending(&self) -> bool {
5217 self.amend_pending
5218 }
5219
5220 /// Sets the pending amend state, ensuring that the original commit message
5221 /// is either saved, when `value` is `true` and there's no pending amend, or
5222 /// restored, when `value` is `false` and there's a pending amend.
5223 pub fn set_amend_pending(&mut self, value: bool, cx: &mut Context<Self>) {
5224 if value && !self.amend_pending {
5225 let current_message = self.commit_message_buffer(cx).read(cx).text();
5226 self.original_commit_message = if current_message.trim().is_empty() {
5227 None
5228 } else {
5229 Some(current_message)
5230 };
5231 } else if !value && self.amend_pending {
5232 let message = self.original_commit_message.take().unwrap_or_default();
5233 self.commit_message_buffer(cx).update(cx, |buffer, cx| {
5234 let start = buffer.anchor_before(0);
5235 let end = buffer.anchor_after(buffer.len());
5236 buffer.edit([(start..end, message)], None, cx);
5237 });
5238 }
5239
5240 self.amend_pending = value;
5241 self.serialize(cx);
5242 cx.notify();
5243 }
5244
5245 pub fn signoff_enabled(&self) -> bool {
5246 self.signoff_enabled
5247 }
5248
5249 pub fn set_signoff_enabled(&mut self, value: bool, cx: &mut Context<Self>) {
5250 self.signoff_enabled = value;
5251 self.serialize(cx);
5252 cx.notify();
5253 }
5254
5255 pub fn toggle_signoff_enabled(
5256 &mut self,
5257 _: &Signoff,
5258 _window: &mut Window,
5259 cx: &mut Context<Self>,
5260 ) {
5261 self.set_signoff_enabled(!self.signoff_enabled, cx);
5262 }
5263
5264 pub async fn load(
5265 workspace: WeakEntity<Workspace>,
5266 mut cx: AsyncWindowContext,
5267 ) -> anyhow::Result<Entity<Self>> {
5268 let serialized_panel = match workspace
5269 .read_with(&cx, |workspace, _| Self::serialization_key(workspace))
5270 .ok()
5271 .flatten()
5272 {
5273 Some(serialization_key) => cx
5274 .background_spawn(async move { KEY_VALUE_STORE.read_kvp(&serialization_key) })
5275 .await
5276 .context("loading git panel")
5277 .log_err()
5278 .flatten()
5279 .map(|panel| serde_json::from_str::<SerializedGitPanel>(&panel))
5280 .transpose()
5281 .log_err()
5282 .flatten(),
5283 None => None,
5284 };
5285
5286 workspace.update_in(&mut cx, |workspace, window, cx| {
5287 let panel = GitPanel::new(workspace, window, cx);
5288
5289 if let Some(serialized_panel) = serialized_panel {
5290 panel.update(cx, |panel, cx| {
5291 panel.width = serialized_panel.width;
5292 panel.amend_pending = serialized_panel.amend_pending;
5293 panel.signoff_enabled = serialized_panel.signoff_enabled;
5294 cx.notify();
5295 })
5296 }
5297
5298 panel
5299 })
5300 }
5301
5302 fn stage_bulk(&mut self, mut index: usize, cx: &mut Context<'_, Self>) {
5303 let Some(op) = self.bulk_staging.as_ref() else {
5304 return;
5305 };
5306 let Some(mut anchor_index) = self.entry_by_path(&op.anchor) else {
5307 return;
5308 };
5309 if let Some(entry) = self.entries.get(index)
5310 && let Some(entry) = entry.status_entry()
5311 {
5312 self.set_bulk_staging_anchor(entry.repo_path.clone(), cx);
5313 }
5314 if index < anchor_index {
5315 std::mem::swap(&mut index, &mut anchor_index);
5316 }
5317 let entries = self
5318 .entries
5319 .get(anchor_index..=index)
5320 .unwrap_or_default()
5321 .iter()
5322 .filter_map(|entry| entry.status_entry().cloned())
5323 .collect::<Vec<_>>();
5324 self.change_file_stage(true, entries, cx);
5325 }
5326
5327 fn set_bulk_staging_anchor(&mut self, path: RepoPath, cx: &mut Context<'_, GitPanel>) {
5328 let Some(repo) = self.active_repository.as_ref() else {
5329 return;
5330 };
5331 self.bulk_staging = Some(BulkStaging {
5332 repo_id: repo.read(cx).id,
5333 anchor: path,
5334 });
5335 }
5336
5337 pub(crate) fn toggle_amend_pending(&mut self, cx: &mut Context<Self>) {
5338 self.set_amend_pending(!self.amend_pending, cx);
5339 if self.amend_pending {
5340 self.load_last_commit_message(cx);
5341 }
5342 }
5343}
5344
5345impl Render for GitPanel {
5346 fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
5347 let project = self.project.read(cx);
5348 let has_entries = !self.entries.is_empty();
5349 let room = self
5350 .workspace
5351 .upgrade()
5352 .and_then(|workspace| workspace.read(cx).active_call()?.read(cx).room().cloned());
5353
5354 let has_write_access = self.has_write_access(cx);
5355
5356 let has_co_authors = room.is_some_and(|room| {
5357 self.load_local_committer(cx);
5358 let room = room.read(cx);
5359 room.remote_participants()
5360 .values()
5361 .any(|remote_participant| remote_participant.can_write())
5362 });
5363
5364 v_flex()
5365 .id("git_panel")
5366 .key_context(self.dispatch_context(window, cx))
5367 .track_focus(&self.focus_handle)
5368 .when(has_write_access && !project.is_read_only(cx), |this| {
5369 this.on_action(cx.listener(Self::toggle_staged_for_selected))
5370 .on_action(cx.listener(Self::stage_range))
5371 .on_action(cx.listener(GitPanel::on_commit))
5372 .on_action(cx.listener(GitPanel::on_amend))
5373 .on_action(cx.listener(GitPanel::toggle_signoff_enabled))
5374 .on_action(cx.listener(Self::stage_all))
5375 .on_action(cx.listener(Self::unstage_all))
5376 .on_action(cx.listener(Self::stage_selected))
5377 .on_action(cx.listener(Self::unstage_selected))
5378 .on_action(cx.listener(Self::restore_tracked_files))
5379 .on_action(cx.listener(Self::revert_selected))
5380 .on_action(cx.listener(Self::add_to_gitignore))
5381 .on_action(cx.listener(Self::clean_all))
5382 .on_action(cx.listener(Self::generate_commit_message_action))
5383 .on_action(cx.listener(Self::stash_all))
5384 .on_action(cx.listener(Self::stash_pop))
5385 })
5386 .on_action(cx.listener(Self::collapse_selected_entry))
5387 .on_action(cx.listener(Self::expand_selected_entry))
5388 .on_action(cx.listener(Self::select_first))
5389 .on_action(cx.listener(Self::select_next))
5390 .on_action(cx.listener(Self::select_previous))
5391 .on_action(cx.listener(Self::select_last))
5392 .on_action(cx.listener(Self::first_entry))
5393 .on_action(cx.listener(Self::next_entry))
5394 .on_action(cx.listener(Self::previous_entry))
5395 .on_action(cx.listener(Self::last_entry))
5396 .on_action(cx.listener(Self::close_panel))
5397 .on_action(cx.listener(Self::open_diff))
5398 .on_action(cx.listener(Self::open_file))
5399 .on_action(cx.listener(Self::file_history))
5400 .on_action(cx.listener(Self::focus_changes_list))
5401 .on_action(cx.listener(Self::focus_editor))
5402 .on_action(cx.listener(Self::expand_commit_editor))
5403 .when(has_write_access && has_co_authors, |git_panel| {
5404 git_panel.on_action(cx.listener(Self::toggle_fill_co_authors))
5405 })
5406 .on_action(cx.listener(Self::toggle_sort_by_path))
5407 .on_action(cx.listener(Self::toggle_tree_view))
5408 .size_full()
5409 .overflow_hidden()
5410 .bg(cx.theme().colors().panel_background)
5411 .child(
5412 v_flex()
5413 .size_full()
5414 .children(self.render_panel_header(window, cx))
5415 .map(|this| {
5416 if has_entries {
5417 this.child(self.render_entries(has_write_access, window, cx))
5418 } else {
5419 this.child(self.render_empty_state(cx).into_any_element())
5420 }
5421 })
5422 .children(self.render_footer(window, cx))
5423 .when(self.amend_pending, |this| {
5424 this.child(self.render_pending_amend(cx))
5425 })
5426 .when(!self.amend_pending, |this| {
5427 this.children(self.render_previous_commit(cx))
5428 })
5429 .into_any_element(),
5430 )
5431 .children(self.context_menu.as_ref().map(|(menu, position, _)| {
5432 deferred(
5433 anchored()
5434 .position(*position)
5435 .anchor(Corner::TopLeft)
5436 .child(menu.clone()),
5437 )
5438 .with_priority(1)
5439 }))
5440 }
5441}
5442
5443impl Focusable for GitPanel {
5444 fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
5445 if self.entries.is_empty() {
5446 self.commit_editor.focus_handle(cx)
5447 } else {
5448 self.focus_handle.clone()
5449 }
5450 }
5451}
5452
5453impl EventEmitter<Event> for GitPanel {}
5454
5455impl EventEmitter<PanelEvent> for GitPanel {}
5456
5457pub(crate) struct GitPanelAddon {
5458 pub(crate) workspace: WeakEntity<Workspace>,
5459}
5460
5461impl editor::Addon for GitPanelAddon {
5462 fn to_any(&self) -> &dyn std::any::Any {
5463 self
5464 }
5465
5466 fn render_buffer_header_controls(
5467 &self,
5468 excerpt_info: &ExcerptInfo,
5469 window: &Window,
5470 cx: &App,
5471 ) -> Option<AnyElement> {
5472 let file = excerpt_info.buffer.file()?;
5473 let git_panel = self.workspace.upgrade()?.read(cx).panel::<GitPanel>(cx)?;
5474
5475 git_panel
5476 .read(cx)
5477 .render_buffer_header_controls(&git_panel, file, window, cx)
5478 }
5479}
5480
5481impl Panel for GitPanel {
5482 fn persistent_name() -> &'static str {
5483 "GitPanel"
5484 }
5485
5486 fn panel_key() -> &'static str {
5487 GIT_PANEL_KEY
5488 }
5489
5490 fn position(&self, _: &Window, cx: &App) -> DockPosition {
5491 GitPanelSettings::get_global(cx).dock
5492 }
5493
5494 fn position_is_valid(&self, position: DockPosition) -> bool {
5495 matches!(position, DockPosition::Left | DockPosition::Right)
5496 }
5497
5498 fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
5499 settings::update_settings_file(self.fs.clone(), cx, move |settings, _| {
5500 settings.git_panel.get_or_insert_default().dock = Some(position.into())
5501 });
5502 }
5503
5504 fn size(&self, _: &Window, cx: &App) -> Pixels {
5505 self.width
5506 .unwrap_or_else(|| GitPanelSettings::get_global(cx).default_width)
5507 }
5508
5509 fn set_size(&mut self, size: Option<Pixels>, _: &mut Window, cx: &mut Context<Self>) {
5510 self.width = size;
5511 self.serialize(cx);
5512 cx.notify();
5513 }
5514
5515 fn icon(&self, _: &Window, cx: &App) -> Option<ui::IconName> {
5516 Some(ui::IconName::GitBranchAlt).filter(|_| GitPanelSettings::get_global(cx).button)
5517 }
5518
5519 fn icon_tooltip(&self, _window: &Window, _cx: &App) -> Option<&'static str> {
5520 Some("Git Panel")
5521 }
5522
5523 fn toggle_action(&self) -> Box<dyn Action> {
5524 Box::new(ToggleFocus)
5525 }
5526
5527 fn activation_priority(&self) -> u32 {
5528 2
5529 }
5530}
5531
5532impl PanelHeader for GitPanel {}
5533
5534struct GitPanelMessageTooltip {
5535 commit_tooltip: Option<Entity<CommitTooltip>>,
5536}
5537
5538impl GitPanelMessageTooltip {
5539 fn new(
5540 git_panel: Entity<GitPanel>,
5541 sha: SharedString,
5542 repository: Entity<Repository>,
5543 window: &mut Window,
5544 cx: &mut App,
5545 ) -> Entity<Self> {
5546 let remote_url = repository.read(cx).default_remote_url();
5547 cx.new(|cx| {
5548 cx.spawn_in(window, async move |this, cx| {
5549 let (details, workspace) = git_panel.update(cx, |git_panel, cx| {
5550 (
5551 git_panel.load_commit_details(sha.to_string(), cx),
5552 git_panel.workspace.clone(),
5553 )
5554 })?;
5555 let details = details.await?;
5556 let provider_registry = cx
5557 .update(|_, app| GitHostingProviderRegistry::default_global(app))
5558 .ok();
5559
5560 let commit_details = crate::commit_tooltip::CommitDetails {
5561 sha: details.sha.clone(),
5562 author_name: details.author_name.clone(),
5563 author_email: details.author_email.clone(),
5564 commit_time: OffsetDateTime::from_unix_timestamp(details.commit_timestamp)?,
5565 message: Some(ParsedCommitMessage::parse(
5566 details.sha.to_string(),
5567 details.message.to_string(),
5568 remote_url.as_deref(),
5569 provider_registry,
5570 )),
5571 };
5572
5573 this.update(cx, |this: &mut GitPanelMessageTooltip, cx| {
5574 this.commit_tooltip = Some(cx.new(move |cx| {
5575 CommitTooltip::new(commit_details, repository, workspace, cx)
5576 }));
5577 cx.notify();
5578 })
5579 })
5580 .detach();
5581
5582 Self {
5583 commit_tooltip: None,
5584 }
5585 })
5586 }
5587}
5588
5589impl Render for GitPanelMessageTooltip {
5590 fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
5591 if let Some(commit_tooltip) = &self.commit_tooltip {
5592 commit_tooltip.clone().into_any_element()
5593 } else {
5594 gpui::Empty.into_any_element()
5595 }
5596 }
5597}
5598
5599#[derive(IntoElement, RegisterComponent)]
5600pub struct PanelRepoFooter {
5601 active_repository: SharedString,
5602 branch: Option<Branch>,
5603 head_commit: Option<CommitDetails>,
5604
5605 // Getting a GitPanel in previews will be difficult.
5606 //
5607 // For now just take an option here, and we won't bind handlers to buttons in previews.
5608 git_panel: Option<Entity<GitPanel>>,
5609}
5610
5611impl PanelRepoFooter {
5612 pub fn new(
5613 active_repository: SharedString,
5614 branch: Option<Branch>,
5615 head_commit: Option<CommitDetails>,
5616 git_panel: Option<Entity<GitPanel>>,
5617 ) -> Self {
5618 Self {
5619 active_repository,
5620 branch,
5621 head_commit,
5622 git_panel,
5623 }
5624 }
5625
5626 pub fn new_preview(active_repository: SharedString, branch: Option<Branch>) -> Self {
5627 Self {
5628 active_repository,
5629 branch,
5630 head_commit: None,
5631 git_panel: None,
5632 }
5633 }
5634}
5635
5636impl RenderOnce for PanelRepoFooter {
5637 fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
5638 let project = self
5639 .git_panel
5640 .as_ref()
5641 .map(|panel| panel.read(cx).project.clone());
5642
5643 let (workspace, repo) = self
5644 .git_panel
5645 .as_ref()
5646 .map(|panel| {
5647 let panel = panel.read(cx);
5648 (panel.workspace.clone(), panel.active_repository.clone())
5649 })
5650 .unzip();
5651
5652 let single_repo = project
5653 .as_ref()
5654 .map(|project| project.read(cx).git_store().read(cx).repositories().len() == 1)
5655 .unwrap_or(true);
5656
5657 const MAX_BRANCH_LEN: usize = 16;
5658 const MAX_REPO_LEN: usize = 16;
5659 const LABEL_CHARACTER_BUDGET: usize = MAX_BRANCH_LEN + MAX_REPO_LEN;
5660 const MAX_SHORT_SHA_LEN: usize = 8;
5661 let branch_name = self
5662 .branch
5663 .as_ref()
5664 .map(|branch| branch.name().to_owned())
5665 .or_else(|| {
5666 self.head_commit.as_ref().map(|commit| {
5667 commit
5668 .sha
5669 .chars()
5670 .take(MAX_SHORT_SHA_LEN)
5671 .collect::<String>()
5672 })
5673 })
5674 .unwrap_or_else(|| " (no branch)".to_owned());
5675 let show_separator = self.branch.is_some() || self.head_commit.is_some();
5676
5677 let active_repo_name = self.active_repository.clone();
5678
5679 let branch_actual_len = branch_name.len();
5680 let repo_actual_len = active_repo_name.len();
5681
5682 // ideally, show the whole branch and repo names but
5683 // when we can't, use a budget to allocate space between the two
5684 let (repo_display_len, branch_display_len) =
5685 if branch_actual_len + repo_actual_len <= LABEL_CHARACTER_BUDGET {
5686 (repo_actual_len, branch_actual_len)
5687 } else if branch_actual_len <= MAX_BRANCH_LEN {
5688 let repo_space = (LABEL_CHARACTER_BUDGET - branch_actual_len).min(MAX_REPO_LEN);
5689 (repo_space, branch_actual_len)
5690 } else if repo_actual_len <= MAX_REPO_LEN {
5691 let branch_space = (LABEL_CHARACTER_BUDGET - repo_actual_len).min(MAX_BRANCH_LEN);
5692 (repo_actual_len, branch_space)
5693 } else {
5694 (MAX_REPO_LEN, MAX_BRANCH_LEN)
5695 };
5696
5697 let truncated_repo_name = if repo_actual_len <= repo_display_len {
5698 active_repo_name.to_string()
5699 } else {
5700 util::truncate_and_trailoff(active_repo_name.trim_ascii(), repo_display_len)
5701 };
5702
5703 let truncated_branch_name = if branch_actual_len <= branch_display_len {
5704 branch_name
5705 } else {
5706 util::truncate_and_trailoff(branch_name.trim_ascii(), branch_display_len)
5707 };
5708
5709 let repo_selector_trigger = Button::new("repo-selector", truncated_repo_name)
5710 .size(ButtonSize::None)
5711 .label_size(LabelSize::Small)
5712 .color(Color::Muted);
5713
5714 let repo_selector = PopoverMenu::new("repository-switcher")
5715 .menu({
5716 let project = project;
5717 move |window, cx| {
5718 let project = project.clone()?;
5719 Some(cx.new(|cx| RepositorySelector::new(project, rems(16.), window, cx)))
5720 }
5721 })
5722 .trigger_with_tooltip(
5723 repo_selector_trigger.disabled(single_repo).truncate(true),
5724 Tooltip::text("Switch Active Repository"),
5725 )
5726 .anchor(Corner::BottomLeft)
5727 .into_any_element();
5728
5729 let branch_selector_button = Button::new("branch-selector", truncated_branch_name)
5730 .size(ButtonSize::None)
5731 .label_size(LabelSize::Small)
5732 .truncate(true)
5733 .on_click(|_, window, cx| {
5734 window.dispatch_action(zed_actions::git::Switch.boxed_clone(), cx);
5735 });
5736
5737 let branch_selector = PopoverMenu::new("popover-button")
5738 .menu(move |window, cx| {
5739 let workspace = workspace.clone()?;
5740 let repo = repo.clone().flatten();
5741 Some(branch_picker::popover(workspace, repo, window, cx))
5742 })
5743 .trigger_with_tooltip(
5744 branch_selector_button,
5745 Tooltip::for_action_title("Switch Branch", &zed_actions::git::Switch),
5746 )
5747 .anchor(Corner::BottomLeft)
5748 .offset(gpui::Point {
5749 x: px(0.0),
5750 y: px(-2.0),
5751 });
5752
5753 h_flex()
5754 .h(px(36.))
5755 .w_full()
5756 .px_2()
5757 .justify_between()
5758 .gap_1()
5759 .child(
5760 h_flex()
5761 .flex_1()
5762 .overflow_hidden()
5763 .gap_px()
5764 .child(
5765 Icon::new(IconName::GitBranchAlt)
5766 .size(IconSize::Small)
5767 .color(if single_repo {
5768 Color::Disabled
5769 } else {
5770 Color::Muted
5771 }),
5772 )
5773 .child(repo_selector)
5774 .when(show_separator, |this| {
5775 this.child(
5776 div()
5777 .text_sm()
5778 .text_color(cx.theme().colors().icon_muted.opacity(0.5))
5779 .child("/"),
5780 )
5781 })
5782 .child(branch_selector),
5783 )
5784 .children(if let Some(git_panel) = self.git_panel {
5785 git_panel.update(cx, |git_panel, cx| git_panel.render_remote_button(cx))
5786 } else {
5787 None
5788 })
5789 }
5790}
5791
5792impl Component for PanelRepoFooter {
5793 fn scope() -> ComponentScope {
5794 ComponentScope::VersionControl
5795 }
5796
5797 fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
5798 let unknown_upstream = None;
5799 let no_remote_upstream = Some(UpstreamTracking::Gone);
5800 let ahead_of_upstream = Some(
5801 UpstreamTrackingStatus {
5802 ahead: 2,
5803 behind: 0,
5804 }
5805 .into(),
5806 );
5807 let behind_upstream = Some(
5808 UpstreamTrackingStatus {
5809 ahead: 0,
5810 behind: 2,
5811 }
5812 .into(),
5813 );
5814 let ahead_and_behind_upstream = Some(
5815 UpstreamTrackingStatus {
5816 ahead: 3,
5817 behind: 1,
5818 }
5819 .into(),
5820 );
5821
5822 let not_ahead_or_behind_upstream = Some(
5823 UpstreamTrackingStatus {
5824 ahead: 0,
5825 behind: 0,
5826 }
5827 .into(),
5828 );
5829
5830 fn branch(upstream: Option<UpstreamTracking>) -> Branch {
5831 Branch {
5832 is_head: true,
5833 ref_name: "some-branch".into(),
5834 upstream: upstream.map(|tracking| Upstream {
5835 ref_name: "origin/some-branch".into(),
5836 tracking,
5837 }),
5838 most_recent_commit: Some(CommitSummary {
5839 sha: "abc123".into(),
5840 subject: "Modify stuff".into(),
5841 commit_timestamp: 1710932954,
5842 author_name: "John Doe".into(),
5843 has_parent: true,
5844 }),
5845 }
5846 }
5847
5848 fn custom(branch_name: &str, upstream: Option<UpstreamTracking>) -> Branch {
5849 Branch {
5850 is_head: true,
5851 ref_name: branch_name.to_string().into(),
5852 upstream: upstream.map(|tracking| Upstream {
5853 ref_name: format!("zed/{}", branch_name).into(),
5854 tracking,
5855 }),
5856 most_recent_commit: Some(CommitSummary {
5857 sha: "abc123".into(),
5858 subject: "Modify stuff".into(),
5859 commit_timestamp: 1710932954,
5860 author_name: "John Doe".into(),
5861 has_parent: true,
5862 }),
5863 }
5864 }
5865
5866 fn active_repository(id: usize) -> SharedString {
5867 format!("repo-{}", id).into()
5868 }
5869
5870 let example_width = px(340.);
5871 Some(
5872 v_flex()
5873 .gap_6()
5874 .w_full()
5875 .flex_none()
5876 .children(vec![
5877 example_group_with_title(
5878 "Action Button States",
5879 vec![
5880 single_example(
5881 "No Branch",
5882 div()
5883 .w(example_width)
5884 .overflow_hidden()
5885 .child(PanelRepoFooter::new_preview(active_repository(1), None))
5886 .into_any_element(),
5887 ),
5888 single_example(
5889 "Remote status unknown",
5890 div()
5891 .w(example_width)
5892 .overflow_hidden()
5893 .child(PanelRepoFooter::new_preview(
5894 active_repository(2),
5895 Some(branch(unknown_upstream)),
5896 ))
5897 .into_any_element(),
5898 ),
5899 single_example(
5900 "No Remote Upstream",
5901 div()
5902 .w(example_width)
5903 .overflow_hidden()
5904 .child(PanelRepoFooter::new_preview(
5905 active_repository(3),
5906 Some(branch(no_remote_upstream)),
5907 ))
5908 .into_any_element(),
5909 ),
5910 single_example(
5911 "Not Ahead or Behind",
5912 div()
5913 .w(example_width)
5914 .overflow_hidden()
5915 .child(PanelRepoFooter::new_preview(
5916 active_repository(4),
5917 Some(branch(not_ahead_or_behind_upstream)),
5918 ))
5919 .into_any_element(),
5920 ),
5921 single_example(
5922 "Behind remote",
5923 div()
5924 .w(example_width)
5925 .overflow_hidden()
5926 .child(PanelRepoFooter::new_preview(
5927 active_repository(5),
5928 Some(branch(behind_upstream)),
5929 ))
5930 .into_any_element(),
5931 ),
5932 single_example(
5933 "Ahead of remote",
5934 div()
5935 .w(example_width)
5936 .overflow_hidden()
5937 .child(PanelRepoFooter::new_preview(
5938 active_repository(6),
5939 Some(branch(ahead_of_upstream)),
5940 ))
5941 .into_any_element(),
5942 ),
5943 single_example(
5944 "Ahead and behind remote",
5945 div()
5946 .w(example_width)
5947 .overflow_hidden()
5948 .child(PanelRepoFooter::new_preview(
5949 active_repository(7),
5950 Some(branch(ahead_and_behind_upstream)),
5951 ))
5952 .into_any_element(),
5953 ),
5954 ],
5955 )
5956 .grow()
5957 .vertical(),
5958 ])
5959 .children(vec![
5960 example_group_with_title(
5961 "Labels",
5962 vec![
5963 single_example(
5964 "Short Branch & Repo",
5965 div()
5966 .w(example_width)
5967 .overflow_hidden()
5968 .child(PanelRepoFooter::new_preview(
5969 SharedString::from("zed"),
5970 Some(custom("main", behind_upstream)),
5971 ))
5972 .into_any_element(),
5973 ),
5974 single_example(
5975 "Long Branch",
5976 div()
5977 .w(example_width)
5978 .overflow_hidden()
5979 .child(PanelRepoFooter::new_preview(
5980 SharedString::from("zed"),
5981 Some(custom(
5982 "redesign-and-update-git-ui-list-entry-style",
5983 behind_upstream,
5984 )),
5985 ))
5986 .into_any_element(),
5987 ),
5988 single_example(
5989 "Long Repo",
5990 div()
5991 .w(example_width)
5992 .overflow_hidden()
5993 .child(PanelRepoFooter::new_preview(
5994 SharedString::from("zed-industries-community-examples"),
5995 Some(custom("gpui", ahead_of_upstream)),
5996 ))
5997 .into_any_element(),
5998 ),
5999 single_example(
6000 "Long Repo & Branch",
6001 div()
6002 .w(example_width)
6003 .overflow_hidden()
6004 .child(PanelRepoFooter::new_preview(
6005 SharedString::from("zed-industries-community-examples"),
6006 Some(custom(
6007 "redesign-and-update-git-ui-list-entry-style",
6008 behind_upstream,
6009 )),
6010 ))
6011 .into_any_element(),
6012 ),
6013 single_example(
6014 "Uppercase Repo",
6015 div()
6016 .w(example_width)
6017 .overflow_hidden()
6018 .child(PanelRepoFooter::new_preview(
6019 SharedString::from("LICENSES"),
6020 Some(custom("main", ahead_of_upstream)),
6021 ))
6022 .into_any_element(),
6023 ),
6024 single_example(
6025 "Uppercase Branch",
6026 div()
6027 .w(example_width)
6028 .overflow_hidden()
6029 .child(PanelRepoFooter::new_preview(
6030 SharedString::from("zed"),
6031 Some(custom("update-README", behind_upstream)),
6032 ))
6033 .into_any_element(),
6034 ),
6035 ],
6036 )
6037 .grow()
6038 .vertical(),
6039 ])
6040 .into_any_element(),
6041 )
6042 }
6043}
6044
6045fn open_output(
6046 operation: impl Into<SharedString>,
6047 workspace: &mut Workspace,
6048 output: &str,
6049 window: &mut Window,
6050 cx: &mut Context<Workspace>,
6051) {
6052 let operation = operation.into();
6053 let buffer = cx.new(|cx| Buffer::local(output, cx));
6054 buffer.update(cx, |buffer, cx| {
6055 buffer.set_capability(language::Capability::ReadOnly, cx);
6056 });
6057 let editor = cx.new(|cx| {
6058 let mut editor = Editor::for_buffer(buffer, None, window, cx);
6059 editor.buffer().update(cx, |buffer, cx| {
6060 buffer.set_title(format!("Output from git {operation}"), cx);
6061 });
6062 editor.set_read_only(true);
6063 editor
6064 });
6065
6066 workspace.add_item_to_center(Box::new(editor), window, cx);
6067}
6068
6069pub(crate) fn show_error_toast(
6070 workspace: Entity<Workspace>,
6071 action: impl Into<SharedString>,
6072 e: anyhow::Error,
6073 cx: &mut App,
6074) {
6075 let action = action.into();
6076 let message = e.to_string().trim().to_string();
6077 if message
6078 .matches(git::repository::REMOTE_CANCELLED_BY_USER)
6079 .next()
6080 .is_some()
6081 { // Hide the cancelled by user message
6082 } else {
6083 workspace.update(cx, |workspace, cx| {
6084 let workspace_weak = cx.weak_entity();
6085 let toast = StatusToast::new(format!("git {} failed", action), cx, |this, _cx| {
6086 this.icon(ToastIcon::new(IconName::XCircle).color(Color::Error))
6087 .action("View Log", move |window, cx| {
6088 let message = message.clone();
6089 let action = action.clone();
6090 workspace_weak
6091 .update(cx, move |workspace, cx| {
6092 open_output(action, workspace, &message, window, cx)
6093 })
6094 .ok();
6095 })
6096 });
6097 workspace.toggle_status_toast(toast, cx)
6098 });
6099 }
6100}
6101
6102#[cfg(test)]
6103mod tests {
6104 use git::{
6105 repository::repo_path,
6106 status::{StatusCode, UnmergedStatus, UnmergedStatusCode},
6107 };
6108 use gpui::{TestAppContext, UpdateGlobal, VisualTestContext};
6109 use indoc::indoc;
6110 use project::FakeFs;
6111 use serde_json::json;
6112 use settings::SettingsStore;
6113 use theme::LoadThemes;
6114 use util::path;
6115 use util::rel_path::rel_path;
6116
6117 use super::*;
6118
6119 fn init_test(cx: &mut gpui::TestAppContext) {
6120 zlog::init_test();
6121
6122 cx.update(|cx| {
6123 let settings_store = SettingsStore::test(cx);
6124 cx.set_global(settings_store);
6125 theme::init(LoadThemes::JustBase, cx);
6126 editor::init(cx);
6127 crate::init(cx);
6128 });
6129 }
6130
6131 #[gpui::test]
6132 async fn test_entry_worktree_paths(cx: &mut TestAppContext) {
6133 init_test(cx);
6134 let fs = FakeFs::new(cx.background_executor.clone());
6135 fs.insert_tree(
6136 "/root",
6137 json!({
6138 "zed": {
6139 ".git": {},
6140 "crates": {
6141 "gpui": {
6142 "gpui.rs": "fn main() {}"
6143 },
6144 "util": {
6145 "util.rs": "fn do_it() {}"
6146 }
6147 }
6148 },
6149 }),
6150 )
6151 .await;
6152
6153 fs.set_status_for_repo(
6154 Path::new(path!("/root/zed/.git")),
6155 &[
6156 ("crates/gpui/gpui.rs", StatusCode::Modified.worktree()),
6157 ("crates/util/util.rs", StatusCode::Modified.worktree()),
6158 ],
6159 );
6160
6161 let project =
6162 Project::test(fs.clone(), [path!("/root/zed/crates/gpui").as_ref()], cx).await;
6163 let workspace =
6164 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6165 let cx = &mut VisualTestContext::from_window(*workspace, cx);
6166
6167 cx.read(|cx| {
6168 project
6169 .read(cx)
6170 .worktrees(cx)
6171 .next()
6172 .unwrap()
6173 .read(cx)
6174 .as_local()
6175 .unwrap()
6176 .scan_complete()
6177 })
6178 .await;
6179
6180 cx.executor().run_until_parked();
6181
6182 let panel = workspace.update(cx, GitPanel::new).unwrap();
6183
6184 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6185 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6186 });
6187 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6188 handle.await;
6189
6190 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6191 pretty_assertions::assert_eq!(
6192 entries,
6193 [
6194 GitListEntry::Header(GitHeaderEntry {
6195 header: Section::Tracked
6196 }),
6197 GitListEntry::Status(GitStatusEntry {
6198 repo_path: repo_path("crates/gpui/gpui.rs"),
6199 status: StatusCode::Modified.worktree(),
6200 staging: StageStatus::Unstaged,
6201 }),
6202 GitListEntry::Status(GitStatusEntry {
6203 repo_path: repo_path("crates/util/util.rs"),
6204 status: StatusCode::Modified.worktree(),
6205 staging: StageStatus::Unstaged,
6206 },),
6207 ],
6208 );
6209
6210 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6211 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6212 });
6213 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6214 handle.await;
6215 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6216 pretty_assertions::assert_eq!(
6217 entries,
6218 [
6219 GitListEntry::Header(GitHeaderEntry {
6220 header: Section::Tracked
6221 }),
6222 GitListEntry::Status(GitStatusEntry {
6223 repo_path: repo_path("crates/gpui/gpui.rs"),
6224 status: StatusCode::Modified.worktree(),
6225 staging: StageStatus::Unstaged,
6226 }),
6227 GitListEntry::Status(GitStatusEntry {
6228 repo_path: repo_path("crates/util/util.rs"),
6229 status: StatusCode::Modified.worktree(),
6230 staging: StageStatus::Unstaged,
6231 },),
6232 ],
6233 );
6234 }
6235
6236 #[gpui::test]
6237 async fn test_bulk_staging(cx: &mut TestAppContext) {
6238 use GitListEntry::*;
6239
6240 init_test(cx);
6241 let fs = FakeFs::new(cx.background_executor.clone());
6242 fs.insert_tree(
6243 "/root",
6244 json!({
6245 "project": {
6246 ".git": {},
6247 "src": {
6248 "main.rs": "fn main() {}",
6249 "lib.rs": "pub fn hello() {}",
6250 "utils.rs": "pub fn util() {}"
6251 },
6252 "tests": {
6253 "test.rs": "fn test() {}"
6254 },
6255 "new_file.txt": "new content",
6256 "another_new.rs": "// new file",
6257 "conflict.txt": "conflicted content"
6258 }
6259 }),
6260 )
6261 .await;
6262
6263 fs.set_status_for_repo(
6264 Path::new(path!("/root/project/.git")),
6265 &[
6266 ("src/main.rs", StatusCode::Modified.worktree()),
6267 ("src/lib.rs", StatusCode::Modified.worktree()),
6268 ("tests/test.rs", StatusCode::Modified.worktree()),
6269 ("new_file.txt", FileStatus::Untracked),
6270 ("another_new.rs", FileStatus::Untracked),
6271 ("src/utils.rs", FileStatus::Untracked),
6272 (
6273 "conflict.txt",
6274 UnmergedStatus {
6275 first_head: UnmergedStatusCode::Updated,
6276 second_head: UnmergedStatusCode::Updated,
6277 }
6278 .into(),
6279 ),
6280 ],
6281 );
6282
6283 let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
6284 let workspace =
6285 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6286 let cx = &mut VisualTestContext::from_window(*workspace, cx);
6287
6288 cx.read(|cx| {
6289 project
6290 .read(cx)
6291 .worktrees(cx)
6292 .next()
6293 .unwrap()
6294 .read(cx)
6295 .as_local()
6296 .unwrap()
6297 .scan_complete()
6298 })
6299 .await;
6300
6301 cx.executor().run_until_parked();
6302
6303 let panel = workspace.update(cx, GitPanel::new).unwrap();
6304
6305 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6306 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6307 });
6308 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6309 handle.await;
6310
6311 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6312 #[rustfmt::skip]
6313 pretty_assertions::assert_matches!(
6314 entries.as_slice(),
6315 &[
6316 Header(GitHeaderEntry { header: Section::Conflict }),
6317 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6318 Header(GitHeaderEntry { header: Section::Tracked }),
6319 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6320 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6321 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6322 Header(GitHeaderEntry { header: Section::New }),
6323 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6324 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6325 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6326 ],
6327 );
6328
6329 let second_status_entry = entries[3].clone();
6330 panel.update_in(cx, |panel, window, cx| {
6331 panel.toggle_staged_for_entry(&second_status_entry, window, cx);
6332 });
6333
6334 panel.update_in(cx, |panel, window, cx| {
6335 panel.selected_entry = Some(7);
6336 panel.stage_range(&git::StageRange, window, cx);
6337 });
6338
6339 cx.read(|cx| {
6340 project
6341 .read(cx)
6342 .worktrees(cx)
6343 .next()
6344 .unwrap()
6345 .read(cx)
6346 .as_local()
6347 .unwrap()
6348 .scan_complete()
6349 })
6350 .await;
6351
6352 cx.executor().run_until_parked();
6353
6354 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6355 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6356 });
6357 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6358 handle.await;
6359
6360 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6361 #[rustfmt::skip]
6362 pretty_assertions::assert_matches!(
6363 entries.as_slice(),
6364 &[
6365 Header(GitHeaderEntry { header: Section::Conflict }),
6366 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6367 Header(GitHeaderEntry { header: Section::Tracked }),
6368 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6369 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6370 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6371 Header(GitHeaderEntry { header: Section::New }),
6372 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6373 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6374 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6375 ],
6376 );
6377
6378 let third_status_entry = entries[4].clone();
6379 panel.update_in(cx, |panel, window, cx| {
6380 panel.toggle_staged_for_entry(&third_status_entry, window, cx);
6381 });
6382
6383 panel.update_in(cx, |panel, window, cx| {
6384 panel.selected_entry = Some(9);
6385 panel.stage_range(&git::StageRange, window, cx);
6386 });
6387
6388 cx.read(|cx| {
6389 project
6390 .read(cx)
6391 .worktrees(cx)
6392 .next()
6393 .unwrap()
6394 .read(cx)
6395 .as_local()
6396 .unwrap()
6397 .scan_complete()
6398 })
6399 .await;
6400
6401 cx.executor().run_until_parked();
6402
6403 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6404 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6405 });
6406 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6407 handle.await;
6408
6409 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6410 #[rustfmt::skip]
6411 pretty_assertions::assert_matches!(
6412 entries.as_slice(),
6413 &[
6414 Header(GitHeaderEntry { header: Section::Conflict }),
6415 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6416 Header(GitHeaderEntry { header: Section::Tracked }),
6417 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6418 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6419 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6420 Header(GitHeaderEntry { header: Section::New }),
6421 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6422 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6423 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
6424 ],
6425 );
6426 }
6427
6428 #[gpui::test]
6429 async fn test_bulk_staging_with_sort_by_paths(cx: &mut TestAppContext) {
6430 use GitListEntry::*;
6431
6432 init_test(cx);
6433 let fs = FakeFs::new(cx.background_executor.clone());
6434 fs.insert_tree(
6435 "/root",
6436 json!({
6437 "project": {
6438 ".git": {},
6439 "src": {
6440 "main.rs": "fn main() {}",
6441 "lib.rs": "pub fn hello() {}",
6442 "utils.rs": "pub fn util() {}"
6443 },
6444 "tests": {
6445 "test.rs": "fn test() {}"
6446 },
6447 "new_file.txt": "new content",
6448 "another_new.rs": "// new file",
6449 "conflict.txt": "conflicted content"
6450 }
6451 }),
6452 )
6453 .await;
6454
6455 fs.set_status_for_repo(
6456 Path::new(path!("/root/project/.git")),
6457 &[
6458 ("src/main.rs", StatusCode::Modified.worktree()),
6459 ("src/lib.rs", StatusCode::Modified.worktree()),
6460 ("tests/test.rs", StatusCode::Modified.worktree()),
6461 ("new_file.txt", FileStatus::Untracked),
6462 ("another_new.rs", FileStatus::Untracked),
6463 ("src/utils.rs", FileStatus::Untracked),
6464 (
6465 "conflict.txt",
6466 UnmergedStatus {
6467 first_head: UnmergedStatusCode::Updated,
6468 second_head: UnmergedStatusCode::Updated,
6469 }
6470 .into(),
6471 ),
6472 ],
6473 );
6474
6475 let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
6476 let workspace =
6477 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6478 let cx = &mut VisualTestContext::from_window(*workspace, cx);
6479
6480 cx.read(|cx| {
6481 project
6482 .read(cx)
6483 .worktrees(cx)
6484 .next()
6485 .unwrap()
6486 .read(cx)
6487 .as_local()
6488 .unwrap()
6489 .scan_complete()
6490 })
6491 .await;
6492
6493 cx.executor().run_until_parked();
6494
6495 let panel = workspace.update(cx, GitPanel::new).unwrap();
6496
6497 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6498 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6499 });
6500 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6501 handle.await;
6502
6503 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6504 #[rustfmt::skip]
6505 pretty_assertions::assert_matches!(
6506 entries.as_slice(),
6507 &[
6508 Header(GitHeaderEntry { header: Section::Conflict }),
6509 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6510 Header(GitHeaderEntry { header: Section::Tracked }),
6511 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6512 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6513 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6514 Header(GitHeaderEntry { header: Section::New }),
6515 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6516 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6517 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
6518 ],
6519 );
6520
6521 assert_entry_paths(
6522 &entries,
6523 &[
6524 None,
6525 Some("conflict.txt"),
6526 None,
6527 Some("src/lib.rs"),
6528 Some("src/main.rs"),
6529 Some("tests/test.rs"),
6530 None,
6531 Some("another_new.rs"),
6532 Some("new_file.txt"),
6533 Some("src/utils.rs"),
6534 ],
6535 );
6536
6537 let second_status_entry = entries[3].clone();
6538 panel.update_in(cx, |panel, window, cx| {
6539 panel.toggle_staged_for_entry(&second_status_entry, window, cx);
6540 });
6541
6542 cx.update(|_window, cx| {
6543 SettingsStore::update_global(cx, |store, cx| {
6544 store.update_user_settings(cx, |settings| {
6545 settings.git_panel.get_or_insert_default().sort_by_path = Some(true);
6546 })
6547 });
6548 });
6549
6550 panel.update_in(cx, |panel, window, cx| {
6551 panel.selected_entry = Some(7);
6552 panel.stage_range(&git::StageRange, window, cx);
6553 });
6554
6555 cx.read(|cx| {
6556 project
6557 .read(cx)
6558 .worktrees(cx)
6559 .next()
6560 .unwrap()
6561 .read(cx)
6562 .as_local()
6563 .unwrap()
6564 .scan_complete()
6565 })
6566 .await;
6567
6568 cx.executor().run_until_parked();
6569
6570 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6571 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6572 });
6573 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6574 handle.await;
6575
6576 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6577 #[rustfmt::skip]
6578 pretty_assertions::assert_matches!(
6579 entries.as_slice(),
6580 &[
6581 Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
6582 Status(GitStatusEntry { status: FileStatus::Unmerged(..), staging: StageStatus::Unstaged, .. }),
6583 Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
6584 Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Staged, .. }),
6585 Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Unstaged, .. }),
6586 Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
6587 Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Unstaged, .. }),
6588 ],
6589 );
6590
6591 assert_entry_paths(
6592 &entries,
6593 &[
6594 Some("another_new.rs"),
6595 Some("conflict.txt"),
6596 Some("new_file.txt"),
6597 Some("src/lib.rs"),
6598 Some("src/main.rs"),
6599 Some("src/utils.rs"),
6600 Some("tests/test.rs"),
6601 ],
6602 );
6603
6604 let third_status_entry = entries[4].clone();
6605 panel.update_in(cx, |panel, window, cx| {
6606 panel.toggle_staged_for_entry(&third_status_entry, window, cx);
6607 });
6608
6609 panel.update_in(cx, |panel, window, cx| {
6610 panel.selected_entry = Some(9);
6611 panel.stage_range(&git::StageRange, window, cx);
6612 });
6613
6614 cx.read(|cx| {
6615 project
6616 .read(cx)
6617 .worktrees(cx)
6618 .next()
6619 .unwrap()
6620 .read(cx)
6621 .as_local()
6622 .unwrap()
6623 .scan_complete()
6624 })
6625 .await;
6626
6627 cx.executor().run_until_parked();
6628
6629 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6630 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6631 });
6632 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6633 handle.await;
6634
6635 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
6636 #[rustfmt::skip]
6637 pretty_assertions::assert_matches!(
6638 entries.as_slice(),
6639 &[
6640 Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
6641 Status(GitStatusEntry { status: FileStatus::Unmerged(..), staging: StageStatus::Unstaged, .. }),
6642 Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
6643 Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Staged, .. }),
6644 Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Staged, .. }),
6645 Status(GitStatusEntry { status: FileStatus::Untracked, staging: StageStatus::Unstaged, .. }),
6646 Status(GitStatusEntry { status: FileStatus::Tracked(..), staging: StageStatus::Unstaged, .. }),
6647 ],
6648 );
6649
6650 assert_entry_paths(
6651 &entries,
6652 &[
6653 Some("another_new.rs"),
6654 Some("conflict.txt"),
6655 Some("new_file.txt"),
6656 Some("src/lib.rs"),
6657 Some("src/main.rs"),
6658 Some("src/utils.rs"),
6659 Some("tests/test.rs"),
6660 ],
6661 );
6662 }
6663
6664 #[gpui::test]
6665 async fn test_amend_commit_message_handling(cx: &mut TestAppContext) {
6666 init_test(cx);
6667 let fs = FakeFs::new(cx.background_executor.clone());
6668 fs.insert_tree(
6669 "/root",
6670 json!({
6671 "project": {
6672 ".git": {},
6673 "src": {
6674 "main.rs": "fn main() {}"
6675 }
6676 }
6677 }),
6678 )
6679 .await;
6680
6681 fs.set_status_for_repo(
6682 Path::new(path!("/root/project/.git")),
6683 &[("src/main.rs", StatusCode::Modified.worktree())],
6684 );
6685
6686 let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
6687 let workspace =
6688 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6689 let cx = &mut VisualTestContext::from_window(*workspace, cx);
6690
6691 let panel = workspace.update(cx, GitPanel::new).unwrap();
6692
6693 // Test: User has commit message, enables amend (saves message), then disables (restores message)
6694 panel.update(cx, |panel, cx| {
6695 panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
6696 let start = buffer.anchor_before(0);
6697 let end = buffer.anchor_after(buffer.len());
6698 buffer.edit([(start..end, "Initial commit message")], None, cx);
6699 });
6700
6701 panel.set_amend_pending(true, cx);
6702 assert!(panel.original_commit_message.is_some());
6703
6704 panel.set_amend_pending(false, cx);
6705 let current_message = panel.commit_message_buffer(cx).read(cx).text();
6706 assert_eq!(current_message, "Initial commit message");
6707 assert!(panel.original_commit_message.is_none());
6708 });
6709
6710 // Test: User has empty commit message, enables amend, then disables (clears message)
6711 panel.update(cx, |panel, cx| {
6712 panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
6713 let start = buffer.anchor_before(0);
6714 let end = buffer.anchor_after(buffer.len());
6715 buffer.edit([(start..end, "")], None, cx);
6716 });
6717
6718 panel.set_amend_pending(true, cx);
6719 assert!(panel.original_commit_message.is_none());
6720
6721 panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
6722 let start = buffer.anchor_before(0);
6723 let end = buffer.anchor_after(buffer.len());
6724 buffer.edit([(start..end, "Previous commit message")], None, cx);
6725 });
6726
6727 panel.set_amend_pending(false, cx);
6728 let current_message = panel.commit_message_buffer(cx).read(cx).text();
6729 assert_eq!(current_message, "");
6730 });
6731 }
6732
6733 #[gpui::test]
6734 async fn test_amend(cx: &mut TestAppContext) {
6735 init_test(cx);
6736 let fs = FakeFs::new(cx.background_executor.clone());
6737 fs.insert_tree(
6738 "/root",
6739 json!({
6740 "project": {
6741 ".git": {},
6742 "src": {
6743 "main.rs": "fn main() {}"
6744 }
6745 }
6746 }),
6747 )
6748 .await;
6749
6750 fs.set_status_for_repo(
6751 Path::new(path!("/root/project/.git")),
6752 &[("src/main.rs", StatusCode::Modified.worktree())],
6753 );
6754
6755 let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
6756 let workspace =
6757 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6758 let cx = &mut VisualTestContext::from_window(*workspace, cx);
6759
6760 // Wait for the project scanning to finish so that `head_commit(cx)` is
6761 // actually set, otherwise no head commit would be available from which
6762 // to fetch the latest commit message from.
6763 cx.executor().run_until_parked();
6764
6765 let panel = workspace.update(cx, GitPanel::new).unwrap();
6766 panel.read_with(cx, |panel, cx| {
6767 assert!(panel.active_repository.is_some());
6768 assert!(panel.head_commit(cx).is_some());
6769 });
6770
6771 panel.update_in(cx, |panel, window, cx| {
6772 // Update the commit editor's message to ensure that its contents
6773 // are later restored, after amending is finished.
6774 panel.commit_message_buffer(cx).update(cx, |buffer, cx| {
6775 buffer.set_text("refactor: update main.rs", cx);
6776 });
6777
6778 // Start amending the previous commit.
6779 panel.focus_editor(&Default::default(), window, cx);
6780 panel.on_amend(&Amend, window, cx);
6781 });
6782
6783 // Since `GitPanel.amend` attempts to fetch the latest commit message in
6784 // a background task, we need to wait for it to complete before being
6785 // able to assert that the commit message editor's state has been
6786 // updated.
6787 cx.run_until_parked();
6788
6789 panel.update_in(cx, |panel, window, cx| {
6790 assert_eq!(
6791 panel.commit_message_buffer(cx).read(cx).text(),
6792 "initial commit"
6793 );
6794 assert_eq!(
6795 panel.original_commit_message,
6796 Some("refactor: update main.rs".to_string())
6797 );
6798
6799 // Finish amending the previous commit.
6800 panel.focus_editor(&Default::default(), window, cx);
6801 panel.on_amend(&Amend, window, cx);
6802 });
6803
6804 // Since the actual commit logic is run in a background task, we need to
6805 // await its completion to actually ensure that the commit message
6806 // editor's contents are set to the original message and haven't been
6807 // cleared.
6808 cx.run_until_parked();
6809
6810 panel.update_in(cx, |panel, _window, cx| {
6811 // After amending, the commit editor's message should be restored to
6812 // the original message.
6813 assert_eq!(
6814 panel.commit_message_buffer(cx).read(cx).text(),
6815 "refactor: update main.rs"
6816 );
6817 assert!(panel.original_commit_message.is_none());
6818 });
6819 }
6820
6821 #[gpui::test]
6822 async fn test_open_diff(cx: &mut TestAppContext) {
6823 init_test(cx);
6824
6825 let fs = FakeFs::new(cx.background_executor.clone());
6826 fs.insert_tree(
6827 path!("/project"),
6828 json!({
6829 ".git": {},
6830 "tracked": "tracked\n",
6831 "untracked": "\n",
6832 }),
6833 )
6834 .await;
6835
6836 fs.set_head_and_index_for_repo(
6837 path!("/project/.git").as_ref(),
6838 &[("tracked", "old tracked\n".into())],
6839 );
6840
6841 let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
6842 let workspace =
6843 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6844 let cx = &mut VisualTestContext::from_window(*workspace, cx);
6845 let panel = workspace.update(cx, GitPanel::new).unwrap();
6846
6847 // Enable the `sort_by_path` setting and wait for entries to be updated,
6848 // as there should no longer be separators between Tracked and Untracked
6849 // files.
6850 cx.update(|_window, cx| {
6851 SettingsStore::update_global(cx, |store, cx| {
6852 store.update_user_settings(cx, |settings| {
6853 settings.git_panel.get_or_insert_default().sort_by_path = Some(true);
6854 })
6855 });
6856 });
6857
6858 cx.update_window_entity(&panel, |panel, _, _| {
6859 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6860 })
6861 .await;
6862
6863 // Confirm that `Open Diff` still works for the untracked file, updating
6864 // the Project Diff's active path.
6865 panel.update_in(cx, |panel, window, cx| {
6866 panel.selected_entry = Some(1);
6867 panel.open_diff(&menu::Confirm, window, cx);
6868 });
6869 cx.run_until_parked();
6870
6871 let _ = workspace.update(cx, |workspace, _window, cx| {
6872 let active_path = workspace
6873 .item_of_type::<ProjectDiff>(cx)
6874 .expect("ProjectDiff should exist")
6875 .read(cx)
6876 .active_path(cx)
6877 .expect("active_path should exist");
6878
6879 assert_eq!(active_path.path, rel_path("untracked").into_arc());
6880 });
6881 }
6882
6883 #[gpui::test]
6884 async fn test_tree_view_reveals_collapsed_parent_on_select_entry_by_path(
6885 cx: &mut TestAppContext,
6886 ) {
6887 init_test(cx);
6888
6889 let fs = FakeFs::new(cx.background_executor.clone());
6890 fs.insert_tree(
6891 path!("/project"),
6892 json!({
6893 ".git": {},
6894 "src": {
6895 "a": {
6896 "foo.rs": "fn foo() {}",
6897 },
6898 "b": {
6899 "bar.rs": "fn bar() {}",
6900 },
6901 },
6902 }),
6903 )
6904 .await;
6905
6906 fs.set_status_for_repo(
6907 path!("/project/.git").as_ref(),
6908 &[
6909 ("src/a/foo.rs", StatusCode::Modified.worktree()),
6910 ("src/b/bar.rs", StatusCode::Modified.worktree()),
6911 ],
6912 );
6913
6914 let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
6915 let workspace =
6916 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
6917 let cx = &mut VisualTestContext::from_window(*workspace, cx);
6918
6919 cx.read(|cx| {
6920 project
6921 .read(cx)
6922 .worktrees(cx)
6923 .next()
6924 .unwrap()
6925 .read(cx)
6926 .as_local()
6927 .unwrap()
6928 .scan_complete()
6929 })
6930 .await;
6931
6932 cx.executor().run_until_parked();
6933
6934 cx.update(|_window, cx| {
6935 SettingsStore::update_global(cx, |store, cx| {
6936 store.update_user_settings(cx, |settings| {
6937 settings.git_panel.get_or_insert_default().tree_view = Some(true);
6938 })
6939 });
6940 });
6941
6942 let panel = workspace.update(cx, GitPanel::new).unwrap();
6943
6944 let handle = cx.update_window_entity(&panel, |panel, _, _| {
6945 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
6946 });
6947 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
6948 handle.await;
6949
6950 let src_key = panel.read_with(cx, |panel, _| {
6951 panel
6952 .entries
6953 .iter()
6954 .find_map(|entry| match entry {
6955 GitListEntry::Directory(dir) if dir.key.path == repo_path("src") => {
6956 Some(dir.key.clone())
6957 }
6958 _ => None,
6959 })
6960 .expect("src directory should exist in tree view")
6961 });
6962
6963 panel.update_in(cx, |panel, window, cx| {
6964 panel.toggle_directory(&src_key, window, cx);
6965 });
6966
6967 panel.read_with(cx, |panel, _| {
6968 let state = panel
6969 .view_mode
6970 .tree_state()
6971 .expect("tree view state should exist");
6972 assert_eq!(state.expanded_dirs.get(&src_key).copied(), Some(false));
6973 });
6974
6975 let worktree_id =
6976 cx.read(|cx| project.read(cx).worktrees(cx).next().unwrap().read(cx).id());
6977 let project_path = ProjectPath {
6978 worktree_id,
6979 path: RelPath::unix("src/a/foo.rs").unwrap().into_arc(),
6980 };
6981
6982 panel.update_in(cx, |panel, window, cx| {
6983 panel.select_entry_by_path(project_path, window, cx);
6984 });
6985
6986 panel.read_with(cx, |panel, _| {
6987 let state = panel
6988 .view_mode
6989 .tree_state()
6990 .expect("tree view state should exist");
6991 assert_eq!(state.expanded_dirs.get(&src_key).copied(), Some(true));
6992
6993 let selected_ix = panel.selected_entry.expect("selection should be set");
6994 assert!(state.logical_indices.contains(&selected_ix));
6995
6996 let selected_entry = panel
6997 .entries
6998 .get(selected_ix)
6999 .and_then(|entry| entry.status_entry())
7000 .expect("selected entry should be a status entry");
7001 assert_eq!(selected_entry.repo_path, repo_path("src/a/foo.rs"));
7002 });
7003 }
7004
7005 fn assert_entry_paths(entries: &[GitListEntry], expected_paths: &[Option<&str>]) {
7006 assert_eq!(entries.len(), expected_paths.len());
7007 for (entry, expected_path) in entries.iter().zip(expected_paths) {
7008 assert_eq!(
7009 entry.status_entry().map(|status| status
7010 .repo_path
7011 .as_ref()
7012 .as_std_path()
7013 .to_string_lossy()
7014 .to_string()),
7015 expected_path.map(|s| s.to_string())
7016 );
7017 }
7018 }
7019
7020 #[test]
7021 fn test_compress_diff_no_truncation() {
7022 let diff = indoc! {"
7023 --- a/file.txt
7024 +++ b/file.txt
7025 @@ -1,2 +1,2 @@
7026 -old
7027 +new
7028 "};
7029 let result = GitPanel::compress_commit_diff(diff, 1000);
7030 assert_eq!(result, diff);
7031 }
7032
7033 #[test]
7034 fn test_compress_diff_truncate_long_lines() {
7035 let long_line = "🦀".repeat(300);
7036 let diff = indoc::formatdoc! {"
7037 --- a/file.txt
7038 +++ b/file.txt
7039 @@ -1,2 +1,3 @@
7040 context
7041 +{}
7042 more context
7043 ", long_line};
7044 let result = GitPanel::compress_commit_diff(&diff, 100);
7045 assert!(result.contains("...[truncated]"));
7046 assert!(result.len() < diff.len());
7047 }
7048
7049 #[test]
7050 fn test_compress_diff_truncate_hunks() {
7051 let diff = indoc! {"
7052 --- a/file.txt
7053 +++ b/file.txt
7054 @@ -1,2 +1,2 @@
7055 context
7056 -old1
7057 +new1
7058 @@ -5,2 +5,2 @@
7059 context 2
7060 -old2
7061 +new2
7062 @@ -10,2 +10,2 @@
7063 context 3
7064 -old3
7065 +new3
7066 "};
7067 let result = GitPanel::compress_commit_diff(diff, 100);
7068 let expected = indoc! {"
7069 --- a/file.txt
7070 +++ b/file.txt
7071 @@ -1,2 +1,2 @@
7072 context
7073 -old1
7074 +new1
7075 [...skipped 2 hunks...]
7076 "};
7077 assert_eq!(result, expected);
7078 }
7079
7080 #[gpui::test]
7081 async fn test_suggest_commit_message(cx: &mut TestAppContext) {
7082 init_test(cx);
7083
7084 let fs = FakeFs::new(cx.background_executor.clone());
7085 fs.insert_tree(
7086 path!("/project"),
7087 json!({
7088 ".git": {},
7089 "tracked": "tracked\n",
7090 "untracked": "\n",
7091 }),
7092 )
7093 .await;
7094
7095 fs.set_head_and_index_for_repo(
7096 path!("/project/.git").as_ref(),
7097 &[("tracked", "old tracked\n".into())],
7098 );
7099
7100 let project = Project::test(fs.clone(), [Path::new(path!("/project"))], cx).await;
7101 let workspace =
7102 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
7103 let cx = &mut VisualTestContext::from_window(*workspace, cx);
7104 let panel = workspace.update(cx, GitPanel::new).unwrap();
7105
7106 let handle = cx.update_window_entity(&panel, |panel, _, _| {
7107 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
7108 });
7109 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
7110 handle.await;
7111
7112 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
7113
7114 // GitPanel
7115 // - Tracked:
7116 // - [] tracked
7117 // - Untracked
7118 // - [] untracked
7119 //
7120 // The commit message should now read:
7121 // "Update tracked"
7122 let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
7123 assert_eq!(message, Some("Update tracked".to_string()));
7124
7125 let first_status_entry = entries[1].clone();
7126 panel.update_in(cx, |panel, window, cx| {
7127 panel.toggle_staged_for_entry(&first_status_entry, window, cx);
7128 });
7129
7130 cx.read(|cx| {
7131 project
7132 .read(cx)
7133 .worktrees(cx)
7134 .next()
7135 .unwrap()
7136 .read(cx)
7137 .as_local()
7138 .unwrap()
7139 .scan_complete()
7140 })
7141 .await;
7142
7143 cx.executor().run_until_parked();
7144
7145 let handle = cx.update_window_entity(&panel, |panel, _, _| {
7146 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
7147 });
7148 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
7149 handle.await;
7150
7151 // GitPanel
7152 // - Tracked:
7153 // - [x] tracked
7154 // - Untracked
7155 // - [] untracked
7156 //
7157 // The commit message should still read:
7158 // "Update tracked"
7159 let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
7160 assert_eq!(message, Some("Update tracked".to_string()));
7161
7162 let second_status_entry = entries[3].clone();
7163 panel.update_in(cx, |panel, window, cx| {
7164 panel.toggle_staged_for_entry(&second_status_entry, window, cx);
7165 });
7166
7167 cx.read(|cx| {
7168 project
7169 .read(cx)
7170 .worktrees(cx)
7171 .next()
7172 .unwrap()
7173 .read(cx)
7174 .as_local()
7175 .unwrap()
7176 .scan_complete()
7177 })
7178 .await;
7179
7180 cx.executor().run_until_parked();
7181
7182 let handle = cx.update_window_entity(&panel, |panel, _, _| {
7183 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
7184 });
7185 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
7186 handle.await;
7187
7188 // GitPanel
7189 // - Tracked:
7190 // - [x] tracked
7191 // - Untracked
7192 // - [x] untracked
7193 //
7194 // The commit message should now read:
7195 // "Enter commit message"
7196 // (which means we should see None returned).
7197 let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
7198 assert!(message.is_none());
7199
7200 panel.update_in(cx, |panel, window, cx| {
7201 panel.toggle_staged_for_entry(&first_status_entry, window, cx);
7202 });
7203
7204 cx.read(|cx| {
7205 project
7206 .read(cx)
7207 .worktrees(cx)
7208 .next()
7209 .unwrap()
7210 .read(cx)
7211 .as_local()
7212 .unwrap()
7213 .scan_complete()
7214 })
7215 .await;
7216
7217 cx.executor().run_until_parked();
7218
7219 let handle = cx.update_window_entity(&panel, |panel, _, _| {
7220 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
7221 });
7222 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
7223 handle.await;
7224
7225 // GitPanel
7226 // - Tracked:
7227 // - [] tracked
7228 // - Untracked
7229 // - [x] untracked
7230 //
7231 // The commit message should now read:
7232 // "Update untracked"
7233 let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
7234 assert_eq!(message, Some("Create untracked".to_string()));
7235
7236 panel.update_in(cx, |panel, window, cx| {
7237 panel.toggle_staged_for_entry(&second_status_entry, window, cx);
7238 });
7239
7240 cx.read(|cx| {
7241 project
7242 .read(cx)
7243 .worktrees(cx)
7244 .next()
7245 .unwrap()
7246 .read(cx)
7247 .as_local()
7248 .unwrap()
7249 .scan_complete()
7250 })
7251 .await;
7252
7253 cx.executor().run_until_parked();
7254
7255 let handle = cx.update_window_entity(&panel, |panel, _, _| {
7256 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
7257 });
7258 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
7259 handle.await;
7260
7261 // GitPanel
7262 // - Tracked:
7263 // - [] tracked
7264 // - Untracked
7265 // - [] untracked
7266 //
7267 // The commit message should now read:
7268 // "Update tracked"
7269 let message = panel.update(cx, |panel, cx| panel.suggest_commit_message(cx));
7270 assert_eq!(message, Some("Update tracked".to_string()));
7271 }
7272}