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