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