use std::any::Any; use ::settings::Settings; use command_palette_hooks::CommandPaletteFilter; use commit_modal::CommitModal; use git::{ repository::{Branch, Upstream, UpstreamTracking, UpstreamTrackingStatus}, status::{FileStatus, StatusCode, UnmergedStatus, UnmergedStatusCode}, }; use git_panel_settings::GitPanelSettings; use gpui::{actions, App, FocusHandle}; use onboarding::{clear_dismissed, GitOnboardingModal}; use project_diff::ProjectDiff; use ui::prelude::*; use workspace::Workspace; mod askpass_modal; pub mod branch_picker; mod commit_modal; pub mod git_panel; mod git_panel_settings; pub mod onboarding; pub mod picker_prompt; pub mod project_diff; pub(crate) mod remote_output; pub mod repository_selector; actions!(git, [ResetOnboarding]); pub fn init(cx: &mut App) { GitPanelSettings::register(cx); cx.observe_new(|workspace: &mut Workspace, _, cx| { ProjectDiff::register(workspace, cx); CommitModal::register(workspace); git_panel::register(workspace); repository_selector::register(workspace); branch_picker::register(workspace); let project = workspace.project().read(cx); if project.is_read_only(cx) { return; } if !project.is_via_collab() { workspace.register_action(|workspace, _: &git::Fetch, window, cx| { let Some(panel) = workspace.panel::(cx) else { return; }; panel.update(cx, |panel, cx| { panel.fetch(window, cx); }); }); workspace.register_action(|workspace, _: &git::Push, window, cx| { let Some(panel) = workspace.panel::(cx) else { return; }; panel.update(cx, |panel, cx| { panel.push(false, window, cx); }); }); workspace.register_action(|workspace, _: &git::ForcePush, window, cx| { let Some(panel) = workspace.panel::(cx) else { return; }; panel.update(cx, |panel, cx| { panel.push(true, window, cx); }); }); workspace.register_action(|workspace, _: &git::Pull, window, cx| { let Some(panel) = workspace.panel::(cx) else { return; }; panel.update(cx, |panel, cx| { panel.pull(window, cx); }); }); } workspace.register_action(|workspace, action: &git::StageAll, window, cx| { let Some(panel) = workspace.panel::(cx) else { return; }; panel.update(cx, |panel, cx| { panel.stage_all(action, window, cx); }); }); workspace.register_action(|workspace, action: &git::UnstageAll, window, cx| { let Some(panel) = workspace.panel::(cx) else { return; }; panel.update(cx, |panel, cx| { panel.unstage_all(action, window, cx); }); }); CommandPaletteFilter::update_global(cx, |filter, _cx| { filter.hide_action_types(&[ zed_actions::OpenGitIntegrationOnboarding.type_id(), // ResetOnboarding.type_id(), ]); }); workspace.register_action( move |workspace, _: &zed_actions::OpenGitIntegrationOnboarding, window, cx| { GitOnboardingModal::toggle(workspace, window, cx) }, ); workspace.register_action(move |_, _: &ResetOnboarding, window, cx| { clear_dismissed(cx); window.refresh(); }); workspace.register_action(|workspace, _action: &git::Init, window, cx| { let Some(panel) = workspace.panel::(cx) else { return; }; panel.update(cx, |panel, cx| { panel.git_init(window, cx); }); }); }) .detach(); } pub fn git_status_icon(status: FileStatus) -> impl IntoElement { GitStatusIcon::new(status) } fn render_remote_button( id: impl Into, branch: &Branch, keybinding_target: Option, show_fetch_button: bool, ) -> Option { let id = id.into(); let upstream = branch.upstream.as_ref(); match upstream { Some(Upstream { tracking: UpstreamTracking::Tracked(UpstreamTrackingStatus { ahead, behind }), .. }) => match (*ahead, *behind) { (0, 0) if show_fetch_button => { Some(remote_button::render_fetch_button(keybinding_target, id)) } (0, 0) => None, (ahead, 0) => Some(remote_button::render_push_button( keybinding_target.clone(), id, ahead, )), (ahead, behind) => Some(remote_button::render_pull_button( keybinding_target.clone(), id, ahead, behind, )), }, Some(Upstream { tracking: UpstreamTracking::Gone, .. }) => Some(remote_button::render_republish_button( keybinding_target, id, )), None => Some(remote_button::render_publish_button(keybinding_target, id)), } } mod remote_button { use gpui::{Action, AnyView, ClickEvent, Corner, FocusHandle}; use ui::{ div, h_flex, rems, App, ButtonCommon, Clickable, ContextMenu, ElementId, FluentBuilder, Icon, IconName, IconSize, IntoElement, Label, LabelCommon, LabelSize, LineHeightStyle, ParentElement, PopoverMenu, SharedString, SplitButton, Styled, Tooltip, Window, }; pub fn render_fetch_button( keybinding_target: Option, id: SharedString, ) -> SplitButton { split_button( id, "Fetch", 0, 0, Some(IconName::ArrowCircle), keybinding_target.clone(), move |_, window, cx| { window.dispatch_action(Box::new(git::Fetch), cx); }, move |window, cx| { git_action_tooltip( "Fetch updates from remote", &git::Fetch, "git fetch", keybinding_target.clone(), window, cx, ) }, ) } pub fn render_push_button( keybinding_target: Option, id: SharedString, ahead: u32, ) -> SplitButton { split_button( id, "Push", ahead as usize, 0, None, keybinding_target.clone(), move |_, window, cx| { window.dispatch_action(Box::new(git::Push), cx); }, move |window, cx| { git_action_tooltip( "Push committed changes to remote", &git::Push, "git push", keybinding_target.clone(), window, cx, ) }, ) } pub fn render_pull_button( keybinding_target: Option, id: SharedString, ahead: u32, behind: u32, ) -> SplitButton { split_button( id, "Pull", ahead as usize, behind as usize, None, keybinding_target.clone(), move |_, window, cx| { window.dispatch_action(Box::new(git::Pull), cx); }, move |window, cx| { git_action_tooltip( "Pull", &git::Pull, "git pull", keybinding_target.clone(), window, cx, ) }, ) } pub fn render_publish_button( keybinding_target: Option, id: SharedString, ) -> SplitButton { split_button( id, "Publish", 0, 0, Some(IconName::ArrowUpFromLine), keybinding_target.clone(), move |_, window, cx| { window.dispatch_action(Box::new(git::Push), cx); }, move |window, cx| { git_action_tooltip( "Publish branch to remote", &git::Push, "git push --set-upstream", keybinding_target.clone(), window, cx, ) }, ) } pub fn render_republish_button( keybinding_target: Option, id: SharedString, ) -> SplitButton { split_button( id, "Republish", 0, 0, Some(IconName::ArrowUpFromLine), keybinding_target.clone(), move |_, window, cx| { window.dispatch_action(Box::new(git::Push), cx); }, move |window, cx| { git_action_tooltip( "Re-publish branch to remote", &git::Push, "git push --set-upstream", keybinding_target.clone(), window, cx, ) }, ) } fn git_action_tooltip( label: impl Into, action: &dyn Action, command: impl Into, focus_handle: Option, window: &mut Window, cx: &mut App, ) -> AnyView { let label = label.into(); let command = command.into(); if let Some(handle) = focus_handle { Tooltip::with_meta_in( label.clone(), Some(action), command.clone(), &handle, window, cx, ) } else { Tooltip::with_meta(label.clone(), Some(action), command.clone(), window, cx) } } fn render_git_action_menu( id: impl Into, keybinding_target: Option, ) -> impl IntoElement { PopoverMenu::new(id.into()) .trigger( ui::ButtonLike::new_rounded_right("split-button-right") .layer(ui::ElevationIndex::ModalSurface) .size(ui::ButtonSize::None) .child( div() .px_1() .child(Icon::new(IconName::ChevronDownSmall).size(IconSize::XSmall)), ), ) .menu(move |window, cx| { Some(ContextMenu::build(window, cx, |context_menu, _, _| { context_menu .when_some(keybinding_target.clone(), |el, keybinding_target| { el.context(keybinding_target.clone()) }) .action("Fetch", git::Fetch.boxed_clone()) .action("Pull", git::Pull.boxed_clone()) .separator() .action("Push", git::Push.boxed_clone()) .action("Force Push", git::ForcePush.boxed_clone()) })) }) .anchor(Corner::TopRight) } #[allow(clippy::too_many_arguments)] fn split_button( id: SharedString, left_label: impl Into, ahead_count: usize, behind_count: usize, left_icon: Option, keybinding_target: Option, left_on_click: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static, tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static, ) -> SplitButton { fn count(count: usize) -> impl IntoElement { h_flex() .ml_neg_px() .h(rems(0.875)) .items_center() .overflow_hidden() .px_0p5() .child( Label::new(count.to_string()) .size(LabelSize::XSmall) .line_height_style(LineHeightStyle::UiLabel), ) } let should_render_counts = left_icon.is_none() && (ahead_count > 0 || behind_count > 0); let left = ui::ButtonLike::new_rounded_left(ElementId::Name( format!("split-button-left-{}", id).into(), )) .layer(ui::ElevationIndex::ModalSurface) .size(ui::ButtonSize::Compact) .when(should_render_counts, |this| { this.child( h_flex() .ml_neg_0p5() .mr_1() .when(behind_count > 0, |this| { this.child(Icon::new(IconName::ArrowDown).size(IconSize::XSmall)) .child(count(behind_count)) }) .when(ahead_count > 0, |this| { this.child(Icon::new(IconName::ArrowUp).size(IconSize::XSmall)) .child(count(ahead_count)) }), ) }) .when_some(left_icon, |this, left_icon| { this.child( h_flex() .ml_neg_0p5() .mr_1() .child(Icon::new(left_icon).size(IconSize::XSmall)), ) }) .child( div() .child(Label::new(left_label).size(LabelSize::Small)) .mr_0p5(), ) .on_click(left_on_click) .tooltip(tooltip); let right = render_git_action_menu( ElementId::Name(format!("split-button-right-{}", id).into()), keybinding_target, ) .into_any_element(); SplitButton { left, right } } } #[derive(IntoElement, IntoComponent)] #[component(scope = "Version Control")] pub struct GitStatusIcon { status: FileStatus, } impl GitStatusIcon { pub fn new(status: FileStatus) -> Self { Self { status } } } impl RenderOnce for GitStatusIcon { fn render(self, _window: &mut ui::Window, cx: &mut App) -> impl IntoElement { let status = self.status; let (icon_name, color) = if status.is_conflicted() { ( IconName::Warning, cx.theme().colors().version_control_conflict, ) } else if status.is_deleted() { ( IconName::SquareMinus, cx.theme().colors().version_control_deleted, ) } else if status.is_modified() { ( IconName::SquareDot, cx.theme().colors().version_control_modified, ) } else { ( IconName::SquarePlus, cx.theme().colors().version_control_added, ) }; Icon::new(icon_name).color(Color::Custom(color)) } } // View this component preview using `workspace: open component-preview` impl ComponentPreview for GitStatusIcon { fn preview(_window: &mut Window, _cx: &mut App) -> AnyElement { fn tracked_file_status(code: StatusCode) -> FileStatus { FileStatus::Tracked(git::status::TrackedStatus { index_status: code, worktree_status: code, }) } let modified = tracked_file_status(StatusCode::Modified); let added = tracked_file_status(StatusCode::Added); let deleted = tracked_file_status(StatusCode::Deleted); let conflict = UnmergedStatus { first_head: UnmergedStatusCode::Updated, second_head: UnmergedStatusCode::Updated, } .into(); v_flex() .gap_6() .children(vec![example_group(vec![ single_example("Modified", GitStatusIcon::new(modified).into_any_element()), single_example("Added", GitStatusIcon::new(added).into_any_element()), single_example("Deleted", GitStatusIcon::new(deleted).into_any_element()), single_example( "Conflicted", GitStatusIcon::new(conflict).into_any_element(), ), ])]) .into_any_element() } }