1use crate::askpass_modal::AskPassModal;
2use crate::commit_modal::CommitModal;
3use crate::commit_tooltip::CommitTooltip;
4use crate::commit_view::CommitView;
5use crate::git_panel_settings::StatusStyle;
6use crate::project_diff::{self, Diff, ProjectDiff};
7use crate::remote_output::{self, RemoteAction, SuccessMessage};
8use crate::{branch_picker, picker_prompt, render_remote_button};
9use crate::{
10 git_panel_settings::GitPanelSettings, git_status_icon, repository_selector::RepositorySelector,
11};
12use agent_settings::AgentSettings;
13use anyhow::Context as _;
14use askpass::AskPassDelegate;
15use db::kvp::KEY_VALUE_STORE;
16use editor::{
17 Editor, EditorElement, EditorMode, EditorSettings, MultiBuffer, ShowScrollbar,
18 scroll::ScrollbarAutoHide,
19};
20use futures::StreamExt as _;
21use git::blame::ParsedCommitMessage;
22use git::repository::{
23 Branch, CommitDetails, CommitOptions, CommitSummary, DiffType, FetchOptions, GitCommitter,
24 PushOptions, Remote, RemoteCommandOutput, ResetMode, Upstream, UpstreamTracking,
25 UpstreamTrackingStatus, get_git_committer,
26};
27use git::status::StageStatus;
28use git::{Amend, Signoff, ToggleStaged, repository::RepoPath, status::FileStatus};
29use git::{
30 ExpandCommitEditor, RestoreTrackedFiles, StageAll, StashAll, StashPop, TrashUntrackedFiles,
31 UnstageAll,
32};
33use gpui::{
34 Action, Animation, AnimationExt as _, AsyncApp, AsyncWindowContext, Axis, ClickEvent, Corner,
35 DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, KeyContext,
36 ListHorizontalSizingBehavior, ListSizingBehavior, MouseButton, MouseDownEvent, Point,
37 PromptLevel, ScrollStrategy, Subscription, Task, Transformation, UniformListScrollHandle,
38 WeakEntity, actions, anchored, deferred, percentage, uniform_list,
39};
40use itertools::Itertools;
41use language::{Buffer, File};
42use language_model::{
43 ConfiguredModel, LanguageModel, LanguageModelRegistry, LanguageModelRequest,
44 LanguageModelRequestMessage, Role,
45};
46use menu::{Confirm, SecondaryConfirm, SelectFirst, SelectLast, SelectNext, SelectPrevious};
47use multi_buffer::ExcerptInfo;
48use notifications::status_toast::{StatusToast, ToastIcon};
49use panel::{
50 PanelHeader, panel_button, panel_editor_container, panel_editor_style, panel_filled_button,
51 panel_icon_button,
52};
53use project::{
54 DisableAiSettings, Fs, Project, ProjectPath,
55 git_store::{GitStoreEvent, Repository, RepositoryEvent, RepositoryId},
56};
57use serde::{Deserialize, Serialize};
58use settings::{Settings, SettingsStore};
59use std::future::Future;
60use std::ops::Range;
61use std::path::{Path, PathBuf};
62use std::{collections::HashSet, sync::Arc, time::Duration, usize};
63use strum::{IntoEnumIterator, VariantNames};
64use time::OffsetDateTime;
65use ui::{
66 Checkbox, ContextMenu, ElevationIndex, IconPosition, Label, LabelSize, PopoverMenu, Scrollbar,
67 ScrollbarState, SplitButton, Tooltip, prelude::*,
68};
69use util::{ResultExt, TryFutureExt, maybe};
70use workspace::SERIALIZATION_THROTTLE_TIME;
71
72use cloud_llm_client::CompletionIntent;
73use workspace::{
74 Workspace,
75 dock::{DockPosition, Panel, PanelEvent},
76 notifications::{DetachAndPromptErr, ErrorMessagePrompt, NotificationId},
77};
78
79actions!(
80 git_panel,
81 [
82 /// Closes the git panel.
83 Close,
84 /// Toggles focus on the git panel.
85 ToggleFocus,
86 /// Opens the git panel menu.
87 OpenMenu,
88 /// Focuses on the commit message editor.
89 FocusEditor,
90 /// Focuses on the changes list.
91 FocusChanges,
92 /// Toggles automatic co-author suggestions.
93 ToggleFillCoAuthors,
94 ]
95);
96
97fn prompt<T>(
98 msg: &str,
99 detail: Option<&str>,
100 window: &mut Window,
101 cx: &mut App,
102) -> Task<anyhow::Result<T>>
103where
104 T: IntoEnumIterator + VariantNames + 'static,
105{
106 let rx = window.prompt(PromptLevel::Info, msg, detail, &T::VARIANTS, cx);
107 cx.spawn(async move |_| Ok(T::iter().nth(rx.await?).unwrap()))
108}
109
110#[derive(strum::EnumIter, strum::VariantNames)]
111#[strum(serialize_all = "title_case")]
112enum TrashCancel {
113 Trash,
114 Cancel,
115}
116
117struct GitMenuState {
118 has_tracked_changes: bool,
119 has_staged_changes: bool,
120 has_unstaged_changes: bool,
121 has_new_changes: bool,
122}
123
124fn git_panel_context_menu(
125 focus_handle: FocusHandle,
126 state: GitMenuState,
127 window: &mut Window,
128 cx: &mut App,
129) -> Entity<ContextMenu> {
130 ContextMenu::build(window, cx, move |context_menu, _, _| {
131 context_menu
132 .context(focus_handle)
133 .action_disabled_when(
134 !state.has_unstaged_changes,
135 "Stage All",
136 StageAll.boxed_clone(),
137 )
138 .action_disabled_when(
139 !state.has_staged_changes,
140 "Unstage All",
141 UnstageAll.boxed_clone(),
142 )
143 .separator()
144 .action_disabled_when(
145 !(state.has_new_changes || state.has_tracked_changes),
146 "Stash All",
147 StashAll.boxed_clone(),
148 )
149 .action("Stash Pop", StashPop.boxed_clone())
150 .separator()
151 .action("Open Diff", project_diff::Diff.boxed_clone())
152 .separator()
153 .action_disabled_when(
154 !state.has_tracked_changes,
155 "Discard Tracked Changes",
156 RestoreTrackedFiles.boxed_clone(),
157 )
158 .action_disabled_when(
159 !state.has_new_changes,
160 "Trash Untracked Files",
161 TrashUntrackedFiles.boxed_clone(),
162 )
163 })
164}
165
166const GIT_PANEL_KEY: &str = "GitPanel";
167
168const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
169
170pub fn register(workspace: &mut Workspace) {
171 workspace.register_action(|workspace, _: &ToggleFocus, window, cx| {
172 workspace.toggle_panel_focus::<GitPanel>(window, cx);
173 });
174 workspace.register_action(|workspace, _: &ExpandCommitEditor, window, cx| {
175 CommitModal::toggle(workspace, None, window, cx)
176 });
177}
178
179#[derive(Debug, Clone)]
180pub enum Event {
181 Focus,
182}
183
184#[derive(Serialize, Deserialize)]
185struct SerializedGitPanel {
186 width: Option<Pixels>,
187 #[serde(default)]
188 amend_pending: bool,
189 #[serde(default)]
190 signoff_enabled: bool,
191}
192
193#[derive(Debug, PartialEq, Eq, Clone, Copy)]
194enum Section {
195 Conflict,
196 Tracked,
197 New,
198}
199
200#[derive(Debug, PartialEq, Eq, Clone)]
201struct GitHeaderEntry {
202 header: Section,
203}
204
205impl GitHeaderEntry {
206 pub fn contains(&self, status_entry: &GitStatusEntry, repo: &Repository) -> bool {
207 let this = &self.header;
208 let status = status_entry.status;
209 match this {
210 Section::Conflict => {
211 repo.had_conflict_on_last_merge_head_change(&status_entry.repo_path)
212 }
213 Section::Tracked => !status.is_created(),
214 Section::New => status.is_created(),
215 }
216 }
217 pub fn title(&self) -> &'static str {
218 match self.header {
219 Section::Conflict => "Conflicts",
220 Section::Tracked => "Tracked",
221 Section::New => "Untracked",
222 }
223 }
224}
225
226#[derive(Debug, PartialEq, Eq, Clone)]
227enum GitListEntry {
228 Status(GitStatusEntry),
229 Header(GitHeaderEntry),
230}
231
232impl GitListEntry {
233 fn status_entry(&self) -> Option<&GitStatusEntry> {
234 match self {
235 GitListEntry::Status(entry) => Some(entry),
236 _ => None,
237 }
238 }
239}
240
241#[derive(Debug, PartialEq, Eq, Clone)]
242pub struct GitStatusEntry {
243 pub(crate) repo_path: RepoPath,
244 pub(crate) abs_path: PathBuf,
245 pub(crate) status: FileStatus,
246 pub(crate) staging: StageStatus,
247}
248
249impl GitStatusEntry {
250 fn display_name(&self) -> String {
251 self.repo_path
252 .file_name()
253 .map(|name| name.to_string_lossy().into_owned())
254 .unwrap_or_else(|| self.repo_path.to_string_lossy().into_owned())
255 }
256
257 fn parent_dir(&self) -> Option<String> {
258 self.repo_path
259 .parent()
260 .map(|parent| parent.to_string_lossy().into_owned())
261 }
262}
263
264#[derive(Clone, Copy, Debug, PartialEq, Eq)]
265enum TargetStatus {
266 Staged,
267 Unstaged,
268 Reverted,
269 Unchanged,
270}
271
272struct PendingOperation {
273 finished: bool,
274 target_status: TargetStatus,
275 entries: Vec<GitStatusEntry>,
276 op_id: usize,
277}
278
279// computed state related to how to render scrollbars
280// one per axis
281// on render we just read this off the panel
282// we update it when
283// - settings change
284// - on focus in, on focus out, on hover, etc.
285#[derive(Debug)]
286struct ScrollbarProperties {
287 axis: Axis,
288 show_scrollbar: bool,
289 show_track: bool,
290 auto_hide: bool,
291 hide_task: Option<Task<()>>,
292 state: ScrollbarState,
293}
294
295impl ScrollbarProperties {
296 // Shows the scrollbar and cancels any pending hide task
297 fn show(&mut self, cx: &mut Context<GitPanel>) {
298 if !self.auto_hide {
299 return;
300 }
301 self.show_scrollbar = true;
302 self.hide_task.take();
303 cx.notify();
304 }
305
306 fn hide(&mut self, window: &mut Window, cx: &mut Context<GitPanel>) {
307 const SCROLLBAR_SHOW_INTERVAL: Duration = Duration::from_secs(1);
308
309 if !self.auto_hide {
310 return;
311 }
312
313 let axis = self.axis;
314 self.hide_task = Some(cx.spawn_in(window, async move |panel, cx| {
315 cx.background_executor()
316 .timer(SCROLLBAR_SHOW_INTERVAL)
317 .await;
318
319 if let Some(panel) = panel.upgrade() {
320 panel
321 .update(cx, |panel, cx| {
322 match axis {
323 Axis::Vertical => panel.vertical_scrollbar.show_scrollbar = false,
324 Axis::Horizontal => panel.horizontal_scrollbar.show_scrollbar = false,
325 }
326 cx.notify();
327 })
328 .log_err();
329 }
330 }));
331 }
332}
333
334pub struct GitPanel {
335 pub(crate) active_repository: Option<Entity<Repository>>,
336 pub(crate) commit_editor: Entity<Editor>,
337 conflicted_count: usize,
338 conflicted_staged_count: usize,
339 add_coauthors: bool,
340 generate_commit_message_task: Option<Task<Option<()>>>,
341 entries: Vec<GitListEntry>,
342 single_staged_entry: Option<GitStatusEntry>,
343 single_tracked_entry: Option<GitStatusEntry>,
344 focus_handle: FocusHandle,
345 fs: Arc<dyn Fs>,
346 horizontal_scrollbar: ScrollbarProperties,
347 vertical_scrollbar: ScrollbarProperties,
348 new_count: usize,
349 entry_count: usize,
350 new_staged_count: usize,
351 pending: Vec<PendingOperation>,
352 pending_commit: Option<Task<()>>,
353 amend_pending: bool,
354 signoff_enabled: bool,
355 pending_serialization: Task<()>,
356 pub(crate) project: Entity<Project>,
357 scroll_handle: UniformListScrollHandle,
358 max_width_item_index: Option<usize>,
359 selected_entry: Option<usize>,
360 marked_entries: Vec<usize>,
361 tracked_count: usize,
362 tracked_staged_count: usize,
363 update_visible_entries_task: Task<()>,
364 width: Option<Pixels>,
365 workspace: WeakEntity<Workspace>,
366 context_menu: Option<(Entity<ContextMenu>, Point<Pixels>, Subscription)>,
367 modal_open: bool,
368 show_placeholders: bool,
369 local_committer: Option<GitCommitter>,
370 local_committer_task: Option<Task<()>>,
371 bulk_staging: Option<BulkStaging>,
372 _settings_subscription: Subscription,
373}
374
375#[derive(Clone, Debug, PartialEq, Eq)]
376struct BulkStaging {
377 repo_id: RepositoryId,
378 anchor: RepoPath,
379}
380
381const MAX_PANEL_EDITOR_LINES: usize = 6;
382
383pub(crate) fn commit_message_editor(
384 commit_message_buffer: Entity<Buffer>,
385 placeholder: Option<SharedString>,
386 project: Entity<Project>,
387 in_panel: bool,
388 window: &mut Window,
389 cx: &mut Context<Editor>,
390) -> Editor {
391 project.update(cx, |this, cx| {
392 this.mark_buffer_as_non_searchable(commit_message_buffer.read(cx).remote_id(), cx);
393 });
394 let buffer = cx.new(|cx| MultiBuffer::singleton(commit_message_buffer, cx));
395 let max_lines = if in_panel { MAX_PANEL_EDITOR_LINES } else { 18 };
396 let mut commit_editor = Editor::new(
397 EditorMode::AutoHeight {
398 min_lines: 1,
399 max_lines: Some(max_lines),
400 },
401 buffer,
402 None,
403 window,
404 cx,
405 );
406 commit_editor.set_collaboration_hub(Box::new(project));
407 commit_editor.set_use_autoclose(false);
408 commit_editor.set_show_gutter(false, cx);
409 commit_editor.set_use_modal_editing(true);
410 commit_editor.set_show_wrap_guides(false, cx);
411 commit_editor.set_show_indent_guides(false, cx);
412 let placeholder = placeholder.unwrap_or("Enter commit message".into());
413 commit_editor.set_placeholder_text(placeholder, cx);
414 commit_editor
415}
416
417impl GitPanel {
418 fn new(
419 workspace: &mut Workspace,
420 window: &mut Window,
421 cx: &mut Context<Workspace>,
422 ) -> Entity<Self> {
423 let project = workspace.project().clone();
424 let app_state = workspace.app_state().clone();
425 let fs = app_state.fs.clone();
426 let git_store = project.read(cx).git_store().clone();
427 let active_repository = project.read(cx).active_repository(cx);
428
429 let git_panel = cx.new(|cx| {
430 let focus_handle = cx.focus_handle();
431 cx.on_focus(&focus_handle, window, Self::focus_in).detach();
432 cx.on_focus_out(&focus_handle, window, |this, _, window, cx| {
433 this.hide_scrollbars(window, cx);
434 })
435 .detach();
436
437 let mut was_sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
438 cx.observe_global::<SettingsStore>(move |this, cx| {
439 let is_sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
440 if is_sort_by_path != was_sort_by_path {
441 this.update_visible_entries(cx);
442 }
443 was_sort_by_path = is_sort_by_path
444 })
445 .detach();
446
447 // just to let us render a placeholder editor.
448 // Once the active git repo is set, this buffer will be replaced.
449 let temporary_buffer = cx.new(|cx| Buffer::local("", cx));
450 let commit_editor = cx.new(|cx| {
451 commit_message_editor(temporary_buffer, None, project.clone(), true, window, cx)
452 });
453
454 commit_editor.update(cx, |editor, cx| {
455 editor.clear(window, cx);
456 });
457
458 let scroll_handle = UniformListScrollHandle::new();
459
460 let vertical_scrollbar = ScrollbarProperties {
461 axis: Axis::Vertical,
462 state: ScrollbarState::new(scroll_handle.clone()).parent_entity(&cx.entity()),
463 show_scrollbar: false,
464 show_track: false,
465 auto_hide: false,
466 hide_task: None,
467 };
468
469 let horizontal_scrollbar = ScrollbarProperties {
470 axis: Axis::Horizontal,
471 state: ScrollbarState::new(scroll_handle.clone()).parent_entity(&cx.entity()),
472 show_scrollbar: false,
473 show_track: false,
474 auto_hide: false,
475 hide_task: None,
476 };
477
478 let mut assistant_enabled = AgentSettings::get_global(cx).enabled;
479 let mut was_ai_disabled = DisableAiSettings::get_global(cx).disable_ai;
480 let _settings_subscription = cx.observe_global::<SettingsStore>(move |_, cx| {
481 let is_ai_disabled = DisableAiSettings::get_global(cx).disable_ai;
482 if assistant_enabled != AgentSettings::get_global(cx).enabled
483 || was_ai_disabled != is_ai_disabled
484 {
485 assistant_enabled = AgentSettings::get_global(cx).enabled;
486 was_ai_disabled = is_ai_disabled;
487 cx.notify();
488 }
489 });
490
491 cx.subscribe_in(
492 &git_store,
493 window,
494 move |this, _git_store, event, window, cx| match event {
495 GitStoreEvent::ActiveRepositoryChanged(_) => {
496 this.active_repository = this.project.read(cx).active_repository(cx);
497 this.schedule_update(true, window, cx);
498 }
499 GitStoreEvent::RepositoryUpdated(
500 _,
501 RepositoryEvent::Updated { full_scan, .. },
502 true,
503 ) => {
504 this.schedule_update(*full_scan, window, cx);
505 }
506
507 GitStoreEvent::RepositoryAdded(_) | GitStoreEvent::RepositoryRemoved(_) => {
508 this.schedule_update(false, window, cx);
509 }
510 GitStoreEvent::IndexWriteError(error) => {
511 this.workspace
512 .update(cx, |workspace, cx| {
513 workspace.show_error(error, cx);
514 })
515 .ok();
516 }
517 GitStoreEvent::RepositoryUpdated(_, _, _) => {}
518 GitStoreEvent::JobsUpdated | GitStoreEvent::ConflictsUpdated => {}
519 },
520 )
521 .detach();
522
523 let mut this = Self {
524 active_repository,
525 commit_editor,
526 conflicted_count: 0,
527 conflicted_staged_count: 0,
528 add_coauthors: true,
529 generate_commit_message_task: None,
530 entries: Vec::new(),
531 focus_handle: cx.focus_handle(),
532 fs,
533 new_count: 0,
534 new_staged_count: 0,
535 pending: Vec::new(),
536 pending_commit: None,
537 amend_pending: false,
538 signoff_enabled: false,
539 pending_serialization: Task::ready(()),
540 single_staged_entry: None,
541 single_tracked_entry: None,
542 project,
543 scroll_handle,
544 max_width_item_index: None,
545 selected_entry: None,
546 marked_entries: Vec::new(),
547 tracked_count: 0,
548 tracked_staged_count: 0,
549 update_visible_entries_task: Task::ready(()),
550 width: None,
551 show_placeholders: false,
552 local_committer: None,
553 local_committer_task: None,
554 context_menu: None,
555 workspace: workspace.weak_handle(),
556 modal_open: false,
557 entry_count: 0,
558 horizontal_scrollbar,
559 vertical_scrollbar,
560 bulk_staging: None,
561 _settings_subscription,
562 };
563
564 this.schedule_update(false, window, cx);
565 this
566 });
567
568 git_panel
569 }
570
571 fn hide_scrollbars(&mut self, window: &mut Window, cx: &mut Context<Self>) {
572 self.horizontal_scrollbar.hide(window, cx);
573 self.vertical_scrollbar.hide(window, cx);
574 }
575
576 fn update_scrollbar_properties(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
577 // TODO: This PR should have defined Editor's `scrollbar.axis`
578 // as an Option<ScrollbarAxis>, not a ScrollbarAxes as it would allow you to
579 // `.unwrap_or(EditorSettings::get_global(cx).scrollbar.show)`.
580 //
581 // Once this is fixed we can extend the GitPanelSettings with a `scrollbar.axis`
582 // so we can show each axis based on the settings.
583 //
584 // We should fix this. PR: https://github.com/zed-industries/zed/pull/19495
585
586 let show_setting = GitPanelSettings::get_global(cx)
587 .scrollbar
588 .show
589 .unwrap_or(EditorSettings::get_global(cx).scrollbar.show);
590
591 let scroll_handle = self.scroll_handle.0.borrow();
592
593 let autohide = |show: ShowScrollbar, cx: &mut Context<Self>| match show {
594 ShowScrollbar::Auto => true,
595 ShowScrollbar::System => cx
596 .try_global::<ScrollbarAutoHide>()
597 .map_or_else(|| cx.should_auto_hide_scrollbars(), |autohide| autohide.0),
598 ShowScrollbar::Always => false,
599 ShowScrollbar::Never => false,
600 };
601
602 let longest_item_width = scroll_handle.last_item_size.and_then(|size| {
603 (size.contents.width > size.item.width).then_some(size.contents.width)
604 });
605
606 // is there an item long enough that we should show a horizontal scrollbar?
607 let item_wider_than_container = if let Some(longest_item_width) = longest_item_width {
608 longest_item_width > px(scroll_handle.base_handle.bounds().size.width.0)
609 } else {
610 true
611 };
612
613 let show_horizontal = match (show_setting, item_wider_than_container) {
614 (_, false) => false,
615 (ShowScrollbar::Auto | ShowScrollbar::System | ShowScrollbar::Always, true) => true,
616 (ShowScrollbar::Never, true) => false,
617 };
618
619 let show_vertical = match show_setting {
620 ShowScrollbar::Auto | ShowScrollbar::System | ShowScrollbar::Always => true,
621 ShowScrollbar::Never => false,
622 };
623
624 let show_horizontal_track =
625 show_horizontal && matches!(show_setting, ShowScrollbar::Always);
626
627 // TODO: we probably should hide the scroll track when the list doesn't need to scroll
628 let show_vertical_track = show_vertical && matches!(show_setting, ShowScrollbar::Always);
629
630 self.vertical_scrollbar = ScrollbarProperties {
631 axis: self.vertical_scrollbar.axis,
632 state: self.vertical_scrollbar.state.clone(),
633 show_scrollbar: show_vertical,
634 show_track: show_vertical_track,
635 auto_hide: autohide(show_setting, cx),
636 hide_task: None,
637 };
638
639 self.horizontal_scrollbar = ScrollbarProperties {
640 axis: self.horizontal_scrollbar.axis,
641 state: self.horizontal_scrollbar.state.clone(),
642 show_scrollbar: show_horizontal,
643 show_track: show_horizontal_track,
644 auto_hide: autohide(show_setting, cx),
645 hide_task: None,
646 };
647
648 cx.notify();
649 }
650
651 pub fn entry_by_path(&self, path: &RepoPath, cx: &App) -> Option<usize> {
652 if GitPanelSettings::get_global(cx).sort_by_path {
653 return self
654 .entries
655 .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(&path))
656 .ok();
657 }
658
659 if self.conflicted_count > 0 {
660 let conflicted_start = 1;
661 if let Ok(ix) = self.entries[conflicted_start..conflicted_start + self.conflicted_count]
662 .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(&path))
663 {
664 return Some(conflicted_start + ix);
665 }
666 }
667 if self.tracked_count > 0 {
668 let tracked_start = if self.conflicted_count > 0 {
669 1 + self.conflicted_count
670 } else {
671 0
672 } + 1;
673 if let Ok(ix) = self.entries[tracked_start..tracked_start + self.tracked_count]
674 .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(&path))
675 {
676 return Some(tracked_start + ix);
677 }
678 }
679 if self.new_count > 0 {
680 let untracked_start = if self.conflicted_count > 0 {
681 1 + self.conflicted_count
682 } else {
683 0
684 } + if self.tracked_count > 0 {
685 1 + self.tracked_count
686 } else {
687 0
688 } + 1;
689 if let Ok(ix) = self.entries[untracked_start..untracked_start + self.new_count]
690 .binary_search_by(|entry| entry.status_entry().unwrap().repo_path.cmp(&path))
691 {
692 return Some(untracked_start + ix);
693 }
694 }
695 None
696 }
697
698 pub fn select_entry_by_path(
699 &mut self,
700 path: ProjectPath,
701 _: &mut Window,
702 cx: &mut Context<Self>,
703 ) {
704 let Some(git_repo) = self.active_repository.as_ref() else {
705 return;
706 };
707 let Some(repo_path) = git_repo.read(cx).project_path_to_repo_path(&path, cx) else {
708 return;
709 };
710 let Some(ix) = self.entry_by_path(&repo_path, cx) else {
711 return;
712 };
713 self.selected_entry = Some(ix);
714 cx.notify();
715 }
716
717 fn serialization_key(workspace: &Workspace) -> Option<String> {
718 workspace
719 .database_id()
720 .map(|id| i64::from(id).to_string())
721 .or(workspace.session_id())
722 .map(|id| format!("{}-{:?}", GIT_PANEL_KEY, id))
723 }
724
725 fn serialize(&mut self, cx: &mut Context<Self>) {
726 let width = self.width;
727 let amend_pending = self.amend_pending;
728 let signoff_enabled = self.signoff_enabled;
729
730 self.pending_serialization = cx.spawn(async move |git_panel, cx| {
731 cx.background_executor()
732 .timer(SERIALIZATION_THROTTLE_TIME)
733 .await;
734 let Some(serialization_key) = git_panel
735 .update(cx, |git_panel, cx| {
736 git_panel
737 .workspace
738 .read_with(cx, |workspace, _| Self::serialization_key(workspace))
739 .ok()
740 .flatten()
741 })
742 .ok()
743 .flatten()
744 else {
745 return;
746 };
747 cx.background_spawn(
748 async move {
749 KEY_VALUE_STORE
750 .write_kvp(
751 serialization_key,
752 serde_json::to_string(&SerializedGitPanel {
753 width,
754 amend_pending,
755 signoff_enabled,
756 })?,
757 )
758 .await?;
759 anyhow::Ok(())
760 }
761 .log_err(),
762 )
763 .await;
764 });
765 }
766
767 pub(crate) fn set_modal_open(&mut self, open: bool, cx: &mut Context<Self>) {
768 self.modal_open = open;
769 cx.notify();
770 }
771
772 fn dispatch_context(&self, window: &mut Window, cx: &Context<Self>) -> KeyContext {
773 let mut dispatch_context = KeyContext::new_with_defaults();
774 dispatch_context.add("GitPanel");
775
776 if window
777 .focused(cx)
778 .map_or(false, |focused| self.focus_handle == focused)
779 {
780 dispatch_context.add("menu");
781 dispatch_context.add("ChangesList");
782 }
783
784 if self.commit_editor.read(cx).is_focused(window) {
785 dispatch_context.add("CommitEditor");
786 }
787
788 dispatch_context
789 }
790
791 fn close_panel(&mut self, _: &Close, _window: &mut Window, cx: &mut Context<Self>) {
792 cx.emit(PanelEvent::Close);
793 }
794
795 fn focus_in(&mut self, window: &mut Window, cx: &mut Context<Self>) {
796 if !self.focus_handle.contains_focused(window, cx) {
797 cx.emit(Event::Focus);
798 }
799 }
800
801 fn scroll_to_selected_entry(&mut self, cx: &mut Context<Self>) {
802 if let Some(selected_entry) = self.selected_entry {
803 self.scroll_handle
804 .scroll_to_item(selected_entry, ScrollStrategy::Center);
805 }
806
807 cx.notify();
808 }
809
810 fn select_first(&mut self, _: &SelectFirst, _window: &mut Window, cx: &mut Context<Self>) {
811 if !self.entries.is_empty() {
812 self.selected_entry = Some(1);
813 self.scroll_to_selected_entry(cx);
814 }
815 }
816
817 fn select_previous(
818 &mut self,
819 _: &SelectPrevious,
820 _window: &mut Window,
821 cx: &mut Context<Self>,
822 ) {
823 let item_count = self.entries.len();
824 if item_count == 0 {
825 return;
826 }
827
828 if let Some(selected_entry) = self.selected_entry {
829 let new_selected_entry = if selected_entry > 0 {
830 selected_entry - 1
831 } else {
832 selected_entry
833 };
834
835 if matches!(
836 self.entries.get(new_selected_entry),
837 Some(GitListEntry::Header(..))
838 ) {
839 if new_selected_entry > 0 {
840 self.selected_entry = Some(new_selected_entry - 1)
841 }
842 } else {
843 self.selected_entry = Some(new_selected_entry);
844 }
845
846 self.scroll_to_selected_entry(cx);
847 }
848
849 cx.notify();
850 }
851
852 fn select_next(&mut self, _: &SelectNext, _window: &mut Window, cx: &mut Context<Self>) {
853 let item_count = self.entries.len();
854 if item_count == 0 {
855 return;
856 }
857
858 if let Some(selected_entry) = self.selected_entry {
859 let new_selected_entry = if selected_entry < item_count - 1 {
860 selected_entry + 1
861 } else {
862 selected_entry
863 };
864 if matches!(
865 self.entries.get(new_selected_entry),
866 Some(GitListEntry::Header(..))
867 ) {
868 self.selected_entry = Some(new_selected_entry + 1);
869 } else {
870 self.selected_entry = Some(new_selected_entry);
871 }
872
873 self.scroll_to_selected_entry(cx);
874 }
875
876 cx.notify();
877 }
878
879 fn select_last(&mut self, _: &SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
880 if self.entries.last().is_some() {
881 self.selected_entry = Some(self.entries.len() - 1);
882 self.scroll_to_selected_entry(cx);
883 }
884 }
885
886 fn focus_editor(&mut self, _: &FocusEditor, window: &mut Window, cx: &mut Context<Self>) {
887 self.commit_editor.update(cx, |editor, cx| {
888 window.focus(&editor.focus_handle(cx));
889 });
890 cx.notify();
891 }
892
893 fn select_first_entry_if_none(&mut self, cx: &mut Context<Self>) {
894 let have_entries = self
895 .active_repository
896 .as_ref()
897 .map_or(false, |active_repository| {
898 active_repository.read(cx).status_summary().count > 0
899 });
900 if have_entries && self.selected_entry.is_none() {
901 self.selected_entry = Some(1);
902 self.scroll_to_selected_entry(cx);
903 cx.notify();
904 }
905 }
906
907 fn focus_changes_list(
908 &mut self,
909 _: &FocusChanges,
910 window: &mut Window,
911 cx: &mut Context<Self>,
912 ) {
913 self.select_first_entry_if_none(cx);
914
915 cx.focus_self(window);
916 cx.notify();
917 }
918
919 fn get_selected_entry(&self) -> Option<&GitListEntry> {
920 self.selected_entry.and_then(|i| self.entries.get(i))
921 }
922
923 fn open_diff(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
924 maybe!({
925 let entry = self.entries.get(self.selected_entry?)?.status_entry()?;
926 let workspace = self.workspace.upgrade()?;
927 let git_repo = self.active_repository.as_ref()?;
928
929 if let Some(project_diff) = workspace.read(cx).active_item_as::<ProjectDiff>(cx) {
930 if let Some(project_path) = project_diff.read(cx).active_path(cx) {
931 if Some(&entry.repo_path)
932 == git_repo
933 .read(cx)
934 .project_path_to_repo_path(&project_path, cx)
935 .as_ref()
936 {
937 project_diff.focus_handle(cx).focus(window);
938 project_diff.update(cx, |project_diff, cx| project_diff.autoscroll(cx));
939 return None;
940 }
941 }
942 };
943
944 self.workspace
945 .update(cx, |workspace, cx| {
946 ProjectDiff::deploy_at(workspace, Some(entry.clone()), window, cx);
947 })
948 .ok();
949 self.focus_handle.focus(window);
950
951 Some(())
952 });
953 }
954
955 fn open_file(
956 &mut self,
957 _: &menu::SecondaryConfirm,
958 window: &mut Window,
959 cx: &mut Context<Self>,
960 ) {
961 maybe!({
962 let entry = self.entries.get(self.selected_entry?)?.status_entry()?;
963 let active_repo = self.active_repository.as_ref()?;
964 let path = active_repo
965 .read(cx)
966 .repo_path_to_project_path(&entry.repo_path, cx)?;
967 if entry.status.is_deleted() {
968 return None;
969 }
970
971 self.workspace
972 .update(cx, |workspace, cx| {
973 workspace
974 .open_path_preview(path, None, false, false, true, window, cx)
975 .detach_and_prompt_err("Failed to open file", window, cx, |e, _, _| {
976 Some(format!("{e}"))
977 });
978 })
979 .ok()
980 });
981 }
982
983 fn revert_selected(
984 &mut self,
985 action: &git::RestoreFile,
986 window: &mut Window,
987 cx: &mut Context<Self>,
988 ) {
989 maybe!({
990 let list_entry = self.entries.get(self.selected_entry?)?.clone();
991 let entry = list_entry.status_entry()?.to_owned();
992 let skip_prompt = action.skip_prompt || entry.status.is_created();
993
994 let prompt = if skip_prompt {
995 Task::ready(Ok(0))
996 } else {
997 let prompt = window.prompt(
998 PromptLevel::Warning,
999 &format!(
1000 "Are you sure you want to restore {}?",
1001 entry
1002 .repo_path
1003 .file_name()
1004 .unwrap_or(entry.repo_path.as_os_str())
1005 .to_string_lossy()
1006 ),
1007 None,
1008 &["Restore", "Cancel"],
1009 cx,
1010 );
1011 cx.background_spawn(prompt)
1012 };
1013
1014 let this = cx.weak_entity();
1015 window
1016 .spawn(cx, async move |cx| {
1017 if prompt.await? != 0 {
1018 return anyhow::Ok(());
1019 }
1020
1021 this.update_in(cx, |this, window, cx| {
1022 this.revert_entry(&entry, window, cx);
1023 })?;
1024
1025 Ok(())
1026 })
1027 .detach();
1028 Some(())
1029 });
1030 }
1031
1032 fn revert_entry(
1033 &mut self,
1034 entry: &GitStatusEntry,
1035 window: &mut Window,
1036 cx: &mut Context<Self>,
1037 ) {
1038 maybe!({
1039 let active_repo = self.active_repository.clone()?;
1040 let path = active_repo
1041 .read(cx)
1042 .repo_path_to_project_path(&entry.repo_path, cx)?;
1043 let workspace = self.workspace.clone();
1044
1045 if entry.status.staging().has_staged() {
1046 self.change_file_stage(false, vec![entry.clone()], cx);
1047 }
1048 let filename = path.path.file_name()?.to_string_lossy();
1049
1050 if !entry.status.is_created() {
1051 self.perform_checkout(vec![entry.clone()], cx);
1052 } else {
1053 let prompt = prompt(&format!("Trash {}?", filename), None, window, cx);
1054 cx.spawn_in(window, async move |_, cx| {
1055 match prompt.await? {
1056 TrashCancel::Trash => {}
1057 TrashCancel::Cancel => return Ok(()),
1058 }
1059 let task = workspace.update(cx, |workspace, cx| {
1060 workspace
1061 .project()
1062 .update(cx, |project, cx| project.delete_file(path, true, cx))
1063 })?;
1064 if let Some(task) = task {
1065 task.await?;
1066 }
1067 Ok(())
1068 })
1069 .detach_and_prompt_err(
1070 "Failed to trash file",
1071 window,
1072 cx,
1073 |e, _, _| Some(format!("{e}")),
1074 );
1075 }
1076 Some(())
1077 });
1078 }
1079
1080 fn perform_checkout(&mut self, entries: Vec<GitStatusEntry>, cx: &mut Context<Self>) {
1081 let workspace = self.workspace.clone();
1082 let Some(active_repository) = self.active_repository.clone() else {
1083 return;
1084 };
1085
1086 let op_id = self.pending.iter().map(|p| p.op_id).max().unwrap_or(0) + 1;
1087 self.pending.push(PendingOperation {
1088 op_id,
1089 target_status: TargetStatus::Reverted,
1090 entries: entries.clone(),
1091 finished: false,
1092 });
1093 self.update_visible_entries(cx);
1094 let task = cx.spawn(async move |_, cx| {
1095 let tasks: Vec<_> = workspace.update(cx, |workspace, cx| {
1096 workspace.project().update(cx, |project, cx| {
1097 entries
1098 .iter()
1099 .filter_map(|entry| {
1100 let path = active_repository
1101 .read(cx)
1102 .repo_path_to_project_path(&entry.repo_path, cx)?;
1103 Some(project.open_buffer(path, cx))
1104 })
1105 .collect()
1106 })
1107 })?;
1108
1109 let buffers = futures::future::join_all(tasks).await;
1110
1111 active_repository
1112 .update(cx, |repo, cx| {
1113 repo.checkout_files(
1114 "HEAD",
1115 entries
1116 .into_iter()
1117 .map(|entries| entries.repo_path)
1118 .collect(),
1119 cx,
1120 )
1121 })?
1122 .await??;
1123
1124 let tasks: Vec<_> = cx.update(|cx| {
1125 buffers
1126 .iter()
1127 .filter_map(|buffer| {
1128 buffer.as_ref().ok()?.update(cx, |buffer, cx| {
1129 buffer.is_dirty().then(|| buffer.reload(cx))
1130 })
1131 })
1132 .collect()
1133 })?;
1134
1135 futures::future::join_all(tasks).await;
1136
1137 Ok(())
1138 });
1139
1140 cx.spawn(async move |this, cx| {
1141 let result = task.await;
1142
1143 this.update(cx, |this, cx| {
1144 for pending in this.pending.iter_mut() {
1145 if pending.op_id == op_id {
1146 pending.finished = true;
1147 if result.is_err() {
1148 pending.target_status = TargetStatus::Unchanged;
1149 this.update_visible_entries(cx);
1150 }
1151 break;
1152 }
1153 }
1154 result
1155 .map_err(|e| {
1156 this.show_error_toast("checkout", e, cx);
1157 })
1158 .ok();
1159 })
1160 .ok();
1161 })
1162 .detach();
1163 }
1164
1165 fn restore_tracked_files(
1166 &mut self,
1167 _: &RestoreTrackedFiles,
1168 window: &mut Window,
1169 cx: &mut Context<Self>,
1170 ) {
1171 let entries = self
1172 .entries
1173 .iter()
1174 .filter_map(|entry| entry.status_entry().cloned())
1175 .filter(|status_entry| !status_entry.status.is_created())
1176 .collect::<Vec<_>>();
1177
1178 match entries.len() {
1179 0 => return,
1180 1 => return self.revert_entry(&entries[0], window, cx),
1181 _ => {}
1182 }
1183 let mut details = entries
1184 .iter()
1185 .filter_map(|entry| entry.repo_path.0.file_name())
1186 .map(|filename| filename.to_string_lossy())
1187 .take(5)
1188 .join("\n");
1189 if entries.len() > 5 {
1190 details.push_str(&format!("\nand {} more…", entries.len() - 5))
1191 }
1192
1193 #[derive(strum::EnumIter, strum::VariantNames)]
1194 #[strum(serialize_all = "title_case")]
1195 enum RestoreCancel {
1196 RestoreTrackedFiles,
1197 Cancel,
1198 }
1199 let prompt = prompt(
1200 "Discard changes to these files?",
1201 Some(&details),
1202 window,
1203 cx,
1204 );
1205 cx.spawn(async move |this, cx| match prompt.await {
1206 Ok(RestoreCancel::RestoreTrackedFiles) => {
1207 this.update(cx, |this, cx| {
1208 this.perform_checkout(entries, cx);
1209 })
1210 .ok();
1211 }
1212 _ => {
1213 return;
1214 }
1215 })
1216 .detach();
1217 }
1218
1219 fn clean_all(&mut self, _: &TrashUntrackedFiles, window: &mut Window, cx: &mut Context<Self>) {
1220 let workspace = self.workspace.clone();
1221 let Some(active_repo) = self.active_repository.clone() else {
1222 return;
1223 };
1224 let to_delete = self
1225 .entries
1226 .iter()
1227 .filter_map(|entry| entry.status_entry())
1228 .filter(|status_entry| status_entry.status.is_created())
1229 .cloned()
1230 .collect::<Vec<_>>();
1231
1232 match to_delete.len() {
1233 0 => return,
1234 1 => return self.revert_entry(&to_delete[0], window, cx),
1235 _ => {}
1236 };
1237
1238 let mut details = to_delete
1239 .iter()
1240 .map(|entry| {
1241 entry
1242 .repo_path
1243 .0
1244 .file_name()
1245 .map(|f| f.to_string_lossy())
1246 .unwrap_or_default()
1247 })
1248 .take(5)
1249 .join("\n");
1250
1251 if to_delete.len() > 5 {
1252 details.push_str(&format!("\nand {} more…", to_delete.len() - 5))
1253 }
1254
1255 let prompt = prompt("Trash these files?", Some(&details), window, cx);
1256 cx.spawn_in(window, async move |this, cx| {
1257 match prompt.await? {
1258 TrashCancel::Trash => {}
1259 TrashCancel::Cancel => return Ok(()),
1260 }
1261 let tasks = workspace.update(cx, |workspace, cx| {
1262 to_delete
1263 .iter()
1264 .filter_map(|entry| {
1265 workspace.project().update(cx, |project, cx| {
1266 let project_path = active_repo
1267 .read(cx)
1268 .repo_path_to_project_path(&entry.repo_path, cx)?;
1269 project.delete_file(project_path, true, cx)
1270 })
1271 })
1272 .collect::<Vec<_>>()
1273 })?;
1274 let to_unstage = to_delete
1275 .into_iter()
1276 .filter(|entry| !entry.status.staging().is_fully_unstaged())
1277 .collect();
1278 this.update(cx, |this, cx| this.change_file_stage(false, to_unstage, cx))?;
1279 for task in tasks {
1280 task.await?;
1281 }
1282 Ok(())
1283 })
1284 .detach_and_prompt_err("Failed to trash files", window, cx, |e, _, _| {
1285 Some(format!("{e}"))
1286 });
1287 }
1288
1289 pub fn stage_all(&mut self, _: &StageAll, _window: &mut Window, cx: &mut Context<Self>) {
1290 let entries = self
1291 .entries
1292 .iter()
1293 .filter_map(|entry| entry.status_entry())
1294 .filter(|status_entry| status_entry.staging.has_unstaged())
1295 .cloned()
1296 .collect::<Vec<_>>();
1297 self.change_file_stage(true, entries, cx);
1298 }
1299
1300 pub fn unstage_all(&mut self, _: &UnstageAll, _window: &mut Window, cx: &mut Context<Self>) {
1301 let entries = self
1302 .entries
1303 .iter()
1304 .filter_map(|entry| entry.status_entry())
1305 .filter(|status_entry| status_entry.staging.has_staged())
1306 .cloned()
1307 .collect::<Vec<_>>();
1308 self.change_file_stage(false, entries, cx);
1309 }
1310
1311 fn toggle_staged_for_entry(
1312 &mut self,
1313 entry: &GitListEntry,
1314 _window: &mut Window,
1315 cx: &mut Context<Self>,
1316 ) {
1317 let Some(active_repository) = self.active_repository.as_ref() else {
1318 return;
1319 };
1320 let (stage, repo_paths) = match entry {
1321 GitListEntry::Status(status_entry) => {
1322 if status_entry.status.staging().is_fully_staged() {
1323 if let Some(op) = self.bulk_staging.clone()
1324 && op.anchor == status_entry.repo_path
1325 {
1326 self.bulk_staging = None;
1327 }
1328
1329 (false, vec![status_entry.clone()])
1330 } else {
1331 self.set_bulk_staging_anchor(status_entry.repo_path.clone(), cx);
1332
1333 (true, vec![status_entry.clone()])
1334 }
1335 }
1336 GitListEntry::Header(section) => {
1337 let goal_staged_state = !self.header_state(section.header).selected();
1338 let repository = active_repository.read(cx);
1339 let entries = self
1340 .entries
1341 .iter()
1342 .filter_map(|entry| entry.status_entry())
1343 .filter(|status_entry| {
1344 section.contains(&status_entry, repository)
1345 && status_entry.staging.as_bool() != Some(goal_staged_state)
1346 })
1347 .map(|status_entry| status_entry.clone())
1348 .collect::<Vec<_>>();
1349
1350 (goal_staged_state, entries)
1351 }
1352 };
1353 self.change_file_stage(stage, repo_paths, cx);
1354 }
1355
1356 fn change_file_stage(
1357 &mut self,
1358 stage: bool,
1359 entries: Vec<GitStatusEntry>,
1360 cx: &mut Context<Self>,
1361 ) {
1362 let Some(active_repository) = self.active_repository.clone() else {
1363 return;
1364 };
1365 let op_id = self.pending.iter().map(|p| p.op_id).max().unwrap_or(0) + 1;
1366 self.pending.push(PendingOperation {
1367 op_id,
1368 target_status: if stage {
1369 TargetStatus::Staged
1370 } else {
1371 TargetStatus::Unstaged
1372 },
1373 entries: entries.clone(),
1374 finished: false,
1375 });
1376 let repository = active_repository.read(cx);
1377 self.update_counts(repository);
1378 cx.notify();
1379
1380 cx.spawn({
1381 async move |this, cx| {
1382 let result = cx
1383 .update(|cx| {
1384 if stage {
1385 active_repository.update(cx, |repo, cx| {
1386 let repo_paths = entries
1387 .iter()
1388 .map(|entry| entry.repo_path.clone())
1389 .collect();
1390 repo.stage_entries(repo_paths, cx)
1391 })
1392 } else {
1393 active_repository.update(cx, |repo, cx| {
1394 let repo_paths = entries
1395 .iter()
1396 .map(|entry| entry.repo_path.clone())
1397 .collect();
1398 repo.unstage_entries(repo_paths, cx)
1399 })
1400 }
1401 })?
1402 .await;
1403
1404 this.update(cx, |this, cx| {
1405 for pending in this.pending.iter_mut() {
1406 if pending.op_id == op_id {
1407 pending.finished = true
1408 }
1409 }
1410 result
1411 .map_err(|e| {
1412 this.show_error_toast(if stage { "add" } else { "reset" }, e, cx);
1413 })
1414 .ok();
1415 cx.notify();
1416 })
1417 }
1418 })
1419 .detach();
1420 }
1421
1422 pub fn total_staged_count(&self) -> usize {
1423 self.tracked_staged_count + self.new_staged_count + self.conflicted_staged_count
1424 }
1425
1426 pub fn stash_pop(&mut self, _: &StashPop, _window: &mut Window, cx: &mut Context<Self>) {
1427 let Some(active_repository) = self.active_repository.clone() else {
1428 return;
1429 };
1430
1431 cx.spawn({
1432 async move |this, cx| {
1433 let stash_task = active_repository
1434 .update(cx, |repo, cx| repo.stash_pop(cx))?
1435 .await;
1436 this.update(cx, |this, cx| {
1437 stash_task
1438 .map_err(|e| {
1439 this.show_error_toast("stash pop", e, cx);
1440 })
1441 .ok();
1442 cx.notify();
1443 })
1444 }
1445 })
1446 .detach();
1447 }
1448
1449 pub fn stash_all(&mut self, _: &StashAll, _window: &mut Window, cx: &mut Context<Self>) {
1450 let Some(active_repository) = self.active_repository.clone() else {
1451 return;
1452 };
1453
1454 cx.spawn({
1455 async move |this, cx| {
1456 let stash_task = active_repository
1457 .update(cx, |repo, cx| repo.stash_all(cx))?
1458 .await;
1459 this.update(cx, |this, cx| {
1460 stash_task
1461 .map_err(|e| {
1462 this.show_error_toast("stash", e, cx);
1463 })
1464 .ok();
1465 cx.notify();
1466 })
1467 }
1468 })
1469 .detach();
1470 }
1471
1472 pub fn commit_message_buffer(&self, cx: &App) -> Entity<Buffer> {
1473 self.commit_editor
1474 .read(cx)
1475 .buffer()
1476 .read(cx)
1477 .as_singleton()
1478 .unwrap()
1479 .clone()
1480 }
1481
1482 fn toggle_staged_for_selected(
1483 &mut self,
1484 _: &git::ToggleStaged,
1485 window: &mut Window,
1486 cx: &mut Context<Self>,
1487 ) {
1488 if let Some(selected_entry) = self.get_selected_entry().cloned() {
1489 self.toggle_staged_for_entry(&selected_entry, window, cx);
1490 }
1491 }
1492
1493 fn stage_range(&mut self, _: &git::StageRange, _window: &mut Window, cx: &mut Context<Self>) {
1494 let Some(index) = self.selected_entry else {
1495 return;
1496 };
1497 self.stage_bulk(index, cx);
1498 }
1499
1500 fn stage_selected(&mut self, _: &git::StageFile, _window: &mut Window, cx: &mut Context<Self>) {
1501 let Some(selected_entry) = self.get_selected_entry() else {
1502 return;
1503 };
1504 let Some(status_entry) = selected_entry.status_entry() else {
1505 return;
1506 };
1507 if status_entry.staging != StageStatus::Staged {
1508 self.change_file_stage(true, vec![status_entry.clone()], cx);
1509 }
1510 }
1511
1512 fn unstage_selected(
1513 &mut self,
1514 _: &git::UnstageFile,
1515 _window: &mut Window,
1516 cx: &mut Context<Self>,
1517 ) {
1518 let Some(selected_entry) = self.get_selected_entry() else {
1519 return;
1520 };
1521 let Some(status_entry) = selected_entry.status_entry() else {
1522 return;
1523 };
1524 if status_entry.staging != StageStatus::Unstaged {
1525 self.change_file_stage(false, vec![status_entry.clone()], cx);
1526 }
1527 }
1528
1529 fn commit(&mut self, _: &git::Commit, window: &mut Window, cx: &mut Context<Self>) {
1530 if self.amend_pending {
1531 return;
1532 }
1533 if self
1534 .commit_editor
1535 .focus_handle(cx)
1536 .contains_focused(window, cx)
1537 {
1538 telemetry::event!("Git Committed", source = "Git Panel");
1539 self.commit_changes(
1540 CommitOptions {
1541 amend: false,
1542 signoff: self.signoff_enabled,
1543 },
1544 window,
1545 cx,
1546 )
1547 } else {
1548 cx.propagate();
1549 }
1550 }
1551
1552 fn amend(&mut self, _: &git::Amend, window: &mut Window, cx: &mut Context<Self>) {
1553 if self
1554 .commit_editor
1555 .focus_handle(cx)
1556 .contains_focused(window, cx)
1557 {
1558 if self.head_commit(cx).is_some() {
1559 if !self.amend_pending {
1560 self.set_amend_pending(true, cx);
1561 self.load_last_commit_message_if_empty(cx);
1562 } else {
1563 telemetry::event!("Git Amended", source = "Git Panel");
1564 self.set_amend_pending(false, cx);
1565 self.commit_changes(
1566 CommitOptions {
1567 amend: true,
1568 signoff: self.signoff_enabled,
1569 },
1570 window,
1571 cx,
1572 );
1573 }
1574 }
1575 } else {
1576 cx.propagate();
1577 }
1578 }
1579
1580 pub fn head_commit(&self, cx: &App) -> Option<CommitDetails> {
1581 self.active_repository
1582 .as_ref()
1583 .and_then(|repo| repo.read(cx).head_commit.as_ref())
1584 .cloned()
1585 }
1586
1587 pub fn load_last_commit_message_if_empty(&mut self, cx: &mut Context<Self>) {
1588 if !self.commit_editor.read(cx).is_empty(cx) {
1589 return;
1590 }
1591 let Some(head_commit) = self.head_commit(cx) else {
1592 return;
1593 };
1594 let recent_sha = head_commit.sha.to_string();
1595 let detail_task = self.load_commit_details(recent_sha, cx);
1596 cx.spawn(async move |this, cx| {
1597 if let Ok(message) = detail_task.await.map(|detail| detail.message) {
1598 this.update(cx, |this, cx| {
1599 this.commit_message_buffer(cx).update(cx, |buffer, cx| {
1600 let start = buffer.anchor_before(0);
1601 let end = buffer.anchor_after(buffer.len());
1602 buffer.edit([(start..end, message)], None, cx);
1603 });
1604 })
1605 .log_err();
1606 }
1607 })
1608 .detach();
1609 }
1610
1611 fn custom_or_suggested_commit_message(
1612 &self,
1613 window: &mut Window,
1614 cx: &mut Context<Self>,
1615 ) -> Option<String> {
1616 let git_commit_language = self.commit_editor.read(cx).language_at(0, cx);
1617 let message = self.commit_editor.read(cx).text(cx);
1618 if message.is_empty() {
1619 return self
1620 .suggest_commit_message(cx)
1621 .filter(|message| !message.trim().is_empty());
1622 } else if message.trim().is_empty() {
1623 return None;
1624 }
1625 let buffer = cx.new(|cx| {
1626 let mut buffer = Buffer::local(message, cx);
1627 buffer.set_language(git_commit_language, cx);
1628 buffer
1629 });
1630 let editor = cx.new(|cx| Editor::for_buffer(buffer, None, window, cx));
1631 let wrapped_message = editor.update(cx, |editor, cx| {
1632 editor.select_all(&Default::default(), window, cx);
1633 editor.rewrap(&Default::default(), window, cx);
1634 editor.text(cx)
1635 });
1636 if wrapped_message.trim().is_empty() {
1637 return None;
1638 }
1639 Some(wrapped_message)
1640 }
1641
1642 fn has_commit_message(&self, cx: &mut Context<Self>) -> bool {
1643 let text = self.commit_editor.read(cx).text(cx);
1644 if !text.trim().is_empty() {
1645 return true;
1646 } else if text.is_empty() {
1647 return self
1648 .suggest_commit_message(cx)
1649 .is_some_and(|text| !text.trim().is_empty());
1650 } else {
1651 return false;
1652 }
1653 }
1654
1655 pub(crate) fn commit_changes(
1656 &mut self,
1657 options: CommitOptions,
1658 window: &mut Window,
1659 cx: &mut Context<Self>,
1660 ) {
1661 let Some(active_repository) = self.active_repository.clone() else {
1662 return;
1663 };
1664 let error_spawn = |message, window: &mut Window, cx: &mut App| {
1665 let prompt = window.prompt(PromptLevel::Warning, message, None, &["Ok"], cx);
1666 cx.spawn(async move |_| {
1667 prompt.await.ok();
1668 })
1669 .detach();
1670 };
1671
1672 if self.has_unstaged_conflicts() {
1673 error_spawn(
1674 "There are still conflicts. You must stage these before committing",
1675 window,
1676 cx,
1677 );
1678 return;
1679 }
1680
1681 let commit_message = self.custom_or_suggested_commit_message(window, cx);
1682
1683 let Some(mut message) = commit_message else {
1684 self.commit_editor.read(cx).focus_handle(cx).focus(window);
1685 return;
1686 };
1687
1688 if self.add_coauthors {
1689 self.fill_co_authors(&mut message, cx);
1690 }
1691
1692 let task = if self.has_staged_changes() {
1693 // Repository serializes all git operations, so we can just send a commit immediately
1694 let commit_task = active_repository.update(cx, |repo, cx| {
1695 repo.commit(message.into(), None, options, cx)
1696 });
1697 cx.background_spawn(async move { commit_task.await? })
1698 } else {
1699 let changed_files = self
1700 .entries
1701 .iter()
1702 .filter_map(|entry| entry.status_entry())
1703 .filter(|status_entry| !status_entry.status.is_created())
1704 .map(|status_entry| status_entry.repo_path.clone())
1705 .collect::<Vec<_>>();
1706
1707 if changed_files.is_empty() {
1708 error_spawn("No changes to commit", window, cx);
1709 return;
1710 }
1711
1712 let stage_task =
1713 active_repository.update(cx, |repo, cx| repo.stage_entries(changed_files, cx));
1714 cx.spawn(async move |_, cx| {
1715 stage_task.await?;
1716 let commit_task = active_repository.update(cx, |repo, cx| {
1717 repo.commit(message.into(), None, options, cx)
1718 })?;
1719 commit_task.await?
1720 })
1721 };
1722 let task = cx.spawn_in(window, async move |this, cx| {
1723 let result = task.await;
1724 this.update_in(cx, |this, window, cx| {
1725 this.pending_commit.take();
1726 match result {
1727 Ok(()) => {
1728 this.commit_editor
1729 .update(cx, |editor, cx| editor.clear(window, cx));
1730 }
1731 Err(e) => this.show_error_toast("commit", e, cx),
1732 }
1733 })
1734 .ok();
1735 });
1736
1737 self.pending_commit = Some(task);
1738 }
1739
1740 fn uncommit(&mut self, window: &mut Window, cx: &mut Context<Self>) {
1741 let Some(repo) = self.active_repository.clone() else {
1742 return;
1743 };
1744 telemetry::event!("Git Uncommitted");
1745
1746 let confirmation = self.check_for_pushed_commits(window, cx);
1747 let prior_head = self.load_commit_details("HEAD".to_string(), cx);
1748
1749 let task = cx.spawn_in(window, async move |this, cx| {
1750 let result = maybe!(async {
1751 if let Ok(true) = confirmation.await {
1752 let prior_head = prior_head.await?;
1753
1754 repo.update(cx, |repo, cx| {
1755 repo.reset("HEAD^".to_string(), ResetMode::Soft, cx)
1756 })?
1757 .await??;
1758
1759 Ok(Some(prior_head))
1760 } else {
1761 Ok(None)
1762 }
1763 })
1764 .await;
1765
1766 this.update_in(cx, |this, window, cx| {
1767 this.pending_commit.take();
1768 match result {
1769 Ok(None) => {}
1770 Ok(Some(prior_commit)) => {
1771 this.commit_editor.update(cx, |editor, cx| {
1772 editor.set_text(prior_commit.message, window, cx)
1773 });
1774 }
1775 Err(e) => this.show_error_toast("reset", e, cx),
1776 }
1777 })
1778 .ok();
1779 });
1780
1781 self.pending_commit = Some(task);
1782 }
1783
1784 fn check_for_pushed_commits(
1785 &mut self,
1786 window: &mut Window,
1787 cx: &mut Context<Self>,
1788 ) -> impl Future<Output = anyhow::Result<bool>> + use<> {
1789 let repo = self.active_repository.clone();
1790 let mut cx = window.to_async(cx);
1791
1792 async move {
1793 let repo = repo.context("No active repository")?;
1794
1795 let pushed_to: Vec<SharedString> = repo
1796 .update(&mut cx, |repo, _| repo.check_for_pushed_commits())?
1797 .await??;
1798
1799 if pushed_to.is_empty() {
1800 Ok(true)
1801 } else {
1802 #[derive(strum::EnumIter, strum::VariantNames)]
1803 #[strum(serialize_all = "title_case")]
1804 enum CancelUncommit {
1805 Uncommit,
1806 Cancel,
1807 }
1808 let detail = format!(
1809 "This commit was already pushed to {}.",
1810 pushed_to.into_iter().join(", ")
1811 );
1812 let result = cx
1813 .update(|window, cx| prompt("Are you sure?", Some(&detail), window, cx))?
1814 .await?;
1815
1816 match result {
1817 CancelUncommit::Cancel => Ok(false),
1818 CancelUncommit::Uncommit => Ok(true),
1819 }
1820 }
1821 }
1822 }
1823
1824 /// Suggests a commit message based on the changed files and their statuses
1825 pub fn suggest_commit_message(&self, cx: &App) -> Option<String> {
1826 if let Some(merge_message) = self
1827 .active_repository
1828 .as_ref()
1829 .and_then(|repo| repo.read(cx).merge.message.as_ref())
1830 {
1831 return Some(merge_message.to_string());
1832 }
1833
1834 let git_status_entry = if let Some(staged_entry) = &self.single_staged_entry {
1835 Some(staged_entry)
1836 } else if let Some(single_tracked_entry) = &self.single_tracked_entry {
1837 Some(single_tracked_entry)
1838 } else {
1839 None
1840 }?;
1841
1842 let action_text = if git_status_entry.status.is_deleted() {
1843 Some("Delete")
1844 } else if git_status_entry.status.is_created() {
1845 Some("Create")
1846 } else if git_status_entry.status.is_modified() {
1847 Some("Update")
1848 } else {
1849 None
1850 }?;
1851
1852 let file_name = git_status_entry
1853 .repo_path
1854 .file_name()
1855 .unwrap_or_default()
1856 .to_string_lossy();
1857
1858 Some(format!("{} {}", action_text, file_name))
1859 }
1860
1861 fn generate_commit_message_action(
1862 &mut self,
1863 _: &git::GenerateCommitMessage,
1864 _window: &mut Window,
1865 cx: &mut Context<Self>,
1866 ) {
1867 self.generate_commit_message(cx);
1868 }
1869
1870 /// Generates a commit message using an LLM.
1871 pub fn generate_commit_message(&mut self, cx: &mut Context<Self>) {
1872 if !self.can_commit() || DisableAiSettings::get_global(cx).disable_ai {
1873 return;
1874 }
1875
1876 let model = match current_language_model(cx) {
1877 Some(value) => value,
1878 None => return,
1879 };
1880
1881 let Some(repo) = self.active_repository.as_ref() else {
1882 return;
1883 };
1884
1885 telemetry::event!("Git Commit Message Generated");
1886
1887 let diff = repo.update(cx, |repo, cx| {
1888 if self.has_staged_changes() {
1889 repo.diff(DiffType::HeadToIndex, cx)
1890 } else {
1891 repo.diff(DiffType::HeadToWorktree, cx)
1892 }
1893 });
1894
1895 let temperature = AgentSettings::temperature_for_model(&model, cx);
1896
1897 self.generate_commit_message_task = Some(cx.spawn(async move |this, cx| {
1898 async move {
1899 let _defer = cx.on_drop(&this, |this, _cx| {
1900 this.generate_commit_message_task.take();
1901 });
1902
1903 let mut diff_text = match diff.await {
1904 Ok(result) => match result {
1905 Ok(text) => text,
1906 Err(e) => {
1907 Self::show_commit_message_error(&this, &e, cx);
1908 return anyhow::Ok(());
1909 }
1910 },
1911 Err(e) => {
1912 Self::show_commit_message_error(&this, &e, cx);
1913 return anyhow::Ok(());
1914 }
1915 };
1916
1917 const ONE_MB: usize = 1_000_000;
1918 if diff_text.len() > ONE_MB {
1919 diff_text = diff_text.chars().take(ONE_MB).collect()
1920 }
1921
1922 let subject = this.update(cx, |this, cx| {
1923 this.commit_editor.read(cx).text(cx).lines().next().map(ToOwned::to_owned).unwrap_or_default()
1924 })?;
1925
1926 let text_empty = subject.trim().is_empty();
1927
1928 let content = if text_empty {
1929 format!("{PROMPT}\nHere are the changes in this commit:\n{diff_text}")
1930 } else {
1931 format!("{PROMPT}\nHere is the user's subject line:\n{subject}\nHere are the changes in this commit:\n{diff_text}\n")
1932 };
1933
1934 const PROMPT: &str = include_str!("commit_message_prompt.txt");
1935
1936 let request = LanguageModelRequest {
1937 thread_id: None,
1938 prompt_id: None,
1939 intent: Some(CompletionIntent::GenerateGitCommitMessage),
1940 mode: None,
1941 messages: vec![LanguageModelRequestMessage {
1942 role: Role::User,
1943 content: vec![content.into()],
1944 cache: false,
1945 }],
1946 tools: Vec::new(),
1947 tool_choice: None,
1948 stop: Vec::new(),
1949 temperature,
1950 thinking_allowed: false,
1951 };
1952
1953 let stream = model.stream_completion_text(request, &cx);
1954 match stream.await {
1955 Ok(mut messages) => {
1956 if !text_empty {
1957 this.update(cx, |this, cx| {
1958 this.commit_message_buffer(cx).update(cx, |buffer, cx| {
1959 let insert_position = buffer.anchor_before(buffer.len());
1960 buffer.edit([(insert_position..insert_position, "\n")], None, cx)
1961 });
1962 })?;
1963 }
1964
1965 while let Some(message) = messages.stream.next().await {
1966 match message {
1967 Ok(text) => {
1968 this.update(cx, |this, cx| {
1969 this.commit_message_buffer(cx).update(cx, |buffer, cx| {
1970 let insert_position = buffer.anchor_before(buffer.len());
1971 buffer.edit([(insert_position..insert_position, text)], None, cx);
1972 });
1973 })?;
1974 }
1975 Err(e) => {
1976 Self::show_commit_message_error(&this, &e, cx);
1977 break;
1978 }
1979 }
1980 }
1981 }
1982 Err(e) => {
1983 Self::show_commit_message_error(&this, &e, cx);
1984 }
1985 }
1986
1987 anyhow::Ok(())
1988 }
1989 .log_err().await
1990 }));
1991 }
1992
1993 fn get_fetch_options(
1994 &self,
1995 window: &mut Window,
1996 cx: &mut Context<Self>,
1997 ) -> Task<Option<FetchOptions>> {
1998 let repo = self.active_repository.clone();
1999 let workspace = self.workspace.clone();
2000
2001 cx.spawn_in(window, async move |_, cx| {
2002 let repo = repo?;
2003 let remotes = repo
2004 .update(cx, |repo, _| repo.get_remotes(None))
2005 .ok()?
2006 .await
2007 .ok()?
2008 .log_err()?;
2009
2010 let mut remotes: Vec<_> = remotes.into_iter().map(FetchOptions::Remote).collect();
2011 if remotes.len() > 1 {
2012 remotes.push(FetchOptions::All);
2013 }
2014 let selection = cx
2015 .update(|window, cx| {
2016 picker_prompt::prompt(
2017 "Pick which remote to fetch",
2018 remotes.iter().map(|r| r.name()).collect(),
2019 workspace,
2020 window,
2021 cx,
2022 )
2023 })
2024 .ok()?
2025 .await?;
2026 remotes.get(selection).cloned()
2027 })
2028 }
2029
2030 pub(crate) fn fetch(
2031 &mut self,
2032 is_fetch_all: bool,
2033 window: &mut Window,
2034 cx: &mut Context<Self>,
2035 ) {
2036 if !self.can_push_and_pull(cx) {
2037 return;
2038 }
2039
2040 let Some(repo) = self.active_repository.clone() else {
2041 return;
2042 };
2043 telemetry::event!("Git Fetched");
2044 let askpass = self.askpass_delegate("git fetch", window, cx);
2045 let this = cx.weak_entity();
2046
2047 let fetch_options = if is_fetch_all {
2048 Task::ready(Some(FetchOptions::All))
2049 } else {
2050 self.get_fetch_options(window, cx)
2051 };
2052
2053 window
2054 .spawn(cx, async move |cx| {
2055 let Some(fetch_options) = fetch_options.await else {
2056 return Ok(());
2057 };
2058 let fetch = repo.update(cx, |repo, cx| {
2059 repo.fetch(fetch_options.clone(), askpass, cx)
2060 })?;
2061
2062 let remote_message = fetch.await?;
2063 this.update(cx, |this, cx| {
2064 let action = match fetch_options {
2065 FetchOptions::All => RemoteAction::Fetch(None),
2066 FetchOptions::Remote(remote) => RemoteAction::Fetch(Some(remote)),
2067 };
2068 match remote_message {
2069 Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
2070 Err(e) => {
2071 log::error!("Error while fetching {:?}", e);
2072 this.show_error_toast(action.name(), e, cx)
2073 }
2074 }
2075
2076 anyhow::Ok(())
2077 })
2078 .ok();
2079 anyhow::Ok(())
2080 })
2081 .detach_and_log_err(cx);
2082 }
2083
2084 pub(crate) fn git_clone(&mut self, repo: String, window: &mut Window, cx: &mut Context<Self>) {
2085 let path = cx.prompt_for_paths(gpui::PathPromptOptions {
2086 files: false,
2087 directories: true,
2088 multiple: false,
2089 });
2090
2091 let workspace = self.workspace.clone();
2092
2093 cx.spawn_in(window, async move |this, cx| {
2094 let mut paths = path.await.ok()?.ok()??;
2095 let mut path = paths.pop()?;
2096 let repo_name = repo
2097 .split(std::path::MAIN_SEPARATOR_STR)
2098 .last()?
2099 .strip_suffix(".git")?
2100 .to_owned();
2101
2102 let fs = this.read_with(cx, |this, _| this.fs.clone()).ok()?;
2103
2104 let prompt_answer = match fs.git_clone(&repo, path.as_path()).await {
2105 Ok(_) => cx.update(|window, cx| {
2106 window.prompt(
2107 PromptLevel::Info,
2108 &format!("Git Clone: {}", repo_name),
2109 None,
2110 &["Add repo to project", "Open repo in new project"],
2111 cx,
2112 )
2113 }),
2114 Err(e) => {
2115 this.update(cx, |this: &mut GitPanel, cx| {
2116 let toast = StatusToast::new(e.to_string(), cx, |this, _| {
2117 this.icon(ToastIcon::new(IconName::XCircle).color(Color::Error))
2118 .dismiss_button(true)
2119 });
2120
2121 this.workspace
2122 .update(cx, |workspace, cx| {
2123 workspace.toggle_status_toast(toast, cx);
2124 })
2125 .ok();
2126 })
2127 .ok()?;
2128
2129 return None;
2130 }
2131 }
2132 .ok()?;
2133
2134 path.push(repo_name);
2135 match prompt_answer.await.ok()? {
2136 0 => {
2137 workspace
2138 .update(cx, |workspace, cx| {
2139 workspace
2140 .project()
2141 .update(cx, |project, cx| {
2142 project.create_worktree(path.as_path(), true, cx)
2143 })
2144 .detach();
2145 })
2146 .ok();
2147 }
2148 1 => {
2149 workspace
2150 .update(cx, move |workspace, cx| {
2151 workspace::open_new(
2152 Default::default(),
2153 workspace.app_state().clone(),
2154 cx,
2155 move |workspace, _, cx| {
2156 cx.activate(true);
2157 workspace
2158 .project()
2159 .update(cx, |project, cx| {
2160 project.create_worktree(&path, true, cx)
2161 })
2162 .detach();
2163 },
2164 )
2165 .detach();
2166 })
2167 .ok();
2168 }
2169 _ => {}
2170 }
2171
2172 Some(())
2173 })
2174 .detach();
2175 }
2176
2177 pub(crate) fn git_init(&mut self, window: &mut Window, cx: &mut Context<Self>) {
2178 let worktrees = self
2179 .project
2180 .read(cx)
2181 .visible_worktrees(cx)
2182 .collect::<Vec<_>>();
2183
2184 let worktree = if worktrees.len() == 1 {
2185 Task::ready(Some(worktrees.first().unwrap().clone()))
2186 } else if worktrees.len() == 0 {
2187 let result = window.prompt(
2188 PromptLevel::Warning,
2189 "Unable to initialize a git repository",
2190 Some("Open a directory first"),
2191 &["Ok"],
2192 cx,
2193 );
2194 cx.background_executor()
2195 .spawn(async move {
2196 result.await.ok();
2197 })
2198 .detach();
2199 return;
2200 } else {
2201 let worktree_directories = worktrees
2202 .iter()
2203 .map(|worktree| worktree.read(cx).abs_path())
2204 .map(|worktree_abs_path| {
2205 if let Ok(path) = worktree_abs_path.strip_prefix(util::paths::home_dir()) {
2206 Path::new("~")
2207 .join(path)
2208 .to_string_lossy()
2209 .to_string()
2210 .into()
2211 } else {
2212 worktree_abs_path.to_string_lossy().to_string().into()
2213 }
2214 })
2215 .collect_vec();
2216 let prompt = picker_prompt::prompt(
2217 "Where would you like to initialize this git repository?",
2218 worktree_directories,
2219 self.workspace.clone(),
2220 window,
2221 cx,
2222 );
2223
2224 cx.spawn(async move |_, _| prompt.await.map(|ix| worktrees[ix].clone()))
2225 };
2226
2227 cx.spawn_in(window, async move |this, cx| {
2228 let worktree = match worktree.await {
2229 Some(worktree) => worktree,
2230 None => {
2231 return;
2232 }
2233 };
2234
2235 let Ok(result) = this.update(cx, |this, cx| {
2236 let fallback_branch_name = GitPanelSettings::get_global(cx)
2237 .fallback_branch_name
2238 .clone();
2239 this.project.read(cx).git_init(
2240 worktree.read(cx).abs_path(),
2241 fallback_branch_name,
2242 cx,
2243 )
2244 }) else {
2245 return;
2246 };
2247
2248 let result = result.await;
2249
2250 this.update_in(cx, |this, _, cx| match result {
2251 Ok(()) => {}
2252 Err(e) => this.show_error_toast("init", e, cx),
2253 })
2254 .ok();
2255 })
2256 .detach();
2257 }
2258
2259 pub(crate) fn pull(&mut self, window: &mut Window, cx: &mut Context<Self>) {
2260 if !self.can_push_and_pull(cx) {
2261 return;
2262 }
2263 let Some(repo) = self.active_repository.clone() else {
2264 return;
2265 };
2266 let Some(branch) = repo.read(cx).branch.as_ref() else {
2267 return;
2268 };
2269 telemetry::event!("Git Pulled");
2270 let branch = branch.clone();
2271 let remote = self.get_remote(false, window, cx);
2272 cx.spawn_in(window, async move |this, cx| {
2273 let remote = match remote.await {
2274 Ok(Some(remote)) => remote,
2275 Ok(None) => {
2276 return Ok(());
2277 }
2278 Err(e) => {
2279 log::error!("Failed to get current remote: {}", e);
2280 this.update(cx, |this, cx| this.show_error_toast("pull", e, cx))
2281 .ok();
2282 return Ok(());
2283 }
2284 };
2285
2286 let askpass = this.update_in(cx, |this, window, cx| {
2287 this.askpass_delegate(format!("git pull {}", remote.name), window, cx)
2288 })?;
2289
2290 let pull = repo.update(cx, |repo, cx| {
2291 repo.pull(
2292 branch.name().to_owned().into(),
2293 remote.name.clone(),
2294 askpass,
2295 cx,
2296 )
2297 })?;
2298
2299 let remote_message = pull.await?;
2300
2301 let action = RemoteAction::Pull(remote);
2302 this.update(cx, |this, cx| match remote_message {
2303 Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
2304 Err(e) => {
2305 log::error!("Error while pulling {:?}", e);
2306 this.show_error_toast(action.name(), e, cx)
2307 }
2308 })
2309 .ok();
2310
2311 anyhow::Ok(())
2312 })
2313 .detach_and_log_err(cx);
2314 }
2315
2316 pub(crate) fn push(
2317 &mut self,
2318 force_push: bool,
2319 select_remote: bool,
2320 window: &mut Window,
2321 cx: &mut Context<Self>,
2322 ) {
2323 if !self.can_push_and_pull(cx) {
2324 return;
2325 }
2326 let Some(repo) = self.active_repository.clone() else {
2327 return;
2328 };
2329 let Some(branch) = repo.read(cx).branch.as_ref() else {
2330 return;
2331 };
2332 telemetry::event!("Git Pushed");
2333 let branch = branch.clone();
2334
2335 let options = if force_push {
2336 Some(PushOptions::Force)
2337 } else {
2338 match branch.upstream {
2339 Some(Upstream {
2340 tracking: UpstreamTracking::Gone,
2341 ..
2342 })
2343 | None => Some(PushOptions::SetUpstream),
2344 _ => None,
2345 }
2346 };
2347 let remote = self.get_remote(select_remote, window, cx);
2348
2349 cx.spawn_in(window, async move |this, cx| {
2350 let remote = match remote.await {
2351 Ok(Some(remote)) => remote,
2352 Ok(None) => {
2353 return Ok(());
2354 }
2355 Err(e) => {
2356 log::error!("Failed to get current remote: {}", e);
2357 this.update(cx, |this, cx| this.show_error_toast("push", e, cx))
2358 .ok();
2359 return Ok(());
2360 }
2361 };
2362
2363 let askpass_delegate = this.update_in(cx, |this, window, cx| {
2364 this.askpass_delegate(format!("git push {}", remote.name), window, cx)
2365 })?;
2366
2367 let push = repo.update(cx, |repo, cx| {
2368 repo.push(
2369 branch.name().to_owned().into(),
2370 remote.name.clone(),
2371 options,
2372 askpass_delegate,
2373 cx,
2374 )
2375 })?;
2376
2377 let remote_output = push.await?;
2378
2379 let action = RemoteAction::Push(branch.name().to_owned().into(), remote);
2380 this.update(cx, |this, cx| match remote_output {
2381 Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
2382 Err(e) => {
2383 log::error!("Error while pushing {:?}", e);
2384 this.show_error_toast(action.name(), e, cx)
2385 }
2386 })?;
2387
2388 anyhow::Ok(())
2389 })
2390 .detach_and_log_err(cx);
2391 }
2392
2393 fn askpass_delegate(
2394 &self,
2395 operation: impl Into<SharedString>,
2396 window: &mut Window,
2397 cx: &mut Context<Self>,
2398 ) -> AskPassDelegate {
2399 let this = cx.weak_entity();
2400 let operation = operation.into();
2401 let window = window.window_handle();
2402 AskPassDelegate::new(&mut cx.to_async(), move |prompt, tx, cx| {
2403 window
2404 .update(cx, |_, window, cx| {
2405 this.update(cx, |this, cx| {
2406 this.workspace.update(cx, |workspace, cx| {
2407 workspace.toggle_modal(window, cx, |window, cx| {
2408 AskPassModal::new(operation.clone(), prompt.into(), tx, window, cx)
2409 });
2410 })
2411 })
2412 })
2413 .ok();
2414 })
2415 }
2416
2417 fn can_push_and_pull(&self, cx: &App) -> bool {
2418 !self.project.read(cx).is_via_collab()
2419 }
2420
2421 fn get_remote(
2422 &mut self,
2423 always_select: bool,
2424 window: &mut Window,
2425 cx: &mut Context<Self>,
2426 ) -> impl Future<Output = anyhow::Result<Option<Remote>>> + use<> {
2427 let repo = self.active_repository.clone();
2428 let workspace = self.workspace.clone();
2429 let mut cx = window.to_async(cx);
2430
2431 async move {
2432 let repo = repo.context("No active repository")?;
2433 let current_remotes: Vec<Remote> = repo
2434 .update(&mut cx, |repo, _| {
2435 let current_branch = if always_select {
2436 None
2437 } else {
2438 let current_branch = repo.branch.as_ref().context("No active branch")?;
2439 Some(current_branch.name().to_string())
2440 };
2441 anyhow::Ok(repo.get_remotes(current_branch))
2442 })??
2443 .await??;
2444
2445 let current_remotes: Vec<_> = current_remotes
2446 .into_iter()
2447 .map(|remotes| remotes.name)
2448 .collect();
2449 let selection = cx
2450 .update(|window, cx| {
2451 picker_prompt::prompt(
2452 "Pick which remote to push to",
2453 current_remotes.clone(),
2454 workspace,
2455 window,
2456 cx,
2457 )
2458 })?
2459 .await;
2460
2461 Ok(selection.map(|selection| Remote {
2462 name: current_remotes[selection].clone(),
2463 }))
2464 }
2465 }
2466
2467 pub fn load_local_committer(&mut self, cx: &Context<Self>) {
2468 if self.local_committer_task.is_none() {
2469 self.local_committer_task = Some(cx.spawn(async move |this, cx| {
2470 let committer = get_git_committer(cx).await;
2471 this.update(cx, |this, cx| {
2472 this.local_committer = Some(committer);
2473 cx.notify()
2474 })
2475 .ok();
2476 }));
2477 }
2478 }
2479
2480 fn potential_co_authors(&self, cx: &App) -> Vec<(String, String)> {
2481 let mut new_co_authors = Vec::new();
2482 let project = self.project.read(cx);
2483
2484 let Some(room) = self
2485 .workspace
2486 .upgrade()
2487 .and_then(|workspace| workspace.read(cx).active_call()?.read(cx).room().cloned())
2488 else {
2489 return Vec::default();
2490 };
2491
2492 let room = room.read(cx);
2493
2494 for (peer_id, collaborator) in project.collaborators() {
2495 if collaborator.is_host {
2496 continue;
2497 }
2498
2499 let Some(participant) = room.remote_participant_for_peer_id(*peer_id) else {
2500 continue;
2501 };
2502 if !participant.can_write() {
2503 continue;
2504 }
2505 if let Some(email) = &collaborator.committer_email {
2506 let name = collaborator
2507 .committer_name
2508 .clone()
2509 .or_else(|| participant.user.name.clone())
2510 .unwrap_or_else(|| participant.user.github_login.clone().to_string());
2511 new_co_authors.push((name.clone(), email.clone()))
2512 }
2513 }
2514 if !project.is_local() && !project.is_read_only(cx) {
2515 if let Some(local_committer) = self.local_committer(room, cx) {
2516 new_co_authors.push(local_committer);
2517 }
2518 }
2519 new_co_authors
2520 }
2521
2522 fn local_committer(&self, room: &call::Room, cx: &App) -> Option<(String, String)> {
2523 let user = room.local_participant_user(cx)?;
2524 let committer = self.local_committer.as_ref()?;
2525 let email = committer.email.clone()?;
2526 let name = committer
2527 .name
2528 .clone()
2529 .or_else(|| user.name.clone())
2530 .unwrap_or_else(|| user.github_login.clone().to_string());
2531 Some((name, email))
2532 }
2533
2534 fn toggle_fill_co_authors(
2535 &mut self,
2536 _: &ToggleFillCoAuthors,
2537 _: &mut Window,
2538 cx: &mut Context<Self>,
2539 ) {
2540 self.add_coauthors = !self.add_coauthors;
2541 cx.notify();
2542 }
2543
2544 fn fill_co_authors(&mut self, message: &mut String, cx: &mut Context<Self>) {
2545 const CO_AUTHOR_PREFIX: &str = "Co-authored-by: ";
2546
2547 let existing_text = message.to_ascii_lowercase();
2548 let lowercase_co_author_prefix = CO_AUTHOR_PREFIX.to_lowercase();
2549 let mut ends_with_co_authors = false;
2550 let existing_co_authors = existing_text
2551 .lines()
2552 .filter_map(|line| {
2553 let line = line.trim();
2554 if line.starts_with(&lowercase_co_author_prefix) {
2555 ends_with_co_authors = true;
2556 Some(line)
2557 } else {
2558 ends_with_co_authors = false;
2559 None
2560 }
2561 })
2562 .collect::<HashSet<_>>();
2563
2564 let new_co_authors = self
2565 .potential_co_authors(cx)
2566 .into_iter()
2567 .filter(|(_, email)| {
2568 !existing_co_authors
2569 .iter()
2570 .any(|existing| existing.contains(email.as_str()))
2571 })
2572 .collect::<Vec<_>>();
2573
2574 if new_co_authors.is_empty() {
2575 return;
2576 }
2577
2578 if !ends_with_co_authors {
2579 message.push('\n');
2580 }
2581 for (name, email) in new_co_authors {
2582 message.push('\n');
2583 message.push_str(CO_AUTHOR_PREFIX);
2584 message.push_str(&name);
2585 message.push_str(" <");
2586 message.push_str(&email);
2587 message.push('>');
2588 }
2589 message.push('\n');
2590 }
2591
2592 fn schedule_update(
2593 &mut self,
2594 clear_pending: bool,
2595 window: &mut Window,
2596 cx: &mut Context<Self>,
2597 ) {
2598 let handle = cx.entity().downgrade();
2599 self.reopen_commit_buffer(window, cx);
2600 self.update_visible_entries_task = cx.spawn_in(window, async move |_, cx| {
2601 cx.background_executor().timer(UPDATE_DEBOUNCE).await;
2602 if let Some(git_panel) = handle.upgrade() {
2603 git_panel
2604 .update_in(cx, |git_panel, window, cx| {
2605 if clear_pending {
2606 git_panel.clear_pending();
2607 }
2608 git_panel.update_visible_entries(cx);
2609 git_panel.update_scrollbar_properties(window, cx);
2610 })
2611 .ok();
2612 }
2613 });
2614 }
2615
2616 fn reopen_commit_buffer(&mut self, window: &mut Window, cx: &mut Context<Self>) {
2617 let Some(active_repo) = self.active_repository.as_ref() else {
2618 return;
2619 };
2620 let load_buffer = active_repo.update(cx, |active_repo, cx| {
2621 let project = self.project.read(cx);
2622 active_repo.open_commit_buffer(
2623 Some(project.languages().clone()),
2624 project.buffer_store().clone(),
2625 cx,
2626 )
2627 });
2628
2629 cx.spawn_in(window, async move |git_panel, cx| {
2630 let buffer = load_buffer.await?;
2631 git_panel.update_in(cx, |git_panel, window, cx| {
2632 if git_panel
2633 .commit_editor
2634 .read(cx)
2635 .buffer()
2636 .read(cx)
2637 .as_singleton()
2638 .as_ref()
2639 != Some(&buffer)
2640 {
2641 git_panel.commit_editor = cx.new(|cx| {
2642 commit_message_editor(
2643 buffer,
2644 git_panel.suggest_commit_message(cx).map(SharedString::from),
2645 git_panel.project.clone(),
2646 true,
2647 window,
2648 cx,
2649 )
2650 });
2651 }
2652 })
2653 })
2654 .detach_and_log_err(cx);
2655 }
2656
2657 fn clear_pending(&mut self) {
2658 self.pending.retain(|v| !v.finished)
2659 }
2660
2661 fn update_visible_entries(&mut self, cx: &mut Context<Self>) {
2662 let bulk_staging = self.bulk_staging.take();
2663 let last_staged_path_prev_index = bulk_staging
2664 .as_ref()
2665 .and_then(|op| self.entry_by_path(&op.anchor, cx));
2666
2667 self.entries.clear();
2668 self.single_staged_entry.take();
2669 self.single_tracked_entry.take();
2670 self.conflicted_count = 0;
2671 self.conflicted_staged_count = 0;
2672 self.new_count = 0;
2673 self.tracked_count = 0;
2674 self.new_staged_count = 0;
2675 self.tracked_staged_count = 0;
2676 self.entry_count = 0;
2677
2678 let sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
2679
2680 let mut changed_entries = Vec::new();
2681 let mut new_entries = Vec::new();
2682 let mut conflict_entries = Vec::new();
2683 let mut single_staged_entry = None;
2684 let mut staged_count = 0;
2685 let mut max_width_item: Option<(RepoPath, usize)> = None;
2686
2687 let Some(repo) = self.active_repository.as_ref() else {
2688 // Just clear entries if no repository is active.
2689 cx.notify();
2690 return;
2691 };
2692
2693 let repo = repo.read(cx);
2694
2695 for entry in repo.cached_status() {
2696 let is_conflict = repo.had_conflict_on_last_merge_head_change(&entry.repo_path);
2697 let is_new = entry.status.is_created();
2698 let staging = entry.status.staging();
2699
2700 if self.pending.iter().any(|pending| {
2701 pending.target_status == TargetStatus::Reverted
2702 && !pending.finished
2703 && pending
2704 .entries
2705 .iter()
2706 .any(|pending| pending.repo_path == entry.repo_path)
2707 }) {
2708 continue;
2709 }
2710
2711 let abs_path = repo.work_directory_abs_path.join(&entry.repo_path.0);
2712 let entry = GitStatusEntry {
2713 repo_path: entry.repo_path.clone(),
2714 abs_path,
2715 status: entry.status,
2716 staging,
2717 };
2718
2719 if staging.has_staged() {
2720 staged_count += 1;
2721 single_staged_entry = Some(entry.clone());
2722 }
2723
2724 let width_estimate = Self::item_width_estimate(
2725 entry.parent_dir().map(|s| s.len()).unwrap_or(0),
2726 entry.display_name().len(),
2727 );
2728
2729 match max_width_item.as_mut() {
2730 Some((repo_path, estimate)) => {
2731 if width_estimate > *estimate {
2732 *repo_path = entry.repo_path.clone();
2733 *estimate = width_estimate;
2734 }
2735 }
2736 None => max_width_item = Some((entry.repo_path.clone(), width_estimate)),
2737 }
2738
2739 if sort_by_path {
2740 changed_entries.push(entry);
2741 } else if is_conflict {
2742 conflict_entries.push(entry);
2743 } else if is_new {
2744 new_entries.push(entry);
2745 } else {
2746 changed_entries.push(entry);
2747 }
2748 }
2749
2750 let mut pending_staged_count = 0;
2751 let mut last_pending_staged = None;
2752 let mut pending_status_for_single_staged = None;
2753 for pending in self.pending.iter() {
2754 if pending.target_status == TargetStatus::Staged {
2755 pending_staged_count += pending.entries.len();
2756 last_pending_staged = pending.entries.iter().next().cloned();
2757 }
2758 if let Some(single_staged) = &single_staged_entry {
2759 if pending
2760 .entries
2761 .iter()
2762 .any(|entry| entry.repo_path == single_staged.repo_path)
2763 {
2764 pending_status_for_single_staged = Some(pending.target_status);
2765 }
2766 }
2767 }
2768
2769 if conflict_entries.len() == 0 && staged_count == 1 && pending_staged_count == 0 {
2770 match pending_status_for_single_staged {
2771 Some(TargetStatus::Staged) | None => {
2772 self.single_staged_entry = single_staged_entry;
2773 }
2774 _ => {}
2775 }
2776 } else if conflict_entries.len() == 0 && pending_staged_count == 1 {
2777 self.single_staged_entry = last_pending_staged;
2778 }
2779
2780 if conflict_entries.len() == 0 && changed_entries.len() == 1 {
2781 self.single_tracked_entry = changed_entries.first().cloned();
2782 }
2783
2784 if conflict_entries.len() > 0 {
2785 self.entries.push(GitListEntry::Header(GitHeaderEntry {
2786 header: Section::Conflict,
2787 }));
2788 self.entries
2789 .extend(conflict_entries.into_iter().map(GitListEntry::Status));
2790 }
2791
2792 if changed_entries.len() > 0 {
2793 if !sort_by_path {
2794 self.entries.push(GitListEntry::Header(GitHeaderEntry {
2795 header: Section::Tracked,
2796 }));
2797 }
2798 self.entries
2799 .extend(changed_entries.into_iter().map(GitListEntry::Status));
2800 }
2801 if new_entries.len() > 0 {
2802 self.entries.push(GitListEntry::Header(GitHeaderEntry {
2803 header: Section::New,
2804 }));
2805 self.entries
2806 .extend(new_entries.into_iter().map(GitListEntry::Status));
2807 }
2808
2809 if let Some((repo_path, _)) = max_width_item {
2810 self.max_width_item_index = self.entries.iter().position(|entry| match entry {
2811 GitListEntry::Status(git_status_entry) => git_status_entry.repo_path == repo_path,
2812 GitListEntry::Header(_) => false,
2813 });
2814 }
2815
2816 self.update_counts(repo);
2817
2818 let bulk_staging_anchor_new_index = bulk_staging
2819 .as_ref()
2820 .filter(|op| op.repo_id == repo.id)
2821 .and_then(|op| self.entry_by_path(&op.anchor, cx));
2822 if bulk_staging_anchor_new_index == last_staged_path_prev_index
2823 && let Some(index) = bulk_staging_anchor_new_index
2824 && let Some(entry) = self.entries.get(index)
2825 && let Some(entry) = entry.status_entry()
2826 && self.entry_staging(entry) == StageStatus::Staged
2827 {
2828 self.bulk_staging = bulk_staging;
2829 }
2830
2831 self.select_first_entry_if_none(cx);
2832
2833 let suggested_commit_message = self.suggest_commit_message(cx);
2834 let placeholder_text = suggested_commit_message.unwrap_or("Enter commit message".into());
2835
2836 self.commit_editor.update(cx, |editor, cx| {
2837 editor.set_placeholder_text(Arc::from(placeholder_text), cx)
2838 });
2839
2840 cx.notify();
2841 }
2842
2843 fn header_state(&self, header_type: Section) -> ToggleState {
2844 let (staged_count, count) = match header_type {
2845 Section::New => (self.new_staged_count, self.new_count),
2846 Section::Tracked => (self.tracked_staged_count, self.tracked_count),
2847 Section::Conflict => (self.conflicted_staged_count, self.conflicted_count),
2848 };
2849 if staged_count == 0 {
2850 ToggleState::Unselected
2851 } else if count == staged_count {
2852 ToggleState::Selected
2853 } else {
2854 ToggleState::Indeterminate
2855 }
2856 }
2857
2858 fn update_counts(&mut self, repo: &Repository) {
2859 self.show_placeholders = false;
2860 self.conflicted_count = 0;
2861 self.conflicted_staged_count = 0;
2862 self.new_count = 0;
2863 self.tracked_count = 0;
2864 self.new_staged_count = 0;
2865 self.tracked_staged_count = 0;
2866 self.entry_count = 0;
2867 for entry in &self.entries {
2868 let Some(status_entry) = entry.status_entry() else {
2869 continue;
2870 };
2871 self.entry_count += 1;
2872 if repo.had_conflict_on_last_merge_head_change(&status_entry.repo_path) {
2873 self.conflicted_count += 1;
2874 if self.entry_staging(status_entry).has_staged() {
2875 self.conflicted_staged_count += 1;
2876 }
2877 } else if status_entry.status.is_created() {
2878 self.new_count += 1;
2879 if self.entry_staging(status_entry).has_staged() {
2880 self.new_staged_count += 1;
2881 }
2882 } else {
2883 self.tracked_count += 1;
2884 if self.entry_staging(status_entry).has_staged() {
2885 self.tracked_staged_count += 1;
2886 }
2887 }
2888 }
2889 }
2890
2891 fn entry_staging(&self, entry: &GitStatusEntry) -> StageStatus {
2892 for pending in self.pending.iter().rev() {
2893 if pending
2894 .entries
2895 .iter()
2896 .any(|pending_entry| pending_entry.repo_path == entry.repo_path)
2897 {
2898 match pending.target_status {
2899 TargetStatus::Staged => return StageStatus::Staged,
2900 TargetStatus::Unstaged => return StageStatus::Unstaged,
2901 TargetStatus::Reverted => continue,
2902 TargetStatus::Unchanged => continue,
2903 }
2904 }
2905 }
2906 entry.staging
2907 }
2908
2909 pub(crate) fn has_staged_changes(&self) -> bool {
2910 self.tracked_staged_count > 0
2911 || self.new_staged_count > 0
2912 || self.conflicted_staged_count > 0
2913 }
2914
2915 pub(crate) fn has_unstaged_changes(&self) -> bool {
2916 self.tracked_count > self.tracked_staged_count
2917 || self.new_count > self.new_staged_count
2918 || self.conflicted_count > self.conflicted_staged_count
2919 }
2920
2921 fn has_tracked_changes(&self) -> bool {
2922 self.tracked_count > 0
2923 }
2924
2925 pub fn has_unstaged_conflicts(&self) -> bool {
2926 self.conflicted_count > 0 && self.conflicted_count != self.conflicted_staged_count
2927 }
2928
2929 fn show_error_toast(&self, action: impl Into<SharedString>, e: anyhow::Error, cx: &mut App) {
2930 let action = action.into();
2931 let Some(workspace) = self.workspace.upgrade() else {
2932 return;
2933 };
2934
2935 let message = e.to_string().trim().to_string();
2936 if message
2937 .matches(git::repository::REMOTE_CANCELLED_BY_USER)
2938 .next()
2939 .is_some()
2940 {
2941 return; // Hide the cancelled by user message
2942 } else {
2943 workspace.update(cx, |workspace, cx| {
2944 let workspace_weak = cx.weak_entity();
2945 let toast = StatusToast::new(format!("git {} failed", action), cx, |this, _cx| {
2946 this.icon(ToastIcon::new(IconName::XCircle).color(Color::Error))
2947 .action("View Log", move |window, cx| {
2948 let message = message.clone();
2949 let action = action.clone();
2950 workspace_weak
2951 .update(cx, move |workspace, cx| {
2952 Self::open_output(action, workspace, &message, window, cx)
2953 })
2954 .ok();
2955 })
2956 });
2957 workspace.toggle_status_toast(toast, cx)
2958 });
2959 }
2960 }
2961
2962 fn show_commit_message_error<E>(weak_this: &WeakEntity<Self>, err: &E, cx: &mut AsyncApp)
2963 where
2964 E: std::fmt::Debug + std::fmt::Display,
2965 {
2966 if let Ok(Some(workspace)) = weak_this.update(cx, |this, _cx| this.workspace.upgrade()) {
2967 let _ = workspace.update(cx, |workspace, cx| {
2968 struct CommitMessageError;
2969 let notification_id = NotificationId::unique::<CommitMessageError>();
2970 workspace.show_notification(notification_id, cx, |cx| {
2971 cx.new(|cx| {
2972 ErrorMessagePrompt::new(
2973 format!("Failed to generate commit message: {err}"),
2974 cx,
2975 )
2976 })
2977 });
2978 });
2979 }
2980 }
2981
2982 fn show_remote_output(&self, action: RemoteAction, info: RemoteCommandOutput, cx: &mut App) {
2983 let Some(workspace) = self.workspace.upgrade() else {
2984 return;
2985 };
2986
2987 workspace.update(cx, |workspace, cx| {
2988 let SuccessMessage { message, style } = remote_output::format_output(&action, info);
2989 let workspace_weak = cx.weak_entity();
2990 let operation = action.name();
2991
2992 let status_toast = StatusToast::new(message, cx, move |this, _cx| {
2993 use remote_output::SuccessStyle::*;
2994 match style {
2995 Toast { .. } => {
2996 this.icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted))
2997 }
2998 ToastWithLog { output } => this
2999 .icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted))
3000 .action("View Log", move |window, cx| {
3001 let output = output.clone();
3002 let output =
3003 format!("stdout:\n{}\nstderr:\n{}", output.stdout, output.stderr);
3004 workspace_weak
3005 .update(cx, move |workspace, cx| {
3006 Self::open_output(operation, workspace, &output, window, cx)
3007 })
3008 .ok();
3009 }),
3010 PushPrLink { text, link } => this
3011 .icon(ToastIcon::new(IconName::GitBranchAlt).color(Color::Muted))
3012 .action(text, move |_, cx| cx.open_url(&link)),
3013 }
3014 });
3015 workspace.toggle_status_toast(status_toast, cx)
3016 });
3017 }
3018
3019 fn open_output(
3020 operation: impl Into<SharedString>,
3021 workspace: &mut Workspace,
3022 output: &str,
3023 window: &mut Window,
3024 cx: &mut Context<Workspace>,
3025 ) {
3026 let operation = operation.into();
3027 let buffer = cx.new(|cx| Buffer::local(output, cx));
3028 buffer.update(cx, |buffer, cx| {
3029 buffer.set_capability(language::Capability::ReadOnly, cx);
3030 });
3031 let editor = cx.new(|cx| {
3032 let mut editor = Editor::for_buffer(buffer, None, window, cx);
3033 editor.buffer().update(cx, |buffer, cx| {
3034 buffer.set_title(format!("Output from git {operation}"), cx);
3035 });
3036 editor.set_read_only(true);
3037 editor
3038 });
3039
3040 workspace.add_item_to_center(Box::new(editor), window, cx);
3041 }
3042
3043 pub fn can_commit(&self) -> bool {
3044 (self.has_staged_changes() || self.has_tracked_changes()) && !self.has_unstaged_conflicts()
3045 }
3046
3047 pub fn can_stage_all(&self) -> bool {
3048 self.has_unstaged_changes()
3049 }
3050
3051 pub fn can_unstage_all(&self) -> bool {
3052 self.has_staged_changes()
3053 }
3054
3055 // eventually we'll need to take depth into account here
3056 // if we add a tree view
3057 fn item_width_estimate(path: usize, file_name: usize) -> usize {
3058 path + file_name
3059 }
3060
3061 fn render_overflow_menu(&self, id: impl Into<ElementId>) -> impl IntoElement {
3062 let focus_handle = self.focus_handle.clone();
3063 let has_tracked_changes = self.has_tracked_changes();
3064 let has_staged_changes = self.has_staged_changes();
3065 let has_unstaged_changes = self.has_unstaged_changes();
3066 let has_new_changes = self.new_count > 0;
3067
3068 PopoverMenu::new(id.into())
3069 .trigger(
3070 IconButton::new("overflow-menu-trigger", IconName::Ellipsis)
3071 .icon_size(IconSize::Small)
3072 .icon_color(Color::Muted),
3073 )
3074 .menu(move |window, cx| {
3075 Some(git_panel_context_menu(
3076 focus_handle.clone(),
3077 GitMenuState {
3078 has_tracked_changes,
3079 has_staged_changes,
3080 has_unstaged_changes,
3081 has_new_changes,
3082 },
3083 window,
3084 cx,
3085 ))
3086 })
3087 .anchor(Corner::TopRight)
3088 }
3089
3090 pub(crate) fn render_generate_commit_message_button(
3091 &self,
3092 cx: &Context<Self>,
3093 ) -> Option<AnyElement> {
3094 current_language_model(cx).is_some().then(|| {
3095 if self.generate_commit_message_task.is_some() {
3096 return h_flex()
3097 .gap_1()
3098 .child(
3099 Icon::new(IconName::ArrowCircle)
3100 .size(IconSize::XSmall)
3101 .color(Color::Info)
3102 .with_animation(
3103 "arrow-circle",
3104 Animation::new(Duration::from_secs(2)).repeat(),
3105 |icon, delta| {
3106 icon.transform(Transformation::rotate(percentage(delta)))
3107 },
3108 ),
3109 )
3110 .child(
3111 Label::new("Generating Commit...")
3112 .size(LabelSize::Small)
3113 .color(Color::Muted),
3114 )
3115 .into_any_element();
3116 }
3117
3118 let can_commit = self.can_commit();
3119 let editor_focus_handle = self.commit_editor.focus_handle(cx);
3120 IconButton::new("generate-commit-message", IconName::AiEdit)
3121 .shape(ui::IconButtonShape::Square)
3122 .icon_color(Color::Muted)
3123 .tooltip(move |window, cx| {
3124 if can_commit {
3125 Tooltip::for_action_in(
3126 "Generate Commit Message",
3127 &git::GenerateCommitMessage,
3128 &editor_focus_handle,
3129 window,
3130 cx,
3131 )
3132 } else {
3133 Tooltip::simple("No changes to commit", cx)
3134 }
3135 })
3136 .disabled(!can_commit)
3137 .on_click(cx.listener(move |this, _event, _window, cx| {
3138 this.generate_commit_message(cx);
3139 }))
3140 .into_any_element()
3141 })
3142 }
3143
3144 pub(crate) fn render_co_authors(&self, cx: &Context<Self>) -> Option<AnyElement> {
3145 let potential_co_authors = self.potential_co_authors(cx);
3146
3147 let (tooltip_label, icon) = if self.add_coauthors {
3148 ("Remove co-authored-by", IconName::Person)
3149 } else {
3150 ("Add co-authored-by", IconName::UserCheck)
3151 };
3152
3153 if potential_co_authors.is_empty() {
3154 None
3155 } else {
3156 Some(
3157 IconButton::new("co-authors", icon)
3158 .shape(ui::IconButtonShape::Square)
3159 .icon_color(Color::Disabled)
3160 .selected_icon_color(Color::Selected)
3161 .toggle_state(self.add_coauthors)
3162 .tooltip(move |_, cx| {
3163 let title = format!(
3164 "{}:{}{}",
3165 tooltip_label,
3166 if potential_co_authors.len() == 1 {
3167 ""
3168 } else {
3169 "\n"
3170 },
3171 potential_co_authors
3172 .iter()
3173 .map(|(name, email)| format!(" {} <{}>", name, email))
3174 .join("\n")
3175 );
3176 Tooltip::simple(title, cx)
3177 })
3178 .on_click(cx.listener(|this, _, _, cx| {
3179 this.add_coauthors = !this.add_coauthors;
3180 cx.notify();
3181 }))
3182 .into_any_element(),
3183 )
3184 }
3185 }
3186
3187 fn render_git_commit_menu(
3188 &self,
3189 id: impl Into<ElementId>,
3190 keybinding_target: Option<FocusHandle>,
3191 cx: &mut Context<Self>,
3192 ) -> impl IntoElement {
3193 PopoverMenu::new(id.into())
3194 .trigger(
3195 ui::ButtonLike::new_rounded_right("commit-split-button-right")
3196 .layer(ui::ElevationIndex::ModalSurface)
3197 .size(ButtonSize::None)
3198 .child(
3199 h_flex()
3200 .px_1()
3201 .h_full()
3202 .justify_center()
3203 .border_l_1()
3204 .border_color(cx.theme().colors().border)
3205 .child(Icon::new(IconName::ChevronDown).size(IconSize::XSmall)),
3206 ),
3207 )
3208 .menu({
3209 let git_panel = cx.entity();
3210 let has_previous_commit = self.head_commit(cx).is_some();
3211 let amend = self.amend_pending();
3212 let signoff = self.signoff_enabled;
3213
3214 move |window, cx| {
3215 Some(ContextMenu::build(window, cx, |context_menu, _, _| {
3216 context_menu
3217 .when_some(keybinding_target.clone(), |el, keybinding_target| {
3218 el.context(keybinding_target.clone())
3219 })
3220 .when(has_previous_commit, |this| {
3221 this.toggleable_entry(
3222 "Amend",
3223 amend,
3224 IconPosition::Start,
3225 Some(Box::new(Amend)),
3226 {
3227 let git_panel = git_panel.downgrade();
3228 move |_, cx| {
3229 git_panel
3230 .update(cx, |git_panel, cx| {
3231 git_panel.toggle_amend_pending(cx);
3232 })
3233 .ok();
3234 }
3235 },
3236 )
3237 })
3238 .toggleable_entry(
3239 "Signoff",
3240 signoff,
3241 IconPosition::Start,
3242 Some(Box::new(Signoff)),
3243 move |window, cx| window.dispatch_action(Box::new(Signoff), cx),
3244 )
3245 }))
3246 }
3247 })
3248 .anchor(Corner::TopRight)
3249 }
3250
3251 pub fn configure_commit_button(&self, cx: &mut Context<Self>) -> (bool, &'static str) {
3252 if self.has_unstaged_conflicts() {
3253 (false, "You must resolve conflicts before committing")
3254 } else if !self.has_staged_changes() && !self.has_tracked_changes() {
3255 (false, "No changes to commit")
3256 } else if self.pending_commit.is_some() {
3257 (false, "Commit in progress")
3258 } else if !self.has_commit_message(cx) {
3259 (false, "No commit message")
3260 } else if !self.has_write_access(cx) {
3261 (false, "You do not have write access to this project")
3262 } else {
3263 (true, self.commit_button_title())
3264 }
3265 }
3266
3267 pub fn commit_button_title(&self) -> &'static str {
3268 if self.amend_pending {
3269 if self.has_staged_changes() {
3270 "Amend"
3271 } else {
3272 "Amend Tracked"
3273 }
3274 } else {
3275 if self.has_staged_changes() {
3276 "Commit"
3277 } else {
3278 "Commit Tracked"
3279 }
3280 }
3281 }
3282
3283 fn expand_commit_editor(
3284 &mut self,
3285 _: &git::ExpandCommitEditor,
3286 window: &mut Window,
3287 cx: &mut Context<Self>,
3288 ) {
3289 let workspace = self.workspace.clone();
3290 window.defer(cx, move |window, cx| {
3291 workspace
3292 .update(cx, |workspace, cx| {
3293 CommitModal::toggle(workspace, None, window, cx)
3294 })
3295 .ok();
3296 })
3297 }
3298
3299 fn render_panel_header(
3300 &self,
3301 window: &mut Window,
3302 cx: &mut Context<Self>,
3303 ) -> Option<impl IntoElement> {
3304 self.active_repository.as_ref()?;
3305
3306 let text;
3307 let action;
3308 let tooltip;
3309 if self.total_staged_count() == self.entry_count && self.entry_count > 0 {
3310 text = "Unstage All";
3311 action = git::UnstageAll.boxed_clone();
3312 tooltip = "git reset";
3313 } else {
3314 text = "Stage All";
3315 action = git::StageAll.boxed_clone();
3316 tooltip = "git add --all ."
3317 }
3318
3319 let change_string = match self.entry_count {
3320 0 => "No Changes".to_string(),
3321 1 => "1 Change".to_string(),
3322 _ => format!("{} Changes", self.entry_count),
3323 };
3324
3325 Some(
3326 self.panel_header_container(window, cx)
3327 .px_2()
3328 .justify_between()
3329 .child(
3330 panel_button(change_string)
3331 .color(Color::Muted)
3332 .tooltip(Tooltip::for_action_title_in(
3333 "Open Diff",
3334 &Diff,
3335 &self.focus_handle,
3336 ))
3337 .on_click(|_, _, cx| {
3338 cx.defer(|cx| {
3339 cx.dispatch_action(&Diff);
3340 })
3341 }),
3342 )
3343 .child(
3344 h_flex()
3345 .gap_1()
3346 .child(self.render_overflow_menu("overflow_menu"))
3347 .child(
3348 panel_filled_button(text)
3349 .tooltip(Tooltip::for_action_title_in(
3350 tooltip,
3351 action.as_ref(),
3352 &self.focus_handle,
3353 ))
3354 .disabled(self.entry_count == 0)
3355 .on_click(move |_, _, cx| {
3356 let action = action.boxed_clone();
3357 cx.defer(move |cx| {
3358 cx.dispatch_action(action.as_ref());
3359 })
3360 }),
3361 ),
3362 ),
3363 )
3364 }
3365
3366 pub(crate) fn render_remote_button(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
3367 let branch = self.active_repository.as_ref()?.read(cx).branch.clone();
3368 if !self.can_push_and_pull(cx) {
3369 return None;
3370 }
3371 Some(
3372 h_flex()
3373 .gap_1()
3374 .flex_shrink_0()
3375 .when_some(branch, |this, branch| {
3376 let focus_handle = Some(self.focus_handle(cx));
3377
3378 this.children(render_remote_button(
3379 "remote-button",
3380 &branch,
3381 focus_handle,
3382 true,
3383 ))
3384 })
3385 .into_any_element(),
3386 )
3387 }
3388
3389 pub fn render_footer(
3390 &self,
3391 window: &mut Window,
3392 cx: &mut Context<Self>,
3393 ) -> Option<impl IntoElement> {
3394 let active_repository = self.active_repository.clone()?;
3395 let panel_editor_style = panel_editor_style(true, window, cx);
3396
3397 let enable_coauthors = self.render_co_authors(cx);
3398
3399 let editor_focus_handle = self.commit_editor.focus_handle(cx);
3400 let expand_tooltip_focus_handle = editor_focus_handle.clone();
3401
3402 let branch = active_repository.read(cx).branch.clone();
3403 let head_commit = active_repository.read(cx).head_commit.clone();
3404
3405 let footer_size = px(32.);
3406 let gap = px(9.0);
3407 let max_height = panel_editor_style
3408 .text
3409 .line_height_in_pixels(window.rem_size())
3410 * MAX_PANEL_EDITOR_LINES
3411 + gap;
3412
3413 let git_panel = cx.entity();
3414 let display_name = SharedString::from(Arc::from(
3415 active_repository
3416 .read(cx)
3417 .display_name()
3418 .trim_end_matches("/"),
3419 ));
3420 let editor_is_long = self.commit_editor.update(cx, |editor, cx| {
3421 editor.max_point(cx).row().0 >= MAX_PANEL_EDITOR_LINES as u32
3422 });
3423
3424 let footer = v_flex()
3425 .child(PanelRepoFooter::new(
3426 display_name,
3427 branch,
3428 head_commit,
3429 Some(git_panel.clone()),
3430 ))
3431 .child(
3432 panel_editor_container(window, cx)
3433 .id("commit-editor-container")
3434 .relative()
3435 .w_full()
3436 .h(max_height + footer_size)
3437 .border_t_1()
3438 .border_color(cx.theme().colors().border)
3439 .cursor_text()
3440 .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
3441 window.focus(&this.commit_editor.focus_handle(cx));
3442 }))
3443 .child(
3444 h_flex()
3445 .id("commit-footer")
3446 .border_t_1()
3447 .when(editor_is_long, |el| {
3448 el.border_color(cx.theme().colors().border_variant)
3449 })
3450 .absolute()
3451 .bottom_0()
3452 .left_0()
3453 .w_full()
3454 .px_2()
3455 .h(footer_size)
3456 .flex_none()
3457 .justify_between()
3458 .child(
3459 self.render_generate_commit_message_button(cx)
3460 .unwrap_or_else(|| div().into_any_element()),
3461 )
3462 .child(
3463 h_flex()
3464 .gap_0p5()
3465 .children(enable_coauthors)
3466 .child(self.render_commit_button(cx)),
3467 ),
3468 )
3469 .child(
3470 div()
3471 .pr_2p5()
3472 .on_action(|&editor::actions::MoveUp, _, cx| {
3473 cx.stop_propagation();
3474 })
3475 .on_action(|&editor::actions::MoveDown, _, cx| {
3476 cx.stop_propagation();
3477 })
3478 .child(EditorElement::new(&self.commit_editor, panel_editor_style)),
3479 )
3480 .child(
3481 h_flex()
3482 .absolute()
3483 .top_2()
3484 .right_2()
3485 .opacity(0.5)
3486 .hover(|this| this.opacity(1.0))
3487 .child(
3488 panel_icon_button("expand-commit-editor", IconName::Maximize)
3489 .icon_size(IconSize::Small)
3490 .size(ui::ButtonSize::Default)
3491 .tooltip(move |window, cx| {
3492 Tooltip::for_action_in(
3493 "Open Commit Modal",
3494 &git::ExpandCommitEditor,
3495 &expand_tooltip_focus_handle,
3496 window,
3497 cx,
3498 )
3499 })
3500 .on_click(cx.listener({
3501 move |_, _, window, cx| {
3502 window.dispatch_action(
3503 git::ExpandCommitEditor.boxed_clone(),
3504 cx,
3505 )
3506 }
3507 })),
3508 ),
3509 ),
3510 );
3511
3512 Some(footer)
3513 }
3514
3515 fn render_commit_button(&self, cx: &mut Context<Self>) -> impl IntoElement {
3516 let (can_commit, tooltip) = self.configure_commit_button(cx);
3517 let title = self.commit_button_title();
3518 let commit_tooltip_focus_handle = self.commit_editor.focus_handle(cx);
3519 let amend = self.amend_pending();
3520 let signoff = self.signoff_enabled;
3521
3522 div()
3523 .id("commit-wrapper")
3524 .on_hover(cx.listener(move |this, hovered, _, cx| {
3525 this.show_placeholders =
3526 *hovered && !this.has_staged_changes() && !this.has_unstaged_conflicts();
3527 cx.notify()
3528 }))
3529 .child(SplitButton::new(
3530 ui::ButtonLike::new_rounded_left(ElementId::Name(
3531 format!("split-button-left-{}", title).into(),
3532 ))
3533 .layer(ui::ElevationIndex::ModalSurface)
3534 .size(ui::ButtonSize::Compact)
3535 .child(
3536 div()
3537 .child(Label::new(title).size(LabelSize::Small))
3538 .mr_0p5(),
3539 )
3540 .on_click({
3541 let git_panel = cx.weak_entity();
3542 move |_, window, cx| {
3543 telemetry::event!("Git Committed", source = "Git Panel");
3544 git_panel
3545 .update(cx, |git_panel, cx| {
3546 git_panel.set_amend_pending(false, cx);
3547 git_panel.commit_changes(
3548 CommitOptions { amend, signoff },
3549 window,
3550 cx,
3551 );
3552 })
3553 .ok();
3554 }
3555 })
3556 .disabled(!can_commit || self.modal_open)
3557 .tooltip({
3558 let handle = commit_tooltip_focus_handle.clone();
3559 move |window, cx| {
3560 if can_commit {
3561 Tooltip::with_meta_in(
3562 tooltip,
3563 Some(&git::Commit),
3564 format!(
3565 "git commit{}{}",
3566 if amend { " --amend" } else { "" },
3567 if signoff { " --signoff" } else { "" }
3568 ),
3569 &handle.clone(),
3570 window,
3571 cx,
3572 )
3573 } else {
3574 Tooltip::simple(tooltip, cx)
3575 }
3576 }
3577 }),
3578 self.render_git_commit_menu(
3579 ElementId::Name(format!("split-button-right-{}", title).into()),
3580 Some(commit_tooltip_focus_handle.clone()),
3581 cx,
3582 )
3583 .into_any_element(),
3584 ))
3585 }
3586
3587 fn render_pending_amend(&self, cx: &mut Context<Self>) -> impl IntoElement {
3588 h_flex()
3589 .py_1p5()
3590 .px_2()
3591 .gap_1p5()
3592 .justify_between()
3593 .border_t_1()
3594 .border_color(cx.theme().colors().border.opacity(0.8))
3595 .child(
3596 div()
3597 .flex_grow()
3598 .overflow_hidden()
3599 .max_w(relative(0.85))
3600 .child(
3601 Label::new("This will update your most recent commit.")
3602 .size(LabelSize::Small)
3603 .truncate(),
3604 ),
3605 )
3606 .child(
3607 panel_button("Cancel")
3608 .size(ButtonSize::Default)
3609 .on_click(cx.listener(|this, _, _, cx| this.set_amend_pending(false, cx))),
3610 )
3611 }
3612
3613 fn render_previous_commit(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> {
3614 let active_repository = self.active_repository.as_ref()?;
3615 let branch = active_repository.read(cx).branch.as_ref()?;
3616 let commit = branch.most_recent_commit.as_ref()?.clone();
3617 let workspace = self.workspace.clone();
3618 let this = cx.entity();
3619
3620 Some(
3621 h_flex()
3622 .py_1p5()
3623 .px_2()
3624 .gap_1p5()
3625 .justify_between()
3626 .border_t_1()
3627 .border_color(cx.theme().colors().border.opacity(0.8))
3628 .child(
3629 div()
3630 .flex_grow()
3631 .overflow_hidden()
3632 .max_w(relative(0.85))
3633 .child(
3634 Label::new(commit.subject.clone())
3635 .size(LabelSize::Small)
3636 .truncate(),
3637 )
3638 .id("commit-msg-hover")
3639 .on_click({
3640 let commit = commit.clone();
3641 let repo = active_repository.downgrade();
3642 move |_, window, cx| {
3643 CommitView::open(
3644 commit.clone(),
3645 repo.clone(),
3646 workspace.clone().clone(),
3647 window,
3648 cx,
3649 );
3650 }
3651 })
3652 .hoverable_tooltip({
3653 let repo = active_repository.clone();
3654 move |window, cx| {
3655 GitPanelMessageTooltip::new(
3656 this.clone(),
3657 commit.sha.clone(),
3658 repo.clone(),
3659 window,
3660 cx,
3661 )
3662 .into()
3663 }
3664 }),
3665 )
3666 .when(commit.has_parent, |this| {
3667 let has_unstaged = self.has_unstaged_changes();
3668 this.child(
3669 panel_icon_button("undo", IconName::Undo)
3670 .icon_size(IconSize::XSmall)
3671 .icon_color(Color::Muted)
3672 .tooltip(move |window, cx| {
3673 Tooltip::with_meta(
3674 "Uncommit",
3675 Some(&git::Uncommit),
3676 if has_unstaged {
3677 "git reset HEAD^ --soft"
3678 } else {
3679 "git reset HEAD^"
3680 },
3681 window,
3682 cx,
3683 )
3684 })
3685 .on_click(cx.listener(|this, _, window, cx| this.uncommit(window, cx))),
3686 )
3687 }),
3688 )
3689 }
3690
3691 fn render_empty_state(&self, cx: &mut Context<Self>) -> impl IntoElement {
3692 h_flex().h_full().flex_grow().justify_center().child(
3693 v_flex()
3694 .gap_2()
3695 .child(h_flex().w_full().justify_around().child(
3696 if self.active_repository.is_some() {
3697 "No changes to commit"
3698 } else {
3699 "No Git repositories"
3700 },
3701 ))
3702 .children({
3703 let worktree_count = self.project.read(cx).visible_worktrees(cx).count();
3704 (worktree_count > 0 && self.active_repository.is_none()).then(|| {
3705 h_flex().w_full().justify_around().child(
3706 panel_filled_button("Initialize Repository")
3707 .tooltip(Tooltip::for_action_title_in(
3708 "git init",
3709 &git::Init,
3710 &self.focus_handle,
3711 ))
3712 .on_click(move |_, _, cx| {
3713 cx.defer(move |cx| {
3714 cx.dispatch_action(&git::Init);
3715 })
3716 }),
3717 )
3718 })
3719 })
3720 .text_ui_sm(cx)
3721 .mx_auto()
3722 .text_color(Color::Placeholder.color(cx)),
3723 )
3724 }
3725
3726 fn render_vertical_scrollbar(
3727 &self,
3728 show_horizontal_scrollbar_container: bool,
3729 cx: &mut Context<Self>,
3730 ) -> impl IntoElement {
3731 div()
3732 .id("git-panel-vertical-scroll")
3733 .occlude()
3734 .flex_none()
3735 .h_full()
3736 .cursor_default()
3737 .absolute()
3738 .right_0()
3739 .top_0()
3740 .bottom_0()
3741 .w(px(12.))
3742 .when(show_horizontal_scrollbar_container, |this| {
3743 this.pb_neg_3p5()
3744 })
3745 .on_mouse_move(cx.listener(|_, _, _, cx| {
3746 cx.notify();
3747 cx.stop_propagation()
3748 }))
3749 .on_hover(|_, _, cx| {
3750 cx.stop_propagation();
3751 })
3752 .on_any_mouse_down(|_, _, cx| {
3753 cx.stop_propagation();
3754 })
3755 .on_mouse_up(
3756 MouseButton::Left,
3757 cx.listener(|this, _, window, cx| {
3758 if !this.vertical_scrollbar.state.is_dragging()
3759 && !this.focus_handle.contains_focused(window, cx)
3760 {
3761 this.vertical_scrollbar.hide(window, cx);
3762 cx.notify();
3763 }
3764
3765 cx.stop_propagation();
3766 }),
3767 )
3768 .on_scroll_wheel(cx.listener(|_, _, _, cx| {
3769 cx.notify();
3770 }))
3771 .children(Scrollbar::vertical(
3772 // percentage as f32..end_offset as f32,
3773 self.vertical_scrollbar.state.clone(),
3774 ))
3775 }
3776
3777 /// Renders the horizontal scrollbar.
3778 ///
3779 /// The right offset is used to determine how far to the right the
3780 /// scrollbar should extend to, useful for ensuring it doesn't collide
3781 /// with the vertical scrollbar when visible.
3782 fn render_horizontal_scrollbar(
3783 &self,
3784 right_offset: Pixels,
3785 cx: &mut Context<Self>,
3786 ) -> impl IntoElement {
3787 div()
3788 .id("git-panel-horizontal-scroll")
3789 .occlude()
3790 .flex_none()
3791 .w_full()
3792 .cursor_default()
3793 .absolute()
3794 .bottom_neg_px()
3795 .left_0()
3796 .right_0()
3797 .pr(right_offset)
3798 .on_mouse_move(cx.listener(|_, _, _, cx| {
3799 cx.notify();
3800 cx.stop_propagation()
3801 }))
3802 .on_hover(|_, _, cx| {
3803 cx.stop_propagation();
3804 })
3805 .on_any_mouse_down(|_, _, cx| {
3806 cx.stop_propagation();
3807 })
3808 .on_mouse_up(
3809 MouseButton::Left,
3810 cx.listener(|this, _, window, cx| {
3811 if !this.horizontal_scrollbar.state.is_dragging()
3812 && !this.focus_handle.contains_focused(window, cx)
3813 {
3814 this.horizontal_scrollbar.hide(window, cx);
3815 cx.notify();
3816 }
3817
3818 cx.stop_propagation();
3819 }),
3820 )
3821 .on_scroll_wheel(cx.listener(|_, _, _, cx| {
3822 cx.notify();
3823 }))
3824 .children(Scrollbar::horizontal(
3825 // percentage as f32..end_offset as f32,
3826 self.horizontal_scrollbar.state.clone(),
3827 ))
3828 }
3829
3830 fn render_buffer_header_controls(
3831 &self,
3832 entity: &Entity<Self>,
3833 file: &Arc<dyn File>,
3834 _: &Window,
3835 cx: &App,
3836 ) -> Option<AnyElement> {
3837 let repo = self.active_repository.as_ref()?.read(cx);
3838 let project_path = (file.worktree_id(cx), file.path()).into();
3839 let repo_path = repo.project_path_to_repo_path(&project_path, cx)?;
3840 let ix = self.entry_by_path(&repo_path, cx)?;
3841 let entry = self.entries.get(ix)?;
3842
3843 let entry_staging = self.entry_staging(entry.status_entry()?);
3844
3845 let checkbox = Checkbox::new("stage-file", entry_staging.as_bool().into())
3846 .disabled(!self.has_write_access(cx))
3847 .fill()
3848 .elevation(ElevationIndex::Surface)
3849 .on_click({
3850 let entry = entry.clone();
3851 let git_panel = entity.downgrade();
3852 move |_, window, cx| {
3853 git_panel
3854 .update(cx, |this, cx| {
3855 this.toggle_staged_for_entry(&entry, window, cx);
3856 cx.stop_propagation();
3857 })
3858 .ok();
3859 }
3860 });
3861 Some(
3862 h_flex()
3863 .id("start-slot")
3864 .text_lg()
3865 .child(checkbox)
3866 .on_mouse_down(MouseButton::Left, |_, _, cx| {
3867 // prevent the list item active state triggering when toggling checkbox
3868 cx.stop_propagation();
3869 })
3870 .into_any_element(),
3871 )
3872 }
3873
3874 fn render_entries(
3875 &self,
3876 has_write_access: bool,
3877 _: &Window,
3878 cx: &mut Context<Self>,
3879 ) -> impl IntoElement {
3880 let entry_count = self.entries.len();
3881
3882 let scroll_track_size = px(16.);
3883
3884 let h_scroll_offset = if self.vertical_scrollbar.show_scrollbar {
3885 // magic number
3886 px(3.)
3887 } else {
3888 px(0.)
3889 };
3890
3891 v_flex()
3892 .flex_1()
3893 .size_full()
3894 .overflow_hidden()
3895 .relative()
3896 // Show a border on the top and bottom of the container when
3897 // the vertical scrollbar container is visible so we don't have a
3898 // floating left border in the panel.
3899 .when(self.vertical_scrollbar.show_track, |this| {
3900 this.border_t_1()
3901 .border_b_1()
3902 .border_color(cx.theme().colors().border)
3903 })
3904 .child(
3905 h_flex()
3906 .flex_1()
3907 .size_full()
3908 .relative()
3909 .overflow_hidden()
3910 .child(
3911 uniform_list(
3912 "entries",
3913 entry_count,
3914 cx.processor(move |this, range: Range<usize>, window, cx| {
3915 let mut items = Vec::with_capacity(range.end - range.start);
3916
3917 for ix in range {
3918 match &this.entries.get(ix) {
3919 Some(GitListEntry::Status(entry)) => {
3920 items.push(this.render_entry(
3921 ix,
3922 entry,
3923 has_write_access,
3924 window,
3925 cx,
3926 ));
3927 }
3928 Some(GitListEntry::Header(header)) => {
3929 items.push(this.render_list_header(
3930 ix,
3931 header,
3932 has_write_access,
3933 window,
3934 cx,
3935 ));
3936 }
3937 None => {}
3938 }
3939 }
3940
3941 items
3942 }),
3943 )
3944 .when(
3945 !self.horizontal_scrollbar.show_track
3946 && self.horizontal_scrollbar.show_scrollbar,
3947 |this| {
3948 // when not showing the horizontal scrollbar track, make sure we don't
3949 // obscure the last entry
3950 this.pb(scroll_track_size)
3951 },
3952 )
3953 .size_full()
3954 .flex_grow()
3955 .with_sizing_behavior(ListSizingBehavior::Auto)
3956 .with_horizontal_sizing_behavior(
3957 ListHorizontalSizingBehavior::Unconstrained,
3958 )
3959 .with_width_from_item(self.max_width_item_index)
3960 .track_scroll(self.scroll_handle.clone()),
3961 )
3962 .on_mouse_down(
3963 MouseButton::Right,
3964 cx.listener(move |this, event: &MouseDownEvent, window, cx| {
3965 this.deploy_panel_context_menu(event.position, window, cx)
3966 }),
3967 )
3968 .when(self.vertical_scrollbar.show_track, |this| {
3969 this.child(
3970 v_flex()
3971 .h_full()
3972 .flex_none()
3973 .w(scroll_track_size)
3974 .bg(cx.theme().colors().panel_background)
3975 .child(
3976 div()
3977 .size_full()
3978 .flex_1()
3979 .border_l_1()
3980 .border_color(cx.theme().colors().border),
3981 ),
3982 )
3983 })
3984 .when(self.vertical_scrollbar.show_scrollbar, |this| {
3985 this.child(
3986 self.render_vertical_scrollbar(
3987 self.horizontal_scrollbar.show_track,
3988 cx,
3989 ),
3990 )
3991 }),
3992 )
3993 .when(self.horizontal_scrollbar.show_track, |this| {
3994 this.child(
3995 h_flex()
3996 .w_full()
3997 .h(scroll_track_size)
3998 .flex_none()
3999 .relative()
4000 .child(
4001 div()
4002 .w_full()
4003 .flex_1()
4004 // for some reason the horizontal scrollbar is 1px
4005 // taller than the vertical scrollbar??
4006 .h(scroll_track_size - px(1.))
4007 .bg(cx.theme().colors().panel_background)
4008 .border_t_1()
4009 .border_color(cx.theme().colors().border),
4010 )
4011 .when(self.vertical_scrollbar.show_track, |this| {
4012 this.child(
4013 div()
4014 .flex_none()
4015 // -1px prevents a missing pixel between the two container borders
4016 .w(scroll_track_size - px(1.))
4017 .h_full(),
4018 )
4019 .child(
4020 // HACK: Fill the missing 1px 🥲
4021 div()
4022 .absolute()
4023 .right(scroll_track_size - px(1.))
4024 .bottom(scroll_track_size - px(1.))
4025 .size_px()
4026 .bg(cx.theme().colors().border),
4027 )
4028 }),
4029 )
4030 })
4031 .when(self.horizontal_scrollbar.show_scrollbar, |this| {
4032 this.child(self.render_horizontal_scrollbar(h_scroll_offset, cx))
4033 })
4034 }
4035
4036 fn entry_label(&self, label: impl Into<SharedString>, color: Color) -> Label {
4037 Label::new(label.into()).color(color).single_line()
4038 }
4039
4040 fn list_item_height(&self) -> Rems {
4041 rems(1.75)
4042 }
4043
4044 fn render_list_header(
4045 &self,
4046 ix: usize,
4047 header: &GitHeaderEntry,
4048 _: bool,
4049 _: &Window,
4050 _: &Context<Self>,
4051 ) -> AnyElement {
4052 let id: ElementId = ElementId::Name(format!("header_{}", ix).into());
4053
4054 h_flex()
4055 .id(id)
4056 .h(self.list_item_height())
4057 .w_full()
4058 .items_end()
4059 .px(rems(0.75)) // ~12px
4060 .pb(rems(0.3125)) // ~ 5px
4061 .child(
4062 Label::new(header.title())
4063 .color(Color::Muted)
4064 .size(LabelSize::Small)
4065 .line_height_style(LineHeightStyle::UiLabel)
4066 .single_line(),
4067 )
4068 .into_any_element()
4069 }
4070
4071 pub fn load_commit_details(
4072 &self,
4073 sha: String,
4074 cx: &mut Context<Self>,
4075 ) -> Task<anyhow::Result<CommitDetails>> {
4076 let Some(repo) = self.active_repository.clone() else {
4077 return Task::ready(Err(anyhow::anyhow!("no active repo")));
4078 };
4079 repo.update(cx, |repo, cx| {
4080 let show = repo.show(sha);
4081 cx.spawn(async move |_, _| show.await?)
4082 })
4083 }
4084
4085 fn deploy_entry_context_menu(
4086 &mut self,
4087 position: Point<Pixels>,
4088 ix: usize,
4089 window: &mut Window,
4090 cx: &mut Context<Self>,
4091 ) {
4092 let Some(entry) = self.entries.get(ix).and_then(|e| e.status_entry()) else {
4093 return;
4094 };
4095 let stage_title = if entry.status.staging().is_fully_staged() {
4096 "Unstage File"
4097 } else {
4098 "Stage File"
4099 };
4100 let restore_title = if entry.status.is_created() {
4101 "Trash File"
4102 } else {
4103 "Restore File"
4104 };
4105 let context_menu = ContextMenu::build(window, cx, |context_menu, _, _| {
4106 context_menu
4107 .context(self.focus_handle.clone())
4108 .action(stage_title, ToggleStaged.boxed_clone())
4109 .action(restore_title, git::RestoreFile::default().boxed_clone())
4110 .separator()
4111 .action("Open Diff", Confirm.boxed_clone())
4112 .action("Open File", SecondaryConfirm.boxed_clone())
4113 });
4114 self.selected_entry = Some(ix);
4115 self.set_context_menu(context_menu, position, window, cx);
4116 }
4117
4118 fn deploy_panel_context_menu(
4119 &mut self,
4120 position: Point<Pixels>,
4121 window: &mut Window,
4122 cx: &mut Context<Self>,
4123 ) {
4124 let context_menu = git_panel_context_menu(
4125 self.focus_handle.clone(),
4126 GitMenuState {
4127 has_tracked_changes: self.has_tracked_changes(),
4128 has_staged_changes: self.has_staged_changes(),
4129 has_unstaged_changes: self.has_unstaged_changes(),
4130 has_new_changes: self.new_count > 0,
4131 },
4132 window,
4133 cx,
4134 );
4135 self.set_context_menu(context_menu, position, window, cx);
4136 }
4137
4138 fn set_context_menu(
4139 &mut self,
4140 context_menu: Entity<ContextMenu>,
4141 position: Point<Pixels>,
4142 window: &Window,
4143 cx: &mut Context<Self>,
4144 ) {
4145 let subscription = cx.subscribe_in(
4146 &context_menu,
4147 window,
4148 |this, _, _: &DismissEvent, window, cx| {
4149 if this.context_menu.as_ref().is_some_and(|context_menu| {
4150 context_menu.0.focus_handle(cx).contains_focused(window, cx)
4151 }) {
4152 cx.focus_self(window);
4153 }
4154 this.context_menu.take();
4155 cx.notify();
4156 },
4157 );
4158 self.context_menu = Some((context_menu, position, subscription));
4159 cx.notify();
4160 }
4161
4162 fn render_entry(
4163 &self,
4164 ix: usize,
4165 entry: &GitStatusEntry,
4166 has_write_access: bool,
4167 window: &Window,
4168 cx: &Context<Self>,
4169 ) -> AnyElement {
4170 let display_name = entry.display_name();
4171
4172 let selected = self.selected_entry == Some(ix);
4173 let marked = self.marked_entries.contains(&ix);
4174 let status_style = GitPanelSettings::get_global(cx).status_style;
4175 let status = entry.status;
4176
4177 let has_conflict = status.is_conflicted();
4178 let is_modified = status.is_modified();
4179 let is_deleted = status.is_deleted();
4180
4181 let label_color = if status_style == StatusStyle::LabelColor {
4182 if has_conflict {
4183 Color::VersionControlConflict
4184 } else if is_modified {
4185 Color::VersionControlModified
4186 } else if is_deleted {
4187 // We don't want a bunch of red labels in the list
4188 Color::Disabled
4189 } else {
4190 Color::VersionControlAdded
4191 }
4192 } else {
4193 Color::Default
4194 };
4195
4196 let path_color = if status.is_deleted() {
4197 Color::Disabled
4198 } else {
4199 Color::Muted
4200 };
4201
4202 let id: ElementId = ElementId::Name(format!("entry_{}_{}", display_name, ix).into());
4203 let checkbox_wrapper_id: ElementId =
4204 ElementId::Name(format!("entry_{}_{}_checkbox_wrapper", display_name, ix).into());
4205 let checkbox_id: ElementId =
4206 ElementId::Name(format!("entry_{}_{}_checkbox", display_name, ix).into());
4207
4208 let entry_staging = self.entry_staging(entry);
4209 let mut is_staged: ToggleState = self.entry_staging(entry).as_bool().into();
4210 if self.show_placeholders && !self.has_staged_changes() && !entry.status.is_created() {
4211 is_staged = ToggleState::Selected;
4212 }
4213
4214 let handle = cx.weak_entity();
4215
4216 let selected_bg_alpha = 0.08;
4217 let marked_bg_alpha = 0.12;
4218 let state_opacity_step = 0.04;
4219
4220 let base_bg = match (selected, marked) {
4221 (true, true) => cx
4222 .theme()
4223 .status()
4224 .info
4225 .alpha(selected_bg_alpha + marked_bg_alpha),
4226 (true, false) => cx.theme().status().info.alpha(selected_bg_alpha),
4227 (false, true) => cx.theme().status().info.alpha(marked_bg_alpha),
4228 _ => cx.theme().colors().ghost_element_background,
4229 };
4230
4231 let hover_bg = if selected {
4232 cx.theme()
4233 .status()
4234 .info
4235 .alpha(selected_bg_alpha + state_opacity_step)
4236 } else {
4237 cx.theme().colors().ghost_element_hover
4238 };
4239
4240 let active_bg = if selected {
4241 cx.theme()
4242 .status()
4243 .info
4244 .alpha(selected_bg_alpha + state_opacity_step * 2.0)
4245 } else {
4246 cx.theme().colors().ghost_element_active
4247 };
4248
4249 h_flex()
4250 .id(id)
4251 .h(self.list_item_height())
4252 .w_full()
4253 .items_center()
4254 .border_1()
4255 .when(selected && self.focus_handle.is_focused(window), |el| {
4256 el.border_color(cx.theme().colors().border_focused)
4257 })
4258 .px(rems(0.75)) // ~12px
4259 .overflow_hidden()
4260 .flex_none()
4261 .gap_1p5()
4262 .bg(base_bg)
4263 .hover(|this| this.bg(hover_bg))
4264 .active(|this| this.bg(active_bg))
4265 .on_click({
4266 cx.listener(move |this, event: &ClickEvent, window, cx| {
4267 this.selected_entry = Some(ix);
4268 cx.notify();
4269 if event.modifiers().secondary() {
4270 this.open_file(&Default::default(), window, cx)
4271 } else {
4272 this.open_diff(&Default::default(), window, cx);
4273 this.focus_handle.focus(window);
4274 }
4275 })
4276 })
4277 .on_mouse_down(
4278 MouseButton::Right,
4279 move |event: &MouseDownEvent, window, cx| {
4280 // why isn't this happening automatically? we are passing MouseButton::Right to `on_mouse_down`?
4281 if event.button != MouseButton::Right {
4282 return;
4283 }
4284
4285 let Some(this) = handle.upgrade() else {
4286 return;
4287 };
4288 this.update(cx, |this, cx| {
4289 this.deploy_entry_context_menu(event.position, ix, window, cx);
4290 });
4291 cx.stop_propagation();
4292 },
4293 )
4294 .child(
4295 div()
4296 .id(checkbox_wrapper_id)
4297 .flex_none()
4298 .occlude()
4299 .cursor_pointer()
4300 .child(
4301 Checkbox::new(checkbox_id, is_staged)
4302 .disabled(!has_write_access)
4303 .fill()
4304 .elevation(ElevationIndex::Surface)
4305 .on_click_ext({
4306 let entry = entry.clone();
4307 let this = cx.weak_entity();
4308 move |_, click, window, cx| {
4309 this.update(cx, |this, cx| {
4310 if !has_write_access {
4311 return;
4312 }
4313 if click.modifiers().shift {
4314 this.stage_bulk(ix, cx);
4315 } else {
4316 this.toggle_staged_for_entry(
4317 &GitListEntry::Status(entry.clone()),
4318 window,
4319 cx,
4320 );
4321 }
4322 cx.stop_propagation();
4323 })
4324 .ok();
4325 }
4326 })
4327 .tooltip(move |window, cx| {
4328 let is_staged = entry_staging.is_fully_staged();
4329
4330 let action = if is_staged { "Unstage" } else { "Stage" };
4331 let tooltip_name = action.to_string();
4332
4333 Tooltip::for_action(tooltip_name, &ToggleStaged, window, cx)
4334 }),
4335 ),
4336 )
4337 .child(git_status_icon(status))
4338 .child(
4339 h_flex()
4340 .items_center()
4341 .flex_1()
4342 // .overflow_hidden()
4343 .when_some(entry.parent_dir(), |this, parent| {
4344 if !parent.is_empty() {
4345 this.child(
4346 self.entry_label(format!("{}/", parent), path_color)
4347 .when(status.is_deleted(), |this| this.strikethrough()),
4348 )
4349 } else {
4350 this
4351 }
4352 })
4353 .child(
4354 self.entry_label(display_name.clone(), label_color)
4355 .when(status.is_deleted(), |this| this.strikethrough()),
4356 ),
4357 )
4358 .into_any_element()
4359 }
4360
4361 fn has_write_access(&self, cx: &App) -> bool {
4362 !self.project.read(cx).is_read_only(cx)
4363 }
4364
4365 pub fn amend_pending(&self) -> bool {
4366 self.amend_pending
4367 }
4368
4369 pub fn set_amend_pending(&mut self, value: bool, cx: &mut Context<Self>) {
4370 self.amend_pending = value;
4371 self.serialize(cx);
4372 cx.notify();
4373 }
4374
4375 pub fn signoff_enabled(&self) -> bool {
4376 self.signoff_enabled
4377 }
4378
4379 pub fn set_signoff_enabled(&mut self, value: bool, cx: &mut Context<Self>) {
4380 self.signoff_enabled = value;
4381 self.serialize(cx);
4382 cx.notify();
4383 }
4384
4385 pub fn toggle_signoff_enabled(
4386 &mut self,
4387 _: &Signoff,
4388 _window: &mut Window,
4389 cx: &mut Context<Self>,
4390 ) {
4391 self.set_signoff_enabled(!self.signoff_enabled, cx);
4392 }
4393
4394 pub async fn load(
4395 workspace: WeakEntity<Workspace>,
4396 mut cx: AsyncWindowContext,
4397 ) -> anyhow::Result<Entity<Self>> {
4398 let serialized_panel = match workspace
4399 .read_with(&cx, |workspace, _| Self::serialization_key(workspace))
4400 .ok()
4401 .flatten()
4402 {
4403 Some(serialization_key) => cx
4404 .background_spawn(async move { KEY_VALUE_STORE.read_kvp(&serialization_key) })
4405 .await
4406 .context("loading git panel")
4407 .log_err()
4408 .flatten()
4409 .map(|panel| serde_json::from_str::<SerializedGitPanel>(&panel))
4410 .transpose()
4411 .log_err()
4412 .flatten(),
4413 None => None,
4414 };
4415
4416 workspace.update_in(&mut cx, |workspace, window, cx| {
4417 let panel = GitPanel::new(workspace, window, cx);
4418
4419 if let Some(serialized_panel) = serialized_panel {
4420 panel.update(cx, |panel, cx| {
4421 panel.width = serialized_panel.width;
4422 panel.amend_pending = serialized_panel.amend_pending;
4423 panel.signoff_enabled = serialized_panel.signoff_enabled;
4424 cx.notify();
4425 })
4426 }
4427
4428 panel
4429 })
4430 }
4431
4432 fn stage_bulk(&mut self, mut index: usize, cx: &mut Context<'_, Self>) {
4433 let Some(op) = self.bulk_staging.as_ref() else {
4434 return;
4435 };
4436 let Some(mut anchor_index) = self.entry_by_path(&op.anchor, cx) else {
4437 return;
4438 };
4439 if let Some(entry) = self.entries.get(index)
4440 && let Some(entry) = entry.status_entry()
4441 {
4442 self.set_bulk_staging_anchor(entry.repo_path.clone(), cx);
4443 }
4444 if index < anchor_index {
4445 std::mem::swap(&mut index, &mut anchor_index);
4446 }
4447 let entries = self
4448 .entries
4449 .get(anchor_index..=index)
4450 .unwrap_or_default()
4451 .iter()
4452 .filter_map(|entry| entry.status_entry().cloned())
4453 .collect::<Vec<_>>();
4454 self.change_file_stage(true, entries, cx);
4455 }
4456
4457 fn set_bulk_staging_anchor(&mut self, path: RepoPath, cx: &mut Context<'_, GitPanel>) {
4458 let Some(repo) = self.active_repository.as_ref() else {
4459 return;
4460 };
4461 self.bulk_staging = Some(BulkStaging {
4462 repo_id: repo.read(cx).id,
4463 anchor: path,
4464 });
4465 }
4466
4467 pub(crate) fn toggle_amend_pending(&mut self, cx: &mut Context<Self>) {
4468 self.set_amend_pending(!self.amend_pending, cx);
4469 if self.amend_pending {
4470 self.load_last_commit_message_if_empty(cx);
4471 }
4472 }
4473}
4474
4475fn current_language_model(cx: &Context<'_, GitPanel>) -> Option<Arc<dyn LanguageModel>> {
4476 let is_enabled = agent_settings::AgentSettings::get_global(cx).enabled
4477 && !DisableAiSettings::get_global(cx).disable_ai;
4478
4479 is_enabled
4480 .then(|| {
4481 let ConfiguredModel { provider, model } =
4482 LanguageModelRegistry::read_global(cx).commit_message_model()?;
4483
4484 provider.is_authenticated(cx).then(|| model)
4485 })
4486 .flatten()
4487}
4488
4489impl Render for GitPanel {
4490 fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
4491 let project = self.project.read(cx);
4492 let has_entries = self.entries.len() > 0;
4493 let room = self
4494 .workspace
4495 .upgrade()
4496 .and_then(|workspace| workspace.read(cx).active_call()?.read(cx).room().cloned());
4497
4498 let has_write_access = self.has_write_access(cx);
4499
4500 let has_co_authors = room.map_or(false, |room| {
4501 self.load_local_committer(cx);
4502 let room = room.read(cx);
4503 room.remote_participants()
4504 .values()
4505 .any(|remote_participant| remote_participant.can_write())
4506 });
4507
4508 v_flex()
4509 .id("git_panel")
4510 .key_context(self.dispatch_context(window, cx))
4511 .track_focus(&self.focus_handle)
4512 .when(has_write_access && !project.is_read_only(cx), |this| {
4513 this.on_action(cx.listener(Self::toggle_staged_for_selected))
4514 .on_action(cx.listener(Self::stage_range))
4515 .on_action(cx.listener(GitPanel::commit))
4516 .on_action(cx.listener(GitPanel::amend))
4517 .on_action(cx.listener(GitPanel::toggle_signoff_enabled))
4518 .on_action(cx.listener(Self::stage_all))
4519 .on_action(cx.listener(Self::unstage_all))
4520 .on_action(cx.listener(Self::stage_selected))
4521 .on_action(cx.listener(Self::unstage_selected))
4522 .on_action(cx.listener(Self::restore_tracked_files))
4523 .on_action(cx.listener(Self::revert_selected))
4524 .on_action(cx.listener(Self::clean_all))
4525 .on_action(cx.listener(Self::generate_commit_message_action))
4526 .on_action(cx.listener(Self::stash_all))
4527 .on_action(cx.listener(Self::stash_pop))
4528 })
4529 .on_action(cx.listener(Self::select_first))
4530 .on_action(cx.listener(Self::select_next))
4531 .on_action(cx.listener(Self::select_previous))
4532 .on_action(cx.listener(Self::select_last))
4533 .on_action(cx.listener(Self::close_panel))
4534 .on_action(cx.listener(Self::open_diff))
4535 .on_action(cx.listener(Self::open_file))
4536 .on_action(cx.listener(Self::focus_changes_list))
4537 .on_action(cx.listener(Self::focus_editor))
4538 .on_action(cx.listener(Self::expand_commit_editor))
4539 .when(has_write_access && has_co_authors, |git_panel| {
4540 git_panel.on_action(cx.listener(Self::toggle_fill_co_authors))
4541 })
4542 .on_hover(cx.listener(move |this, hovered, window, cx| {
4543 if *hovered {
4544 this.horizontal_scrollbar.show(cx);
4545 this.vertical_scrollbar.show(cx);
4546 cx.notify();
4547 } else if !this.focus_handle.contains_focused(window, cx) {
4548 this.hide_scrollbars(window, cx);
4549 }
4550 }))
4551 .size_full()
4552 .overflow_hidden()
4553 .bg(cx.theme().colors().panel_background)
4554 .child(
4555 v_flex()
4556 .size_full()
4557 .children(self.render_panel_header(window, cx))
4558 .map(|this| {
4559 if has_entries {
4560 this.child(self.render_entries(has_write_access, window, cx))
4561 } else {
4562 this.child(self.render_empty_state(cx).into_any_element())
4563 }
4564 })
4565 .children(self.render_footer(window, cx))
4566 .when(self.amend_pending, |this| {
4567 this.child(self.render_pending_amend(cx))
4568 })
4569 .when(!self.amend_pending, |this| {
4570 this.children(self.render_previous_commit(cx))
4571 })
4572 .into_any_element(),
4573 )
4574 .children(self.context_menu.as_ref().map(|(menu, position, _)| {
4575 deferred(
4576 anchored()
4577 .position(*position)
4578 .anchor(Corner::TopLeft)
4579 .child(menu.clone()),
4580 )
4581 .with_priority(1)
4582 }))
4583 }
4584}
4585
4586impl Focusable for GitPanel {
4587 fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
4588 if self.entries.is_empty() {
4589 self.commit_editor.focus_handle(cx)
4590 } else {
4591 self.focus_handle.clone()
4592 }
4593 }
4594}
4595
4596impl EventEmitter<Event> for GitPanel {}
4597
4598impl EventEmitter<PanelEvent> for GitPanel {}
4599
4600pub(crate) struct GitPanelAddon {
4601 pub(crate) workspace: WeakEntity<Workspace>,
4602}
4603
4604impl editor::Addon for GitPanelAddon {
4605 fn to_any(&self) -> &dyn std::any::Any {
4606 self
4607 }
4608
4609 fn render_buffer_header_controls(
4610 &self,
4611 excerpt_info: &ExcerptInfo,
4612 window: &Window,
4613 cx: &App,
4614 ) -> Option<AnyElement> {
4615 let file = excerpt_info.buffer.file()?;
4616 let git_panel = self.workspace.upgrade()?.read(cx).panel::<GitPanel>(cx)?;
4617
4618 git_panel
4619 .read(cx)
4620 .render_buffer_header_controls(&git_panel, &file, window, cx)
4621 }
4622}
4623
4624impl Panel for GitPanel {
4625 fn persistent_name() -> &'static str {
4626 "GitPanel"
4627 }
4628
4629 fn position(&self, _: &Window, cx: &App) -> DockPosition {
4630 GitPanelSettings::get_global(cx).dock
4631 }
4632
4633 fn position_is_valid(&self, position: DockPosition) -> bool {
4634 matches!(position, DockPosition::Left | DockPosition::Right)
4635 }
4636
4637 fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
4638 settings::update_settings_file::<GitPanelSettings>(
4639 self.fs.clone(),
4640 cx,
4641 move |settings, _| settings.dock = Some(position),
4642 );
4643 }
4644
4645 fn size(&self, _: &Window, cx: &App) -> Pixels {
4646 self.width
4647 .unwrap_or_else(|| GitPanelSettings::get_global(cx).default_width)
4648 }
4649
4650 fn set_size(&mut self, size: Option<Pixels>, _: &mut Window, cx: &mut Context<Self>) {
4651 self.width = size;
4652 self.serialize(cx);
4653 cx.notify();
4654 }
4655
4656 fn icon(&self, _: &Window, cx: &App) -> Option<ui::IconName> {
4657 Some(ui::IconName::GitBranchAlt).filter(|_| GitPanelSettings::get_global(cx).button)
4658 }
4659
4660 fn icon_tooltip(&self, _window: &Window, _cx: &App) -> Option<&'static str> {
4661 Some("Git Panel")
4662 }
4663
4664 fn toggle_action(&self) -> Box<dyn Action> {
4665 Box::new(ToggleFocus)
4666 }
4667
4668 fn activation_priority(&self) -> u32 {
4669 2
4670 }
4671}
4672
4673impl PanelHeader for GitPanel {}
4674
4675struct GitPanelMessageTooltip {
4676 commit_tooltip: Option<Entity<CommitTooltip>>,
4677}
4678
4679impl GitPanelMessageTooltip {
4680 fn new(
4681 git_panel: Entity<GitPanel>,
4682 sha: SharedString,
4683 repository: Entity<Repository>,
4684 window: &mut Window,
4685 cx: &mut App,
4686 ) -> Entity<Self> {
4687 cx.new(|cx| {
4688 cx.spawn_in(window, async move |this, cx| {
4689 let (details, workspace) = git_panel.update(cx, |git_panel, cx| {
4690 (
4691 git_panel.load_commit_details(sha.to_string(), cx),
4692 git_panel.workspace.clone(),
4693 )
4694 })?;
4695 let details = details.await?;
4696
4697 let commit_details = crate::commit_tooltip::CommitDetails {
4698 sha: details.sha.clone(),
4699 author_name: details.author_name.clone(),
4700 author_email: details.author_email.clone(),
4701 commit_time: OffsetDateTime::from_unix_timestamp(details.commit_timestamp)?,
4702 message: Some(ParsedCommitMessage {
4703 message: details.message.clone(),
4704 ..Default::default()
4705 }),
4706 };
4707
4708 this.update(cx, |this: &mut GitPanelMessageTooltip, cx| {
4709 this.commit_tooltip = Some(cx.new(move |cx| {
4710 CommitTooltip::new(commit_details, repository, workspace, cx)
4711 }));
4712 cx.notify();
4713 })
4714 })
4715 .detach();
4716
4717 Self {
4718 commit_tooltip: None,
4719 }
4720 })
4721 }
4722}
4723
4724impl Render for GitPanelMessageTooltip {
4725 fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
4726 if let Some(commit_tooltip) = &self.commit_tooltip {
4727 commit_tooltip.clone().into_any_element()
4728 } else {
4729 gpui::Empty.into_any_element()
4730 }
4731 }
4732}
4733
4734#[derive(IntoElement, RegisterComponent)]
4735pub struct PanelRepoFooter {
4736 active_repository: SharedString,
4737 branch: Option<Branch>,
4738 head_commit: Option<CommitDetails>,
4739
4740 // Getting a GitPanel in previews will be difficult.
4741 //
4742 // For now just take an option here, and we won't bind handlers to buttons in previews.
4743 git_panel: Option<Entity<GitPanel>>,
4744}
4745
4746impl PanelRepoFooter {
4747 pub fn new(
4748 active_repository: SharedString,
4749 branch: Option<Branch>,
4750 head_commit: Option<CommitDetails>,
4751 git_panel: Option<Entity<GitPanel>>,
4752 ) -> Self {
4753 Self {
4754 active_repository,
4755 branch,
4756 head_commit,
4757 git_panel,
4758 }
4759 }
4760
4761 pub fn new_preview(active_repository: SharedString, branch: Option<Branch>) -> Self {
4762 Self {
4763 active_repository,
4764 branch,
4765 head_commit: None,
4766 git_panel: None,
4767 }
4768 }
4769}
4770
4771impl RenderOnce for PanelRepoFooter {
4772 fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
4773 let project = self
4774 .git_panel
4775 .as_ref()
4776 .map(|panel| panel.read(cx).project.clone());
4777
4778 let repo = self
4779 .git_panel
4780 .as_ref()
4781 .and_then(|panel| panel.read(cx).active_repository.clone());
4782
4783 let single_repo = project
4784 .as_ref()
4785 .map(|project| project.read(cx).git_store().read(cx).repositories().len() == 1)
4786 .unwrap_or(true);
4787
4788 const MAX_BRANCH_LEN: usize = 16;
4789 const MAX_REPO_LEN: usize = 16;
4790 const LABEL_CHARACTER_BUDGET: usize = MAX_BRANCH_LEN + MAX_REPO_LEN;
4791 const MAX_SHORT_SHA_LEN: usize = 8;
4792
4793 let branch_name = self
4794 .branch
4795 .as_ref()
4796 .map(|branch| branch.name().to_owned())
4797 .or_else(|| {
4798 self.head_commit.as_ref().map(|commit| {
4799 commit
4800 .sha
4801 .chars()
4802 .take(MAX_SHORT_SHA_LEN)
4803 .collect::<String>()
4804 })
4805 })
4806 .unwrap_or_else(|| " (no branch)".to_owned());
4807 let show_separator = self.branch.is_some() || self.head_commit.is_some();
4808
4809 let active_repo_name = self.active_repository.clone();
4810
4811 let branch_actual_len = branch_name.len();
4812 let repo_actual_len = active_repo_name.len();
4813
4814 // ideally, show the whole branch and repo names but
4815 // when we can't, use a budget to allocate space between the two
4816 let (repo_display_len, branch_display_len) = if branch_actual_len + repo_actual_len
4817 <= LABEL_CHARACTER_BUDGET
4818 {
4819 (repo_actual_len, branch_actual_len)
4820 } else {
4821 if branch_actual_len <= MAX_BRANCH_LEN {
4822 let repo_space = (LABEL_CHARACTER_BUDGET - branch_actual_len).min(MAX_REPO_LEN);
4823 (repo_space, branch_actual_len)
4824 } else if repo_actual_len <= MAX_REPO_LEN {
4825 let branch_space = (LABEL_CHARACTER_BUDGET - repo_actual_len).min(MAX_BRANCH_LEN);
4826 (repo_actual_len, branch_space)
4827 } else {
4828 (MAX_REPO_LEN, MAX_BRANCH_LEN)
4829 }
4830 };
4831
4832 let truncated_repo_name = if repo_actual_len <= repo_display_len {
4833 active_repo_name.to_string()
4834 } else {
4835 util::truncate_and_trailoff(active_repo_name.trim_ascii(), repo_display_len)
4836 };
4837
4838 let truncated_branch_name = if branch_actual_len <= branch_display_len {
4839 branch_name.to_string()
4840 } else {
4841 util::truncate_and_trailoff(branch_name.trim_ascii(), branch_display_len)
4842 };
4843
4844 let repo_selector_trigger = Button::new("repo-selector", truncated_repo_name)
4845 .style(ButtonStyle::Transparent)
4846 .size(ButtonSize::None)
4847 .label_size(LabelSize::Small)
4848 .color(Color::Muted);
4849
4850 let repo_selector = PopoverMenu::new("repository-switcher")
4851 .menu({
4852 let project = project.clone();
4853 move |window, cx| {
4854 let project = project.clone()?;
4855 Some(cx.new(|cx| RepositorySelector::new(project, rems(16.), window, cx)))
4856 }
4857 })
4858 .trigger_with_tooltip(
4859 repo_selector_trigger.disabled(single_repo).truncate(true),
4860 Tooltip::text("Switch Active Repository"),
4861 )
4862 .anchor(Corner::BottomLeft)
4863 .into_any_element();
4864
4865 let branch_selector_button = Button::new("branch-selector", truncated_branch_name)
4866 .style(ButtonStyle::Transparent)
4867 .size(ButtonSize::None)
4868 .label_size(LabelSize::Small)
4869 .truncate(true)
4870 .tooltip(Tooltip::for_action_title(
4871 "Switch Branch",
4872 &zed_actions::git::Switch,
4873 ))
4874 .on_click(|_, window, cx| {
4875 window.dispatch_action(zed_actions::git::Switch.boxed_clone(), cx);
4876 });
4877
4878 let branch_selector = PopoverMenu::new("popover-button")
4879 .menu(move |window, cx| Some(branch_picker::popover(repo.clone(), window, cx)))
4880 .trigger_with_tooltip(
4881 branch_selector_button,
4882 Tooltip::for_action_title("Switch Branch", &zed_actions::git::Switch),
4883 )
4884 .anchor(Corner::BottomLeft)
4885 .offset(gpui::Point {
4886 x: px(0.0),
4887 y: px(-2.0),
4888 });
4889
4890 h_flex()
4891 .w_full()
4892 .px_2()
4893 .h(px(36.))
4894 .items_center()
4895 .justify_between()
4896 .gap_1()
4897 .child(
4898 h_flex()
4899 .flex_1()
4900 .overflow_hidden()
4901 .items_center()
4902 .child(
4903 div().child(
4904 Icon::new(IconName::GitBranchAlt)
4905 .size(IconSize::Small)
4906 .color(if single_repo {
4907 Color::Disabled
4908 } else {
4909 Color::Muted
4910 }),
4911 ),
4912 )
4913 .child(repo_selector)
4914 .when(show_separator, |this| {
4915 this.child(
4916 div()
4917 .text_color(cx.theme().colors().text_muted)
4918 .text_sm()
4919 .child("/"),
4920 )
4921 })
4922 .child(branch_selector),
4923 )
4924 .children(if let Some(git_panel) = self.git_panel {
4925 git_panel.update(cx, |git_panel, cx| git_panel.render_remote_button(cx))
4926 } else {
4927 None
4928 })
4929 }
4930}
4931
4932impl Component for PanelRepoFooter {
4933 fn scope() -> ComponentScope {
4934 ComponentScope::VersionControl
4935 }
4936
4937 fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
4938 let unknown_upstream = None;
4939 let no_remote_upstream = Some(UpstreamTracking::Gone);
4940 let ahead_of_upstream = Some(
4941 UpstreamTrackingStatus {
4942 ahead: 2,
4943 behind: 0,
4944 }
4945 .into(),
4946 );
4947 let behind_upstream = Some(
4948 UpstreamTrackingStatus {
4949 ahead: 0,
4950 behind: 2,
4951 }
4952 .into(),
4953 );
4954 let ahead_and_behind_upstream = Some(
4955 UpstreamTrackingStatus {
4956 ahead: 3,
4957 behind: 1,
4958 }
4959 .into(),
4960 );
4961
4962 let not_ahead_or_behind_upstream = Some(
4963 UpstreamTrackingStatus {
4964 ahead: 0,
4965 behind: 0,
4966 }
4967 .into(),
4968 );
4969
4970 fn branch(upstream: Option<UpstreamTracking>) -> Branch {
4971 Branch {
4972 is_head: true,
4973 ref_name: "some-branch".into(),
4974 upstream: upstream.map(|tracking| Upstream {
4975 ref_name: "origin/some-branch".into(),
4976 tracking,
4977 }),
4978 most_recent_commit: Some(CommitSummary {
4979 sha: "abc123".into(),
4980 subject: "Modify stuff".into(),
4981 commit_timestamp: 1710932954,
4982 has_parent: true,
4983 }),
4984 }
4985 }
4986
4987 fn custom(branch_name: &str, upstream: Option<UpstreamTracking>) -> Branch {
4988 Branch {
4989 is_head: true,
4990 ref_name: branch_name.to_string().into(),
4991 upstream: upstream.map(|tracking| Upstream {
4992 ref_name: format!("zed/{}", branch_name).into(),
4993 tracking,
4994 }),
4995 most_recent_commit: Some(CommitSummary {
4996 sha: "abc123".into(),
4997 subject: "Modify stuff".into(),
4998 commit_timestamp: 1710932954,
4999 has_parent: true,
5000 }),
5001 }
5002 }
5003
5004 fn active_repository(id: usize) -> SharedString {
5005 format!("repo-{}", id).into()
5006 }
5007
5008 let example_width = px(340.);
5009 Some(
5010 v_flex()
5011 .gap_6()
5012 .w_full()
5013 .flex_none()
5014 .children(vec![
5015 example_group_with_title(
5016 "Action Button States",
5017 vec![
5018 single_example(
5019 "No Branch",
5020 div()
5021 .w(example_width)
5022 .overflow_hidden()
5023 .child(PanelRepoFooter::new_preview(
5024 active_repository(1).clone(),
5025 None,
5026 ))
5027 .into_any_element(),
5028 ),
5029 single_example(
5030 "Remote status unknown",
5031 div()
5032 .w(example_width)
5033 .overflow_hidden()
5034 .child(PanelRepoFooter::new_preview(
5035 active_repository(2).clone(),
5036 Some(branch(unknown_upstream)),
5037 ))
5038 .into_any_element(),
5039 ),
5040 single_example(
5041 "No Remote Upstream",
5042 div()
5043 .w(example_width)
5044 .overflow_hidden()
5045 .child(PanelRepoFooter::new_preview(
5046 active_repository(3).clone(),
5047 Some(branch(no_remote_upstream)),
5048 ))
5049 .into_any_element(),
5050 ),
5051 single_example(
5052 "Not Ahead or Behind",
5053 div()
5054 .w(example_width)
5055 .overflow_hidden()
5056 .child(PanelRepoFooter::new_preview(
5057 active_repository(4).clone(),
5058 Some(branch(not_ahead_or_behind_upstream)),
5059 ))
5060 .into_any_element(),
5061 ),
5062 single_example(
5063 "Behind remote",
5064 div()
5065 .w(example_width)
5066 .overflow_hidden()
5067 .child(PanelRepoFooter::new_preview(
5068 active_repository(5).clone(),
5069 Some(branch(behind_upstream)),
5070 ))
5071 .into_any_element(),
5072 ),
5073 single_example(
5074 "Ahead of remote",
5075 div()
5076 .w(example_width)
5077 .overflow_hidden()
5078 .child(PanelRepoFooter::new_preview(
5079 active_repository(6).clone(),
5080 Some(branch(ahead_of_upstream)),
5081 ))
5082 .into_any_element(),
5083 ),
5084 single_example(
5085 "Ahead and behind remote",
5086 div()
5087 .w(example_width)
5088 .overflow_hidden()
5089 .child(PanelRepoFooter::new_preview(
5090 active_repository(7).clone(),
5091 Some(branch(ahead_and_behind_upstream)),
5092 ))
5093 .into_any_element(),
5094 ),
5095 ],
5096 )
5097 .grow()
5098 .vertical(),
5099 ])
5100 .children(vec![
5101 example_group_with_title(
5102 "Labels",
5103 vec![
5104 single_example(
5105 "Short Branch & Repo",
5106 div()
5107 .w(example_width)
5108 .overflow_hidden()
5109 .child(PanelRepoFooter::new_preview(
5110 SharedString::from("zed"),
5111 Some(custom("main", behind_upstream)),
5112 ))
5113 .into_any_element(),
5114 ),
5115 single_example(
5116 "Long Branch",
5117 div()
5118 .w(example_width)
5119 .overflow_hidden()
5120 .child(PanelRepoFooter::new_preview(
5121 SharedString::from("zed"),
5122 Some(custom(
5123 "redesign-and-update-git-ui-list-entry-style",
5124 behind_upstream,
5125 )),
5126 ))
5127 .into_any_element(),
5128 ),
5129 single_example(
5130 "Long Repo",
5131 div()
5132 .w(example_width)
5133 .overflow_hidden()
5134 .child(PanelRepoFooter::new_preview(
5135 SharedString::from("zed-industries-community-examples"),
5136 Some(custom("gpui", ahead_of_upstream)),
5137 ))
5138 .into_any_element(),
5139 ),
5140 single_example(
5141 "Long Repo & Branch",
5142 div()
5143 .w(example_width)
5144 .overflow_hidden()
5145 .child(PanelRepoFooter::new_preview(
5146 SharedString::from("zed-industries-community-examples"),
5147 Some(custom(
5148 "redesign-and-update-git-ui-list-entry-style",
5149 behind_upstream,
5150 )),
5151 ))
5152 .into_any_element(),
5153 ),
5154 single_example(
5155 "Uppercase Repo",
5156 div()
5157 .w(example_width)
5158 .overflow_hidden()
5159 .child(PanelRepoFooter::new_preview(
5160 SharedString::from("LICENSES"),
5161 Some(custom("main", ahead_of_upstream)),
5162 ))
5163 .into_any_element(),
5164 ),
5165 single_example(
5166 "Uppercase Branch",
5167 div()
5168 .w(example_width)
5169 .overflow_hidden()
5170 .child(PanelRepoFooter::new_preview(
5171 SharedString::from("zed"),
5172 Some(custom("update-README", behind_upstream)),
5173 ))
5174 .into_any_element(),
5175 ),
5176 ],
5177 )
5178 .grow()
5179 .vertical(),
5180 ])
5181 .into_any_element(),
5182 )
5183 }
5184}
5185
5186#[cfg(test)]
5187mod tests {
5188 use git::status::{StatusCode, UnmergedStatus, UnmergedStatusCode};
5189 use gpui::{TestAppContext, VisualTestContext};
5190 use project::{FakeFs, WorktreeSettings};
5191 use serde_json::json;
5192 use settings::SettingsStore;
5193 use theme::LoadThemes;
5194 use util::path;
5195
5196 use super::*;
5197
5198 fn init_test(cx: &mut gpui::TestAppContext) {
5199 zlog::init_test();
5200
5201 cx.update(|cx| {
5202 let settings_store = SettingsStore::test(cx);
5203 cx.set_global(settings_store);
5204 AgentSettings::register(cx);
5205 WorktreeSettings::register(cx);
5206 workspace::init_settings(cx);
5207 theme::init(LoadThemes::JustBase, cx);
5208 language::init(cx);
5209 editor::init(cx);
5210 Project::init_settings(cx);
5211 crate::init(cx);
5212 });
5213 }
5214
5215 #[gpui::test]
5216 async fn test_entry_worktree_paths(cx: &mut TestAppContext) {
5217 init_test(cx);
5218 let fs = FakeFs::new(cx.background_executor.clone());
5219 fs.insert_tree(
5220 "/root",
5221 json!({
5222 "zed": {
5223 ".git": {},
5224 "crates": {
5225 "gpui": {
5226 "gpui.rs": "fn main() {}"
5227 },
5228 "util": {
5229 "util.rs": "fn do_it() {}"
5230 }
5231 }
5232 },
5233 }),
5234 )
5235 .await;
5236
5237 fs.set_status_for_repo(
5238 Path::new(path!("/root/zed/.git")),
5239 &[
5240 (
5241 Path::new("crates/gpui/gpui.rs"),
5242 StatusCode::Modified.worktree(),
5243 ),
5244 (
5245 Path::new("crates/util/util.rs"),
5246 StatusCode::Modified.worktree(),
5247 ),
5248 ],
5249 );
5250
5251 let project =
5252 Project::test(fs.clone(), [path!("/root/zed/crates/gpui").as_ref()], cx).await;
5253 let workspace =
5254 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
5255 let cx = &mut VisualTestContext::from_window(*workspace, cx);
5256
5257 cx.read(|cx| {
5258 project
5259 .read(cx)
5260 .worktrees(cx)
5261 .nth(0)
5262 .unwrap()
5263 .read(cx)
5264 .as_local()
5265 .unwrap()
5266 .scan_complete()
5267 })
5268 .await;
5269
5270 cx.executor().run_until_parked();
5271
5272 let panel = workspace.update(cx, GitPanel::new).unwrap();
5273
5274 let handle = cx.update_window_entity(&panel, |panel, _, _| {
5275 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
5276 });
5277 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
5278 handle.await;
5279
5280 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
5281 pretty_assertions::assert_eq!(
5282 entries,
5283 [
5284 GitListEntry::Header(GitHeaderEntry {
5285 header: Section::Tracked
5286 }),
5287 GitListEntry::Status(GitStatusEntry {
5288 abs_path: path!("/root/zed/crates/gpui/gpui.rs").into(),
5289 repo_path: "crates/gpui/gpui.rs".into(),
5290 status: StatusCode::Modified.worktree(),
5291 staging: StageStatus::Unstaged,
5292 }),
5293 GitListEntry::Status(GitStatusEntry {
5294 abs_path: path!("/root/zed/crates/util/util.rs").into(),
5295 repo_path: "crates/util/util.rs".into(),
5296 status: StatusCode::Modified.worktree(),
5297 staging: StageStatus::Unstaged,
5298 },),
5299 ],
5300 );
5301
5302 let handle = cx.update_window_entity(&panel, |panel, _, _| {
5303 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
5304 });
5305 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
5306 handle.await;
5307 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
5308 pretty_assertions::assert_eq!(
5309 entries,
5310 [
5311 GitListEntry::Header(GitHeaderEntry {
5312 header: Section::Tracked
5313 }),
5314 GitListEntry::Status(GitStatusEntry {
5315 abs_path: path!("/root/zed/crates/gpui/gpui.rs").into(),
5316 repo_path: "crates/gpui/gpui.rs".into(),
5317 status: StatusCode::Modified.worktree(),
5318 staging: StageStatus::Unstaged,
5319 }),
5320 GitListEntry::Status(GitStatusEntry {
5321 abs_path: path!("/root/zed/crates/util/util.rs").into(),
5322 repo_path: "crates/util/util.rs".into(),
5323 status: StatusCode::Modified.worktree(),
5324 staging: StageStatus::Unstaged,
5325 },),
5326 ],
5327 );
5328 }
5329
5330 #[gpui::test]
5331 async fn test_bulk_staging(cx: &mut TestAppContext) {
5332 use GitListEntry::*;
5333
5334 init_test(cx);
5335 let fs = FakeFs::new(cx.background_executor.clone());
5336 fs.insert_tree(
5337 "/root",
5338 json!({
5339 "project": {
5340 ".git": {},
5341 "src": {
5342 "main.rs": "fn main() {}",
5343 "lib.rs": "pub fn hello() {}",
5344 "utils.rs": "pub fn util() {}"
5345 },
5346 "tests": {
5347 "test.rs": "fn test() {}"
5348 },
5349 "new_file.txt": "new content",
5350 "another_new.rs": "// new file",
5351 "conflict.txt": "conflicted content"
5352 }
5353 }),
5354 )
5355 .await;
5356
5357 fs.set_status_for_repo(
5358 Path::new(path!("/root/project/.git")),
5359 &[
5360 (Path::new("src/main.rs"), StatusCode::Modified.worktree()),
5361 (Path::new("src/lib.rs"), StatusCode::Modified.worktree()),
5362 (Path::new("tests/test.rs"), StatusCode::Modified.worktree()),
5363 (Path::new("new_file.txt"), FileStatus::Untracked),
5364 (Path::new("another_new.rs"), FileStatus::Untracked),
5365 (Path::new("src/utils.rs"), FileStatus::Untracked),
5366 (
5367 Path::new("conflict.txt"),
5368 UnmergedStatus {
5369 first_head: UnmergedStatusCode::Updated,
5370 second_head: UnmergedStatusCode::Updated,
5371 }
5372 .into(),
5373 ),
5374 ],
5375 );
5376
5377 let project = Project::test(fs.clone(), [Path::new(path!("/root/project"))], cx).await;
5378 let workspace =
5379 cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx));
5380 let cx = &mut VisualTestContext::from_window(*workspace, cx);
5381
5382 cx.read(|cx| {
5383 project
5384 .read(cx)
5385 .worktrees(cx)
5386 .nth(0)
5387 .unwrap()
5388 .read(cx)
5389 .as_local()
5390 .unwrap()
5391 .scan_complete()
5392 })
5393 .await;
5394
5395 cx.executor().run_until_parked();
5396
5397 let panel = workspace.update(cx, GitPanel::new).unwrap();
5398
5399 let handle = cx.update_window_entity(&panel, |panel, _, _| {
5400 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
5401 });
5402 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
5403 handle.await;
5404
5405 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
5406 #[rustfmt::skip]
5407 pretty_assertions::assert_matches!(
5408 entries.as_slice(),
5409 &[
5410 Header(GitHeaderEntry { header: Section::Conflict }),
5411 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
5412 Header(GitHeaderEntry { header: Section::Tracked }),
5413 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
5414 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
5415 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
5416 Header(GitHeaderEntry { header: Section::New }),
5417 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
5418 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
5419 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
5420 ],
5421 );
5422
5423 let second_status_entry = entries[3].clone();
5424 panel.update_in(cx, |panel, window, cx| {
5425 panel.toggle_staged_for_entry(&second_status_entry, window, cx);
5426 });
5427
5428 panel.update_in(cx, |panel, window, cx| {
5429 panel.selected_entry = Some(7);
5430 panel.stage_range(&git::StageRange, window, cx);
5431 });
5432
5433 cx.read(|cx| {
5434 project
5435 .read(cx)
5436 .worktrees(cx)
5437 .nth(0)
5438 .unwrap()
5439 .read(cx)
5440 .as_local()
5441 .unwrap()
5442 .scan_complete()
5443 })
5444 .await;
5445
5446 cx.executor().run_until_parked();
5447
5448 let handle = cx.update_window_entity(&panel, |panel, _, _| {
5449 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
5450 });
5451 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
5452 handle.await;
5453
5454 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
5455 #[rustfmt::skip]
5456 pretty_assertions::assert_matches!(
5457 entries.as_slice(),
5458 &[
5459 Header(GitHeaderEntry { header: Section::Conflict }),
5460 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
5461 Header(GitHeaderEntry { header: Section::Tracked }),
5462 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
5463 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
5464 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
5465 Header(GitHeaderEntry { header: Section::New }),
5466 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
5467 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
5468 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
5469 ],
5470 );
5471
5472 let third_status_entry = entries[4].clone();
5473 panel.update_in(cx, |panel, window, cx| {
5474 panel.toggle_staged_for_entry(&third_status_entry, window, cx);
5475 });
5476
5477 panel.update_in(cx, |panel, window, cx| {
5478 panel.selected_entry = Some(9);
5479 panel.stage_range(&git::StageRange, window, cx);
5480 });
5481
5482 cx.read(|cx| {
5483 project
5484 .read(cx)
5485 .worktrees(cx)
5486 .nth(0)
5487 .unwrap()
5488 .read(cx)
5489 .as_local()
5490 .unwrap()
5491 .scan_complete()
5492 })
5493 .await;
5494
5495 cx.executor().run_until_parked();
5496
5497 let handle = cx.update_window_entity(&panel, |panel, _, _| {
5498 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
5499 });
5500 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
5501 handle.await;
5502
5503 let entries = panel.read_with(cx, |panel, _| panel.entries.clone());
5504 #[rustfmt::skip]
5505 pretty_assertions::assert_matches!(
5506 entries.as_slice(),
5507 &[
5508 Header(GitHeaderEntry { header: Section::Conflict }),
5509 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
5510 Header(GitHeaderEntry { header: Section::Tracked }),
5511 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
5512 Status(GitStatusEntry { staging: StageStatus::Unstaged, .. }),
5513 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
5514 Header(GitHeaderEntry { header: Section::New }),
5515 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
5516 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
5517 Status(GitStatusEntry { staging: StageStatus::Staged, .. }),
5518 ],
5519 );
5520 }
5521}