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