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 let temperature = AssistantSettings::temperature_for_model(&model, cx);
1739
1740 self.generate_commit_message_task = Some(cx.spawn(async move |this, cx| {
1741 async move {
1742 let _defer = cx.on_drop(&this, |this, _cx| {
1743 this.generate_commit_message_task.take();
1744 });
1745
1746 let mut diff_text = diff.await??;
1747
1748 const ONE_MB: usize = 1_000_000;
1749 if diff_text.len() > ONE_MB {
1750 diff_text = diff_text.chars().take(ONE_MB).collect()
1751 }
1752
1753 let subject = this.update(cx, |this, cx| {
1754 this.commit_editor.read(cx).text(cx).lines().next().map(ToOwned::to_owned).unwrap_or_default()
1755 })?;
1756
1757 let text_empty = subject.trim().is_empty();
1758
1759 let content = if text_empty {
1760 format!("{PROMPT}\nHere are the changes in this commit:\n{diff_text}")
1761 } else {
1762 format!("{PROMPT}\nHere is the user's subject line:\n{subject}\nHere are the changes in this commit:\n{diff_text}\n")
1763 };
1764
1765 const PROMPT: &str = include_str!("commit_message_prompt.txt");
1766
1767 let request = LanguageModelRequest {
1768 thread_id: None,
1769 prompt_id: None,
1770 mode: None,
1771 messages: vec![LanguageModelRequestMessage {
1772 role: Role::User,
1773 content: vec![content.into()],
1774 cache: false,
1775 }],
1776 tools: Vec::new(),
1777 stop: Vec::new(),
1778 temperature,
1779 };
1780
1781 let stream = model.stream_completion_text(request, &cx);
1782 let mut messages = stream.await?;
1783
1784 if !text_empty {
1785 this.update(cx, |this, cx| {
1786 this.commit_message_buffer(cx).update(cx, |buffer, cx| {
1787 let insert_position = buffer.anchor_before(buffer.len());
1788 buffer.edit([(insert_position..insert_position, "\n")], None, cx)
1789 });
1790 })?;
1791 }
1792
1793 while let Some(message) = messages.stream.next().await {
1794 let text = message?;
1795
1796 this.update(cx, |this, cx| {
1797 this.commit_message_buffer(cx).update(cx, |buffer, cx| {
1798 let insert_position = buffer.anchor_before(buffer.len());
1799 buffer.edit([(insert_position..insert_position, text)], None, cx);
1800 });
1801 })?;
1802 }
1803
1804 anyhow::Ok(())
1805 }
1806 .log_err().await
1807 }));
1808 }
1809
1810 pub(crate) fn fetch(&mut self, window: &mut Window, cx: &mut Context<Self>) {
1811 if !self.can_push_and_pull(cx) {
1812 return;
1813 }
1814
1815 let Some(repo) = self.active_repository.clone() else {
1816 return;
1817 };
1818 telemetry::event!("Git Fetched");
1819 let askpass = self.askpass_delegate("git fetch", window, cx);
1820 let this = cx.weak_entity();
1821 window
1822 .spawn(cx, async move |cx| {
1823 let fetch = repo.update(cx, |repo, cx| repo.fetch(askpass, cx))?;
1824
1825 let remote_message = fetch.await?;
1826 this.update(cx, |this, cx| {
1827 let action = RemoteAction::Fetch;
1828 match remote_message {
1829 Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
1830 Err(e) => {
1831 log::error!("Error while fetching {:?}", e);
1832 this.show_error_toast(action.name(), e, cx)
1833 }
1834 }
1835
1836 anyhow::Ok(())
1837 })
1838 .ok();
1839 anyhow::Ok(())
1840 })
1841 .detach_and_log_err(cx);
1842 }
1843
1844 pub(crate) fn git_init(&mut self, window: &mut Window, cx: &mut Context<Self>) {
1845 let worktrees = self
1846 .project
1847 .read(cx)
1848 .visible_worktrees(cx)
1849 .collect::<Vec<_>>();
1850
1851 let worktree = if worktrees.len() == 1 {
1852 Task::ready(Some(worktrees.first().unwrap().clone()))
1853 } else if worktrees.len() == 0 {
1854 let result = window.prompt(
1855 PromptLevel::Warning,
1856 "Unable to initialize a git repository",
1857 Some("Open a directory first"),
1858 &["Ok"],
1859 cx,
1860 );
1861 cx.background_executor()
1862 .spawn(async move {
1863 result.await.ok();
1864 })
1865 .detach();
1866 return;
1867 } else {
1868 let worktree_directories = worktrees
1869 .iter()
1870 .map(|worktree| worktree.read(cx).abs_path())
1871 .map(|worktree_abs_path| {
1872 if let Ok(path) = worktree_abs_path.strip_prefix(util::paths::home_dir()) {
1873 Path::new("~")
1874 .join(path)
1875 .to_string_lossy()
1876 .to_string()
1877 .into()
1878 } else {
1879 worktree_abs_path.to_string_lossy().to_string().into()
1880 }
1881 })
1882 .collect_vec();
1883 let prompt = picker_prompt::prompt(
1884 "Where would you like to initialize this git repository?",
1885 worktree_directories,
1886 self.workspace.clone(),
1887 window,
1888 cx,
1889 );
1890
1891 cx.spawn(async move |_, _| prompt.await.map(|ix| worktrees[ix].clone()))
1892 };
1893
1894 cx.spawn_in(window, async move |this, cx| {
1895 let worktree = match worktree.await {
1896 Some(worktree) => worktree,
1897 None => {
1898 return;
1899 }
1900 };
1901
1902 let Ok(result) = this.update(cx, |this, cx| {
1903 let fallback_branch_name = GitPanelSettings::get_global(cx)
1904 .fallback_branch_name
1905 .clone();
1906 this.project.read(cx).git_init(
1907 worktree.read(cx).abs_path(),
1908 fallback_branch_name,
1909 cx,
1910 )
1911 }) else {
1912 return;
1913 };
1914
1915 let result = result.await;
1916
1917 this.update_in(cx, |this, _, cx| match result {
1918 Ok(()) => {}
1919 Err(e) => this.show_error_toast("init", e, cx),
1920 })
1921 .ok();
1922 })
1923 .detach();
1924 }
1925
1926 pub(crate) fn pull(&mut self, window: &mut Window, cx: &mut Context<Self>) {
1927 if !self.can_push_and_pull(cx) {
1928 return;
1929 }
1930 let Some(repo) = self.active_repository.clone() else {
1931 return;
1932 };
1933 let Some(branch) = repo.read(cx).branch.as_ref() else {
1934 return;
1935 };
1936 telemetry::event!("Git Pulled");
1937 let branch = branch.clone();
1938 let remote = self.get_current_remote(window, cx);
1939 cx.spawn_in(window, async move |this, cx| {
1940 let remote = match remote.await {
1941 Ok(Some(remote)) => remote,
1942 Ok(None) => {
1943 return Ok(());
1944 }
1945 Err(e) => {
1946 log::error!("Failed to get current remote: {}", e);
1947 this.update(cx, |this, cx| this.show_error_toast("pull", e, cx))
1948 .ok();
1949 return Ok(());
1950 }
1951 };
1952
1953 let askpass = this.update_in(cx, |this, window, cx| {
1954 this.askpass_delegate(format!("git pull {}", remote.name), window, cx)
1955 })?;
1956
1957 let pull = repo.update(cx, |repo, cx| {
1958 repo.pull(branch.name.clone(), remote.name.clone(), askpass, cx)
1959 })?;
1960
1961 let remote_message = pull.await?;
1962
1963 let action = RemoteAction::Pull(remote);
1964 this.update(cx, |this, cx| match remote_message {
1965 Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
1966 Err(e) => {
1967 log::error!("Error while pulling {:?}", e);
1968 this.show_error_toast(action.name(), e, cx)
1969 }
1970 })
1971 .ok();
1972
1973 anyhow::Ok(())
1974 })
1975 .detach_and_log_err(cx);
1976 }
1977
1978 pub(crate) fn push(&mut self, force_push: bool, window: &mut Window, cx: &mut Context<Self>) {
1979 if !self.can_push_and_pull(cx) {
1980 return;
1981 }
1982 let Some(repo) = self.active_repository.clone() else {
1983 return;
1984 };
1985 let Some(branch) = repo.read(cx).branch.as_ref() else {
1986 return;
1987 };
1988 telemetry::event!("Git Pushed");
1989 let branch = branch.clone();
1990
1991 let options = if force_push {
1992 Some(PushOptions::Force)
1993 } else {
1994 match branch.upstream {
1995 Some(Upstream {
1996 tracking: UpstreamTracking::Gone,
1997 ..
1998 })
1999 | None => Some(PushOptions::SetUpstream),
2000 _ => None,
2001 }
2002 };
2003 let remote = self.get_current_remote(window, cx);
2004
2005 cx.spawn_in(window, async move |this, cx| {
2006 let remote = match remote.await {
2007 Ok(Some(remote)) => remote,
2008 Ok(None) => {
2009 return Ok(());
2010 }
2011 Err(e) => {
2012 log::error!("Failed to get current remote: {}", e);
2013 this.update(cx, |this, cx| this.show_error_toast("push", e, cx))
2014 .ok();
2015 return Ok(());
2016 }
2017 };
2018
2019 let askpass_delegate = this.update_in(cx, |this, window, cx| {
2020 this.askpass_delegate(format!("git push {}", remote.name), window, cx)
2021 })?;
2022
2023 let push = repo.update(cx, |repo, cx| {
2024 repo.push(
2025 branch.name.clone(),
2026 remote.name.clone(),
2027 options,
2028 askpass_delegate,
2029 cx,
2030 )
2031 })?;
2032
2033 let remote_output = push.await?;
2034
2035 let action = RemoteAction::Push(branch.name, remote);
2036 this.update(cx, |this, cx| match remote_output {
2037 Ok(remote_message) => this.show_remote_output(action, remote_message, cx),
2038 Err(e) => {
2039 log::error!("Error while pushing {:?}", e);
2040 this.show_error_toast(action.name(), e, cx)
2041 }
2042 })?;
2043
2044 anyhow::Ok(())
2045 })
2046 .detach_and_log_err(cx);
2047 }
2048
2049 fn askpass_delegate(
2050 &self,
2051 operation: impl Into<SharedString>,
2052 window: &mut Window,
2053 cx: &mut Context<Self>,
2054 ) -> AskPassDelegate {
2055 let this = cx.weak_entity();
2056 let operation = operation.into();
2057 let window = window.window_handle();
2058 AskPassDelegate::new(&mut cx.to_async(), move |prompt, tx, cx| {
2059 window
2060 .update(cx, |_, window, cx| {
2061 this.update(cx, |this, cx| {
2062 this.workspace.update(cx, |workspace, cx| {
2063 workspace.toggle_modal(window, cx, |window, cx| {
2064 AskPassModal::new(operation.clone(), prompt.into(), tx, window, cx)
2065 });
2066 })
2067 })
2068 })
2069 .ok();
2070 })
2071 }
2072
2073 fn can_push_and_pull(&self, cx: &App) -> bool {
2074 !self.project.read(cx).is_via_collab()
2075 }
2076
2077 fn get_current_remote(
2078 &mut self,
2079 window: &mut Window,
2080 cx: &mut Context<Self>,
2081 ) -> impl Future<Output = anyhow::Result<Option<Remote>>> + use<> {
2082 let repo = self.active_repository.clone();
2083 let workspace = self.workspace.clone();
2084 let mut cx = window.to_async(cx);
2085
2086 async move {
2087 let Some(repo) = repo else {
2088 return Err(anyhow::anyhow!("No active repository"));
2089 };
2090
2091 let mut current_remotes: Vec<Remote> = repo
2092 .update(&mut cx, |repo, _| {
2093 let Some(current_branch) = repo.branch.as_ref() else {
2094 return Err(anyhow::anyhow!("No active branch"));
2095 };
2096
2097 Ok(repo.get_remotes(Some(current_branch.name.to_string())))
2098 })??
2099 .await??;
2100
2101 if current_remotes.len() == 0 {
2102 return Err(anyhow::anyhow!("No active remote"));
2103 } else if current_remotes.len() == 1 {
2104 return Ok(Some(current_remotes.pop().unwrap()));
2105 } else {
2106 let current_remotes: Vec<_> = current_remotes
2107 .into_iter()
2108 .map(|remotes| remotes.name)
2109 .collect();
2110 let selection = cx
2111 .update(|window, cx| {
2112 picker_prompt::prompt(
2113 "Pick which remote to push to",
2114 current_remotes.clone(),
2115 workspace,
2116 window,
2117 cx,
2118 )
2119 })?
2120 .await;
2121
2122 Ok(selection.map(|selection| Remote {
2123 name: current_remotes[selection].clone(),
2124 }))
2125 }
2126 }
2127 }
2128
2129 fn potential_co_authors(&self, cx: &App) -> Vec<(String, String)> {
2130 let mut new_co_authors = Vec::new();
2131 let project = self.project.read(cx);
2132
2133 let Some(room) = self
2134 .workspace
2135 .upgrade()
2136 .and_then(|workspace| workspace.read(cx).active_call()?.read(cx).room().cloned())
2137 else {
2138 return Vec::default();
2139 };
2140
2141 let room = room.read(cx);
2142
2143 for (peer_id, collaborator) in project.collaborators() {
2144 if collaborator.is_host {
2145 continue;
2146 }
2147
2148 let Some(participant) = room.remote_participant_for_peer_id(*peer_id) else {
2149 continue;
2150 };
2151 if participant.can_write() && participant.user.email.is_some() {
2152 let email = participant.user.email.clone().unwrap();
2153
2154 new_co_authors.push((
2155 participant
2156 .user
2157 .name
2158 .clone()
2159 .unwrap_or_else(|| participant.user.github_login.clone()),
2160 email,
2161 ))
2162 }
2163 }
2164 if !project.is_local() && !project.is_read_only(cx) {
2165 if let Some(user) = room.local_participant_user(cx) {
2166 if let Some(email) = user.email.clone() {
2167 new_co_authors.push((
2168 user.name
2169 .clone()
2170 .unwrap_or_else(|| user.github_login.clone()),
2171 email.clone(),
2172 ))
2173 }
2174 }
2175 }
2176 new_co_authors
2177 }
2178
2179 fn toggle_fill_co_authors(
2180 &mut self,
2181 _: &ToggleFillCoAuthors,
2182 _: &mut Window,
2183 cx: &mut Context<Self>,
2184 ) {
2185 self.add_coauthors = !self.add_coauthors;
2186 cx.notify();
2187 }
2188
2189 fn fill_co_authors(&mut self, message: &mut String, cx: &mut Context<Self>) {
2190 const CO_AUTHOR_PREFIX: &str = "Co-authored-by: ";
2191
2192 let existing_text = message.to_ascii_lowercase();
2193 let lowercase_co_author_prefix = CO_AUTHOR_PREFIX.to_lowercase();
2194 let mut ends_with_co_authors = false;
2195 let existing_co_authors = existing_text
2196 .lines()
2197 .filter_map(|line| {
2198 let line = line.trim();
2199 if line.starts_with(&lowercase_co_author_prefix) {
2200 ends_with_co_authors = true;
2201 Some(line)
2202 } else {
2203 ends_with_co_authors = false;
2204 None
2205 }
2206 })
2207 .collect::<HashSet<_>>();
2208
2209 let new_co_authors = self
2210 .potential_co_authors(cx)
2211 .into_iter()
2212 .filter(|(_, email)| {
2213 !existing_co_authors
2214 .iter()
2215 .any(|existing| existing.contains(email.as_str()))
2216 })
2217 .collect::<Vec<_>>();
2218
2219 if new_co_authors.is_empty() {
2220 return;
2221 }
2222
2223 if !ends_with_co_authors {
2224 message.push('\n');
2225 }
2226 for (name, email) in new_co_authors {
2227 message.push('\n');
2228 message.push_str(CO_AUTHOR_PREFIX);
2229 message.push_str(&name);
2230 message.push_str(" <");
2231 message.push_str(&email);
2232 message.push('>');
2233 }
2234 message.push('\n');
2235 }
2236
2237 fn schedule_update(
2238 &mut self,
2239 clear_pending: bool,
2240 window: &mut Window,
2241 cx: &mut Context<Self>,
2242 ) {
2243 let handle = cx.entity().downgrade();
2244 self.reopen_commit_buffer(window, cx);
2245 self.update_visible_entries_task = cx.spawn_in(window, async move |_, cx| {
2246 cx.background_executor().timer(UPDATE_DEBOUNCE).await;
2247 if let Some(git_panel) = handle.upgrade() {
2248 git_panel
2249 .update_in(cx, |git_panel, window, cx| {
2250 if clear_pending {
2251 git_panel.clear_pending();
2252 }
2253 git_panel.update_visible_entries(cx);
2254 git_panel.update_scrollbar_properties(window, cx);
2255 })
2256 .ok();
2257 }
2258 });
2259 }
2260
2261 fn reopen_commit_buffer(&mut self, window: &mut Window, cx: &mut Context<Self>) {
2262 let Some(active_repo) = self.active_repository.as_ref() else {
2263 return;
2264 };
2265 let load_buffer = active_repo.update(cx, |active_repo, cx| {
2266 let project = self.project.read(cx);
2267 active_repo.open_commit_buffer(
2268 Some(project.languages().clone()),
2269 project.buffer_store().clone(),
2270 cx,
2271 )
2272 });
2273
2274 cx.spawn_in(window, async move |git_panel, cx| {
2275 let buffer = load_buffer.await?;
2276 git_panel.update_in(cx, |git_panel, window, cx| {
2277 if git_panel
2278 .commit_editor
2279 .read(cx)
2280 .buffer()
2281 .read(cx)
2282 .as_singleton()
2283 .as_ref()
2284 != Some(&buffer)
2285 {
2286 git_panel.commit_editor = cx.new(|cx| {
2287 commit_message_editor(
2288 buffer,
2289 git_panel.suggest_commit_message(cx).map(SharedString::from),
2290 git_panel.project.clone(),
2291 true,
2292 window,
2293 cx,
2294 )
2295 });
2296 }
2297 })
2298 })
2299 .detach_and_log_err(cx);
2300 }
2301
2302 fn clear_pending(&mut self) {
2303 self.pending.retain(|v| !v.finished)
2304 }
2305
2306 fn update_visible_entries(&mut self, cx: &mut Context<Self>) {
2307 self.entries.clear();
2308 self.single_staged_entry.take();
2309 self.single_tracked_entry.take();
2310 self.conflicted_count = 0;
2311 self.conflicted_staged_count = 0;
2312 self.new_count = 0;
2313 self.tracked_count = 0;
2314 self.new_staged_count = 0;
2315 self.tracked_staged_count = 0;
2316 self.entry_count = 0;
2317
2318 let sort_by_path = GitPanelSettings::get_global(cx).sort_by_path;
2319
2320 let mut changed_entries = Vec::new();
2321 let mut new_entries = Vec::new();
2322 let mut conflict_entries = Vec::new();
2323 let mut last_staged = None;
2324 let mut staged_count = 0;
2325 let mut max_width_item: Option<(RepoPath, usize)> = None;
2326
2327 let Some(repo) = self.active_repository.as_ref() else {
2328 // Just clear entries if no repository is active.
2329 cx.notify();
2330 return;
2331 };
2332
2333 let repo = repo.read(cx);
2334
2335 for entry in repo.cached_status() {
2336 let is_conflict = repo.has_conflict(&entry.repo_path);
2337 let is_new = entry.status.is_created();
2338 let staging = entry.status.staging();
2339
2340 if self.pending.iter().any(|pending| {
2341 pending.target_status == TargetStatus::Reverted
2342 && !pending.finished
2343 && pending
2344 .entries
2345 .iter()
2346 .any(|pending| pending.repo_path == entry.repo_path)
2347 }) {
2348 continue;
2349 }
2350
2351 let abs_path = repo.work_directory_abs_path.join(&entry.repo_path.0);
2352 let entry = GitStatusEntry {
2353 repo_path: entry.repo_path.clone(),
2354 abs_path,
2355 status: entry.status,
2356 staging,
2357 };
2358
2359 if staging.has_staged() {
2360 staged_count += 1;
2361 last_staged = Some(entry.clone());
2362 }
2363
2364 let width_estimate = Self::item_width_estimate(
2365 entry.parent_dir().map(|s| s.len()).unwrap_or(0),
2366 entry.display_name().len(),
2367 );
2368
2369 match max_width_item.as_mut() {
2370 Some((repo_path, estimate)) => {
2371 if width_estimate > *estimate {
2372 *repo_path = entry.repo_path.clone();
2373 *estimate = width_estimate;
2374 }
2375 }
2376 None => max_width_item = Some((entry.repo_path.clone(), width_estimate)),
2377 }
2378
2379 if sort_by_path {
2380 changed_entries.push(entry);
2381 } else if is_conflict {
2382 conflict_entries.push(entry);
2383 } else if is_new {
2384 new_entries.push(entry);
2385 } else {
2386 changed_entries.push(entry);
2387 }
2388 }
2389
2390 let mut pending_staged_count = 0;
2391 let mut last_pending_staged = None;
2392 let mut pending_status_for_last_staged = None;
2393 for pending in self.pending.iter() {
2394 if pending.target_status == TargetStatus::Staged {
2395 pending_staged_count += pending.entries.len();
2396 last_pending_staged = pending.entries.iter().next().cloned();
2397 }
2398 if let Some(last_staged) = &last_staged {
2399 if pending
2400 .entries
2401 .iter()
2402 .any(|entry| entry.repo_path == last_staged.repo_path)
2403 {
2404 pending_status_for_last_staged = Some(pending.target_status);
2405 }
2406 }
2407 }
2408
2409 if conflict_entries.len() == 0 && staged_count == 1 && pending_staged_count == 0 {
2410 match pending_status_for_last_staged {
2411 Some(TargetStatus::Staged) | None => {
2412 self.single_staged_entry = last_staged;
2413 }
2414 _ => {}
2415 }
2416 } else if conflict_entries.len() == 0 && pending_staged_count == 1 {
2417 self.single_staged_entry = last_pending_staged;
2418 }
2419
2420 if conflict_entries.len() == 0 && changed_entries.len() == 1 {
2421 self.single_tracked_entry = changed_entries.first().cloned();
2422 }
2423
2424 if conflict_entries.len() > 0 {
2425 self.entries.push(GitListEntry::Header(GitHeaderEntry {
2426 header: Section::Conflict,
2427 }));
2428 self.entries.extend(
2429 conflict_entries
2430 .into_iter()
2431 .map(GitListEntry::GitStatusEntry),
2432 );
2433 }
2434
2435 if changed_entries.len() > 0 {
2436 if !sort_by_path {
2437 self.entries.push(GitListEntry::Header(GitHeaderEntry {
2438 header: Section::Tracked,
2439 }));
2440 }
2441 self.entries.extend(
2442 changed_entries
2443 .into_iter()
2444 .map(GitListEntry::GitStatusEntry),
2445 );
2446 }
2447 if new_entries.len() > 0 {
2448 self.entries.push(GitListEntry::Header(GitHeaderEntry {
2449 header: Section::New,
2450 }));
2451 self.entries
2452 .extend(new_entries.into_iter().map(GitListEntry::GitStatusEntry));
2453 }
2454
2455 if let Some((repo_path, _)) = max_width_item {
2456 self.max_width_item_index = self.entries.iter().position(|entry| match entry {
2457 GitListEntry::GitStatusEntry(git_status_entry) => {
2458 git_status_entry.repo_path == repo_path
2459 }
2460 GitListEntry::Header(_) => false,
2461 });
2462 }
2463
2464 self.update_counts(repo);
2465
2466 self.select_first_entry_if_none(cx);
2467
2468 let suggested_commit_message = self.suggest_commit_message(cx);
2469 let placeholder_text = suggested_commit_message.unwrap_or("Enter commit message".into());
2470
2471 self.commit_editor.update(cx, |editor, cx| {
2472 editor.set_placeholder_text(Arc::from(placeholder_text), cx)
2473 });
2474
2475 cx.notify();
2476 }
2477
2478 fn header_state(&self, header_type: Section) -> ToggleState {
2479 let (staged_count, count) = match header_type {
2480 Section::New => (self.new_staged_count, self.new_count),
2481 Section::Tracked => (self.tracked_staged_count, self.tracked_count),
2482 Section::Conflict => (self.conflicted_staged_count, self.conflicted_count),
2483 };
2484 if staged_count == 0 {
2485 ToggleState::Unselected
2486 } else if count == staged_count {
2487 ToggleState::Selected
2488 } else {
2489 ToggleState::Indeterminate
2490 }
2491 }
2492
2493 fn update_counts(&mut self, repo: &Repository) {
2494 self.show_placeholders = false;
2495 self.conflicted_count = 0;
2496 self.conflicted_staged_count = 0;
2497 self.new_count = 0;
2498 self.tracked_count = 0;
2499 self.new_staged_count = 0;
2500 self.tracked_staged_count = 0;
2501 self.entry_count = 0;
2502 for entry in &self.entries {
2503 let Some(status_entry) = entry.status_entry() else {
2504 continue;
2505 };
2506 self.entry_count += 1;
2507 if repo.has_conflict(&status_entry.repo_path) {
2508 self.conflicted_count += 1;
2509 if self.entry_staging(status_entry).has_staged() {
2510 self.conflicted_staged_count += 1;
2511 }
2512 } else if status_entry.status.is_created() {
2513 self.new_count += 1;
2514 if self.entry_staging(status_entry).has_staged() {
2515 self.new_staged_count += 1;
2516 }
2517 } else {
2518 self.tracked_count += 1;
2519 if self.entry_staging(status_entry).has_staged() {
2520 self.tracked_staged_count += 1;
2521 }
2522 }
2523 }
2524 }
2525
2526 fn entry_staging(&self, entry: &GitStatusEntry) -> StageStatus {
2527 for pending in self.pending.iter().rev() {
2528 if pending
2529 .entries
2530 .iter()
2531 .any(|pending_entry| pending_entry.repo_path == entry.repo_path)
2532 {
2533 match pending.target_status {
2534 TargetStatus::Staged => return StageStatus::Staged,
2535 TargetStatus::Unstaged => return StageStatus::Unstaged,
2536 TargetStatus::Reverted => continue,
2537 TargetStatus::Unchanged => continue,
2538 }
2539 }
2540 }
2541 entry.staging
2542 }
2543
2544 pub(crate) fn has_staged_changes(&self) -> bool {
2545 self.tracked_staged_count > 0
2546 || self.new_staged_count > 0
2547 || self.conflicted_staged_count > 0
2548 }
2549
2550 pub(crate) fn has_unstaged_changes(&self) -> bool {
2551 self.tracked_count > self.tracked_staged_count
2552 || self.new_count > self.new_staged_count
2553 || self.conflicted_count > self.conflicted_staged_count
2554 }
2555
2556 fn has_tracked_changes(&self) -> bool {
2557 self.tracked_count > 0
2558 }
2559
2560 pub fn has_unstaged_conflicts(&self) -> bool {
2561 self.conflicted_count > 0 && self.conflicted_count != self.conflicted_staged_count
2562 }
2563
2564 fn show_error_toast(&self, action: impl Into<SharedString>, e: anyhow::Error, cx: &mut App) {
2565 let action = action.into();
2566 let Some(workspace) = self.workspace.upgrade() else {
2567 return;
2568 };
2569
2570 let message = e.to_string().trim().to_string();
2571 if message
2572 .matches(git::repository::REMOTE_CANCELLED_BY_USER)
2573 .next()
2574 .is_some()
2575 {
2576 return; // Hide the cancelled by user message
2577 } else {
2578 workspace.update(cx, |workspace, cx| {
2579 let workspace_weak = cx.weak_entity();
2580 let toast =
2581 StatusToast::new(format!("git {} failed", action.clone()), cx, |this, _cx| {
2582 this.icon(ToastIcon::new(IconName::XCircle).color(Color::Error))
2583 .action("View Log", move |window, cx| {
2584 let message = message.clone();
2585 let action = action.clone();
2586 workspace_weak
2587 .update(cx, move |workspace, cx| {
2588 Self::open_output(action, workspace, &message, window, cx)
2589 })
2590 .ok();
2591 })
2592 });
2593 workspace.toggle_status_toast(toast, cx)
2594 });
2595 }
2596 }
2597
2598 fn show_remote_output(&self, action: RemoteAction, info: RemoteCommandOutput, cx: &mut App) {
2599 let Some(workspace) = self.workspace.upgrade() else {
2600 return;
2601 };
2602
2603 workspace.update(cx, |workspace, cx| {
2604 let SuccessMessage { message, style } = remote_output::format_output(&action, info);
2605 let workspace_weak = cx.weak_entity();
2606 let operation = action.name();
2607
2608 let status_toast = StatusToast::new(message, cx, move |this, _cx| {
2609 use remote_output::SuccessStyle::*;
2610 match style {
2611 Toast { .. } => this,
2612 ToastWithLog { output } => this
2613 .icon(ToastIcon::new(IconName::GitBranchSmall).color(Color::Muted))
2614 .action("View Log", move |window, cx| {
2615 let output = output.clone();
2616 let output =
2617 format!("stdout:\n{}\nstderr:\n{}", output.stdout, output.stderr);
2618 workspace_weak
2619 .update(cx, move |workspace, cx| {
2620 Self::open_output(operation, workspace, &output, window, cx)
2621 })
2622 .ok();
2623 }),
2624 PushPrLink { link } => this
2625 .icon(ToastIcon::new(IconName::GitBranchSmall).color(Color::Muted))
2626 .action("Open Pull Request", move |_, cx| cx.open_url(&link)),
2627 }
2628 });
2629 workspace.toggle_status_toast(status_toast, cx)
2630 });
2631 }
2632
2633 fn open_output(
2634 operation: impl Into<SharedString>,
2635 workspace: &mut Workspace,
2636 output: &str,
2637 window: &mut Window,
2638 cx: &mut Context<Workspace>,
2639 ) {
2640 let operation = operation.into();
2641 let buffer = cx.new(|cx| Buffer::local(output, cx));
2642 buffer.update(cx, |buffer, cx| {
2643 buffer.set_capability(language::Capability::ReadOnly, cx);
2644 });
2645 let editor = cx.new(|cx| {
2646 let mut editor = Editor::for_buffer(buffer, None, window, cx);
2647 editor.buffer().update(cx, |buffer, cx| {
2648 buffer.set_title(format!("Output from git {operation}"), cx);
2649 });
2650 editor.set_read_only(true);
2651 editor
2652 });
2653
2654 workspace.add_item_to_center(Box::new(editor), window, cx);
2655 }
2656
2657 pub fn can_commit(&self) -> bool {
2658 (self.has_staged_changes() || self.has_tracked_changes()) && !self.has_unstaged_conflicts()
2659 }
2660
2661 pub fn can_stage_all(&self) -> bool {
2662 self.has_unstaged_changes()
2663 }
2664
2665 pub fn can_unstage_all(&self) -> bool {
2666 self.has_staged_changes()
2667 }
2668
2669 // eventually we'll need to take depth into account here
2670 // if we add a tree view
2671 fn item_width_estimate(path: usize, file_name: usize) -> usize {
2672 path + file_name
2673 }
2674
2675 fn render_overflow_menu(&self, id: impl Into<ElementId>) -> impl IntoElement {
2676 let focus_handle = self.focus_handle.clone();
2677 let has_tracked_changes = self.has_tracked_changes();
2678 let has_staged_changes = self.has_staged_changes();
2679 let has_unstaged_changes = self.has_unstaged_changes();
2680 let has_new_changes = self.new_count > 0;
2681
2682 PopoverMenu::new(id.into())
2683 .trigger(
2684 IconButton::new("overflow-menu-trigger", IconName::EllipsisVertical)
2685 .icon_size(IconSize::Small)
2686 .icon_color(Color::Muted),
2687 )
2688 .menu(move |window, cx| {
2689 Some(git_panel_context_menu(
2690 focus_handle.clone(),
2691 GitMenuState {
2692 has_tracked_changes,
2693 has_staged_changes,
2694 has_unstaged_changes,
2695 has_new_changes,
2696 },
2697 window,
2698 cx,
2699 ))
2700 })
2701 .anchor(Corner::TopRight)
2702 }
2703
2704 pub(crate) fn render_generate_commit_message_button(
2705 &self,
2706 cx: &Context<Self>,
2707 ) -> Option<AnyElement> {
2708 current_language_model(cx).is_some().then(|| {
2709 if self.generate_commit_message_task.is_some() {
2710 return h_flex()
2711 .gap_1()
2712 .child(
2713 Icon::new(IconName::ArrowCircle)
2714 .size(IconSize::XSmall)
2715 .color(Color::Info)
2716 .with_animation(
2717 "arrow-circle",
2718 Animation::new(Duration::from_secs(2)).repeat(),
2719 |icon, delta| {
2720 icon.transform(Transformation::rotate(percentage(delta)))
2721 },
2722 ),
2723 )
2724 .child(
2725 Label::new("Generating Commit...")
2726 .size(LabelSize::Small)
2727 .color(Color::Muted),
2728 )
2729 .into_any_element();
2730 }
2731
2732 let can_commit = self.can_commit();
2733 let editor_focus_handle = self.commit_editor.focus_handle(cx);
2734 IconButton::new("generate-commit-message", IconName::AiEdit)
2735 .shape(ui::IconButtonShape::Square)
2736 .icon_color(Color::Muted)
2737 .tooltip(move |window, cx| {
2738 if can_commit {
2739 Tooltip::for_action_in(
2740 "Generate Commit Message",
2741 &git::GenerateCommitMessage,
2742 &editor_focus_handle,
2743 window,
2744 cx,
2745 )
2746 } else {
2747 Tooltip::simple("No changes to commit", cx)
2748 }
2749 })
2750 .disabled(!can_commit)
2751 .on_click(cx.listener(move |this, _event, _window, cx| {
2752 this.generate_commit_message(cx);
2753 }))
2754 .into_any_element()
2755 })
2756 }
2757
2758 pub(crate) fn render_co_authors(&self, cx: &Context<Self>) -> Option<AnyElement> {
2759 let potential_co_authors = self.potential_co_authors(cx);
2760 if potential_co_authors.is_empty() {
2761 None
2762 } else {
2763 Some(
2764 IconButton::new("co-authors", IconName::Person)
2765 .shape(ui::IconButtonShape::Square)
2766 .icon_color(Color::Disabled)
2767 .selected_icon_color(Color::Selected)
2768 .toggle_state(self.add_coauthors)
2769 .tooltip(move |_, cx| {
2770 let title = format!(
2771 "Add co-authored-by:{}{}",
2772 if potential_co_authors.len() == 1 {
2773 ""
2774 } else {
2775 "\n"
2776 },
2777 potential_co_authors
2778 .iter()
2779 .map(|(name, email)| format!(" {} <{}>", name, email))
2780 .join("\n")
2781 );
2782 Tooltip::simple(title, cx)
2783 })
2784 .on_click(cx.listener(|this, _, _, cx| {
2785 this.add_coauthors = !this.add_coauthors;
2786 cx.notify();
2787 }))
2788 .into_any_element(),
2789 )
2790 }
2791 }
2792
2793 fn render_git_commit_menu(
2794 &self,
2795 id: impl Into<ElementId>,
2796 keybinding_target: Option<FocusHandle>,
2797 ) -> impl IntoElement {
2798 PopoverMenu::new(id.into())
2799 .trigger(
2800 ui::ButtonLike::new_rounded_right("commit-split-button-right")
2801 .layer(ui::ElevationIndex::ModalSurface)
2802 .size(ui::ButtonSize::None)
2803 .child(
2804 div()
2805 .px_1()
2806 .child(Icon::new(IconName::ChevronDownSmall).size(IconSize::XSmall)),
2807 ),
2808 )
2809 .menu(move |window, cx| {
2810 Some(ContextMenu::build(window, cx, |context_menu, _, _| {
2811 context_menu
2812 .when_some(keybinding_target.clone(), |el, keybinding_target| {
2813 el.context(keybinding_target.clone())
2814 })
2815 .action("Amend", Amend.boxed_clone())
2816 }))
2817 })
2818 .anchor(Corner::TopRight)
2819 }
2820
2821 pub fn configure_commit_button(&self, cx: &mut Context<Self>) -> (bool, &'static str) {
2822 if self.has_unstaged_conflicts() {
2823 (false, "You must resolve conflicts before committing")
2824 } else if !self.has_staged_changes() && !self.has_tracked_changes() {
2825 (false, "No changes to commit")
2826 } else if self.pending_commit.is_some() {
2827 (false, "Commit in progress")
2828 } else if self.custom_or_suggested_commit_message(cx).is_none() {
2829 (false, "No commit message")
2830 } else if !self.has_write_access(cx) {
2831 (false, "You do not have write access to this project")
2832 } else {
2833 (true, self.commit_button_title())
2834 }
2835 }
2836
2837 pub fn commit_button_title(&self) -> &'static str {
2838 if self.amend_pending {
2839 if self.has_staged_changes() {
2840 "Amend"
2841 } else {
2842 "Amend Tracked"
2843 }
2844 } else {
2845 if self.has_staged_changes() {
2846 "Commit"
2847 } else {
2848 "Commit Tracked"
2849 }
2850 }
2851 }
2852
2853 fn expand_commit_editor(
2854 &mut self,
2855 _: &git::ExpandCommitEditor,
2856 window: &mut Window,
2857 cx: &mut Context<Self>,
2858 ) {
2859 let workspace = self.workspace.clone();
2860 window.defer(cx, move |window, cx| {
2861 workspace
2862 .update(cx, |workspace, cx| {
2863 CommitModal::toggle(workspace, None, window, cx)
2864 })
2865 .ok();
2866 })
2867 }
2868
2869 fn render_panel_header(
2870 &self,
2871 window: &mut Window,
2872 cx: &mut Context<Self>,
2873 ) -> Option<impl IntoElement> {
2874 self.active_repository.as_ref()?;
2875
2876 let text;
2877 let action;
2878 let tooltip;
2879 if self.total_staged_count() == self.entry_count && self.entry_count > 0 {
2880 text = "Unstage All";
2881 action = git::UnstageAll.boxed_clone();
2882 tooltip = "git reset";
2883 } else {
2884 text = "Stage All";
2885 action = git::StageAll.boxed_clone();
2886 tooltip = "git add --all ."
2887 }
2888
2889 let change_string = match self.entry_count {
2890 0 => "No Changes".to_string(),
2891 1 => "1 Change".to_string(),
2892 _ => format!("{} Changes", self.entry_count),
2893 };
2894
2895 Some(
2896 self.panel_header_container(window, cx)
2897 .px_2()
2898 .child(
2899 panel_button(change_string)
2900 .color(Color::Muted)
2901 .tooltip(Tooltip::for_action_title_in(
2902 "Open Diff",
2903 &Diff,
2904 &self.focus_handle,
2905 ))
2906 .on_click(|_, _, cx| {
2907 cx.defer(|cx| {
2908 cx.dispatch_action(&Diff);
2909 })
2910 }),
2911 )
2912 .child(div().flex_grow()) // spacer
2913 .child(self.render_overflow_menu("overflow_menu"))
2914 .child(div().w_2()) // another spacer
2915 .child(
2916 panel_filled_button(text)
2917 .tooltip(Tooltip::for_action_title_in(
2918 tooltip,
2919 action.as_ref(),
2920 &self.focus_handle,
2921 ))
2922 .disabled(self.entry_count == 0)
2923 .on_click(move |_, _, cx| {
2924 let action = action.boxed_clone();
2925 cx.defer(move |cx| {
2926 cx.dispatch_action(action.as_ref());
2927 })
2928 }),
2929 ),
2930 )
2931 }
2932
2933 pub(crate) fn render_remote_button(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
2934 let branch = self.active_repository.as_ref()?.read(cx).branch.clone();
2935 if !self.can_push_and_pull(cx) {
2936 return None;
2937 }
2938 Some(
2939 h_flex()
2940 .gap_1()
2941 .flex_shrink_0()
2942 .when_some(branch, |this, branch| {
2943 let focus_handle = Some(self.focus_handle(cx));
2944
2945 this.children(render_remote_button(
2946 "remote-button",
2947 &branch,
2948 focus_handle,
2949 true,
2950 ))
2951 })
2952 .into_any_element(),
2953 )
2954 }
2955
2956 pub fn render_footer(
2957 &self,
2958 window: &mut Window,
2959 cx: &mut Context<Self>,
2960 ) -> Option<impl IntoElement> {
2961 let active_repository = self.active_repository.clone()?;
2962 let panel_editor_style = panel_editor_style(true, window, cx);
2963
2964 let enable_coauthors = self.render_co_authors(cx);
2965
2966 let editor_focus_handle = self.commit_editor.focus_handle(cx);
2967 let expand_tooltip_focus_handle = editor_focus_handle.clone();
2968
2969 let branch = active_repository.read(cx).branch.clone();
2970 let head_commit = active_repository.read(cx).head_commit.clone();
2971
2972 let footer_size = px(32.);
2973 let gap = px(9.0);
2974 let max_height = panel_editor_style
2975 .text
2976 .line_height_in_pixels(window.rem_size())
2977 * MAX_PANEL_EDITOR_LINES
2978 + gap;
2979
2980 let git_panel = cx.entity().clone();
2981 let display_name = SharedString::from(Arc::from(
2982 active_repository
2983 .read(cx)
2984 .display_name()
2985 .trim_end_matches("/"),
2986 ));
2987 let editor_is_long = self.commit_editor.update(cx, |editor, cx| {
2988 editor.max_point(cx).row().0 >= MAX_PANEL_EDITOR_LINES as u32
2989 });
2990 let has_previous_commit = head_commit.is_some();
2991
2992 let footer = v_flex()
2993 .child(PanelRepoFooter::new(
2994 display_name,
2995 branch,
2996 head_commit,
2997 Some(git_panel.clone()),
2998 ))
2999 .child(
3000 panel_editor_container(window, cx)
3001 .id("commit-editor-container")
3002 .relative()
3003 .w_full()
3004 .h(max_height + footer_size)
3005 .border_t_1()
3006 .border_color(cx.theme().colors().border_variant)
3007 .cursor_text()
3008 .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
3009 window.focus(&this.commit_editor.focus_handle(cx));
3010 }))
3011 .child(
3012 h_flex()
3013 .id("commit-footer")
3014 .border_t_1()
3015 .when(editor_is_long, |el| {
3016 el.border_color(cx.theme().colors().border_variant)
3017 })
3018 .absolute()
3019 .bottom_0()
3020 .left_0()
3021 .w_full()
3022 .px_2()
3023 .h(footer_size)
3024 .flex_none()
3025 .justify_between()
3026 .child(
3027 self.render_generate_commit_message_button(cx)
3028 .unwrap_or_else(|| div().into_any_element()),
3029 )
3030 .child(
3031 h_flex()
3032 .gap_0p5()
3033 .children(enable_coauthors)
3034 .child(self.render_commit_button(has_previous_commit, cx)),
3035 ),
3036 )
3037 .child(
3038 div()
3039 .pr_2p5()
3040 .on_action(|&editor::actions::MoveUp, _, cx| {
3041 cx.stop_propagation();
3042 })
3043 .on_action(|&editor::actions::MoveDown, _, cx| {
3044 cx.stop_propagation();
3045 })
3046 .child(EditorElement::new(&self.commit_editor, panel_editor_style)),
3047 )
3048 .child(
3049 h_flex()
3050 .absolute()
3051 .top_2()
3052 .right_2()
3053 .opacity(0.5)
3054 .hover(|this| this.opacity(1.0))
3055 .child(
3056 panel_icon_button("expand-commit-editor", IconName::Maximize)
3057 .icon_size(IconSize::Small)
3058 .size(ui::ButtonSize::Default)
3059 .tooltip(move |window, cx| {
3060 Tooltip::for_action_in(
3061 "Open Commit Modal",
3062 &git::ExpandCommitEditor,
3063 &expand_tooltip_focus_handle,
3064 window,
3065 cx,
3066 )
3067 })
3068 .on_click(cx.listener({
3069 move |_, _, window, cx| {
3070 window.dispatch_action(
3071 git::ExpandCommitEditor.boxed_clone(),
3072 cx,
3073 )
3074 }
3075 })),
3076 ),
3077 ),
3078 );
3079
3080 Some(footer)
3081 }
3082
3083 fn render_commit_button(
3084 &self,
3085 has_previous_commit: bool,
3086 cx: &mut Context<Self>,
3087 ) -> impl IntoElement {
3088 let (can_commit, tooltip) = self.configure_commit_button(cx);
3089 let title = self.commit_button_title();
3090 let commit_tooltip_focus_handle = self.commit_editor.focus_handle(cx);
3091 div()
3092 .id("commit-wrapper")
3093 .on_hover(cx.listener(move |this, hovered, _, cx| {
3094 this.show_placeholders =
3095 *hovered && !this.has_staged_changes() && !this.has_unstaged_conflicts();
3096 cx.notify()
3097 }))
3098 .when(self.amend_pending, {
3099 |this| {
3100 this.h_flex()
3101 .gap_1()
3102 .child(
3103 panel_filled_button("Cancel")
3104 .tooltip({
3105 let handle = commit_tooltip_focus_handle.clone();
3106 move |window, cx| {
3107 Tooltip::for_action_in(
3108 "Cancel amend",
3109 &git::Cancel,
3110 &handle,
3111 window,
3112 cx,
3113 )
3114 }
3115 })
3116 .on_click(move |_, window, cx| {
3117 window.dispatch_action(Box::new(git::Cancel), cx);
3118 }),
3119 )
3120 .child(
3121 panel_filled_button(title)
3122 .tooltip({
3123 let handle = commit_tooltip_focus_handle.clone();
3124 move |window, cx| {
3125 if can_commit {
3126 Tooltip::for_action_in(
3127 tooltip, &Amend, &handle, window, cx,
3128 )
3129 } else {
3130 Tooltip::simple(tooltip, cx)
3131 }
3132 }
3133 })
3134 .disabled(!can_commit || self.modal_open)
3135 .on_click({
3136 let git_panel = cx.weak_entity();
3137 move |_, window, cx| {
3138 telemetry::event!("Git Amended", source = "Git Panel");
3139 git_panel
3140 .update(cx, |git_panel, cx| {
3141 git_panel.set_amend_pending(false, cx);
3142 git_panel.commit_changes(
3143 CommitOptions { amend: true },
3144 window,
3145 cx,
3146 );
3147 })
3148 .ok();
3149 }
3150 }),
3151 )
3152 }
3153 })
3154 .when(!self.amend_pending, |this| {
3155 this.when(has_previous_commit, |this| {
3156 this.child(SplitButton::new(
3157 ui::ButtonLike::new_rounded_left(ElementId::Name(
3158 format!("split-button-left-{}", title).into(),
3159 ))
3160 .layer(ui::ElevationIndex::ModalSurface)
3161 .size(ui::ButtonSize::Compact)
3162 .child(
3163 div()
3164 .child(Label::new(title).size(LabelSize::Small))
3165 .mr_0p5(),
3166 )
3167 .on_click({
3168 let git_panel = cx.weak_entity();
3169 move |_, window, cx| {
3170 telemetry::event!("Git Committed", source = "Git Panel");
3171 git_panel
3172 .update(cx, |git_panel, cx| {
3173 git_panel.commit_changes(
3174 CommitOptions { amend: false },
3175 window,
3176 cx,
3177 );
3178 })
3179 .ok();
3180 }
3181 })
3182 .disabled(!can_commit || self.modal_open)
3183 .tooltip({
3184 let handle = commit_tooltip_focus_handle.clone();
3185 move |window, cx| {
3186 if can_commit {
3187 Tooltip::with_meta_in(
3188 tooltip,
3189 Some(&git::Commit),
3190 "git commit",
3191 &handle.clone(),
3192 window,
3193 cx,
3194 )
3195 } else {
3196 Tooltip::simple(tooltip, cx)
3197 }
3198 }
3199 }),
3200 self.render_git_commit_menu(
3201 ElementId::Name(format!("split-button-right-{}", title).into()),
3202 Some(commit_tooltip_focus_handle.clone()),
3203 )
3204 .into_any_element(),
3205 ))
3206 })
3207 .when(!has_previous_commit, |this| {
3208 this.child(
3209 panel_filled_button(title)
3210 .tooltip(move |window, cx| {
3211 if can_commit {
3212 Tooltip::with_meta_in(
3213 tooltip,
3214 Some(&git::Commit),
3215 "git commit",
3216 &commit_tooltip_focus_handle,
3217 window,
3218 cx,
3219 )
3220 } else {
3221 Tooltip::simple(tooltip, cx)
3222 }
3223 })
3224 .disabled(!can_commit || self.modal_open)
3225 .on_click({
3226 let git_panel = cx.weak_entity();
3227 move |_, window, cx| {
3228 telemetry::event!("Git Committed", source = "Git Panel");
3229 git_panel
3230 .update(cx, |git_panel, cx| {
3231 git_panel.commit_changes(
3232 CommitOptions { amend: false },
3233 window,
3234 cx,
3235 );
3236 })
3237 .ok();
3238 }
3239 }),
3240 )
3241 })
3242 })
3243 }
3244
3245 fn render_pending_amend(&self, cx: &mut Context<Self>) -> impl IntoElement {
3246 div()
3247 .py_2()
3248 .px(px(8.))
3249 .border_color(cx.theme().colors().border)
3250 .child(
3251 Label::new(
3252 "This will update your most recent commit. Cancel to make a new one instead.",
3253 )
3254 .size(LabelSize::Small),
3255 )
3256 }
3257
3258 fn render_previous_commit(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> {
3259 let active_repository = self.active_repository.as_ref()?;
3260 let branch = active_repository.read(cx).branch.as_ref()?;
3261 let commit = branch.most_recent_commit.as_ref()?.clone();
3262 let workspace = self.workspace.clone();
3263
3264 let this = cx.entity();
3265 Some(
3266 h_flex()
3267 .items_center()
3268 .py_2()
3269 .px(px(8.))
3270 .border_color(cx.theme().colors().border)
3271 .gap_1p5()
3272 .child(
3273 div()
3274 .flex_grow()
3275 .overflow_hidden()
3276 .items_center()
3277 .max_w(relative(0.85))
3278 .h_full()
3279 .child(
3280 Label::new(commit.subject.clone())
3281 .size(LabelSize::Small)
3282 .truncate(),
3283 )
3284 .id("commit-msg-hover")
3285 .on_click({
3286 let commit = commit.clone();
3287 let repo = active_repository.downgrade();
3288 move |_, window, cx| {
3289 CommitView::open(
3290 commit.clone(),
3291 repo.clone(),
3292 workspace.clone().clone(),
3293 window,
3294 cx,
3295 );
3296 }
3297 })
3298 .hoverable_tooltip({
3299 let repo = active_repository.clone();
3300 move |window, cx| {
3301 GitPanelMessageTooltip::new(
3302 this.clone(),
3303 commit.sha.clone(),
3304 repo.clone(),
3305 window,
3306 cx,
3307 )
3308 .into()
3309 }
3310 }),
3311 )
3312 .child(div().flex_1())
3313 .when(commit.has_parent, |this| {
3314 let has_unstaged = self.has_unstaged_changes();
3315 this.child(
3316 panel_icon_button("undo", IconName::Undo)
3317 .icon_size(IconSize::Small)
3318 .icon_color(Color::Muted)
3319 .tooltip(move |window, cx| {
3320 Tooltip::with_meta(
3321 "Uncommit",
3322 Some(&git::Uncommit),
3323 if has_unstaged {
3324 "git reset HEAD^ --soft"
3325 } else {
3326 "git reset HEAD^"
3327 },
3328 window,
3329 cx,
3330 )
3331 })
3332 .on_click(cx.listener(|this, _, window, cx| this.uncommit(window, cx))),
3333 )
3334 }),
3335 )
3336 }
3337
3338 fn render_empty_state(&self, cx: &mut Context<Self>) -> impl IntoElement {
3339 h_flex()
3340 .h_full()
3341 .flex_grow()
3342 .justify_center()
3343 .items_center()
3344 .child(
3345 v_flex()
3346 .gap_2()
3347 .child(h_flex().w_full().justify_around().child(
3348 if self.active_repository.is_some() {
3349 "No changes to commit"
3350 } else {
3351 "No Git repositories"
3352 },
3353 ))
3354 .children({
3355 let worktree_count = self.project.read(cx).visible_worktrees(cx).count();
3356 (worktree_count > 0 && self.active_repository.is_none()).then(|| {
3357 h_flex().w_full().justify_around().child(
3358 panel_filled_button("Initialize Repository")
3359 .tooltip(Tooltip::for_action_title_in(
3360 "git init",
3361 &git::Init,
3362 &self.focus_handle,
3363 ))
3364 .on_click(move |_, _, cx| {
3365 cx.defer(move |cx| {
3366 cx.dispatch_action(&git::Init);
3367 })
3368 }),
3369 )
3370 })
3371 })
3372 .text_ui_sm(cx)
3373 .mx_auto()
3374 .text_color(Color::Placeholder.color(cx)),
3375 )
3376 }
3377
3378 fn render_vertical_scrollbar(
3379 &self,
3380 show_horizontal_scrollbar_container: bool,
3381 cx: &mut Context<Self>,
3382 ) -> impl IntoElement {
3383 div()
3384 .id("git-panel-vertical-scroll")
3385 .occlude()
3386 .flex_none()
3387 .h_full()
3388 .cursor_default()
3389 .absolute()
3390 .right_0()
3391 .top_0()
3392 .bottom_0()
3393 .w(px(12.))
3394 .when(show_horizontal_scrollbar_container, |this| {
3395 this.pb_neg_3p5()
3396 })
3397 .on_mouse_move(cx.listener(|_, _, _, cx| {
3398 cx.notify();
3399 cx.stop_propagation()
3400 }))
3401 .on_hover(|_, _, cx| {
3402 cx.stop_propagation();
3403 })
3404 .on_any_mouse_down(|_, _, cx| {
3405 cx.stop_propagation();
3406 })
3407 .on_mouse_up(
3408 MouseButton::Left,
3409 cx.listener(|this, _, window, cx| {
3410 if !this.vertical_scrollbar.state.is_dragging()
3411 && !this.focus_handle.contains_focused(window, cx)
3412 {
3413 this.vertical_scrollbar.hide(window, cx);
3414 cx.notify();
3415 }
3416
3417 cx.stop_propagation();
3418 }),
3419 )
3420 .on_scroll_wheel(cx.listener(|_, _, _, cx| {
3421 cx.notify();
3422 }))
3423 .children(Scrollbar::vertical(
3424 // percentage as f32..end_offset as f32,
3425 self.vertical_scrollbar.state.clone(),
3426 ))
3427 }
3428
3429 /// Renders the horizontal scrollbar.
3430 ///
3431 /// The right offset is used to determine how far to the right the
3432 /// scrollbar should extend to, useful for ensuring it doesn't collide
3433 /// with the vertical scrollbar when visible.
3434 fn render_horizontal_scrollbar(
3435 &self,
3436 right_offset: Pixels,
3437 cx: &mut Context<Self>,
3438 ) -> impl IntoElement {
3439 div()
3440 .id("git-panel-horizontal-scroll")
3441 .occlude()
3442 .flex_none()
3443 .w_full()
3444 .cursor_default()
3445 .absolute()
3446 .bottom_neg_px()
3447 .left_0()
3448 .right_0()
3449 .pr(right_offset)
3450 .on_mouse_move(cx.listener(|_, _, _, cx| {
3451 cx.notify();
3452 cx.stop_propagation()
3453 }))
3454 .on_hover(|_, _, cx| {
3455 cx.stop_propagation();
3456 })
3457 .on_any_mouse_down(|_, _, cx| {
3458 cx.stop_propagation();
3459 })
3460 .on_mouse_up(
3461 MouseButton::Left,
3462 cx.listener(|this, _, window, cx| {
3463 if !this.horizontal_scrollbar.state.is_dragging()
3464 && !this.focus_handle.contains_focused(window, cx)
3465 {
3466 this.horizontal_scrollbar.hide(window, cx);
3467 cx.notify();
3468 }
3469
3470 cx.stop_propagation();
3471 }),
3472 )
3473 .on_scroll_wheel(cx.listener(|_, _, _, cx| {
3474 cx.notify();
3475 }))
3476 .children(Scrollbar::horizontal(
3477 // percentage as f32..end_offset as f32,
3478 self.horizontal_scrollbar.state.clone(),
3479 ))
3480 }
3481
3482 fn render_buffer_header_controls(
3483 &self,
3484 entity: &Entity<Self>,
3485 file: &Arc<dyn File>,
3486 _: &Window,
3487 cx: &App,
3488 ) -> Option<AnyElement> {
3489 let repo = self.active_repository.as_ref()?.read(cx);
3490 let project_path = (file.worktree_id(cx), file.path()).into();
3491 let repo_path = repo.project_path_to_repo_path(&project_path, cx)?;
3492 let ix = self.entry_by_path(&repo_path, cx)?;
3493 let entry = self.entries.get(ix)?;
3494
3495 let entry_staging = self.entry_staging(entry.status_entry()?);
3496
3497 let checkbox = Checkbox::new("stage-file", entry_staging.as_bool().into())
3498 .disabled(!self.has_write_access(cx))
3499 .fill()
3500 .elevation(ElevationIndex::Surface)
3501 .on_click({
3502 let entry = entry.clone();
3503 let git_panel = entity.downgrade();
3504 move |_, window, cx| {
3505 git_panel
3506 .update(cx, |this, cx| {
3507 this.toggle_staged_for_entry(&entry, window, cx);
3508 cx.stop_propagation();
3509 })
3510 .ok();
3511 }
3512 });
3513 Some(
3514 h_flex()
3515 .id("start-slot")
3516 .text_lg()
3517 .child(checkbox)
3518 .on_mouse_down(MouseButton::Left, |_, _, cx| {
3519 // prevent the list item active state triggering when toggling checkbox
3520 cx.stop_propagation();
3521 })
3522 .into_any_element(),
3523 )
3524 }
3525
3526 fn render_entries(
3527 &self,
3528 has_write_access: bool,
3529 _: &Window,
3530 cx: &mut Context<Self>,
3531 ) -> impl IntoElement {
3532 let entry_count = self.entries.len();
3533
3534 let scroll_track_size = px(16.);
3535
3536 let h_scroll_offset = if self.vertical_scrollbar.show_scrollbar {
3537 // magic number
3538 px(3.)
3539 } else {
3540 px(0.)
3541 };
3542
3543 v_flex()
3544 .flex_1()
3545 .size_full()
3546 .overflow_hidden()
3547 .relative()
3548 // Show a border on the top and bottom of the container when
3549 // the vertical scrollbar container is visible so we don't have a
3550 // floating left border in the panel.
3551 .when(self.vertical_scrollbar.show_track, |this| {
3552 this.border_t_1()
3553 .border_b_1()
3554 .border_color(cx.theme().colors().border)
3555 })
3556 .child(
3557 h_flex()
3558 .flex_1()
3559 .size_full()
3560 .relative()
3561 .overflow_hidden()
3562 .child(
3563 uniform_list(cx.entity().clone(), "entries", entry_count, {
3564 move |this, range, window, cx| {
3565 let mut items = Vec::with_capacity(range.end - range.start);
3566
3567 for ix in range {
3568 match &this.entries.get(ix) {
3569 Some(GitListEntry::GitStatusEntry(entry)) => {
3570 items.push(this.render_entry(
3571 ix,
3572 entry,
3573 has_write_access,
3574 window,
3575 cx,
3576 ));
3577 }
3578 Some(GitListEntry::Header(header)) => {
3579 items.push(this.render_list_header(
3580 ix,
3581 header,
3582 has_write_access,
3583 window,
3584 cx,
3585 ));
3586 }
3587 None => {}
3588 }
3589 }
3590
3591 items
3592 }
3593 })
3594 .when(
3595 !self.horizontal_scrollbar.show_track
3596 && self.horizontal_scrollbar.show_scrollbar,
3597 |this| {
3598 // when not showing the horizontal scrollbar track, make sure we don't
3599 // obscure the last entry
3600 this.pb(scroll_track_size)
3601 },
3602 )
3603 .size_full()
3604 .flex_grow()
3605 .with_sizing_behavior(ListSizingBehavior::Auto)
3606 .with_horizontal_sizing_behavior(
3607 ListHorizontalSizingBehavior::Unconstrained,
3608 )
3609 .with_width_from_item(self.max_width_item_index)
3610 .track_scroll(self.scroll_handle.clone()),
3611 )
3612 .on_mouse_down(
3613 MouseButton::Right,
3614 cx.listener(move |this, event: &MouseDownEvent, window, cx| {
3615 this.deploy_panel_context_menu(event.position, window, cx)
3616 }),
3617 )
3618 .when(self.vertical_scrollbar.show_track, |this| {
3619 this.child(
3620 v_flex()
3621 .h_full()
3622 .flex_none()
3623 .w(scroll_track_size)
3624 .bg(cx.theme().colors().panel_background)
3625 .child(
3626 div()
3627 .size_full()
3628 .flex_1()
3629 .border_l_1()
3630 .border_color(cx.theme().colors().border),
3631 ),
3632 )
3633 })
3634 .when(self.vertical_scrollbar.show_scrollbar, |this| {
3635 this.child(
3636 self.render_vertical_scrollbar(
3637 self.horizontal_scrollbar.show_track,
3638 cx,
3639 ),
3640 )
3641 }),
3642 )
3643 .when(self.horizontal_scrollbar.show_track, |this| {
3644 this.child(
3645 h_flex()
3646 .w_full()
3647 .h(scroll_track_size)
3648 .flex_none()
3649 .relative()
3650 .child(
3651 div()
3652 .w_full()
3653 .flex_1()
3654 // for some reason the horizontal scrollbar is 1px
3655 // taller than the vertical scrollbar??
3656 .h(scroll_track_size - px(1.))
3657 .bg(cx.theme().colors().panel_background)
3658 .border_t_1()
3659 .border_color(cx.theme().colors().border),
3660 )
3661 .when(self.vertical_scrollbar.show_track, |this| {
3662 this.child(
3663 div()
3664 .flex_none()
3665 // -1px prevents a missing pixel between the two container borders
3666 .w(scroll_track_size - px(1.))
3667 .h_full(),
3668 )
3669 .child(
3670 // HACK: Fill the missing 1px 🥲
3671 div()
3672 .absolute()
3673 .right(scroll_track_size - px(1.))
3674 .bottom(scroll_track_size - px(1.))
3675 .size_px()
3676 .bg(cx.theme().colors().border),
3677 )
3678 }),
3679 )
3680 })
3681 .when(self.horizontal_scrollbar.show_scrollbar, |this| {
3682 this.child(self.render_horizontal_scrollbar(h_scroll_offset, cx))
3683 })
3684 }
3685
3686 fn entry_label(&self, label: impl Into<SharedString>, color: Color) -> Label {
3687 Label::new(label.into()).color(color).single_line()
3688 }
3689
3690 fn list_item_height(&self) -> Rems {
3691 rems(1.75)
3692 }
3693
3694 fn render_list_header(
3695 &self,
3696 ix: usize,
3697 header: &GitHeaderEntry,
3698 _: bool,
3699 _: &Window,
3700 _: &Context<Self>,
3701 ) -> AnyElement {
3702 let id: ElementId = ElementId::Name(format!("header_{}", ix).into());
3703
3704 h_flex()
3705 .id(id)
3706 .h(self.list_item_height())
3707 .w_full()
3708 .items_end()
3709 .px(rems(0.75)) // ~12px
3710 .pb(rems(0.3125)) // ~ 5px
3711 .child(
3712 Label::new(header.title())
3713 .color(Color::Muted)
3714 .size(LabelSize::Small)
3715 .line_height_style(LineHeightStyle::UiLabel)
3716 .single_line(),
3717 )
3718 .into_any_element()
3719 }
3720
3721 pub fn load_commit_details(
3722 &self,
3723 sha: String,
3724 cx: &mut Context<Self>,
3725 ) -> Task<anyhow::Result<CommitDetails>> {
3726 let Some(repo) = self.active_repository.clone() else {
3727 return Task::ready(Err(anyhow::anyhow!("no active repo")));
3728 };
3729 repo.update(cx, |repo, cx| {
3730 let show = repo.show(sha);
3731 cx.spawn(async move |_, _| show.await?)
3732 })
3733 }
3734
3735 fn deploy_entry_context_menu(
3736 &mut self,
3737 position: Point<Pixels>,
3738 ix: usize,
3739 window: &mut Window,
3740 cx: &mut Context<Self>,
3741 ) {
3742 let Some(entry) = self.entries.get(ix).and_then(|e| e.status_entry()) else {
3743 return;
3744 };
3745 let stage_title = if entry.status.staging().is_fully_staged() {
3746 "Unstage File"
3747 } else {
3748 "Stage File"
3749 };
3750 let restore_title = if entry.status.is_created() {
3751 "Trash File"
3752 } else {
3753 "Restore File"
3754 };
3755 let context_menu = ContextMenu::build(window, cx, |context_menu, _, _| {
3756 context_menu
3757 .context(self.focus_handle.clone())
3758 .action(stage_title, ToggleStaged.boxed_clone())
3759 .action(restore_title, git::RestoreFile::default().boxed_clone())
3760 .separator()
3761 .action("Open Diff", Confirm.boxed_clone())
3762 .action("Open File", SecondaryConfirm.boxed_clone())
3763 });
3764 self.selected_entry = Some(ix);
3765 self.set_context_menu(context_menu, position, window, cx);
3766 }
3767
3768 fn deploy_panel_context_menu(
3769 &mut self,
3770 position: Point<Pixels>,
3771 window: &mut Window,
3772 cx: &mut Context<Self>,
3773 ) {
3774 let context_menu = git_panel_context_menu(
3775 self.focus_handle.clone(),
3776 GitMenuState {
3777 has_tracked_changes: self.has_tracked_changes(),
3778 has_staged_changes: self.has_staged_changes(),
3779 has_unstaged_changes: self.has_unstaged_changes(),
3780 has_new_changes: self.new_count > 0,
3781 },
3782 window,
3783 cx,
3784 );
3785 self.set_context_menu(context_menu, position, window, cx);
3786 }
3787
3788 fn set_context_menu(
3789 &mut self,
3790 context_menu: Entity<ContextMenu>,
3791 position: Point<Pixels>,
3792 window: &Window,
3793 cx: &mut Context<Self>,
3794 ) {
3795 let subscription = cx.subscribe_in(
3796 &context_menu,
3797 window,
3798 |this, _, _: &DismissEvent, window, cx| {
3799 if this.context_menu.as_ref().is_some_and(|context_menu| {
3800 context_menu.0.focus_handle(cx).contains_focused(window, cx)
3801 }) {
3802 cx.focus_self(window);
3803 }
3804 this.context_menu.take();
3805 cx.notify();
3806 },
3807 );
3808 self.context_menu = Some((context_menu, position, subscription));
3809 cx.notify();
3810 }
3811
3812 fn render_entry(
3813 &self,
3814 ix: usize,
3815 entry: &GitStatusEntry,
3816 has_write_access: bool,
3817 window: &Window,
3818 cx: &Context<Self>,
3819 ) -> AnyElement {
3820 let display_name = entry.display_name();
3821
3822 let selected = self.selected_entry == Some(ix);
3823 let marked = self.marked_entries.contains(&ix);
3824 let status_style = GitPanelSettings::get_global(cx).status_style;
3825 let status = entry.status;
3826 let modifiers = self.current_modifiers;
3827 let shift_held = modifiers.shift;
3828
3829 let has_conflict = status.is_conflicted();
3830 let is_modified = status.is_modified();
3831 let is_deleted = status.is_deleted();
3832
3833 let label_color = if status_style == StatusStyle::LabelColor {
3834 if has_conflict {
3835 Color::VersionControlConflict
3836 } else if is_modified {
3837 Color::VersionControlModified
3838 } else if is_deleted {
3839 // We don't want a bunch of red labels in the list
3840 Color::Disabled
3841 } else {
3842 Color::VersionControlAdded
3843 }
3844 } else {
3845 Color::Default
3846 };
3847
3848 let path_color = if status.is_deleted() {
3849 Color::Disabled
3850 } else {
3851 Color::Muted
3852 };
3853
3854 let id: ElementId = ElementId::Name(format!("entry_{}_{}", display_name, ix).into());
3855 let checkbox_wrapper_id: ElementId =
3856 ElementId::Name(format!("entry_{}_{}_checkbox_wrapper", display_name, ix).into());
3857 let checkbox_id: ElementId =
3858 ElementId::Name(format!("entry_{}_{}_checkbox", display_name, ix).into());
3859
3860 let entry_staging = self.entry_staging(entry);
3861 let mut is_staged: ToggleState = self.entry_staging(entry).as_bool().into();
3862 if self.show_placeholders && !self.has_staged_changes() && !entry.status.is_created() {
3863 is_staged = ToggleState::Selected;
3864 }
3865
3866 let handle = cx.weak_entity();
3867
3868 let selected_bg_alpha = 0.08;
3869 let marked_bg_alpha = 0.12;
3870 let state_opacity_step = 0.04;
3871
3872 let base_bg = match (selected, marked) {
3873 (true, true) => cx
3874 .theme()
3875 .status()
3876 .info
3877 .alpha(selected_bg_alpha + marked_bg_alpha),
3878 (true, false) => cx.theme().status().info.alpha(selected_bg_alpha),
3879 (false, true) => cx.theme().status().info.alpha(marked_bg_alpha),
3880 _ => cx.theme().colors().ghost_element_background,
3881 };
3882
3883 let hover_bg = if selected {
3884 cx.theme()
3885 .status()
3886 .info
3887 .alpha(selected_bg_alpha + state_opacity_step)
3888 } else {
3889 cx.theme().colors().ghost_element_hover
3890 };
3891
3892 let active_bg = if selected {
3893 cx.theme()
3894 .status()
3895 .info
3896 .alpha(selected_bg_alpha + state_opacity_step * 2.0)
3897 } else {
3898 cx.theme().colors().ghost_element_active
3899 };
3900
3901 h_flex()
3902 .id(id)
3903 .h(self.list_item_height())
3904 .w_full()
3905 .items_center()
3906 .border_1()
3907 .when(selected && self.focus_handle.is_focused(window), |el| {
3908 el.border_color(cx.theme().colors().border_focused)
3909 })
3910 .px(rems(0.75)) // ~12px
3911 .overflow_hidden()
3912 .flex_none()
3913 .gap_1p5()
3914 .bg(base_bg)
3915 .hover(|this| this.bg(hover_bg))
3916 .active(|this| this.bg(active_bg))
3917 .on_click({
3918 cx.listener(move |this, event: &ClickEvent, window, cx| {
3919 this.selected_entry = Some(ix);
3920 cx.notify();
3921 if event.modifiers().secondary() {
3922 this.open_file(&Default::default(), window, cx)
3923 } else {
3924 this.open_diff(&Default::default(), window, cx);
3925 this.focus_handle.focus(window);
3926 }
3927 })
3928 })
3929 .on_mouse_down(
3930 MouseButton::Right,
3931 move |event: &MouseDownEvent, window, cx| {
3932 // why isn't this happening automatically? we are passing MouseButton::Right to `on_mouse_down`?
3933 if event.button != MouseButton::Right {
3934 return;
3935 }
3936
3937 let Some(this) = handle.upgrade() else {
3938 return;
3939 };
3940 this.update(cx, |this, cx| {
3941 this.deploy_entry_context_menu(event.position, ix, window, cx);
3942 });
3943 cx.stop_propagation();
3944 },
3945 )
3946 // .on_secondary_mouse_down(cx.listener(
3947 // move |this, event: &MouseDownEvent, window, cx| {
3948 // this.deploy_entry_context_menu(event.position, ix, window, cx);
3949 // cx.stop_propagation();
3950 // },
3951 // ))
3952 .child(
3953 div()
3954 .id(checkbox_wrapper_id)
3955 .flex_none()
3956 .occlude()
3957 .cursor_pointer()
3958 .child(
3959 Checkbox::new(checkbox_id, is_staged)
3960 .disabled(!has_write_access)
3961 .fill()
3962 .elevation(ElevationIndex::Surface)
3963 .on_click({
3964 let entry = entry.clone();
3965 cx.listener(move |this, _, window, cx| {
3966 if !has_write_access {
3967 return;
3968 }
3969 this.toggle_staged_for_entry(
3970 &GitListEntry::GitStatusEntry(entry.clone()),
3971 window,
3972 cx,
3973 );
3974 cx.stop_propagation();
3975 })
3976 })
3977 .tooltip(move |window, cx| {
3978 let is_staged = entry_staging.is_fully_staged();
3979
3980 let action = if is_staged { "Unstage" } else { "Stage" };
3981 let tooltip_name = if shift_held {
3982 format!("{} section", action)
3983 } else {
3984 action.to_string()
3985 };
3986
3987 let meta = if shift_held {
3988 format!(
3989 "Release shift to {} single entry",
3990 action.to_lowercase()
3991 )
3992 } else {
3993 format!("Shift click to {} section", action.to_lowercase())
3994 };
3995
3996 Tooltip::with_meta(
3997 tooltip_name,
3998 Some(&ToggleStaged),
3999 meta,
4000 window,
4001 cx,
4002 )
4003 }),
4004 ),
4005 )
4006 .child(git_status_icon(status))
4007 .child(
4008 h_flex()
4009 .items_center()
4010 .flex_1()
4011 // .overflow_hidden()
4012 .when_some(entry.parent_dir(), |this, parent| {
4013 if !parent.is_empty() {
4014 this.child(
4015 self.entry_label(format!("{}/", parent), path_color)
4016 .when(status.is_deleted(), |this| this.strikethrough()),
4017 )
4018 } else {
4019 this
4020 }
4021 })
4022 .child(
4023 self.entry_label(display_name.clone(), label_color)
4024 .when(status.is_deleted(), |this| this.strikethrough()),
4025 ),
4026 )
4027 .into_any_element()
4028 }
4029
4030 fn has_write_access(&self, cx: &App) -> bool {
4031 !self.project.read(cx).is_read_only(cx)
4032 }
4033
4034 pub fn amend_pending(&self) -> bool {
4035 self.amend_pending
4036 }
4037
4038 pub fn set_amend_pending(&mut self, value: bool, cx: &mut Context<Self>) {
4039 self.amend_pending = value;
4040 cx.notify();
4041 }
4042}
4043
4044fn current_language_model(cx: &Context<'_, GitPanel>) -> Option<Arc<dyn LanguageModel>> {
4045 assistant_settings::AssistantSettings::get_global(cx)
4046 .enabled
4047 .then(|| {
4048 let ConfiguredModel { provider, model } =
4049 LanguageModelRegistry::read_global(cx).commit_message_model()?;
4050
4051 provider.is_authenticated(cx).then(|| model)
4052 })
4053 .flatten()
4054}
4055
4056impl Render for GitPanel {
4057 fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
4058 let project = self.project.read(cx);
4059 let has_entries = self.entries.len() > 0;
4060 let room = self
4061 .workspace
4062 .upgrade()
4063 .and_then(|workspace| workspace.read(cx).active_call()?.read(cx).room().cloned());
4064
4065 let has_write_access = self.has_write_access(cx);
4066
4067 let has_co_authors = room.map_or(false, |room| {
4068 room.read(cx)
4069 .remote_participants()
4070 .values()
4071 .any(|remote_participant| remote_participant.can_write())
4072 });
4073
4074 v_flex()
4075 .id("git_panel")
4076 .key_context(self.dispatch_context(window, cx))
4077 .track_focus(&self.focus_handle)
4078 .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
4079 .when(has_write_access && !project.is_read_only(cx), |this| {
4080 this.on_action(cx.listener(Self::toggle_staged_for_selected))
4081 .on_action(cx.listener(GitPanel::commit))
4082 .on_action(cx.listener(GitPanel::amend))
4083 .on_action(cx.listener(GitPanel::cancel))
4084 .on_action(cx.listener(Self::stage_all))
4085 .on_action(cx.listener(Self::unstage_all))
4086 .on_action(cx.listener(Self::stage_selected))
4087 .on_action(cx.listener(Self::unstage_selected))
4088 .on_action(cx.listener(Self::restore_tracked_files))
4089 .on_action(cx.listener(Self::revert_selected))
4090 .on_action(cx.listener(Self::clean_all))
4091 .on_action(cx.listener(Self::generate_commit_message_action))
4092 })
4093 .on_action(cx.listener(Self::select_first))
4094 .on_action(cx.listener(Self::select_next))
4095 .on_action(cx.listener(Self::select_previous))
4096 .on_action(cx.listener(Self::select_last))
4097 .on_action(cx.listener(Self::close_panel))
4098 .on_action(cx.listener(Self::open_diff))
4099 .on_action(cx.listener(Self::open_file))
4100 .on_action(cx.listener(Self::focus_changes_list))
4101 .on_action(cx.listener(Self::focus_editor))
4102 .on_action(cx.listener(Self::expand_commit_editor))
4103 .when(has_write_access && has_co_authors, |git_panel| {
4104 git_panel.on_action(cx.listener(Self::toggle_fill_co_authors))
4105 })
4106 .on_hover(cx.listener(move |this, hovered, window, cx| {
4107 if *hovered {
4108 this.horizontal_scrollbar.show(cx);
4109 this.vertical_scrollbar.show(cx);
4110 cx.notify();
4111 } else if !this.focus_handle.contains_focused(window, cx) {
4112 this.hide_scrollbars(window, cx);
4113 }
4114 }))
4115 .size_full()
4116 .overflow_hidden()
4117 .bg(cx.theme().colors().panel_background)
4118 .child(
4119 v_flex()
4120 .size_full()
4121 .children(self.render_panel_header(window, cx))
4122 .map(|this| {
4123 if has_entries {
4124 this.child(self.render_entries(has_write_access, window, cx))
4125 } else {
4126 this.child(self.render_empty_state(cx).into_any_element())
4127 }
4128 })
4129 .children(self.render_footer(window, cx))
4130 .when(self.amend_pending, |this| {
4131 this.child(self.render_pending_amend(cx))
4132 })
4133 .when(!self.amend_pending, |this| {
4134 this.children(self.render_previous_commit(cx))
4135 })
4136 .into_any_element(),
4137 )
4138 .children(self.context_menu.as_ref().map(|(menu, position, _)| {
4139 deferred(
4140 anchored()
4141 .position(*position)
4142 .anchor(Corner::TopLeft)
4143 .child(menu.clone()),
4144 )
4145 .with_priority(1)
4146 }))
4147 }
4148}
4149
4150impl Focusable for GitPanel {
4151 fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
4152 if self.entries.is_empty() {
4153 self.commit_editor.focus_handle(cx)
4154 } else {
4155 self.focus_handle.clone()
4156 }
4157 }
4158}
4159
4160impl EventEmitter<Event> for GitPanel {}
4161
4162impl EventEmitter<PanelEvent> for GitPanel {}
4163
4164pub(crate) struct GitPanelAddon {
4165 pub(crate) workspace: WeakEntity<Workspace>,
4166}
4167
4168impl editor::Addon for GitPanelAddon {
4169 fn to_any(&self) -> &dyn std::any::Any {
4170 self
4171 }
4172
4173 fn render_buffer_header_controls(
4174 &self,
4175 excerpt_info: &ExcerptInfo,
4176 window: &Window,
4177 cx: &App,
4178 ) -> Option<AnyElement> {
4179 let file = excerpt_info.buffer.file()?;
4180 let git_panel = self.workspace.upgrade()?.read(cx).panel::<GitPanel>(cx)?;
4181
4182 git_panel
4183 .read(cx)
4184 .render_buffer_header_controls(&git_panel, &file, window, cx)
4185 }
4186}
4187
4188impl Panel for GitPanel {
4189 fn persistent_name() -> &'static str {
4190 "GitPanel"
4191 }
4192
4193 fn position(&self, _: &Window, cx: &App) -> DockPosition {
4194 GitPanelSettings::get_global(cx).dock
4195 }
4196
4197 fn position_is_valid(&self, position: DockPosition) -> bool {
4198 matches!(position, DockPosition::Left | DockPosition::Right)
4199 }
4200
4201 fn set_position(&mut self, position: DockPosition, _: &mut Window, cx: &mut Context<Self>) {
4202 settings::update_settings_file::<GitPanelSettings>(
4203 self.fs.clone(),
4204 cx,
4205 move |settings, _| settings.dock = Some(position),
4206 );
4207 }
4208
4209 fn size(&self, _: &Window, cx: &App) -> Pixels {
4210 self.width
4211 .unwrap_or_else(|| GitPanelSettings::get_global(cx).default_width)
4212 }
4213
4214 fn set_size(&mut self, size: Option<Pixels>, _: &mut Window, cx: &mut Context<Self>) {
4215 self.width = size;
4216 self.serialize(cx);
4217 cx.notify();
4218 }
4219
4220 fn icon(&self, _: &Window, cx: &App) -> Option<ui::IconName> {
4221 Some(ui::IconName::GitBranchSmall).filter(|_| GitPanelSettings::get_global(cx).button)
4222 }
4223
4224 fn icon_tooltip(&self, _window: &Window, _cx: &App) -> Option<&'static str> {
4225 Some("Git Panel")
4226 }
4227
4228 fn toggle_action(&self) -> Box<dyn Action> {
4229 Box::new(ToggleFocus)
4230 }
4231
4232 fn activation_priority(&self) -> u32 {
4233 2
4234 }
4235}
4236
4237impl PanelHeader for GitPanel {}
4238
4239struct GitPanelMessageTooltip {
4240 commit_tooltip: Option<Entity<CommitTooltip>>,
4241}
4242
4243impl GitPanelMessageTooltip {
4244 fn new(
4245 git_panel: Entity<GitPanel>,
4246 sha: SharedString,
4247 repository: Entity<Repository>,
4248 window: &mut Window,
4249 cx: &mut App,
4250 ) -> Entity<Self> {
4251 cx.new(|cx| {
4252 cx.spawn_in(window, async move |this, cx| {
4253 let (details, workspace) = git_panel.update(cx, |git_panel, cx| {
4254 (
4255 git_panel.load_commit_details(sha.to_string(), cx),
4256 git_panel.workspace.clone(),
4257 )
4258 })?;
4259 let details = details.await?;
4260
4261 let commit_details = crate::commit_tooltip::CommitDetails {
4262 sha: details.sha.clone(),
4263 author_name: details.author_name.clone(),
4264 author_email: details.author_email.clone(),
4265 commit_time: OffsetDateTime::from_unix_timestamp(details.commit_timestamp)?,
4266 message: Some(ParsedCommitMessage {
4267 message: details.message.clone(),
4268 ..Default::default()
4269 }),
4270 };
4271
4272 this.update(cx, |this: &mut GitPanelMessageTooltip, cx| {
4273 this.commit_tooltip = Some(cx.new(move |cx| {
4274 CommitTooltip::new(commit_details, repository, workspace, cx)
4275 }));
4276 cx.notify();
4277 })
4278 })
4279 .detach();
4280
4281 Self {
4282 commit_tooltip: None,
4283 }
4284 })
4285 }
4286}
4287
4288impl Render for GitPanelMessageTooltip {
4289 fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
4290 if let Some(commit_tooltip) = &self.commit_tooltip {
4291 commit_tooltip.clone().into_any_element()
4292 } else {
4293 gpui::Empty.into_any_element()
4294 }
4295 }
4296}
4297
4298#[derive(IntoElement, RegisterComponent)]
4299pub struct PanelRepoFooter {
4300 active_repository: SharedString,
4301 branch: Option<Branch>,
4302 head_commit: Option<CommitDetails>,
4303
4304 // Getting a GitPanel in previews will be difficult.
4305 //
4306 // For now just take an option here, and we won't bind handlers to buttons in previews.
4307 git_panel: Option<Entity<GitPanel>>,
4308}
4309
4310impl PanelRepoFooter {
4311 pub fn new(
4312 active_repository: SharedString,
4313 branch: Option<Branch>,
4314 head_commit: Option<CommitDetails>,
4315 git_panel: Option<Entity<GitPanel>>,
4316 ) -> Self {
4317 Self {
4318 active_repository,
4319 branch,
4320 head_commit,
4321 git_panel,
4322 }
4323 }
4324
4325 pub fn new_preview(active_repository: SharedString, branch: Option<Branch>) -> Self {
4326 Self {
4327 active_repository,
4328 branch,
4329 head_commit: None,
4330 git_panel: None,
4331 }
4332 }
4333}
4334
4335impl RenderOnce for PanelRepoFooter {
4336 fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
4337 let project = self
4338 .git_panel
4339 .as_ref()
4340 .map(|panel| panel.read(cx).project.clone());
4341
4342 let repo = self
4343 .git_panel
4344 .as_ref()
4345 .and_then(|panel| panel.read(cx).active_repository.clone());
4346
4347 let single_repo = project
4348 .as_ref()
4349 .map(|project| project.read(cx).git_store().read(cx).repositories().len() == 1)
4350 .unwrap_or(true);
4351
4352 const MAX_BRANCH_LEN: usize = 16;
4353 const MAX_REPO_LEN: usize = 16;
4354 const LABEL_CHARACTER_BUDGET: usize = MAX_BRANCH_LEN + MAX_REPO_LEN;
4355 const MAX_SHORT_SHA_LEN: usize = 8;
4356
4357 let branch_name = self
4358 .branch
4359 .as_ref()
4360 .map(|branch| branch.name.clone())
4361 .or_else(|| {
4362 self.head_commit.as_ref().map(|commit| {
4363 SharedString::from(
4364 commit
4365 .sha
4366 .chars()
4367 .take(MAX_SHORT_SHA_LEN)
4368 .collect::<String>(),
4369 )
4370 })
4371 })
4372 .unwrap_or_else(|| SharedString::from(" (no branch)"));
4373 let show_separator = self.branch.is_some() || self.head_commit.is_some();
4374
4375 let active_repo_name = self.active_repository.clone();
4376
4377 let branch_actual_len = branch_name.len();
4378 let repo_actual_len = active_repo_name.len();
4379
4380 // ideally, show the whole branch and repo names but
4381 // when we can't, use a budget to allocate space between the two
4382 let (repo_display_len, branch_display_len) = if branch_actual_len + repo_actual_len
4383 <= LABEL_CHARACTER_BUDGET
4384 {
4385 (repo_actual_len, branch_actual_len)
4386 } else {
4387 if branch_actual_len <= MAX_BRANCH_LEN {
4388 let repo_space = (LABEL_CHARACTER_BUDGET - branch_actual_len).min(MAX_REPO_LEN);
4389 (repo_space, branch_actual_len)
4390 } else if repo_actual_len <= MAX_REPO_LEN {
4391 let branch_space = (LABEL_CHARACTER_BUDGET - repo_actual_len).min(MAX_BRANCH_LEN);
4392 (repo_actual_len, branch_space)
4393 } else {
4394 (MAX_REPO_LEN, MAX_BRANCH_LEN)
4395 }
4396 };
4397
4398 let truncated_repo_name = if repo_actual_len <= repo_display_len {
4399 active_repo_name.to_string()
4400 } else {
4401 util::truncate_and_trailoff(active_repo_name.trim_ascii(), repo_display_len)
4402 };
4403
4404 let truncated_branch_name = if branch_actual_len <= branch_display_len {
4405 branch_name.to_string()
4406 } else {
4407 util::truncate_and_trailoff(branch_name.trim_ascii(), branch_display_len)
4408 };
4409
4410 let repo_selector_trigger = Button::new("repo-selector", truncated_repo_name)
4411 .style(ButtonStyle::Transparent)
4412 .size(ButtonSize::None)
4413 .label_size(LabelSize::Small)
4414 .color(Color::Muted);
4415
4416 let repo_selector = PopoverMenu::new("repository-switcher")
4417 .menu({
4418 let project = project.clone();
4419 move |window, cx| {
4420 let project = project.clone()?;
4421 Some(cx.new(|cx| RepositorySelector::new(project, rems(16.), window, cx)))
4422 }
4423 })
4424 .trigger_with_tooltip(
4425 repo_selector_trigger.disabled(single_repo).truncate(true),
4426 Tooltip::text("Switch active repository"),
4427 )
4428 .anchor(Corner::BottomLeft)
4429 .into_any_element();
4430
4431 let branch_selector_button = Button::new("branch-selector", truncated_branch_name)
4432 .style(ButtonStyle::Transparent)
4433 .size(ButtonSize::None)
4434 .label_size(LabelSize::Small)
4435 .truncate(true)
4436 .tooltip(Tooltip::for_action_title(
4437 "Switch Branch",
4438 &zed_actions::git::Switch,
4439 ))
4440 .on_click(|_, window, cx| {
4441 window.dispatch_action(zed_actions::git::Switch.boxed_clone(), cx);
4442 });
4443
4444 let branch_selector = PopoverMenu::new("popover-button")
4445 .menu(move |window, cx| Some(branch_picker::popover(repo.clone(), window, cx)))
4446 .trigger_with_tooltip(
4447 branch_selector_button,
4448 Tooltip::for_action_title("Switch Branch", &zed_actions::git::Switch),
4449 )
4450 .anchor(Corner::BottomLeft)
4451 .offset(gpui::Point {
4452 x: px(0.0),
4453 y: px(-2.0),
4454 });
4455
4456 h_flex()
4457 .w_full()
4458 .px_2()
4459 .h(px(36.))
4460 .items_center()
4461 .justify_between()
4462 .gap_1()
4463 .child(
4464 h_flex()
4465 .flex_1()
4466 .overflow_hidden()
4467 .items_center()
4468 .child(
4469 div().child(
4470 Icon::new(IconName::GitBranchSmall)
4471 .size(IconSize::Small)
4472 .color(if single_repo {
4473 Color::Disabled
4474 } else {
4475 Color::Muted
4476 }),
4477 ),
4478 )
4479 .child(repo_selector)
4480 .when(show_separator, |this| {
4481 this.child(
4482 div()
4483 .text_color(cx.theme().colors().text_muted)
4484 .text_sm()
4485 .child("/"),
4486 )
4487 })
4488 .child(branch_selector),
4489 )
4490 .children(if let Some(git_panel) = self.git_panel {
4491 git_panel.update(cx, |git_panel, cx| git_panel.render_remote_button(cx))
4492 } else {
4493 None
4494 })
4495 }
4496}
4497
4498impl Component for PanelRepoFooter {
4499 fn scope() -> ComponentScope {
4500 ComponentScope::VersionControl
4501 }
4502
4503 fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
4504 let unknown_upstream = None;
4505 let no_remote_upstream = Some(UpstreamTracking::Gone);
4506 let ahead_of_upstream = Some(
4507 UpstreamTrackingStatus {
4508 ahead: 2,
4509 behind: 0,
4510 }
4511 .into(),
4512 );
4513 let behind_upstream = Some(
4514 UpstreamTrackingStatus {
4515 ahead: 0,
4516 behind: 2,
4517 }
4518 .into(),
4519 );
4520 let ahead_and_behind_upstream = Some(
4521 UpstreamTrackingStatus {
4522 ahead: 3,
4523 behind: 1,
4524 }
4525 .into(),
4526 );
4527
4528 let not_ahead_or_behind_upstream = Some(
4529 UpstreamTrackingStatus {
4530 ahead: 0,
4531 behind: 0,
4532 }
4533 .into(),
4534 );
4535
4536 fn branch(upstream: Option<UpstreamTracking>) -> Branch {
4537 Branch {
4538 is_head: true,
4539 name: "some-branch".into(),
4540 upstream: upstream.map(|tracking| Upstream {
4541 ref_name: "origin/some-branch".into(),
4542 tracking,
4543 }),
4544 most_recent_commit: Some(CommitSummary {
4545 sha: "abc123".into(),
4546 subject: "Modify stuff".into(),
4547 commit_timestamp: 1710932954,
4548 has_parent: true,
4549 }),
4550 }
4551 }
4552
4553 fn custom(branch_name: &str, upstream: Option<UpstreamTracking>) -> Branch {
4554 Branch {
4555 is_head: true,
4556 name: branch_name.to_string().into(),
4557 upstream: upstream.map(|tracking| Upstream {
4558 ref_name: format!("zed/{}", branch_name).into(),
4559 tracking,
4560 }),
4561 most_recent_commit: Some(CommitSummary {
4562 sha: "abc123".into(),
4563 subject: "Modify stuff".into(),
4564 commit_timestamp: 1710932954,
4565 has_parent: true,
4566 }),
4567 }
4568 }
4569
4570 fn active_repository(id: usize) -> SharedString {
4571 format!("repo-{}", id).into()
4572 }
4573
4574 let example_width = px(340.);
4575 Some(
4576 v_flex()
4577 .gap_6()
4578 .w_full()
4579 .flex_none()
4580 .children(vec![
4581 example_group_with_title(
4582 "Action Button States",
4583 vec![
4584 single_example(
4585 "No Branch",
4586 div()
4587 .w(example_width)
4588 .overflow_hidden()
4589 .child(PanelRepoFooter::new_preview(
4590 active_repository(1).clone(),
4591 None,
4592 ))
4593 .into_any_element(),
4594 ),
4595 single_example(
4596 "Remote status unknown",
4597 div()
4598 .w(example_width)
4599 .overflow_hidden()
4600 .child(PanelRepoFooter::new_preview(
4601 active_repository(2).clone(),
4602 Some(branch(unknown_upstream)),
4603 ))
4604 .into_any_element(),
4605 ),
4606 single_example(
4607 "No Remote Upstream",
4608 div()
4609 .w(example_width)
4610 .overflow_hidden()
4611 .child(PanelRepoFooter::new_preview(
4612 active_repository(3).clone(),
4613 Some(branch(no_remote_upstream)),
4614 ))
4615 .into_any_element(),
4616 ),
4617 single_example(
4618 "Not Ahead or Behind",
4619 div()
4620 .w(example_width)
4621 .overflow_hidden()
4622 .child(PanelRepoFooter::new_preview(
4623 active_repository(4).clone(),
4624 Some(branch(not_ahead_or_behind_upstream)),
4625 ))
4626 .into_any_element(),
4627 ),
4628 single_example(
4629 "Behind remote",
4630 div()
4631 .w(example_width)
4632 .overflow_hidden()
4633 .child(PanelRepoFooter::new_preview(
4634 active_repository(5).clone(),
4635 Some(branch(behind_upstream)),
4636 ))
4637 .into_any_element(),
4638 ),
4639 single_example(
4640 "Ahead of remote",
4641 div()
4642 .w(example_width)
4643 .overflow_hidden()
4644 .child(PanelRepoFooter::new_preview(
4645 active_repository(6).clone(),
4646 Some(branch(ahead_of_upstream)),
4647 ))
4648 .into_any_element(),
4649 ),
4650 single_example(
4651 "Ahead and behind remote",
4652 div()
4653 .w(example_width)
4654 .overflow_hidden()
4655 .child(PanelRepoFooter::new_preview(
4656 active_repository(7).clone(),
4657 Some(branch(ahead_and_behind_upstream)),
4658 ))
4659 .into_any_element(),
4660 ),
4661 ],
4662 )
4663 .grow()
4664 .vertical(),
4665 ])
4666 .children(vec![
4667 example_group_with_title(
4668 "Labels",
4669 vec![
4670 single_example(
4671 "Short Branch & Repo",
4672 div()
4673 .w(example_width)
4674 .overflow_hidden()
4675 .child(PanelRepoFooter::new_preview(
4676 SharedString::from("zed"),
4677 Some(custom("main", behind_upstream)),
4678 ))
4679 .into_any_element(),
4680 ),
4681 single_example(
4682 "Long Branch",
4683 div()
4684 .w(example_width)
4685 .overflow_hidden()
4686 .child(PanelRepoFooter::new_preview(
4687 SharedString::from("zed"),
4688 Some(custom(
4689 "redesign-and-update-git-ui-list-entry-style",
4690 behind_upstream,
4691 )),
4692 ))
4693 .into_any_element(),
4694 ),
4695 single_example(
4696 "Long Repo",
4697 div()
4698 .w(example_width)
4699 .overflow_hidden()
4700 .child(PanelRepoFooter::new_preview(
4701 SharedString::from("zed-industries-community-examples"),
4702 Some(custom("gpui", ahead_of_upstream)),
4703 ))
4704 .into_any_element(),
4705 ),
4706 single_example(
4707 "Long Repo & Branch",
4708 div()
4709 .w(example_width)
4710 .overflow_hidden()
4711 .child(PanelRepoFooter::new_preview(
4712 SharedString::from("zed-industries-community-examples"),
4713 Some(custom(
4714 "redesign-and-update-git-ui-list-entry-style",
4715 behind_upstream,
4716 )),
4717 ))
4718 .into_any_element(),
4719 ),
4720 single_example(
4721 "Uppercase Repo",
4722 div()
4723 .w(example_width)
4724 .overflow_hidden()
4725 .child(PanelRepoFooter::new_preview(
4726 SharedString::from("LICENSES"),
4727 Some(custom("main", ahead_of_upstream)),
4728 ))
4729 .into_any_element(),
4730 ),
4731 single_example(
4732 "Uppercase Branch",
4733 div()
4734 .w(example_width)
4735 .overflow_hidden()
4736 .child(PanelRepoFooter::new_preview(
4737 SharedString::from("zed"),
4738 Some(custom("update-README", behind_upstream)),
4739 ))
4740 .into_any_element(),
4741 ),
4742 ],
4743 )
4744 .grow()
4745 .vertical(),
4746 ])
4747 .into_any_element(),
4748 )
4749 }
4750}
4751
4752#[cfg(test)]
4753mod tests {
4754 use git::status::StatusCode;
4755 use gpui::TestAppContext;
4756 use project::{FakeFs, WorktreeSettings};
4757 use serde_json::json;
4758 use settings::SettingsStore;
4759 use theme::LoadThemes;
4760 use util::path;
4761
4762 use super::*;
4763
4764 fn init_test(cx: &mut gpui::TestAppContext) {
4765 if std::env::var("RUST_LOG").is_ok() {
4766 env_logger::try_init().ok();
4767 }
4768
4769 cx.update(|cx| {
4770 let settings_store = SettingsStore::test(cx);
4771 cx.set_global(settings_store);
4772 AssistantSettings::register(cx);
4773 WorktreeSettings::register(cx);
4774 workspace::init_settings(cx);
4775 theme::init(LoadThemes::JustBase, cx);
4776 language::init(cx);
4777 editor::init(cx);
4778 Project::init_settings(cx);
4779 crate::init(cx);
4780 });
4781 }
4782
4783 #[gpui::test]
4784 async fn test_entry_worktree_paths(cx: &mut TestAppContext) {
4785 init_test(cx);
4786 let fs = FakeFs::new(cx.background_executor.clone());
4787 fs.insert_tree(
4788 "/root",
4789 json!({
4790 "zed": {
4791 ".git": {},
4792 "crates": {
4793 "gpui": {
4794 "gpui.rs": "fn main() {}"
4795 },
4796 "util": {
4797 "util.rs": "fn do_it() {}"
4798 }
4799 }
4800 },
4801 }),
4802 )
4803 .await;
4804
4805 fs.set_status_for_repo(
4806 Path::new(path!("/root/zed/.git")),
4807 &[
4808 (
4809 Path::new("crates/gpui/gpui.rs"),
4810 StatusCode::Modified.worktree(),
4811 ),
4812 (
4813 Path::new("crates/util/util.rs"),
4814 StatusCode::Modified.worktree(),
4815 ),
4816 ],
4817 );
4818
4819 let project =
4820 Project::test(fs.clone(), [path!("/root/zed/crates/gpui").as_ref()], cx).await;
4821 let (workspace, cx) =
4822 cx.add_window_view(|window, cx| Workspace::test_new(project.clone(), window, cx));
4823
4824 cx.read(|cx| {
4825 project
4826 .read(cx)
4827 .worktrees(cx)
4828 .nth(0)
4829 .unwrap()
4830 .read(cx)
4831 .as_local()
4832 .unwrap()
4833 .scan_complete()
4834 })
4835 .await;
4836
4837 cx.executor().run_until_parked();
4838
4839 let app_state = workspace.update(cx, |workspace, _| workspace.app_state().clone());
4840 let panel = cx.new_window_entity(|window, cx| {
4841 GitPanel::new(workspace.clone(), project.clone(), app_state, window, cx)
4842 });
4843
4844 let handle = cx.update_window_entity(&panel, |panel, _, _| {
4845 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
4846 });
4847 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
4848 handle.await;
4849
4850 let entries = panel.update(cx, |panel, _| panel.entries.clone());
4851 pretty_assertions::assert_eq!(
4852 entries,
4853 [
4854 GitListEntry::Header(GitHeaderEntry {
4855 header: Section::Tracked
4856 }),
4857 GitListEntry::GitStatusEntry(GitStatusEntry {
4858 abs_path: path!("/root/zed/crates/gpui/gpui.rs").into(),
4859 repo_path: "crates/gpui/gpui.rs".into(),
4860 status: StatusCode::Modified.worktree(),
4861 staging: StageStatus::Unstaged,
4862 }),
4863 GitListEntry::GitStatusEntry(GitStatusEntry {
4864 abs_path: path!("/root/zed/crates/util/util.rs").into(),
4865 repo_path: "crates/util/util.rs".into(),
4866 status: StatusCode::Modified.worktree(),
4867 staging: StageStatus::Unstaged,
4868 },),
4869 ],
4870 );
4871
4872 // TODO(cole) restore this once repository deduplication is implemented properly.
4873 //cx.update_window_entity(&panel, |panel, window, cx| {
4874 // panel.select_last(&Default::default(), window, cx);
4875 // assert_eq!(panel.selected_entry, Some(2));
4876 // panel.open_diff(&Default::default(), window, cx);
4877 //});
4878 //cx.run_until_parked();
4879
4880 //let worktree_roots = workspace.update(cx, |workspace, cx| {
4881 // workspace
4882 // .worktrees(cx)
4883 // .map(|worktree| worktree.read(cx).abs_path())
4884 // .collect::<Vec<_>>()
4885 //});
4886 //pretty_assertions::assert_eq!(
4887 // worktree_roots,
4888 // vec![
4889 // Path::new(path!("/root/zed/crates/gpui")).into(),
4890 // Path::new(path!("/root/zed/crates/util/util.rs")).into(),
4891 // ]
4892 //);
4893
4894 //project.update(cx, |project, cx| {
4895 // let git_store = project.git_store().read(cx);
4896 // // The repo that comes from the single-file worktree can't be selected through the UI.
4897 // let filtered_entries = filtered_repository_entries(git_store, cx)
4898 // .iter()
4899 // .map(|repo| repo.read(cx).worktree_abs_path.clone())
4900 // .collect::<Vec<_>>();
4901 // assert_eq!(
4902 // filtered_entries,
4903 // [Path::new(path!("/root/zed/crates/gpui")).into()]
4904 // );
4905 // // But we can select it artificially here.
4906 // let repo_from_single_file_worktree = git_store
4907 // .repositories()
4908 // .values()
4909 // .find(|repo| {
4910 // repo.read(cx).worktree_abs_path.as_ref()
4911 // == Path::new(path!("/root/zed/crates/util/util.rs"))
4912 // })
4913 // .unwrap()
4914 // .clone();
4915
4916 // // Paths still make sense when we somehow activate a repo that comes from a single-file worktree.
4917 // repo_from_single_file_worktree.update(cx, |repo, cx| repo.set_as_active_repository(cx));
4918 //});
4919
4920 let handle = cx.update_window_entity(&panel, |panel, _, _| {
4921 std::mem::replace(&mut panel.update_visible_entries_task, Task::ready(()))
4922 });
4923 cx.executor().advance_clock(2 * UPDATE_DEBOUNCE);
4924 handle.await;
4925 let entries = panel.update(cx, |panel, _| panel.entries.clone());
4926 pretty_assertions::assert_eq!(
4927 entries,
4928 [
4929 GitListEntry::Header(GitHeaderEntry {
4930 header: Section::Tracked
4931 }),
4932 GitListEntry::GitStatusEntry(GitStatusEntry {
4933 abs_path: path!("/root/zed/crates/gpui/gpui.rs").into(),
4934 repo_path: "crates/gpui/gpui.rs".into(),
4935 status: StatusCode::Modified.worktree(),
4936 staging: StageStatus::Unstaged,
4937 }),
4938 GitListEntry::GitStatusEntry(GitStatusEntry {
4939 abs_path: path!("/root/zed/crates/util/util.rs").into(),
4940 repo_path: "crates/util/util.rs".into(),
4941 status: StatusCode::Modified.worktree(),
4942 staging: StageStatus::Unstaged,
4943 },),
4944 ],
4945 );
4946 }
4947}