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