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
2759 let (tooltip_label, icon) = if self.add_coauthors {
2760 ("Add co-authored-by", IconName::UserCheck)
2761 } else {
2762 ("Remove co-authored-by", IconName::Person)
2763 };
2764
2765 if potential_co_authors.is_empty() {
2766 None
2767 } else {
2768 Some(
2769 IconButton::new("co-authors", icon)
2770 .shape(ui::IconButtonShape::Square)
2771 .icon_color(Color::Disabled)
2772 .selected_icon_color(Color::Selected)
2773 .toggle_state(self.add_coauthors)
2774 .tooltip(move |_, cx| {
2775 let title = format!(
2776 "{}:{}{}",
2777 tooltip_label,
2778 if potential_co_authors.len() == 1 {
2779 ""
2780 } else {
2781 "\n"
2782 },
2783 potential_co_authors
2784 .iter()
2785 .map(|(name, email)| format!(" {} <{}>", name, email))
2786 .join("\n")
2787 );
2788 Tooltip::simple(title, cx)
2789 })
2790 .on_click(cx.listener(|this, _, _, cx| {
2791 this.add_coauthors = !this.add_coauthors;
2792 cx.notify();
2793 }))
2794 .into_any_element(),
2795 )
2796 }
2797 }
2798
2799 fn render_git_commit_menu(
2800 &self,
2801 id: impl Into<ElementId>,
2802 keybinding_target: Option<FocusHandle>,
2803 ) -> impl IntoElement {
2804 PopoverMenu::new(id.into())
2805 .trigger(
2806 ui::ButtonLike::new_rounded_right("commit-split-button-right")
2807 .layer(ui::ElevationIndex::ModalSurface)
2808 .size(ui::ButtonSize::None)
2809 .child(
2810 div()
2811 .px_1()
2812 .child(Icon::new(IconName::ChevronDownSmall).size(IconSize::XSmall)),
2813 ),
2814 )
2815 .menu(move |window, cx| {
2816 Some(ContextMenu::build(window, cx, |context_menu, _, _| {
2817 context_menu
2818 .when_some(keybinding_target.clone(), |el, keybinding_target| {
2819 el.context(keybinding_target.clone())
2820 })
2821 .action("Amend", Amend.boxed_clone())
2822 }))
2823 })
2824 .anchor(Corner::TopRight)
2825 }
2826
2827 pub fn configure_commit_button(&self, cx: &mut Context<Self>) -> (bool, &'static str) {
2828 if self.has_unstaged_conflicts() {
2829 (false, "You must resolve conflicts before committing")
2830 } else if !self.has_staged_changes() && !self.has_tracked_changes() {
2831 (false, "No changes to commit")
2832 } else if self.pending_commit.is_some() {
2833 (false, "Commit in progress")
2834 } else if self.custom_or_suggested_commit_message(cx).is_none() {
2835 (false, "No commit message")
2836 } else if !self.has_write_access(cx) {
2837 (false, "You do not have write access to this project")
2838 } else {
2839 (true, self.commit_button_title())
2840 }
2841 }
2842
2843 pub fn commit_button_title(&self) -> &'static str {
2844 if self.amend_pending {
2845 if self.has_staged_changes() {
2846 "Amend"
2847 } else {
2848 "Amend Tracked"
2849 }
2850 } else {
2851 if self.has_staged_changes() {
2852 "Commit"
2853 } else {
2854 "Commit Tracked"
2855 }
2856 }
2857 }
2858
2859 fn expand_commit_editor(
2860 &mut self,
2861 _: &git::ExpandCommitEditor,
2862 window: &mut Window,
2863 cx: &mut Context<Self>,
2864 ) {
2865 let workspace = self.workspace.clone();
2866 window.defer(cx, move |window, cx| {
2867 workspace
2868 .update(cx, |workspace, cx| {
2869 CommitModal::toggle(workspace, None, window, cx)
2870 })
2871 .ok();
2872 })
2873 }
2874
2875 fn render_panel_header(
2876 &self,
2877 window: &mut Window,
2878 cx: &mut Context<Self>,
2879 ) -> Option<impl IntoElement> {
2880 self.active_repository.as_ref()?;
2881
2882 let text;
2883 let action;
2884 let tooltip;
2885 if self.total_staged_count() == self.entry_count && self.entry_count > 0 {
2886 text = "Unstage All";
2887 action = git::UnstageAll.boxed_clone();
2888 tooltip = "git reset";
2889 } else {
2890 text = "Stage All";
2891 action = git::StageAll.boxed_clone();
2892 tooltip = "git add --all ."
2893 }
2894
2895 let change_string = match self.entry_count {
2896 0 => "No Changes".to_string(),
2897 1 => "1 Change".to_string(),
2898 _ => format!("{} Changes", self.entry_count),
2899 };
2900
2901 Some(
2902 self.panel_header_container(window, cx)
2903 .px_2()
2904 .child(
2905 panel_button(change_string)
2906 .color(Color::Muted)
2907 .tooltip(Tooltip::for_action_title_in(
2908 "Open Diff",
2909 &Diff,
2910 &self.focus_handle,
2911 ))
2912 .on_click(|_, _, cx| {
2913 cx.defer(|cx| {
2914 cx.dispatch_action(&Diff);
2915 })
2916 }),
2917 )
2918 .child(div().flex_grow()) // spacer
2919 .child(self.render_overflow_menu("overflow_menu"))
2920 .child(div().w_2()) // another spacer
2921 .child(
2922 panel_filled_button(text)
2923 .tooltip(Tooltip::for_action_title_in(
2924 tooltip,
2925 action.as_ref(),
2926 &self.focus_handle,
2927 ))
2928 .disabled(self.entry_count == 0)
2929 .on_click(move |_, _, cx| {
2930 let action = action.boxed_clone();
2931 cx.defer(move |cx| {
2932 cx.dispatch_action(action.as_ref());
2933 })
2934 }),
2935 ),
2936 )
2937 }
2938
2939 pub(crate) fn render_remote_button(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
2940 let branch = self.active_repository.as_ref()?.read(cx).branch.clone();
2941 if !self.can_push_and_pull(cx) {
2942 return None;
2943 }
2944 Some(
2945 h_flex()
2946 .gap_1()
2947 .flex_shrink_0()
2948 .when_some(branch, |this, branch| {
2949 let focus_handle = Some(self.focus_handle(cx));
2950
2951 this.children(render_remote_button(
2952 "remote-button",
2953 &branch,
2954 focus_handle,
2955 true,
2956 ))
2957 })
2958 .into_any_element(),
2959 )
2960 }
2961
2962 pub fn render_footer(
2963 &self,
2964 window: &mut Window,
2965 cx: &mut Context<Self>,
2966 ) -> Option<impl IntoElement> {
2967 let active_repository = self.active_repository.clone()?;
2968 let panel_editor_style = panel_editor_style(true, window, cx);
2969
2970 let enable_coauthors = self.render_co_authors(cx);
2971
2972 let editor_focus_handle = self.commit_editor.focus_handle(cx);
2973 let expand_tooltip_focus_handle = editor_focus_handle.clone();
2974
2975 let branch = active_repository.read(cx).branch.clone();
2976 let head_commit = active_repository.read(cx).head_commit.clone();
2977
2978 let footer_size = px(32.);
2979 let gap = px(9.0);
2980 let max_height = panel_editor_style
2981 .text
2982 .line_height_in_pixels(window.rem_size())
2983 * MAX_PANEL_EDITOR_LINES
2984 + gap;
2985
2986 let git_panel = cx.entity().clone();
2987 let display_name = SharedString::from(Arc::from(
2988 active_repository
2989 .read(cx)
2990 .display_name()
2991 .trim_end_matches("/"),
2992 ));
2993 let editor_is_long = self.commit_editor.update(cx, |editor, cx| {
2994 editor.max_point(cx).row().0 >= MAX_PANEL_EDITOR_LINES as u32
2995 });
2996 let has_previous_commit = head_commit.is_some();
2997
2998 let footer = v_flex()
2999 .child(PanelRepoFooter::new(
3000 display_name,
3001 branch,
3002 head_commit,
3003 Some(git_panel.clone()),
3004 ))
3005 .child(
3006 panel_editor_container(window, cx)
3007 .id("commit-editor-container")
3008 .relative()
3009 .w_full()
3010 .h(max_height + footer_size)
3011 .border_t_1()
3012 .border_color(cx.theme().colors().border_variant)
3013 .cursor_text()
3014 .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
3015 window.focus(&this.commit_editor.focus_handle(cx));
3016 }))
3017 .child(
3018 h_flex()
3019 .id("commit-footer")
3020 .border_t_1()
3021 .when(editor_is_long, |el| {
3022 el.border_color(cx.theme().colors().border_variant)
3023 })
3024 .absolute()
3025 .bottom_0()
3026 .left_0()
3027 .w_full()
3028 .px_2()
3029 .h(footer_size)
3030 .flex_none()
3031 .justify_between()
3032 .child(
3033 self.render_generate_commit_message_button(cx)
3034 .unwrap_or_else(|| div().into_any_element()),
3035 )
3036 .child(
3037 h_flex()
3038 .gap_0p5()
3039 .children(enable_coauthors)
3040 .child(self.render_commit_button(has_previous_commit, cx)),
3041 ),
3042 )
3043 .child(
3044 div()
3045 .pr_2p5()
3046 .on_action(|&editor::actions::MoveUp, _, cx| {
3047 cx.stop_propagation();
3048 })
3049 .on_action(|&editor::actions::MoveDown, _, cx| {
3050 cx.stop_propagation();
3051 })
3052 .child(EditorElement::new(&self.commit_editor, panel_editor_style)),
3053 )
3054 .child(
3055 h_flex()
3056 .absolute()
3057 .top_2()
3058 .right_2()
3059 .opacity(0.5)
3060 .hover(|this| this.opacity(1.0))
3061 .child(
3062 panel_icon_button("expand-commit-editor", IconName::Maximize)
3063 .icon_size(IconSize::Small)
3064 .size(ui::ButtonSize::Default)
3065 .tooltip(move |window, cx| {
3066 Tooltip::for_action_in(
3067 "Open Commit Modal",
3068 &git::ExpandCommitEditor,
3069 &expand_tooltip_focus_handle,
3070 window,
3071 cx,
3072 )
3073 })
3074 .on_click(cx.listener({
3075 move |_, _, window, cx| {
3076 window.dispatch_action(
3077 git::ExpandCommitEditor.boxed_clone(),
3078 cx,
3079 )
3080 }
3081 })),
3082 ),
3083 ),
3084 );
3085
3086 Some(footer)
3087 }
3088
3089 fn render_commit_button(
3090 &self,
3091 has_previous_commit: bool,
3092 cx: &mut Context<Self>,
3093 ) -> impl IntoElement {
3094 let (can_commit, tooltip) = self.configure_commit_button(cx);
3095 let title = self.commit_button_title();
3096 let commit_tooltip_focus_handle = self.commit_editor.focus_handle(cx);
3097 div()
3098 .id("commit-wrapper")
3099 .on_hover(cx.listener(move |this, hovered, _, cx| {
3100 this.show_placeholders =
3101 *hovered && !this.has_staged_changes() && !this.has_unstaged_conflicts();
3102 cx.notify()
3103 }))
3104 .when(self.amend_pending, {
3105 |this| {
3106 this.h_flex()
3107 .gap_1()
3108 .child(
3109 panel_filled_button("Cancel")
3110 .tooltip({
3111 let handle = commit_tooltip_focus_handle.clone();
3112 move |window, cx| {
3113 Tooltip::for_action_in(
3114 "Cancel amend",
3115 &git::Cancel,
3116 &handle,
3117 window,
3118 cx,
3119 )
3120 }
3121 })
3122 .on_click(move |_, window, cx| {
3123 window.dispatch_action(Box::new(git::Cancel), cx);
3124 }),
3125 )
3126 .child(
3127 panel_filled_button(title)
3128 .tooltip({
3129 let handle = commit_tooltip_focus_handle.clone();
3130 move |window, cx| {
3131 if can_commit {
3132 Tooltip::for_action_in(
3133 tooltip, &Amend, &handle, window, cx,
3134 )
3135 } else {
3136 Tooltip::simple(tooltip, cx)
3137 }
3138 }
3139 })
3140 .disabled(!can_commit || self.modal_open)
3141 .on_click({
3142 let git_panel = cx.weak_entity();
3143 move |_, window, cx| {
3144 telemetry::event!("Git Amended", source = "Git Panel");
3145 git_panel
3146 .update(cx, |git_panel, cx| {
3147 git_panel.set_amend_pending(false, cx);
3148 git_panel.commit_changes(
3149 CommitOptions { amend: true },
3150 window,
3151 cx,
3152 );
3153 })
3154 .ok();
3155 }
3156 }),
3157 )
3158 }
3159 })
3160 .when(!self.amend_pending, |this| {
3161 this.when(has_previous_commit, |this| {
3162 this.child(SplitButton::new(
3163 ui::ButtonLike::new_rounded_left(ElementId::Name(
3164 format!("split-button-left-{}", title).into(),
3165 ))
3166 .layer(ui::ElevationIndex::ModalSurface)
3167 .size(ui::ButtonSize::Compact)
3168 .child(
3169 div()
3170 .child(Label::new(title).size(LabelSize::Small))
3171 .mr_0p5(),
3172 )
3173 .on_click({
3174 let git_panel = cx.weak_entity();
3175 move |_, window, cx| {
3176 telemetry::event!("Git Committed", source = "Git Panel");
3177 git_panel
3178 .update(cx, |git_panel, cx| {
3179 git_panel.commit_changes(
3180 CommitOptions { amend: false },
3181 window,
3182 cx,
3183 );
3184 })
3185 .ok();
3186 }
3187 })
3188 .disabled(!can_commit || self.modal_open)
3189 .tooltip({
3190 let handle = commit_tooltip_focus_handle.clone();
3191 move |window, cx| {
3192 if can_commit {
3193 Tooltip::with_meta_in(
3194 tooltip,
3195 Some(&git::Commit),
3196 "git commit",
3197 &handle.clone(),
3198 window,
3199 cx,
3200 )
3201 } else {
3202 Tooltip::simple(tooltip, cx)
3203 }
3204 }
3205 }),
3206 self.render_git_commit_menu(
3207 ElementId::Name(format!("split-button-right-{}", title).into()),
3208 Some(commit_tooltip_focus_handle.clone()),
3209 )
3210 .into_any_element(),
3211 ))
3212 })
3213 .when(!has_previous_commit, |this| {
3214 this.child(
3215 panel_filled_button(title)
3216 .tooltip(move |window, cx| {
3217 if can_commit {
3218 Tooltip::with_meta_in(
3219 tooltip,
3220 Some(&git::Commit),
3221 "git commit",
3222 &commit_tooltip_focus_handle,
3223 window,
3224 cx,
3225 )
3226 } else {
3227 Tooltip::simple(tooltip, cx)
3228 }
3229 })
3230 .disabled(!can_commit || self.modal_open)
3231 .on_click({
3232 let git_panel = cx.weak_entity();
3233 move |_, window, cx| {
3234 telemetry::event!("Git Committed", source = "Git Panel");
3235 git_panel
3236 .update(cx, |git_panel, cx| {
3237 git_panel.commit_changes(
3238 CommitOptions { amend: false },
3239 window,
3240 cx,
3241 );
3242 })
3243 .ok();
3244 }
3245 }),
3246 )
3247 })
3248 })
3249 }
3250
3251 fn render_pending_amend(&self, cx: &mut Context<Self>) -> impl IntoElement {
3252 div()
3253 .py_2()
3254 .px(px(8.))
3255 .border_color(cx.theme().colors().border)
3256 .child(
3257 Label::new(
3258 "This will update your most recent commit. Cancel to make a new one instead.",
3259 )
3260 .size(LabelSize::Small),
3261 )
3262 }
3263
3264 fn render_previous_commit(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> {
3265 let active_repository = self.active_repository.as_ref()?;
3266 let branch = active_repository.read(cx).branch.as_ref()?;
3267 let commit = branch.most_recent_commit.as_ref()?.clone();
3268 let workspace = self.workspace.clone();
3269
3270 let this = cx.entity();
3271 Some(
3272 h_flex()
3273 .items_center()
3274 .py_2()
3275 .px(px(8.))
3276 .border_color(cx.theme().colors().border)
3277 .gap_1p5()
3278 .child(
3279 div()
3280 .flex_grow()
3281 .overflow_hidden()
3282 .items_center()
3283 .max_w(relative(0.85))
3284 .h_full()
3285 .child(
3286 Label::new(commit.subject.clone())
3287 .size(LabelSize::Small)
3288 .truncate(),
3289 )
3290 .id("commit-msg-hover")
3291 .on_click({
3292 let commit = commit.clone();
3293 let repo = active_repository.downgrade();
3294 move |_, window, cx| {
3295 CommitView::open(
3296 commit.clone(),
3297 repo.clone(),
3298 workspace.clone().clone(),
3299 window,
3300 cx,
3301 );
3302 }
3303 })
3304 .hoverable_tooltip({
3305 let repo = active_repository.clone();
3306 move |window, cx| {
3307 GitPanelMessageTooltip::new(
3308 this.clone(),
3309 commit.sha.clone(),
3310 repo.clone(),
3311 window,
3312 cx,
3313 )
3314 .into()
3315 }
3316 }),
3317 )
3318 .child(div().flex_1())
3319 .when(commit.has_parent, |this| {
3320 let has_unstaged = self.has_unstaged_changes();
3321 this.child(
3322 panel_icon_button("undo", IconName::Undo)
3323 .icon_size(IconSize::Small)
3324 .icon_color(Color::Muted)
3325 .tooltip(move |window, cx| {
3326 Tooltip::with_meta(
3327 "Uncommit",
3328 Some(&git::Uncommit),
3329 if has_unstaged {
3330 "git reset HEAD^ --soft"
3331 } else {
3332 "git reset HEAD^"
3333 },
3334 window,
3335 cx,
3336 )
3337 })
3338 .on_click(cx.listener(|this, _, window, cx| this.uncommit(window, cx))),
3339 )
3340 }),
3341 )
3342 }
3343
3344 fn render_empty_state(&self, cx: &mut Context<Self>) -> impl IntoElement {
3345 h_flex()
3346 .h_full()
3347 .flex_grow()
3348 .justify_center()
3349 .items_center()
3350 .child(
3351 v_flex()
3352 .gap_2()
3353 .child(h_flex().w_full().justify_around().child(
3354 if self.active_repository.is_some() {
3355 "No changes to commit"
3356 } else {
3357 "No Git repositories"
3358 },
3359 ))
3360 .children({
3361 let worktree_count = self.project.read(cx).visible_worktrees(cx).count();
3362 (worktree_count > 0 && self.active_repository.is_none()).then(|| {
3363 h_flex().w_full().justify_around().child(
3364 panel_filled_button("Initialize Repository")
3365 .tooltip(Tooltip::for_action_title_in(
3366 "git init",
3367 &git::Init,
3368 &self.focus_handle,
3369 ))
3370 .on_click(move |_, _, cx| {
3371 cx.defer(move |cx| {
3372 cx.dispatch_action(&git::Init);
3373 })
3374 }),
3375 )
3376 })
3377 })
3378 .text_ui_sm(cx)
3379 .mx_auto()
3380 .text_color(Color::Placeholder.color(cx)),
3381 )
3382 }
3383
3384 fn render_vertical_scrollbar(
3385 &self,
3386 show_horizontal_scrollbar_container: bool,
3387 cx: &mut Context<Self>,
3388 ) -> impl IntoElement {
3389 div()
3390 .id("git-panel-vertical-scroll")
3391 .occlude()
3392 .flex_none()
3393 .h_full()
3394 .cursor_default()
3395 .absolute()
3396 .right_0()
3397 .top_0()
3398 .bottom_0()
3399 .w(px(12.))
3400 .when(show_horizontal_scrollbar_container, |this| {
3401 this.pb_neg_3p5()
3402 })
3403 .on_mouse_move(cx.listener(|_, _, _, cx| {
3404 cx.notify();
3405 cx.stop_propagation()
3406 }))
3407 .on_hover(|_, _, cx| {
3408 cx.stop_propagation();
3409 })
3410 .on_any_mouse_down(|_, _, cx| {
3411 cx.stop_propagation();
3412 })
3413 .on_mouse_up(
3414 MouseButton::Left,
3415 cx.listener(|this, _, window, cx| {
3416 if !this.vertical_scrollbar.state.is_dragging()
3417 && !this.focus_handle.contains_focused(window, cx)
3418 {
3419 this.vertical_scrollbar.hide(window, cx);
3420 cx.notify();
3421 }
3422
3423 cx.stop_propagation();
3424 }),
3425 )
3426 .on_scroll_wheel(cx.listener(|_, _, _, cx| {
3427 cx.notify();
3428 }))
3429 .children(Scrollbar::vertical(
3430 // percentage as f32..end_offset as f32,
3431 self.vertical_scrollbar.state.clone(),
3432 ))
3433 }
3434
3435 /// Renders the horizontal scrollbar.
3436 ///
3437 /// The right offset is used to determine how far to the right the
3438 /// scrollbar should extend to, useful for ensuring it doesn't collide
3439 /// with the vertical scrollbar when visible.
3440 fn render_horizontal_scrollbar(
3441 &self,
3442 right_offset: Pixels,
3443 cx: &mut Context<Self>,
3444 ) -> impl IntoElement {
3445 div()
3446 .id("git-panel-horizontal-scroll")
3447 .occlude()
3448 .flex_none()
3449 .w_full()
3450 .cursor_default()
3451 .absolute()
3452 .bottom_neg_px()
3453 .left_0()
3454 .right_0()
3455 .pr(right_offset)
3456 .on_mouse_move(cx.listener(|_, _, _, cx| {
3457 cx.notify();
3458 cx.stop_propagation()
3459 }))
3460 .on_hover(|_, _, cx| {
3461 cx.stop_propagation();
3462 })
3463 .on_any_mouse_down(|_, _, cx| {
3464 cx.stop_propagation();
3465 })
3466 .on_mouse_up(
3467 MouseButton::Left,
3468 cx.listener(|this, _, window, cx| {
3469 if !this.horizontal_scrollbar.state.is_dragging()
3470 && !this.focus_handle.contains_focused(window, cx)
3471 {
3472 this.horizontal_scrollbar.hide(window, cx);
3473 cx.notify();
3474 }
3475
3476 cx.stop_propagation();
3477 }),
3478 )
3479 .on_scroll_wheel(cx.listener(|_, _, _, cx| {
3480 cx.notify();
3481 }))
3482 .children(Scrollbar::horizontal(
3483 // percentage as f32..end_offset as f32,
3484 self.horizontal_scrollbar.state.clone(),
3485 ))
3486 }
3487
3488 fn render_buffer_header_controls(
3489 &self,
3490 entity: &Entity<Self>,
3491 file: &Arc<dyn File>,
3492 _: &Window,
3493 cx: &App,
3494 ) -> Option<AnyElement> {
3495 let repo = self.active_repository.as_ref()?.read(cx);
3496 let project_path = (file.worktree_id(cx), file.path()).into();
3497 let repo_path = repo.project_path_to_repo_path(&project_path, cx)?;
3498 let ix = self.entry_by_path(&repo_path, cx)?;
3499 let entry = self.entries.get(ix)?;
3500
3501 let entry_staging = self.entry_staging(entry.status_entry()?);
3502
3503 let checkbox = Checkbox::new("stage-file", entry_staging.as_bool().into())
3504 .disabled(!self.has_write_access(cx))
3505 .fill()
3506 .elevation(ElevationIndex::Surface)
3507 .on_click({
3508 let entry = entry.clone();
3509 let git_panel = entity.downgrade();
3510 move |_, window, cx| {
3511 git_panel
3512 .update(cx, |this, cx| {
3513 this.toggle_staged_for_entry(&entry, window, cx);
3514 cx.stop_propagation();
3515 })
3516 .ok();
3517 }
3518 });
3519 Some(
3520 h_flex()
3521 .id("start-slot")
3522 .text_lg()
3523 .child(checkbox)
3524 .on_mouse_down(MouseButton::Left, |_, _, cx| {
3525 // prevent the list item active state triggering when toggling checkbox
3526 cx.stop_propagation();
3527 })
3528 .into_any_element(),
3529 )
3530 }
3531
3532 fn render_entries(
3533 &self,
3534 has_write_access: bool,
3535 _: &Window,
3536 cx: &mut Context<Self>,
3537 ) -> impl IntoElement {
3538 let entry_count = self.entries.len();
3539
3540 let scroll_track_size = px(16.);
3541
3542 let h_scroll_offset = if self.vertical_scrollbar.show_scrollbar {
3543 // magic number
3544 px(3.)
3545 } else {
3546 px(0.)
3547 };
3548
3549 v_flex()
3550 .flex_1()
3551 .size_full()
3552 .overflow_hidden()
3553 .relative()
3554 // Show a border on the top and bottom of the container when
3555 // the vertical scrollbar container is visible so we don't have a
3556 // floating left border in the panel.
3557 .when(self.vertical_scrollbar.show_track, |this| {
3558 this.border_t_1()
3559 .border_b_1()
3560 .border_color(cx.theme().colors().border)
3561 })
3562 .child(
3563 h_flex()
3564 .flex_1()
3565 .size_full()
3566 .relative()
3567 .overflow_hidden()
3568 .child(
3569 uniform_list(cx.entity().clone(), "entries", entry_count, {
3570 move |this, range, window, cx| {
3571 let mut items = Vec::with_capacity(range.end - range.start);
3572
3573 for ix in range {
3574 match &this.entries.get(ix) {
3575 Some(GitListEntry::GitStatusEntry(entry)) => {
3576 items.push(this.render_entry(
3577 ix,
3578 entry,
3579 has_write_access,
3580 window,
3581 cx,
3582 ));
3583 }
3584 Some(GitListEntry::Header(header)) => {
3585 items.push(this.render_list_header(
3586 ix,
3587 header,
3588 has_write_access,
3589 window,
3590 cx,
3591 ));
3592 }
3593 None => {}
3594 }
3595 }
3596
3597 items
3598 }
3599 })
3600 .when(
3601 !self.horizontal_scrollbar.show_track
3602 && self.horizontal_scrollbar.show_scrollbar,
3603 |this| {
3604 // when not showing the horizontal scrollbar track, make sure we don't
3605 // obscure the last entry
3606 this.pb(scroll_track_size)
3607 },
3608 )
3609 .size_full()
3610 .flex_grow()
3611 .with_sizing_behavior(ListSizingBehavior::Auto)
3612 .with_horizontal_sizing_behavior(
3613 ListHorizontalSizingBehavior::Unconstrained,
3614 )
3615 .with_width_from_item(self.max_width_item_index)
3616 .track_scroll(self.scroll_handle.clone()),
3617 )
3618 .on_mouse_down(
3619 MouseButton::Right,
3620 cx.listener(move |this, event: &MouseDownEvent, window, cx| {
3621 this.deploy_panel_context_menu(event.position, window, cx)
3622 }),
3623 )
3624 .when(self.vertical_scrollbar.show_track, |this| {
3625 this.child(
3626 v_flex()
3627 .h_full()
3628 .flex_none()
3629 .w(scroll_track_size)
3630 .bg(cx.theme().colors().panel_background)
3631 .child(
3632 div()
3633 .size_full()
3634 .flex_1()
3635 .border_l_1()
3636 .border_color(cx.theme().colors().border),
3637 ),
3638 )
3639 })
3640 .when(self.vertical_scrollbar.show_scrollbar, |this| {
3641 this.child(
3642 self.render_vertical_scrollbar(
3643 self.horizontal_scrollbar.show_track,
3644 cx,
3645 ),
3646 )
3647 }),
3648 )
3649 .when(self.horizontal_scrollbar.show_track, |this| {
3650 this.child(
3651 h_flex()
3652 .w_full()
3653 .h(scroll_track_size)
3654 .flex_none()
3655 .relative()
3656 .child(
3657 div()
3658 .w_full()
3659 .flex_1()
3660 // for some reason the horizontal scrollbar is 1px
3661 // taller than the vertical scrollbar??
3662 .h(scroll_track_size - px(1.))
3663 .bg(cx.theme().colors().panel_background)
3664 .border_t_1()
3665 .border_color(cx.theme().colors().border),
3666 )
3667 .when(self.vertical_scrollbar.show_track, |this| {
3668 this.child(
3669 div()
3670 .flex_none()
3671 // -1px prevents a missing pixel between the two container borders
3672 .w(scroll_track_size - px(1.))
3673 .h_full(),
3674 )
3675 .child(
3676 // HACK: Fill the missing 1px 🥲
3677 div()
3678 .absolute()
3679 .right(scroll_track_size - px(1.))
3680 .bottom(scroll_track_size - px(1.))
3681 .size_px()
3682 .bg(cx.theme().colors().border),
3683 )
3684 }),
3685 )
3686 })
3687 .when(self.horizontal_scrollbar.show_scrollbar, |this| {
3688 this.child(self.render_horizontal_scrollbar(h_scroll_offset, cx))
3689 })
3690 }
3691
3692 fn entry_label(&self, label: impl Into<SharedString>, color: Color) -> Label {
3693 Label::new(label.into()).color(color).single_line()
3694 }
3695
3696 fn list_item_height(&self) -> Rems {
3697 rems(1.75)
3698 }
3699
3700 fn render_list_header(
3701 &self,
3702 ix: usize,
3703 header: &GitHeaderEntry,
3704 _: bool,
3705 _: &Window,
3706 _: &Context<Self>,
3707 ) -> AnyElement {
3708 let id: ElementId = ElementId::Name(format!("header_{}", ix).into());
3709
3710 h_flex()
3711 .id(id)
3712 .h(self.list_item_height())
3713 .w_full()
3714 .items_end()
3715 .px(rems(0.75)) // ~12px
3716 .pb(rems(0.3125)) // ~ 5px
3717 .child(
3718 Label::new(header.title())
3719 .color(Color::Muted)
3720 .size(LabelSize::Small)
3721 .line_height_style(LineHeightStyle::UiLabel)
3722 .single_line(),
3723 )
3724 .into_any_element()
3725 }
3726
3727 pub fn load_commit_details(
3728 &self,
3729 sha: String,
3730 cx: &mut Context<Self>,
3731 ) -> Task<anyhow::Result<CommitDetails>> {
3732 let Some(repo) = self.active_repository.clone() else {
3733 return Task::ready(Err(anyhow::anyhow!("no active repo")));
3734 };
3735 repo.update(cx, |repo, cx| {
3736 let show = repo.show(sha);
3737 cx.spawn(async move |_, _| show.await?)
3738 })
3739 }
3740
3741 fn deploy_entry_context_menu(
3742 &mut self,
3743 position: Point<Pixels>,
3744 ix: usize,
3745 window: &mut Window,
3746 cx: &mut Context<Self>,
3747 ) {
3748 let Some(entry) = self.entries.get(ix).and_then(|e| e.status_entry()) else {
3749 return;
3750 };
3751 let stage_title = if entry.status.staging().is_fully_staged() {
3752 "Unstage File"
3753 } else {
3754 "Stage File"
3755 };
3756 let restore_title = if entry.status.is_created() {
3757 "Trash File"
3758 } else {
3759 "Restore File"
3760 };
3761 let context_menu = ContextMenu::build(window, cx, |context_menu, _, _| {
3762 context_menu
3763 .context(self.focus_handle.clone())
3764 .action(stage_title, ToggleStaged.boxed_clone())
3765 .action(restore_title, git::RestoreFile::default().boxed_clone())
3766 .separator()
3767 .action("Open Diff", Confirm.boxed_clone())
3768 .action("Open File", SecondaryConfirm.boxed_clone())
3769 });
3770 self.selected_entry = Some(ix);
3771 self.set_context_menu(context_menu, position, window, cx);
3772 }
3773
3774 fn deploy_panel_context_menu(
3775 &mut self,
3776 position: Point<Pixels>,
3777 window: &mut Window,
3778 cx: &mut Context<Self>,
3779 ) {
3780 let context_menu = git_panel_context_menu(
3781 self.focus_handle.clone(),
3782 GitMenuState {
3783 has_tracked_changes: self.has_tracked_changes(),
3784 has_staged_changes: self.has_staged_changes(),
3785 has_unstaged_changes: self.has_unstaged_changes(),
3786 has_new_changes: self.new_count > 0,
3787 },
3788 window,
3789 cx,
3790 );
3791 self.set_context_menu(context_menu, position, window, cx);
3792 }
3793
3794 fn set_context_menu(
3795 &mut self,
3796 context_menu: Entity<ContextMenu>,
3797 position: Point<Pixels>,
3798 window: &Window,
3799 cx: &mut Context<Self>,
3800 ) {
3801 let subscription = cx.subscribe_in(
3802 &context_menu,
3803 window,
3804 |this, _, _: &DismissEvent, window, cx| {
3805 if this.context_menu.as_ref().is_some_and(|context_menu| {
3806 context_menu.0.focus_handle(cx).contains_focused(window, cx)
3807 }) {
3808 cx.focus_self(window);
3809 }
3810 this.context_menu.take();
3811 cx.notify();
3812 },
3813 );
3814 self.context_menu = Some((context_menu, position, subscription));
3815 cx.notify();
3816 }
3817
3818 fn render_entry(
3819 &self,
3820 ix: usize,
3821 entry: &GitStatusEntry,
3822 has_write_access: bool,
3823 window: &Window,
3824 cx: &Context<Self>,
3825 ) -> AnyElement {
3826 let display_name = entry.display_name();
3827
3828 let selected = self.selected_entry == Some(ix);
3829 let marked = self.marked_entries.contains(&ix);
3830 let status_style = GitPanelSettings::get_global(cx).status_style;
3831 let status = entry.status;
3832 let modifiers = self.current_modifiers;
3833 let shift_held = modifiers.shift;
3834
3835 let has_conflict = status.is_conflicted();
3836 let is_modified = status.is_modified();
3837 let is_deleted = status.is_deleted();
3838
3839 let label_color = if status_style == StatusStyle::LabelColor {
3840 if has_conflict {
3841 Color::VersionControlConflict
3842 } else if is_modified {
3843 Color::VersionControlModified
3844 } else if is_deleted {
3845 // We don't want a bunch of red labels in the list
3846 Color::Disabled
3847 } else {
3848 Color::VersionControlAdded
3849 }
3850 } else {
3851 Color::Default
3852 };
3853
3854 let path_color = if status.is_deleted() {
3855 Color::Disabled
3856 } else {
3857 Color::Muted
3858 };
3859
3860 let id: ElementId = ElementId::Name(format!("entry_{}_{}", display_name, ix).into());
3861 let checkbox_wrapper_id: ElementId =
3862 ElementId::Name(format!("entry_{}_{}_checkbox_wrapper", display_name, ix).into());
3863 let checkbox_id: ElementId =
3864 ElementId::Name(format!("entry_{}_{}_checkbox", display_name, ix).into());
3865
3866 let entry_staging = self.entry_staging(entry);
3867 let mut is_staged: ToggleState = self.entry_staging(entry).as_bool().into();
3868 if self.show_placeholders && !self.has_staged_changes() && !entry.status.is_created() {
3869 is_staged = ToggleState::Selected;
3870 }
3871
3872 let handle = cx.weak_entity();
3873
3874 let selected_bg_alpha = 0.08;
3875 let marked_bg_alpha = 0.12;
3876 let state_opacity_step = 0.04;
3877
3878 let base_bg = match (selected, marked) {
3879 (true, true) => cx
3880 .theme()
3881 .status()
3882 .info
3883 .alpha(selected_bg_alpha + marked_bg_alpha),
3884 (true, false) => cx.theme().status().info.alpha(selected_bg_alpha),
3885 (false, true) => cx.theme().status().info.alpha(marked_bg_alpha),
3886 _ => cx.theme().colors().ghost_element_background,
3887 };
3888
3889 let hover_bg = if selected {
3890 cx.theme()
3891 .status()
3892 .info
3893 .alpha(selected_bg_alpha + state_opacity_step)
3894 } else {
3895 cx.theme().colors().ghost_element_hover
3896 };
3897
3898 let active_bg = if selected {
3899 cx.theme()
3900 .status()
3901 .info
3902 .alpha(selected_bg_alpha + state_opacity_step * 2.0)
3903 } else {
3904 cx.theme().colors().ghost_element_active
3905 };
3906
3907 h_flex()
3908 .id(id)
3909 .h(self.list_item_height())
3910 .w_full()
3911 .items_center()
3912 .border_1()
3913 .when(selected && self.focus_handle.is_focused(window), |el| {
3914 el.border_color(cx.theme().colors().border_focused)
3915 })
3916 .px(rems(0.75)) // ~12px
3917 .overflow_hidden()
3918 .flex_none()
3919 .gap_1p5()
3920 .bg(base_bg)
3921 .hover(|this| this.bg(hover_bg))
3922 .active(|this| this.bg(active_bg))
3923 .on_click({
3924 cx.listener(move |this, event: &ClickEvent, window, cx| {
3925 this.selected_entry = Some(ix);
3926 cx.notify();
3927 if event.modifiers().secondary() {
3928 this.open_file(&Default::default(), window, cx)
3929 } else {
3930 this.open_diff(&Default::default(), window, cx);
3931 this.focus_handle.focus(window);
3932 }
3933 })
3934 })
3935 .on_mouse_down(
3936 MouseButton::Right,
3937 move |event: &MouseDownEvent, window, cx| {
3938 // why isn't this happening automatically? we are passing MouseButton::Right to `on_mouse_down`?
3939 if event.button != MouseButton::Right {
3940 return;
3941 }
3942
3943 let Some(this) = handle.upgrade() else {
3944 return;
3945 };
3946 this.update(cx, |this, cx| {
3947 this.deploy_entry_context_menu(event.position, ix, window, cx);
3948 });
3949 cx.stop_propagation();
3950 },
3951 )
3952 // .on_secondary_mouse_down(cx.listener(
3953 // move |this, event: &MouseDownEvent, window, cx| {
3954 // this.deploy_entry_context_menu(event.position, ix, window, cx);
3955 // cx.stop_propagation();
3956 // },
3957 // ))
3958 .child(
3959 div()
3960 .id(checkbox_wrapper_id)
3961 .flex_none()
3962 .occlude()
3963 .cursor_pointer()
3964 .child(
3965 Checkbox::new(checkbox_id, is_staged)
3966 .disabled(!has_write_access)
3967 .fill()
3968 .elevation(ElevationIndex::Surface)
3969 .on_click({
3970 let entry = entry.clone();
3971 cx.listener(move |this, _, window, cx| {
3972 if !has_write_access {
3973 return;
3974 }
3975 this.toggle_staged_for_entry(
3976 &GitListEntry::GitStatusEntry(entry.clone()),
3977 window,
3978 cx,
3979 );
3980 cx.stop_propagation();
3981 })
3982 })
3983 .tooltip(move |window, cx| {
3984 let is_staged = entry_staging.is_fully_staged();
3985
3986 let action = if is_staged { "Unstage" } else { "Stage" };
3987 let tooltip_name = if shift_held {
3988 format!("{} section", action)
3989 } else {
3990 action.to_string()
3991 };
3992
3993 let meta = if shift_held {
3994 format!(
3995 "Release shift to {} single entry",
3996 action.to_lowercase()
3997 )
3998 } else {
3999 format!("Shift click to {} section", action.to_lowercase())
4000 };
4001
4002 Tooltip::with_meta(
4003 tooltip_name,
4004 Some(&ToggleStaged),
4005 meta,
4006 window,
4007 cx,
4008 )
4009 }),
4010 ),
4011 )
4012 .child(git_status_icon(status))
4013 .child(
4014 h_flex()
4015 .items_center()
4016 .flex_1()
4017 // .overflow_hidden()
4018 .when_some(entry.parent_dir(), |this, parent| {
4019 if !parent.is_empty() {
4020 this.child(
4021 self.entry_label(format!("{}/", parent), path_color)
4022 .when(status.is_deleted(), |this| this.strikethrough()),
4023 )
4024 } else {
4025 this
4026 }
4027 })
4028 .child(
4029 self.entry_label(display_name.clone(), label_color)
4030 .when(status.is_deleted(), |this| this.strikethrough()),
4031 ),
4032 )
4033 .into_any_element()
4034 }
4035
4036 fn has_write_access(&self, cx: &App) -> bool {
4037 !self.project.read(cx).is_read_only(cx)
4038 }
4039
4040 pub fn amend_pending(&self) -> bool {
4041 self.amend_pending
4042 }
4043
4044 pub fn set_amend_pending(&mut self, value: bool, cx: &mut Context<Self>) {
4045 self.amend_pending = value;
4046 cx.notify();
4047 }
4048}
4049
4050fn current_language_model(cx: &Context<'_, GitPanel>) -> Option<Arc<dyn LanguageModel>> {
4051 assistant_settings::AssistantSettings::get_global(cx)
4052 .enabled
4053 .then(|| {
4054 let ConfiguredModel { provider, model } =
4055 LanguageModelRegistry::read_global(cx).commit_message_model()?;
4056
4057 provider.is_authenticated(cx).then(|| model)
4058 })
4059 .flatten()
4060}
4061
4062impl Render for GitPanel {
4063 fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
4064 let project = self.project.read(cx);
4065 let has_entries = self.entries.len() > 0;
4066 let room = self
4067 .workspace
4068 .upgrade()
4069 .and_then(|workspace| workspace.read(cx).active_call()?.read(cx).room().cloned());
4070
4071 let has_write_access = self.has_write_access(cx);
4072
4073 let has_co_authors = room.map_or(false, |room| {
4074 room.read(cx)
4075 .remote_participants()
4076 .values()
4077 .any(|remote_participant| remote_participant.can_write())
4078 });
4079
4080 v_flex()
4081 .id("git_panel")
4082 .key_context(self.dispatch_context(window, cx))
4083 .track_focus(&self.focus_handle)
4084 .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
4085 .when(has_write_access && !project.is_read_only(cx), |this| {
4086 this.on_action(cx.listener(Self::toggle_staged_for_selected))
4087 .on_action(cx.listener(GitPanel::commit))
4088 .on_action(cx.listener(GitPanel::amend))
4089 .on_action(cx.listener(GitPanel::cancel))
4090 .on_action(cx.listener(Self::stage_all))
4091 .on_action(cx.listener(Self::unstage_all))
4092 .on_action(cx.listener(Self::stage_selected))
4093 .on_action(cx.listener(Self::unstage_selected))
4094 .on_action(cx.listener(Self::restore_tracked_files))
4095 .on_action(cx.listener(Self::revert_selected))
4096 .on_action(cx.listener(Self::clean_all))
4097 .on_action(cx.listener(Self::generate_commit_message_action))
4098 })
4099 .on_action(cx.listener(Self::select_first))
4100 .on_action(cx.listener(Self::select_next))
4101 .on_action(cx.listener(Self::select_previous))
4102 .on_action(cx.listener(Self::select_last))
4103 .on_action(cx.listener(Self::close_panel))
4104 .on_action(cx.listener(Self::open_diff))
4105 .on_action(cx.listener(Self::open_file))
4106 .on_action(cx.listener(Self::focus_changes_list))
4107 .on_action(cx.listener(Self::focus_editor))
4108 .on_action(cx.listener(Self::expand_commit_editor))
4109 .when(has_write_access && has_co_authors, |git_panel| {
4110 git_panel.on_action(cx.listener(Self::toggle_fill_co_authors))
4111 })
4112 .on_hover(cx.listener(move |this, hovered, window, cx| {
4113 if *hovered {
4114 this.horizontal_scrollbar.show(cx);
4115 this.vertical_scrollbar.show(cx);
4116 cx.notify();
4117 } else if !this.focus_handle.contains_focused(window, cx) {
4118 this.hide_scrollbars(window, cx);
4119 }
4120 }))
4121 .size_full()
4122 .overflow_hidden()
4123 .bg(cx.theme().colors().panel_background)
4124 .child(
4125 v_flex()
4126 .size_full()
4127 .children(self.render_panel_header(window, cx))
4128 .map(|this| {
4129 if has_entries {
4130 this.child(self.render_entries(has_write_access, window, cx))
4131 } else {
4132 this.child(self.render_empty_state(cx).into_any_element())
4133 }
4134 })
4135 .children(self.render_footer(window, cx))
4136 .when(self.amend_pending, |this| {
4137 this.child(self.render_pending_amend(cx))
4138 })
4139 .when(!self.amend_pending, |this| {
4140 this.children(self.render_previous_commit(cx))
4141 })
4142 .into_any_element(),
4143 )
4144 .children(self.context_menu.as_ref().map(|(menu, position, _)| {
4145 deferred(
4146 anchored()
4147 .position(*position)
4148 .anchor(Corner::TopLeft)
4149 .child(menu.clone()),
4150 )
4151 .with_priority(1)
4152 }))
4153 }
4154}
4155
4156impl Focusable for GitPanel {
4157 fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
4158 if self.entries.is_empty() {
4159 self.commit_editor.focus_handle(cx)
4160 } else {
4161 self.focus_handle.clone()
4162 }
4163 }
4164}
4165
4166impl EventEmitter<Event> for GitPanel {}
4167
4168impl EventEmitter<PanelEvent> for GitPanel {}
4169
4170pub(crate) struct GitPanelAddon {
4171 pub(crate) workspace: WeakEntity<Workspace>,
4172}
4173
4174impl editor::Addon for GitPanelAddon {
4175 fn to_any(&self) -> &dyn std::any::Any {
4176 self
4177 }
4178
4179 fn render_buffer_header_controls(
4180 &self,
4181 excerpt_info: &ExcerptInfo,
4182 window: &Window,
4183 cx: &App,
4184 ) -> Option<AnyElement> {
4185 let file = excerpt_info.buffer.file()?;
4186 let git_panel = self.workspace.upgrade()?.read(cx).panel::<GitPanel>(cx)?;
4187
4188 git_panel
4189 .read(cx)
4190 .render_buffer_header_controls(&git_panel, &file, window, cx)
4191 }
4192}
4193
4194impl Panel for GitPanel {
4195 fn persistent_name() -> &'static str {
4196 "GitPanel"
4197 }
4198
4199 fn position(&self, _: &Window, cx: &App) -> DockPosition {
4200 GitPanelSettings::get_global(cx).dock
4201 }
4202
4203 fn position_is_valid(&self, position: DockPosition) -> bool {
4204 matches!(position, DockPosition::Left | DockPosition::Right)
4205 }
4206
4207 fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
4208 settings::update_settings_file::<GitPanelSettings>(
4209 self.fs.clone(),
4210 cx,
4211 move |settings, _| settings.dock = Some(position),
4212 );
4213 }
4214
4215 fn size(&self, _: &Window, cx: &App) -> Pixels {
4216 self.width
4217 .unwrap_or_else(|| GitPanelSettings::get_global(cx).default_width)
4218 }
4219
4220 fn set_size(&mut self, size: Option<Pixels>, _: &mut Window, cx: &mut Context<Self>) {
4221 self.width = size;
4222 self.serialize(cx);
4223 cx.notify();
4224 }
4225
4226 fn icon(&self, _: &Window, cx: &App) -> Option<ui::IconName> {
4227 Some(ui::IconName::GitBranchSmall).filter(|_| GitPanelSettings::get_global(cx).button)
4228 }
4229
4230 fn icon_tooltip(&self, _window: &Window, _cx: &App) -> Option<&'static str> {
4231 Some("Git Panel")
4232 }
4233
4234 fn toggle_action(&self) -> Box<dyn Action> {
4235 Box::new(ToggleFocus)
4236 }
4237
4238 fn activation_priority(&self) -> u32 {
4239 2
4240 }
4241}
4242
4243impl PanelHeader for GitPanel {}
4244
4245struct GitPanelMessageTooltip {
4246 commit_tooltip: Option<Entity<CommitTooltip>>,
4247}
4248
4249impl GitPanelMessageTooltip {
4250 fn new(
4251 git_panel: Entity<GitPanel>,
4252 sha: SharedString,
4253 repository: Entity<Repository>,
4254 window: &mut Window,
4255 cx: &mut App,
4256 ) -> Entity<Self> {
4257 cx.new(|cx| {
4258 cx.spawn_in(window, async move |this, cx| {
4259 let (details, workspace) = git_panel.update(cx, |git_panel, cx| {
4260 (
4261 git_panel.load_commit_details(sha.to_string(), cx),
4262 git_panel.workspace.clone(),
4263 )
4264 })?;
4265 let details = details.await?;
4266
4267 let commit_details = crate::commit_tooltip::CommitDetails {
4268 sha: details.sha.clone(),
4269 author_name: details.author_name.clone(),
4270 author_email: details.author_email.clone(),
4271 commit_time: OffsetDateTime::from_unix_timestamp(details.commit_timestamp)?,
4272 message: Some(ParsedCommitMessage {
4273 message: details.message.clone(),
4274 ..Default::default()
4275 }),
4276 };
4277
4278 this.update(cx, |this: &mut GitPanelMessageTooltip, cx| {
4279 this.commit_tooltip = Some(cx.new(move |cx| {
4280 CommitTooltip::new(commit_details, repository, workspace, cx)
4281 }));
4282 cx.notify();
4283 })
4284 })
4285 .detach();
4286
4287 Self {
4288 commit_tooltip: None,
4289 }
4290 })
4291 }
4292}
4293
4294impl Render for GitPanelMessageTooltip {
4295 fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
4296 if let Some(commit_tooltip) = &self.commit_tooltip {
4297 commit_tooltip.clone().into_any_element()
4298 } else {
4299 gpui::Empty.into_any_element()
4300 }
4301 }
4302}
4303
4304#[derive(IntoElement, RegisterComponent)]
4305pub struct PanelRepoFooter {
4306 active_repository: SharedString,
4307 branch: Option<Branch>,
4308 head_commit: Option<CommitDetails>,
4309
4310 // Getting a GitPanel in previews will be difficult.
4311 //
4312 // For now just take an option here, and we won't bind handlers to buttons in previews.
4313 git_panel: Option<Entity<GitPanel>>,
4314}
4315
4316impl PanelRepoFooter {
4317 pub fn new(
4318 active_repository: SharedString,
4319 branch: Option<Branch>,
4320 head_commit: Option<CommitDetails>,
4321 git_panel: Option<Entity<GitPanel>>,
4322 ) -> Self {
4323 Self {
4324 active_repository,
4325 branch,
4326 head_commit,
4327 git_panel,
4328 }
4329 }
4330
4331 pub fn new_preview(active_repository: SharedString, branch: Option<Branch>) -> Self {
4332 Self {
4333 active_repository,
4334 branch,
4335 head_commit: None,
4336 git_panel: None,
4337 }
4338 }
4339}
4340
4341impl RenderOnce for PanelRepoFooter {
4342 fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
4343 let project = self
4344 .git_panel
4345 .as_ref()
4346 .map(|panel| panel.read(cx).project.clone());
4347
4348 let repo = self
4349 .git_panel
4350 .as_ref()
4351 .and_then(|panel| panel.read(cx).active_repository.clone());
4352
4353 let single_repo = project
4354 .as_ref()
4355 .map(|project| project.read(cx).git_store().read(cx).repositories().len() == 1)
4356 .unwrap_or(true);
4357
4358 const MAX_BRANCH_LEN: usize = 16;
4359 const MAX_REPO_LEN: usize = 16;
4360 const LABEL_CHARACTER_BUDGET: usize = MAX_BRANCH_LEN + MAX_REPO_LEN;
4361 const MAX_SHORT_SHA_LEN: usize = 8;
4362
4363 let branch_name = self
4364 .branch
4365 .as_ref()
4366 .map(|branch| branch.name.clone())
4367 .or_else(|| {
4368 self.head_commit.as_ref().map(|commit| {
4369 SharedString::from(
4370 commit
4371 .sha
4372 .chars()
4373 .take(MAX_SHORT_SHA_LEN)
4374 .collect::<String>(),
4375 )
4376 })
4377 })
4378 .unwrap_or_else(|| SharedString::from(" (no branch)"));
4379 let show_separator = self.branch.is_some() || self.head_commit.is_some();
4380
4381 let active_repo_name = self.active_repository.clone();
4382
4383 let branch_actual_len = branch_name.len();
4384 let repo_actual_len = active_repo_name.len();
4385
4386 // ideally, show the whole branch and repo names but
4387 // when we can't, use a budget to allocate space between the two
4388 let (repo_display_len, branch_display_len) = if branch_actual_len + repo_actual_len
4389 <= LABEL_CHARACTER_BUDGET
4390 {
4391 (repo_actual_len, branch_actual_len)
4392 } else {
4393 if branch_actual_len <= MAX_BRANCH_LEN {
4394 let repo_space = (LABEL_CHARACTER_BUDGET - branch_actual_len).min(MAX_REPO_LEN);
4395 (repo_space, branch_actual_len)
4396 } else if repo_actual_len <= MAX_REPO_LEN {
4397 let branch_space = (LABEL_CHARACTER_BUDGET - repo_actual_len).min(MAX_BRANCH_LEN);
4398 (repo_actual_len, branch_space)
4399 } else {
4400 (MAX_REPO_LEN, MAX_BRANCH_LEN)
4401 }
4402 };
4403
4404 let truncated_repo_name = if repo_actual_len <= repo_display_len {
4405 active_repo_name.to_string()
4406 } else {
4407 util::truncate_and_trailoff(active_repo_name.trim_ascii(), repo_display_len)
4408 };
4409
4410 let truncated_branch_name = if branch_actual_len <= branch_display_len {
4411 branch_name.to_string()
4412 } else {
4413 util::truncate_and_trailoff(branch_name.trim_ascii(), branch_display_len)
4414 };
4415
4416 let repo_selector_trigger = Button::new("repo-selector", truncated_repo_name)
4417 .style(ButtonStyle::Transparent)
4418 .size(ButtonSize::None)
4419 .label_size(LabelSize::Small)
4420 .color(Color::Muted);
4421
4422 let repo_selector = PopoverMenu::new("repository-switcher")
4423 .menu({
4424 let project = project.clone();
4425 move |window, cx| {
4426 let project = project.clone()?;
4427 Some(cx.new(|cx| RepositorySelector::new(project, rems(16.), window, cx)))
4428 }
4429 })
4430 .trigger_with_tooltip(
4431 repo_selector_trigger.disabled(single_repo).truncate(true),
4432 Tooltip::text("Switch active repository"),
4433 )
4434 .anchor(Corner::BottomLeft)
4435 .into_any_element();
4436
4437 let branch_selector_button = Button::new("branch-selector", truncated_branch_name)
4438 .style(ButtonStyle::Transparent)
4439 .size(ButtonSize::None)
4440 .label_size(LabelSize::Small)
4441 .truncate(true)
4442 .tooltip(Tooltip::for_action_title(
4443 "Switch Branch",
4444 &zed_actions::git::Switch,
4445 ))
4446 .on_click(|_, window, cx| {
4447 window.dispatch_action(zed_actions::git::Switch.boxed_clone(), cx);
4448 });
4449
4450 let branch_selector = PopoverMenu::new("popover-button")
4451 .menu(move |window, cx| Some(branch_picker::popover(repo.clone(), window, cx)))
4452 .trigger_with_tooltip(
4453 branch_selector_button,
4454 Tooltip::for_action_title("Switch Branch", &zed_actions::git::Switch),
4455 )
4456 .anchor(Corner::BottomLeft)
4457 .offset(gpui::Point {
4458 x: px(0.0),
4459 y: px(-2.0),
4460 });
4461
4462 h_flex()
4463 .w_full()
4464 .px_2()
4465 .h(px(36.))
4466 .items_center()
4467 .justify_between()
4468 .gap_1()
4469 .child(
4470 h_flex()
4471 .flex_1()
4472 .overflow_hidden()
4473 .items_center()
4474 .child(
4475 div().child(
4476 Icon::new(IconName::GitBranchSmall)
4477 .size(IconSize::Small)
4478 .color(if single_repo {
4479 Color::Disabled
4480 } else {
4481 Color::Muted
4482 }),
4483 ),
4484 )
4485 .child(repo_selector)
4486 .when(show_separator, |this| {
4487 this.child(
4488 div()
4489 .text_color(cx.theme().colors().text_muted)
4490 .text_sm()
4491 .child("/"),
4492 )
4493 })
4494 .child(branch_selector),
4495 )
4496 .children(if let Some(git_panel) = self.git_panel {
4497 git_panel.update(cx, |git_panel, cx| git_panel.render_remote_button(cx))
4498 } else {
4499 None
4500 })
4501 }
4502}
4503
4504impl Component for PanelRepoFooter {
4505 fn scope() -> ComponentScope {
4506 ComponentScope::VersionControl
4507 }
4508
4509 fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
4510 let unknown_upstream = None;
4511 let no_remote_upstream = Some(UpstreamTracking::Gone);
4512 let ahead_of_upstream = Some(
4513 UpstreamTrackingStatus {
4514 ahead: 2,
4515 behind: 0,
4516 }
4517 .into(),
4518 );
4519 let behind_upstream = Some(
4520 UpstreamTrackingStatus {
4521 ahead: 0,
4522 behind: 2,
4523 }
4524 .into(),
4525 );
4526 let ahead_and_behind_upstream = Some(
4527 UpstreamTrackingStatus {
4528 ahead: 3,
4529 behind: 1,
4530 }
4531 .into(),
4532 );
4533
4534 let not_ahead_or_behind_upstream = Some(
4535 UpstreamTrackingStatus {
4536 ahead: 0,
4537 behind: 0,
4538 }
4539 .into(),
4540 );
4541
4542 fn branch(upstream: Option<UpstreamTracking>) -> Branch {
4543 Branch {
4544 is_head: true,
4545 name: "some-branch".into(),
4546 upstream: upstream.map(|tracking| Upstream {
4547 ref_name: "origin/some-branch".into(),
4548 tracking,
4549 }),
4550 most_recent_commit: Some(CommitSummary {
4551 sha: "abc123".into(),
4552 subject: "Modify stuff".into(),
4553 commit_timestamp: 1710932954,
4554 has_parent: true,
4555 }),
4556 }
4557 }
4558
4559 fn custom(branch_name: &str, upstream: Option<UpstreamTracking>) -> Branch {
4560 Branch {
4561 is_head: true,
4562 name: branch_name.to_string().into(),
4563 upstream: upstream.map(|tracking| Upstream {
4564 ref_name: format!("zed/{}", branch_name).into(),
4565 tracking,
4566 }),
4567 most_recent_commit: Some(CommitSummary {
4568 sha: "abc123".into(),
4569 subject: "Modify stuff".into(),
4570 commit_timestamp: 1710932954,
4571 has_parent: true,
4572 }),
4573 }
4574 }
4575
4576 fn active_repository(id: usize) -> SharedString {
4577 format!("repo-{}", id).into()
4578 }
4579
4580 let example_width = px(340.);
4581 Some(
4582 v_flex()
4583 .gap_6()
4584 .w_full()
4585 .flex_none()
4586 .children(vec![
4587 example_group_with_title(
4588 "Action Button States",
4589 vec![
4590 single_example(
4591 "No Branch",
4592 div()
4593 .w(example_width)
4594 .overflow_hidden()
4595 .child(PanelRepoFooter::new_preview(
4596 active_repository(1).clone(),
4597 None,
4598 ))
4599 .into_any_element(),
4600 ),
4601 single_example(
4602 "Remote status unknown",
4603 div()
4604 .w(example_width)
4605 .overflow_hidden()
4606 .child(PanelRepoFooter::new_preview(
4607 active_repository(2).clone(),
4608 Some(branch(unknown_upstream)),
4609 ))
4610 .into_any_element(),
4611 ),
4612 single_example(
4613 "No Remote Upstream",
4614 div()
4615 .w(example_width)
4616 .overflow_hidden()
4617 .child(PanelRepoFooter::new_preview(
4618 active_repository(3).clone(),
4619 Some(branch(no_remote_upstream)),
4620 ))
4621 .into_any_element(),
4622 ),
4623 single_example(
4624 "Not Ahead or Behind",
4625 div()
4626 .w(example_width)
4627 .overflow_hidden()
4628 .child(PanelRepoFooter::new_preview(
4629 active_repository(4).clone(),
4630 Some(branch(not_ahead_or_behind_upstream)),
4631 ))
4632 .into_any_element(),
4633 ),
4634 single_example(
4635 "Behind remote",
4636 div()
4637 .w(example_width)
4638 .overflow_hidden()
4639 .child(PanelRepoFooter::new_preview(
4640 active_repository(5).clone(),
4641 Some(branch(behind_upstream)),
4642 ))
4643 .into_any_element(),
4644 ),
4645 single_example(
4646 "Ahead of remote",
4647 div()
4648 .w(example_width)
4649 .overflow_hidden()
4650 .child(PanelRepoFooter::new_preview(
4651 active_repository(6).clone(),
4652 Some(branch(ahead_of_upstream)),
4653 ))
4654 .into_any_element(),
4655 ),
4656 single_example(
4657 "Ahead and behind remote",
4658 div()
4659 .w(example_width)
4660 .overflow_hidden()
4661 .child(PanelRepoFooter::new_preview(
4662 active_repository(7).clone(),
4663 Some(branch(ahead_and_behind_upstream)),
4664 ))
4665 .into_any_element(),
4666 ),
4667 ],
4668 )
4669 .grow()
4670 .vertical(),
4671 ])
4672 .children(vec![
4673 example_group_with_title(
4674 "Labels",
4675 vec![
4676 single_example(
4677 "Short Branch & Repo",
4678 div()
4679 .w(example_width)
4680 .overflow_hidden()
4681 .child(PanelRepoFooter::new_preview(
4682 SharedString::from("zed"),
4683 Some(custom("main", behind_upstream)),
4684 ))
4685 .into_any_element(),
4686 ),
4687 single_example(
4688 "Long Branch",
4689 div()
4690 .w(example_width)
4691 .overflow_hidden()
4692 .child(PanelRepoFooter::new_preview(
4693 SharedString::from("zed"),
4694 Some(custom(
4695 "redesign-and-update-git-ui-list-entry-style",
4696 behind_upstream,
4697 )),
4698 ))
4699 .into_any_element(),
4700 ),
4701 single_example(
4702 "Long Repo",
4703 div()
4704 .w(example_width)
4705 .overflow_hidden()
4706 .child(PanelRepoFooter::new_preview(
4707 SharedString::from("zed-industries-community-examples"),
4708 Some(custom("gpui", ahead_of_upstream)),
4709 ))
4710 .into_any_element(),
4711 ),
4712 single_example(
4713 "Long Repo & Branch",
4714 div()
4715 .w(example_width)
4716 .overflow_hidden()
4717 .child(PanelRepoFooter::new_preview(
4718 SharedString::from("zed-industries-community-examples"),
4719 Some(custom(
4720 "redesign-and-update-git-ui-list-entry-style",
4721 behind_upstream,
4722 )),
4723 ))
4724 .into_any_element(),
4725 ),
4726 single_example(
4727 "Uppercase Repo",
4728 div()
4729 .w(example_width)
4730 .overflow_hidden()
4731 .child(PanelRepoFooter::new_preview(
4732 SharedString::from("LICENSES"),
4733 Some(custom("main", ahead_of_upstream)),
4734 ))
4735 .into_any_element(),
4736 ),
4737 single_example(
4738 "Uppercase Branch",
4739 div()
4740 .w(example_width)
4741 .overflow_hidden()
4742 .child(PanelRepoFooter::new_preview(
4743 SharedString::from("zed"),
4744 Some(custom("update-README", behind_upstream)),
4745 ))
4746 .into_any_element(),
4747 ),
4748 ],
4749 )
4750 .grow()
4751 .vertical(),
4752 ])
4753 .into_any_element(),
4754 )
4755 }
4756}
4757
4758#[cfg(test)]
4759mod tests {
4760 use git::status::StatusCode;
4761 use gpui::TestAppContext;
4762 use project::{FakeFs, WorktreeSettings};
4763 use serde_json::json;
4764 use settings::SettingsStore;
4765 use theme::LoadThemes;
4766 use util::path;
4767
4768 use super::*;
4769
4770 fn init_test(cx: &mut gpui::TestAppContext) {
4771 if std::env::var("RUST_LOG").is_ok() {
4772 env_logger::try_init().ok();
4773 }
4774
4775 cx.update(|cx| {
4776 let settings_store = SettingsStore::test(cx);
4777 cx.set_global(settings_store);
4778 AssistantSettings::register(cx);
4779 WorktreeSettings::register(cx);
4780 workspace::init_settings(cx);
4781 theme::init(LoadThemes::JustBase, cx);
4782 language::init(cx);
4783 editor::init(cx);
4784 Project::init_settings(cx);
4785 crate::init(cx);
4786 });
4787 }
4788
4789 #[gpui::test]
4790 async fn test_entry_worktree_paths(cx: &mut TestAppContext) {
4791 init_test(cx);
4792 let fs = FakeFs::new(cx.background_executor.clone());
4793 fs.insert_tree(
4794 "/root",
4795 json!({
4796 "zed": {
4797 ".git": {},
4798 "crates": {
4799 "gpui": {
4800 "gpui.rs": "fn main() {}"
4801 },
4802 "util": {
4803 "util.rs": "fn do_it() {}"
4804 }
4805 }
4806 },
4807 }),
4808 )
4809 .await;
4810
4811 fs.set_status_for_repo(
4812 Path::new(path!("/root/zed/.git")),
4813 &[
4814 (
4815 Path::new("crates/gpui/gpui.rs"),
4816 StatusCode::Modified.worktree(),
4817 ),
4818 (
4819 Path::new("crates/util/util.rs"),
4820 StatusCode::Modified.worktree(),
4821 ),
4822 ],
4823 );
4824
4825 let project =
4826 Project::test(fs.clone(), [path!("/root/zed/crates/gpui").as_ref()], cx).await;
4827 let (workspace, cx) =
4828 cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
4829
4830 cx.read(|cx| {
4831 project
4832 .read(cx)
4833 .worktrees(cx)
4834 .nth(0)
4835 .unwrap()
4836 .read(cx)
4837 .as_local()
4838 .unwrap()
4839 .scan_complete()
4840 })
4841 .await;
4842
4843 cx.executor().run_until_parked();
4844
4845 let app_state = workspace.update(cx, |workspace, _| workspace.app_state().clone());
4846 let panel = cx.new_window_entity(|window, cx| {
4847 GitPanel::new(workspace.clone(), project.clone(), app_state, window, cx)
4848 });
4849
4850 let handle = cx.update_window_entity(&panel, |panel, _, _| {
4851 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
4852 });
4853 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
4854 handle.await;
4855
4856 let entries = panel.update(cx, |panel, _| panel.entries.clone());
4857 pretty_assertions::assert_eq!(
4858 entries,
4859 [
4860 GitListEntry::Header(GitHeaderEntry {
4861 header: Section::Tracked
4862 }),
4863 GitListEntry::GitStatusEntry(GitStatusEntry {
4864 abs_path: path!("/root/zed/crates/gpui/gpui.rs").into(),
4865 repo_path: "crates/gpui/gpui.rs".into(),
4866 status: StatusCode::Modified.worktree(),
4867 staging: StageStatus::Unstaged,
4868 }),
4869 GitListEntry::GitStatusEntry(GitStatusEntry {
4870 abs_path: path!("/root/zed/crates/util/util.rs").into(),
4871 repo_path: "crates/util/util.rs".into(),
4872 status: StatusCode::Modified.worktree(),
4873 staging: StageStatus::Unstaged,
4874 },),
4875 ],
4876 );
4877
4878 // TODO(cole) restore this once repository deduplication is implemented properly.
4879 //cx.update_window_entity(&panel, |panel, window, cx| {
4880 // panel.select_last(&Default::default(), window, cx);
4881 // assert_eq!(panel.selected_entry, Some(2));
4882 // panel.open_diff(&Default::default(), window, cx);
4883 //});
4884 //cx.run_until_parked();
4885
4886 //let worktree_roots = workspace.update(cx, |workspace, cx| {
4887 // workspace
4888 // .worktrees(cx)
4889 // .map(|worktree| worktree.read(cx).abs_path())
4890 // .collect::<Vec<_>>()
4891 //});
4892 //pretty_assertions::assert_eq!(
4893 // worktree_roots,
4894 // vec![
4895 // Path::new(path!("/root/zed/crates/gpui")).into(),
4896 // Path::new(path!("/root/zed/crates/util/util.rs")).into(),
4897 // ]
4898 //);
4899
4900 //project.update(cx, |project, cx| {
4901 // let git_store = project.git_store().read(cx);
4902 // // The repo that comes from the single-file worktree can't be selected through the UI.
4903 // let filtered_entries = filtered_repository_entries(git_store, cx)
4904 // .iter()
4905 // .map(|repo| repo.read(cx).worktree_abs_path.clone())
4906 // .collect::<Vec<_>>();
4907 // assert_eq!(
4908 // filtered_entries,
4909 // [Path::new(path!("/root/zed/crates/gpui")).into()]
4910 // );
4911 // // But we can select it artificially here.
4912 // let repo_from_single_file_worktree = git_store
4913 // .repositories()
4914 // .values()
4915 // .find(|repo| {
4916 // repo.read(cx).worktree_abs_path.as_ref()
4917 // == Path::new(path!("/root/zed/crates/util/util.rs"))
4918 // })
4919 // .unwrap()
4920 // .clone();
4921
4922 // // Paths still make sense when we somehow activate a repo that comes from a single-file worktree.
4923 // repo_from_single_file_worktree.update(cx, |repo, cx| repo.set_as_active_repository(cx));
4924 //});
4925
4926 let handle = cx.update_window_entity(&panel, |panel, _, _| {
4927 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
4928 });
4929 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
4930 handle.await;
4931 let entries = panel.update(cx, |panel, _| panel.entries.clone());
4932 pretty_assertions::assert_eq!(
4933 entries,
4934 [
4935 GitListEntry::Header(GitHeaderEntry {
4936 header: Section::Tracked
4937 }),
4938 GitListEntry::GitStatusEntry(GitStatusEntry {
4939 abs_path: path!("/root/zed/crates/gpui/gpui.rs").into(),
4940 repo_path: "crates/gpui/gpui.rs".into(),
4941 status: StatusCode::Modified.worktree(),
4942 staging: StageStatus::Unstaged,
4943 }),
4944 GitListEntry::GitStatusEntry(GitStatusEntry {
4945 abs_path: path!("/root/zed/crates/util/util.rs").into(),
4946 repo_path: "crates/util/util.rs".into(),
4947 status: StatusCode::Modified.worktree(),
4948 staging: StageStatus::Unstaged,
4949 },),
4950 ],
4951 );
4952 }
4953}