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