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