pub use crate::commit_context_menu::{CopyCommitSha, CopyCommitTag, OpenCommitView}; use crate::{ commit_context_menu::{CommitContextMenuData, CommitContextMenuSource, commit_context_menu}, commit_tooltip::CommitAvatar, commit_view::CommitView, git_status_icon, }; use collections::{BTreeMap, HashMap, IndexSet}; use editor::Editor; use file_icons::FileIcons; use git::{ BuildCommitPermalinkParams, GitHostingProviderRegistry, GitRemote, Oid, ParsedGitRemote, parse_git_remote_url, repository::{InitialGraphCommitData, LogOrder, LogSource, RepoPath, SearchCommitArgs}, status::{FileStatus, StatusCode, TrackedStatus}, }; use gpui::{ Action, Anchor, AnyElement, App, Bounds, ClickEvent, ClipboardItem, DefiniteLength, DismissEvent, DragMoveEvent, ElementId, Empty, Entity, EventEmitter, FocusHandle, Focusable, Hsla, MouseButton, MouseDownEvent, PathBuilder, Pixels, Point, ScrollHandle, ScrollStrategy, ScrollWheelEvent, SharedString, Subscription, Task, TextStyleRefinement, UniformListScrollHandle, WeakEntity, Window, actions, anchored, deferred, point, prelude::*, px, uniform_list, }; use language::line_diff; use markdown::{Markdown, MarkdownElement}; use menu::{Cancel, SelectFirst, SelectLast, SelectNext, SelectPrevious}; use picker::{Picker, PickerDelegate}; use project::{ ProjectPath, git_store::{ CommitDataState, CommitDiff, CommitFile, GitGraphEvent, GitStore, GitStoreEvent, GraphDataResponse, Repository, RepositoryEvent, RepositoryId, }, }; use smallvec::{SmallVec, smallvec}; use std::{ cell::Cell, ops::Range, rc::Rc, sync::{Arc, OnceLock}, time::{Duration, Instant}, }; use zed_actions::{ buffer_search, search::{SelectNextMatch, SelectPreviousMatch, ToggleCaseSensitive}, }; use theme::AccentColors; use time::{OffsetDateTime, UtcOffset, format_description::BorrowedFormatItem}; use ui::{ Chip, ColumnWidthConfig, CommonAnimationExt as _, ContextMenu, DiffStat, Divider, HeaderResizeInfo, HighlightedLabel, IndentGuideColors, ListItem, ListItemSpacing, RedistributableColumnsState, ScrollableHandle, Table, TableInteractionState, TableRenderContext, TableResizeBehavior, Tooltip, WithScrollbar, bind_redistributable_columns, prelude::*, redistribute_hidden_fractions, redistribute_hidden_widths, render_redistributable_columns_resize_handles, render_table_header, table_row::TableRow, }; use util::{ResultExt, debug_panic}; use workspace::{ ModalView, Workspace, item::{Item, ItemEvent, TabTooltipContent}, }; const COMMIT_CIRCLE_RADIUS: Pixels = px(3.5); const COMMIT_CIRCLE_STROKE_WIDTH: Pixels = px(1.5); const LANE_WIDTH: Pixels = px(16.0); const LEFT_PADDING: Pixels = px(12.0); const LINE_WIDTH: Pixels = px(1.5); const RESIZE_HANDLE_WIDTH: f32 = 8.0; const COPIED_STATE_DURATION: Duration = Duration::from_secs(2); const COMMIT_TAG_LIST_WIDTH_IN_REMS: Rems = rems(10.); const TREE_INDENT: f32 = 20.0; const TABLE_COLUMN_COUNT: usize = 4; const ROW_VERTICAL_PADDING: Pixels = px(4.0); struct CopiedState { copied_at: Option, } impl CopiedState { fn new(_window: &mut Window, _cx: &mut Context) -> Self { Self { copied_at: None } } fn is_copied(&self) -> bool { self.copied_at .map(|t| t.elapsed() < COPIED_STATE_DURATION) .unwrap_or(false) } fn mark_copied(&mut self) { self.copied_at = Some(Instant::now()); } } struct DraggedSplitHandle; struct CommitTagPicker { picker: Entity>, } impl CommitTagPicker { fn new(tag_names: Vec, window: &mut Window, cx: &mut Context) -> Self { let delegate = CommitTagPickerDelegate { picker: cx.entity().downgrade(), tag_names, selected_index: 0, }; let picker = cx.new(|cx| { Picker::nonsearchable_uniform_list(delegate, window, cx) .initial_width(COMMIT_TAG_LIST_WIDTH_IN_REMS) }); Self { picker } } } impl EventEmitter for CommitTagPicker {} impl ModalView for CommitTagPicker {} impl Focusable for CommitTagPicker { fn focus_handle(&self, cx: &App) -> FocusHandle { self.picker.focus_handle(cx) } } impl Render for CommitTagPicker { fn render(&mut self, _window: &mut Window, _cx: &mut Context) -> impl IntoElement { v_flex().child(self.picker.clone()) } } struct CommitTagPickerDelegate { picker: WeakEntity, tag_names: Vec, selected_index: usize, } impl PickerDelegate for CommitTagPickerDelegate { type ListItem = ListItem; fn name() -> &'static str { "commit-tag" } fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc { "Copy Tag".into() } fn match_count(&self) -> usize { self.tag_names.len() } fn selected_index(&self) -> usize { self.selected_index } fn set_selected_index( &mut self, ix: usize, _window: &mut Window, _cx: &mut Context>, ) { self.selected_index = ix; } fn update_matches( &mut self, _query: String, _window: &mut Window, _cx: &mut Context>, ) -> Task<()> { Task::ready(()) } fn confirm(&mut self, _secondary: bool, window: &mut Window, cx: &mut Context>) { if let Some(tag_name) = self.tag_names.get(self.selected_index) { cx.write_to_clipboard(ClipboardItem::new_string(tag_name.to_string())); } self.dismissed(window, cx); } fn dismissed(&mut self, _window: &mut Window, cx: &mut Context>) { self.picker .update(cx, |_this, cx| cx.emit(DismissEvent)) .ok(); } fn render_match( &self, ix: usize, selected: bool, _window: &mut Window, _cx: &mut Context>, ) -> Option { Some( ListItem::new(ix) .inset(true) .spacing(ListItemSpacing::Sparse) .toggle_state(selected) .child(Label::new(self.tag_names.get(ix)?.clone())), ) } } #[derive(Clone)] struct ChangedFileEntry { status: FileStatus, file_name: SharedString, dir_path: SharedString, repo_path: RepoPath, } impl ChangedFileEntry { fn from_commit_file(file: &CommitFile, _cx: &App) -> Self { let file_name: SharedString = file .path .file_name() .map(|n| n.to_string()) .unwrap_or_default() .into(); let dir_path: SharedString = file .path .parent() .map(|p| p.as_unix_str().to_string()) .unwrap_or_default() .into(); let status_code = match (&file.old_text, &file.new_text) { (None, Some(_)) => StatusCode::Added, (Some(_), None) => StatusCode::Deleted, _ => StatusCode::Modified, }; let status = FileStatus::Tracked(TrackedStatus { index_status: status_code, worktree_status: StatusCode::Unmodified, }); Self { status, file_name, dir_path, repo_path: file.path.clone(), } } fn open_in_commit_view( &self, commit_sha: &SharedString, repository: &WeakEntity, workspace: &WeakEntity, window: &mut Window, cx: &mut App, ) { CommitView::open( commit_sha.to_string(), repository.clone(), workspace.clone(), None, Some(self.repo_path.clone()), window, cx, ); } fn render( &self, ix: usize, depth: usize, directory_label: Option, commit_sha: SharedString, repository: WeakEntity, workspace: WeakEntity, _cx: &App, ) -> AnyElement { let file_name = self.file_name.clone(); let dir_path = self.dir_path.clone(); ListItem::new(("changed-file", ix)) .spacing(ListItemSpacing::Sparse) .indent_level(depth) .indent_step_size(px(TREE_INDENT)) .start_slot(git_status_icon(self.status)) .child( Label::new(file_name.clone()) .size(LabelSize::Small) .truncate(), ) .when_some(directory_label, |this, directory_label| { this.child( Label::new(directory_label) .size(LabelSize::Small) .color(Color::Muted) .truncate_start(), ) }) .tooltip({ let meta = if dir_path.is_empty() { file_name } else { format!("{}/{}", dir_path, file_name).into() }; move |_, cx| Tooltip::with_meta("View Changes", None, meta.clone(), cx) }) .on_click({ let entry = self.clone(); move |_, window, cx| { entry.open_in_commit_view(&commit_sha, &repository, &workspace, window, cx); } }) .into_any_element() } } enum ChangedFileTreeEntry { Directory(ChangedFileDirectoryEntry), File(ChangedFileTreeStatusEntry), } struct ChangedFileTreeStatusEntry { entry: ChangedFileEntry, depth: usize, } #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] enum ChangedFilesViewMode { Flat, #[default] Tree, } impl ChangedFilesViewMode { fn toggled(self) -> Self { match self { Self::Flat => Self::Tree, Self::Tree => Self::Flat, } } fn is_tree(self) -> bool { matches!(self, Self::Tree) } } struct ChangedFileDirectoryEntry { path: RepoPath, name: SharedString, depth: usize, expanded: bool, } impl ChangedFileDirectoryEntry { fn render(&self, ix: usize, git_graph: WeakEntity, cx: &App) -> AnyElement { let path = self.path.clone(); let expanded = self.expanded; let folder_icon = FileIcons::get_folder_icon(expanded, path.as_std_path(), cx) .map(|icon| { Icon::from_path(icon) .size(IconSize::Small) .color(Color::Muted) }) .unwrap_or_else(|| { let icon = if expanded { IconName::FolderOpen } else { IconName::Folder }; Icon::new(icon).size(IconSize::Small).color(Color::Muted) }); ListItem::new(("changed-file-dir", ix)) .spacing(ListItemSpacing::Sparse) .indent_level(self.depth) .indent_step_size(px(TREE_INDENT)) .start_slot(folder_icon) .child( Label::new(self.name.clone()) .size(LabelSize::Small) .color(Color::Muted) .truncate(), ) .tooltip({ let name = self.name.clone(); move |_, cx| Tooltip::with_meta("Toggle Folder", None, name.clone(), cx) }) .on_click(move |_, _, cx| { git_graph .update(cx, |git_graph, cx| { git_graph .changed_files_expanded_dirs .insert(path.clone(), !expanded); cx.notify(); }) .ok(); }) .into_any_element() } } #[derive(Default)] struct ChangedFileTreeNode { name: SharedString, path: Option, children: BTreeMap, files: Vec, } fn build_changed_file_tree_entries( mut files: Vec, expanded_dirs: &HashMap, ) -> Vec { files.sort_by(|a, b| a.repo_path.cmp(&b.repo_path)); let mut root = ChangedFileTreeNode::default(); for file in files { let components: Vec<&str> = file.repo_path.components().collect(); if components.is_empty() { root.files.push(file); continue; } let mut current = &mut root; let mut current_path = String::new(); for (ix, component) in components.iter().enumerate() { if ix == components.len() - 1 { current.files.push(file.clone()); } else { if !current_path.is_empty() { current_path.push('/'); } current_path.push_str(component); let Ok(dir_path) = RepoPath::new(¤t_path) else { continue; }; let component = SharedString::from(component.to_string()); current = current .children .entry(component.clone()) .or_insert_with(|| ChangedFileTreeNode { name: component, path: Some(dir_path), ..Default::default() }); } } } flatten_changed_file_tree(&root, 0, expanded_dirs) } fn flatten_changed_file_tree( node: &ChangedFileTreeNode, depth: usize, expanded_dirs: &HashMap, ) -> Vec { let mut entries = Vec::new(); for child in node.children.values() { let (terminal, name) = compact_changed_file_directory_chain(child); let Some(path) = terminal.path.clone().or_else(|| child.path.clone()) else { continue; }; let expanded = *expanded_dirs.get(&path).unwrap_or(&true); let child_entries = flatten_changed_file_tree(terminal, depth + 1, expanded_dirs); entries.push(ChangedFileTreeEntry::Directory(ChangedFileDirectoryEntry { path, name, depth, expanded, })); if expanded { entries.extend(child_entries); } } entries.extend( node.files .iter() .cloned() .map(|entry| ChangedFileTreeEntry::File(ChangedFileTreeStatusEntry { entry, depth })), ); entries } fn compact_changed_file_directory_chain( mut node: &ChangedFileTreeNode, ) -> (&ChangedFileTreeNode, SharedString) { let mut parts = vec![node.name.clone()]; while node.files.is_empty() && node.children.len() == 1 { let Some(child) = node.children.values().next() else { continue; }; if child.path.is_none() { break; } parts.push(child.name.clone()); node = child; } (node, SharedString::from(parts.join("/"))) } enum QueryState { Pending(SharedString), Confirmed((SharedString, Task<()>)), Empty, } impl QueryState { fn next_state(&mut self) { match self { Self::Confirmed((query, _)) => *self = Self::Pending(std::mem::take(query)), _ => {} }; } } struct SearchState { case_sensitive: bool, editor: Entity, state: QueryState, matches: IndexSet, selected_index: Option, } struct SplitState { left_ratio: f32, visible_left_ratio: f32, } impl SplitState { fn new() -> Self { Self { left_ratio: 1.0, visible_left_ratio: 1.0, } } fn right_ratio(&self) -> f32 { 1.0 - self.visible_left_ratio } fn on_drag_move( &mut self, drag_event: &DragMoveEvent, _window: &mut Window, _cx: &mut Context, ) { let drag_position = drag_event.event.position; let bounds = drag_event.bounds; let bounds_width = bounds.right() - bounds.left(); let min_ratio = 0.1; let max_ratio = 0.9; let new_ratio = (drag_position.x - bounds.left()) / bounds_width; self.visible_left_ratio = new_ratio.clamp(min_ratio, max_ratio); } fn commit_ratio(&mut self) { self.left_ratio = self.visible_left_ratio; } fn on_double_click(&mut self) { self.left_ratio = 1.0; self.visible_left_ratio = 1.0; } } actions!( git_graph, [ /// Opens the Git Graph Tab. Open, /// Focuses the search field. FocusSearch, /// Focuses the next git graph tab stop. FocusNextTabStop, /// Focuses the previous git graph tab stop. FocusPreviousTabStop, /// Selects a commit half a page above the current selection. ScrollUp, /// Selects a commit half a page below the current selection. ScrollDown, /// Toggles the selected commit's changed files between flat and tree views. ToggleChangedFilesView, ] ); /// Opens the Git Graph Tab at a specific commit. #[derive(Clone, PartialEq, serde::Deserialize, schemars::JsonSchema, gpui::Action)] #[action(namespace = git_graph)] pub struct OpenAtCommit { pub sha: String, } fn timestamp_format() -> &'static [BorrowedFormatItem<'static>] { static FORMAT: OnceLock>> = OnceLock::new(); FORMAT.get_or_init(|| { time::format_description::parse("[day] [month repr:short] [year] [hour]:[minute]") .unwrap_or_default() }) } fn format_timestamp(timestamp: i64) -> String { let Ok(datetime) = OffsetDateTime::from_unix_timestamp(timestamp) else { return "Unknown".to_string(); }; let local_offset = UtcOffset::current_local_offset().unwrap_or(UtcOffset::UTC); let local_datetime = datetime.to_offset(local_offset); local_datetime .format(timestamp_format()) .unwrap_or_default() } fn accent_colors_count(accents: &AccentColors) -> usize { accents.0.len() } #[derive(Copy, Clone, Debug)] struct BranchColor(u8); #[derive(Debug)] enum LaneState { Empty, Active { child: Oid, parent: Oid, color: Option, starting_row: usize, starting_col: usize, destination_column: Option, segments: SmallVec<[CommitLineSegment; 1]>, }, } impl LaneState { fn to_commit_lines( &mut self, ending_row: usize, lane_column: usize, parent_column: usize, parent_color: BranchColor, ) -> Option { let state = std::mem::replace(self, LaneState::Empty); match state { LaneState::Active { #[cfg_attr(not(test), allow(unused_variables))] parent, #[cfg_attr(not(test), allow(unused_variables))] child, color, starting_row, starting_col, destination_column, mut segments, } => { let final_destination = destination_column.unwrap_or(parent_column); let final_color = color.unwrap_or(parent_color); Some(CommitLine { #[cfg(test)] child, #[cfg(test)] parent, child_column: starting_col, full_interval: starting_row..ending_row, color_idx: final_color.0 as usize, segments: { match segments.last_mut() { Some(CommitLineSegment::Straight { to_row }) if *to_row == usize::MAX => { if final_destination != lane_column { *to_row = ending_row - 1; let curved_line = CommitLineSegment::Curve { to_column: final_destination, on_row: ending_row, curve_kind: CurveKind::Checkout, }; if *to_row == starting_row { let last_index = segments.len() - 1; segments[last_index] = curved_line; } else { segments.push(curved_line); } } else { *to_row = ending_row; } } Some(CommitLineSegment::Curve { on_row, to_column, curve_kind, }) if *on_row == usize::MAX => { if *to_column == usize::MAX { *to_column = final_destination; } if matches!(curve_kind, CurveKind::Merge) { *on_row = starting_row + 1; if *on_row < ending_row { if *to_column != final_destination { segments.push(CommitLineSegment::Straight { to_row: ending_row - 1, }); segments.push(CommitLineSegment::Curve { to_column: final_destination, on_row: ending_row, curve_kind: CurveKind::Checkout, }); } else { segments.push(CommitLineSegment::Straight { to_row: ending_row, }); } } else if *to_column != final_destination { segments.push(CommitLineSegment::Curve { to_column: final_destination, on_row: ending_row, curve_kind: CurveKind::Checkout, }); } } else { *on_row = ending_row; if *to_column != final_destination { segments.push(CommitLineSegment::Straight { to_row: ending_row, }); segments.push(CommitLineSegment::Curve { to_column: final_destination, on_row: ending_row, curve_kind: CurveKind::Checkout, }); } } } Some(CommitLineSegment::Curve { on_row, to_column, .. }) => { if *on_row < ending_row { if *to_column != final_destination { segments.push(CommitLineSegment::Straight { to_row: ending_row - 1, }); segments.push(CommitLineSegment::Curve { to_column: final_destination, on_row: ending_row, curve_kind: CurveKind::Checkout, }); } else { segments.push(CommitLineSegment::Straight { to_row: ending_row, }); } } else if *to_column != final_destination { segments.push(CommitLineSegment::Curve { to_column: final_destination, on_row: ending_row, curve_kind: CurveKind::Checkout, }); } } _ => {} } segments }, }) } LaneState::Empty => None, } } fn is_empty(&self) -> bool { match self { LaneState::Empty => true, LaneState::Active { .. } => false, } } } struct CommitEntry { data: Arc, lane: usize, color_idx: usize, } type ActiveLaneIdx = usize; enum AllCommitCount { NotLoaded, Loading(usize), FullyLoaded(usize), } #[derive(Debug)] enum CurveKind { Merge, Checkout, } #[derive(Debug)] enum CommitLineSegment { Straight { to_row: usize, }, Curve { to_column: usize, on_row: usize, curve_kind: CurveKind, }, } #[derive(Debug)] struct CommitLine { #[cfg(test)] child: Oid, #[cfg(test)] parent: Oid, child_column: usize, full_interval: Range, color_idx: usize, segments: SmallVec<[CommitLineSegment; 1]>, } impl CommitLine { fn get_first_visible_segment_idx(&self, first_visible_row: usize) -> Option<(usize, usize)> { if first_visible_row > self.full_interval.end { return None; } else if first_visible_row <= self.full_interval.start { return Some((0, self.child_column)); } let mut current_column = self.child_column; for (idx, segment) in self.segments.iter().enumerate() { match segment { CommitLineSegment::Straight { to_row } => { if *to_row >= first_visible_row { return Some((idx, current_column)); } } CommitLineSegment::Curve { to_column, on_row, .. } => { if *on_row >= first_visible_row { return Some((idx, current_column)); } current_column = *to_column; } } } None } } #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] struct CommitLineKey { child: Oid, parent: Oid, } struct GraphData { lane_states: SmallVec<[LaneState; 8]>, lane_colors: HashMap, parent_to_lanes: HashMap>, next_color: BranchColor, accent_colors_count: usize, commits: Vec>, max_commit_count: AllCommitCount, max_lanes: usize, lines: Vec>, active_commit_lines: HashMap, active_commit_lines_by_parent: HashMap>, } impl GraphData { fn new(accent_colors_count: usize) -> Self { GraphData { lane_states: SmallVec::default(), lane_colors: HashMap::default(), parent_to_lanes: HashMap::default(), next_color: BranchColor(0), accent_colors_count, commits: Vec::default(), max_commit_count: AllCommitCount::NotLoaded, max_lanes: 0, lines: Vec::default(), active_commit_lines: HashMap::default(), active_commit_lines_by_parent: HashMap::default(), } } fn clear(&mut self) { self.lane_states.clear(); self.lane_colors.clear(); self.parent_to_lanes.clear(); self.commits.clear(); self.lines.clear(); self.active_commit_lines.clear(); self.active_commit_lines_by_parent.clear(); self.next_color = BranchColor(0); self.max_commit_count = AllCommitCount::NotLoaded; self.max_lanes = 0; } fn first_empty_lane_idx(&mut self) -> ActiveLaneIdx { self.lane_states .iter() .position(LaneState::is_empty) .unwrap_or_else(|| { self.lane_states.push(LaneState::Empty); self.lane_states.len() - 1 }) } fn get_lane_color(&mut self, lane_idx: ActiveLaneIdx) -> BranchColor { let accent_colors_count = self.accent_colors_count; *self.lane_colors.entry(lane_idx).or_insert_with(|| { let color_idx = self.next_color; self.next_color = BranchColor((self.next_color.0 + 1) % accent_colors_count as u8); color_idx }) } fn add_commits(&mut self, commits: &[Arc]) { self.commits.reserve(commits.len()); self.lines.reserve(commits.len() / 2); for commit in commits.iter() { let commit_row = self.commits.len(); let commit_lane = self .parent_to_lanes .get(&commit.sha) .and_then(|lanes| lanes.iter().min().copied()); let commit_lane = commit_lane.unwrap_or_else(|| self.first_empty_lane_idx()); let commit_color = self.get_lane_color(commit_lane); if let Some(lanes) = self.parent_to_lanes.remove(&commit.sha) { for lane_column in lanes { let state = &mut self.lane_states[lane_column]; if let LaneState::Active { starting_row, segments, .. } = state { if let Some(CommitLineSegment::Curve { to_column, curve_kind: CurveKind::Merge, .. }) = segments.first_mut() { let curve_row = *starting_row + 1; let would_overlap = if lane_column != commit_lane && curve_row < commit_row { self.commits[curve_row..commit_row] .iter() .any(|c| c.lane == commit_lane) } else { false }; if would_overlap { *to_column = lane_column; } } } if let Some(commit_line) = state.to_commit_lines(commit_row, lane_column, commit_lane, commit_color) { self.lines.push(Rc::new(commit_line)); } } } commit .parents .iter() .enumerate() .for_each(|(parent_idx, parent)| { if parent_idx == 0 { self.lane_states[commit_lane] = LaneState::Active { parent: *parent, child: commit.sha, color: Some(commit_color), starting_col: commit_lane, starting_row: commit_row, destination_column: None, segments: smallvec![CommitLineSegment::Straight { to_row: usize::MAX }], }; self.parent_to_lanes .entry(*parent) .or_default() .push(commit_lane); } else { let new_lane = self.first_empty_lane_idx(); self.lane_states[new_lane] = LaneState::Active { parent: *parent, child: commit.sha, color: None, starting_col: commit_lane, starting_row: commit_row, destination_column: None, segments: smallvec![CommitLineSegment::Curve { to_column: usize::MAX, on_row: usize::MAX, curve_kind: CurveKind::Merge, },], }; self.parent_to_lanes .entry(*parent) .or_default() .push(new_lane); } }); self.max_lanes = self.max_lanes.max(self.lane_states.len()); self.commits.push(Rc::new(CommitEntry { data: commit.clone(), lane: commit_lane, color_idx: commit_color.0 as usize, })); } self.max_commit_count = AllCommitCount::Loading(self.commits.len()); } } pub fn init(cx: &mut App) { workspace::register_serializable_item::(cx); cx.observe_new(|workspace: &mut workspace::Workspace, _, _| { workspace.register_action_renderer(|div, workspace, window, cx| { div.when_some( resolve_file_history_target(workspace, window, cx), |div, (repo_id, log_source)| { let git_store = workspace.project().read(cx).git_store().clone(); let workspace = workspace.weak_handle(); div.on_action(move |_: &git::FileHistory, window, cx| { let git_store = git_store.clone(); workspace .update(cx, |workspace, cx| { open_or_reuse_graph( workspace, repo_id, git_store, log_source.clone(), None, window, cx, ); }) .ok(); }) }, ) .when( workspace.project().read(cx).active_repository(cx).is_some(), |div| { let workspace = workspace.weak_handle(); div.on_action({ let workspace = workspace.clone(); move |_: &Open, window, cx| { workspace .update(cx, |workspace, cx| { let Some(repo) = workspace.project().read(cx).active_repository(cx) else { return; }; let selected_repo_id = repo.read(cx).id; let git_store = workspace.project().read(cx).git_store().clone(); open_or_reuse_graph( workspace, selected_repo_id, git_store, LogSource::All, None, window, cx, ); }) .ok(); } }) .on_action(move |action: &OpenAtCommit, window, cx| { let sha = action.sha.clone(); workspace .update(cx, |workspace, cx| { let Some(repo) = workspace.project().read(cx).active_repository(cx) else { return; }; let selected_repo_id = repo.read(cx).id; let git_store = workspace.project().read(cx).git_store().clone(); open_or_reuse_graph( workspace, selected_repo_id, git_store, LogSource::All, Some(sha), window, cx, ); }) .ok(); }) }, ) }); }) .detach(); } /// Resolves a `git::FileHistory` target from a known project path (used by /// callers like `project_panel` that own a focused selection but cannot be /// referenced from this module due to dependency direction). pub fn resolve_file_history_target_from_project_path( workspace: &Workspace, project_path: &ProjectPath, cx: &App, ) -> Option<(RepositoryId, LogSource)> { let git_store = workspace.project().read(cx).git_store(); let (repo, repo_path) = git_store .read(cx) .repository_and_path_for_project_path(project_path, cx)?; let log_source = if repo_path.is_empty() { LogSource::All } else { LogSource::Path(repo_path) }; Some((repo.read(cx).id, log_source)) } fn resolve_file_history_target( workspace: &Workspace, window: &Window, cx: &App, ) -> Option<(RepositoryId, LogSource)> { if let Some(panel) = workspace.panel::(cx) && panel.read(cx).focus_handle(cx).contains_focused(window, cx) && let Some((repository, repo_path)) = panel.read(cx).selected_file_history_target() { return Some((repository.read(cx).id, LogSource::Path(repo_path))); } let editor = workspace.active_item_as::(cx)?; let file = editor .read(cx) .file_at(editor.read(cx).selections.newest_anchor().head(), cx)?; let project_path = ProjectPath { worktree_id: file.worktree_id(cx), path: file.path().clone(), }; let git_store = workspace.project().read(cx).git_store(); let (repo, repo_path) = git_store .read(cx) .repository_and_path_for_project_path(&project_path, cx)?; Some((repo.read(cx).id, LogSource::Path(repo_path))) } pub fn open_or_reuse_graph( workspace: &mut Workspace, repo_id: RepositoryId, git_store: Entity, log_source: LogSource, sha: Option, window: &mut Window, cx: &mut Context, ) { let existing = workspace.items_of_type::(cx).find(|graph| { let graph = graph.read(cx); graph.repo_id == repo_id && graph.log_source == log_source }); let git_graph = if let Some(existing) = existing { workspace.activate_item(&existing, true, true, window, cx); existing } else { let workspace_handle = workspace.weak_handle(); let git_graph = cx.new(|cx| { GitGraph::new( repo_id, git_store, workspace_handle, Some(log_source), window, cx, ) }); workspace.add_item_to_active_pane(Box::new(git_graph.clone()), None, true, window, cx); git_graph }; if let Some(sha) = sha { cx.defer(move |cx| { git_graph.update(cx, |graph, cx| { graph.select_commit_by_sha(sha.as_str(), cx); }); }); } } fn lane_center_x(bounds: Bounds, lane: f32) -> Pixels { bounds.origin.x + LEFT_PADDING + lane * LANE_WIDTH + LANE_WIDTH / 2.0 } fn to_row_center( to_row: usize, row_height: Pixels, scroll_offset: Pixels, bounds: Bounds, ) -> Pixels { bounds.origin.y + to_row as f32 * row_height + row_height / 2.0 - scroll_offset } fn draw_commit_circle(center_x: Pixels, center_y: Pixels, color: Hsla, window: &mut Window) { let radius = COMMIT_CIRCLE_RADIUS; let mut builder = PathBuilder::fill(); // Start at the rightmost point of the circle builder.move_to(point(center_x + radius, center_y)); // Draw the circle using two arc_to calls (top half, then bottom half) builder.arc_to( point(radius, radius), px(0.), false, true, point(center_x - radius, center_y), ); builder.arc_to( point(radius, radius), px(0.), false, true, point(center_x + radius, center_y), ); builder.close(); if let Ok(path) = builder.build() { window.paint_path(path, color); } } fn compute_diff_stats(diff: &CommitDiff) -> (usize, usize) { diff.files.iter().fold((0, 0), |(added, removed), file| { let old_text = file.old_text.as_deref().unwrap_or(""); let new_text = file.new_text.as_deref().unwrap_or(""); let hunks = line_diff(old_text, new_text); hunks .iter() .fold((added, removed), |(a, r), (old_range, new_range)| { ( a + (new_range.end - new_range.start) as usize, r + (old_range.end - old_range.start) as usize, ) }) }) } struct GitGraphContextMenu { menu: Entity, position: Point, target_entry_index: Option, _subscription: Subscription, } struct DetailPanelCommitMessage { sha: Oid, message: Entity, scroll_handle: ScrollHandle, } pub struct GitGraph { focus_handle: FocusHandle, search_state: SearchState, graph_data: GraphData, git_store: Entity, workspace: WeakEntity, context_menu: Option, table_interaction_state: Entity, column_widths: Entity, /// Per-column visibility mask owned by the view (not the resize state) so columns can be /// hidden regardless of whether the table is resizable. `true` means the column is hidden. column_visibility: TableRow, selected_entry_idx: Option, hovered_entry_idx: Option, graph_canvas_bounds: Rc>>>, log_source: LogSource, log_order: LogOrder, selected_commit_diff: Option, selected_commit_diff_stats: Option<(usize, usize)>, _commit_diff_task: Option>, selected_commit_message: Option, _selected_commit_message_task: Option>, commit_details_split_state: Entity, repo_id: RepositoryId, changed_files_scroll_handle: UniformListScrollHandle, changed_files_view_mode: ChangedFilesViewMode, changed_files_expanded_dirs: HashMap, pending_select_sha: Option, } impl GitGraph { fn invalidate_state(&mut self, cx: &mut Context) { self.graph_data.clear(); self.search_state.matches.clear(); self.search_state.selected_index = None; self.search_state.state.next_state(); self.context_menu = None; cx.emit(ItemEvent::Edit); cx.notify(); } /// Computes the height of a single commit row in the git graph. /// /// The returned value is snapped to the nearest physical pixel. This is /// required so that the canvas's float math and the `uniform_list` layout /// (which snaps to device pixels) agree on row positions; otherwise rows /// drift apart as the user scrolls when `ui_font_size` is fractional. fn row_height(window: &Window, _cx: &App) -> Pixels { let rem_size = window.rem_size(); let line_height = window.text_style().line_height_in_pixels(rem_size); let raw = line_height + ROW_VERTICAL_PADDING; let scale = window.scale_factor(); (raw * scale).round() / scale } fn visible_row_count(&self, window: &Window, cx: &App) -> usize { let row_height = Self::row_height(window, cx); let viewport_height = self .table_interaction_state .read(cx) .scroll_handle .0 .borrow() .last_item_size .map_or(window.viewport_size().height, |size| size.item.height); ((viewport_height / row_height).ceil() as usize).min(self.graph_data.commits.len()) } fn graph_canvas_content_width(&self) -> Pixels { (LANE_WIDTH * self.graph_data.max_lanes.max(6) as f32) + LEFT_PADDING * 2.0 } fn preview_column_fractions(&self, window: &Window, cx: &App) -> [f32; 5] { let raw = self .column_widths .read(cx) .preview_fractions(window.rem_size()); let fractions = redistribute_hidden_fractions(&raw, Some(&self.column_visibility)); // Hidden columns occupy no space in the layout, so report them as zero here even though // the shared redistribution helper preserves their stored width for when they return. let value = |idx: usize| { if self.column_visibility.get(idx).copied().unwrap_or(false) { 0.0 } else { fractions[idx] } }; let is_path_history = matches!(self.log_source, LogSource::Path(_)); let graph_fraction = if is_path_history { 0.0 } else { value(0) }; let offset = if is_path_history { 0 } else { 1 }; [ graph_fraction, value(offset), value(offset + 1), value(offset + 2), value(offset + 3), ] } fn table_column_width_config(&self, window: &Window, cx: &App) -> ColumnWidthConfig { let [_, description, date, author, commit] = self.preview_column_fractions(window, cx); let table_total = description + date + author + commit; let widths = if table_total > 0.0 { vec![ DefiniteLength::Fraction(description / table_total), DefiniteLength::Fraction(date / table_total), DefiniteLength::Fraction(author / table_total), DefiniteLength::Fraction(commit / table_total), ] } else { vec![ DefiniteLength::Fraction(0.25), DefiniteLength::Fraction(0.25), DefiniteLength::Fraction(0.25), DefiniteLength::Fraction(0.25), ] }; ColumnWidthConfig::explicit(widths) } fn graph_viewport_width(&self, window: &Window, cx: &App) -> Pixels { let container = self.column_widths.read(cx).cached_container_width(); let graph_fraction = self.preview_column_fractions(window, cx)[0]; if container > px(0.) && graph_fraction > 0.0 { container * graph_fraction } else { self.graph_canvas_content_width() } } pub fn new( repo_id: RepositoryId, git_store: Entity, workspace: WeakEntity, log_source: Option, window: &mut Window, cx: &mut Context, ) -> Self { let focus_handle = cx.focus_handle(); cx.on_focus(&focus_handle, window, |_, _, cx| cx.notify()) .detach(); let accent_colors = cx.theme().accents(); let graph = GraphData::new(accent_colors_count(accent_colors)); let log_source = log_source.unwrap_or_default(); let log_order = LogOrder::default(); cx.subscribe(&git_store, |this, _, event, cx| match event { GitStoreEvent::RepositoryUpdated(updated_repo_id, repo_event, _) => { if this.repo_id == *updated_repo_id { if let Some(repository) = this.get_repository(cx) { this.on_repository_event(repository, repo_event, cx); } } } _ => {} }) .detach(); let search_editor = cx.new(|cx| { let mut editor = Editor::single_line(window, cx); editor.set_placeholder_text("Search commits…", window, cx); editor }); let table_interaction_state = cx.new(|cx| { let mut state = TableInteractionState::new(cx); state.focus_handle = state.focus_handle.tab_index(1).tab_stop(true); state }); let column_widths = if matches!(log_source, LogSource::Path(_)) { cx.new(|_cx| { RedistributableColumnsState::new( 4, vec![ DefiniteLength::Fraction(0.72), DefiniteLength::Fraction(0.12), DefiniteLength::Fraction(0.1), DefiniteLength::Fraction(0.06), ], vec![ TableResizeBehavior::Resizable, TableResizeBehavior::Resizable, TableResizeBehavior::Resizable, TableResizeBehavior::Resizable, ], ) }) } else { cx.new(|_cx| { RedistributableColumnsState::new( 5, vec![ DefiniteLength::Fraction(0.14), DefiniteLength::Fraction(0.6192), DefiniteLength::Fraction(0.1032), DefiniteLength::Fraction(0.086), DefiniteLength::Fraction(0.0516), ], vec![ TableResizeBehavior::Resizable, TableResizeBehavior::Resizable, TableResizeBehavior::Resizable, TableResizeBehavior::Resizable, TableResizeBehavior::Resizable, ], ) }) }; let column_visibility = TableRow::from_element( false, if matches!(log_source, LogSource::Path(_)) { TABLE_COLUMN_COUNT } else { TABLE_COLUMN_COUNT + 1 }, ); let mut row_height = Self::row_height(window, cx); cx.observe_global_in::(window, move |this, window, cx| { let new_row_height = Self::row_height(window, cx); if new_row_height != row_height { // The `uniform_list` powering the table caches the item size // from its last layout; invalidate it so it re-measures with // the new row height on the next frame. this.table_interaction_state.update(cx, |state, _cx| { state.scroll_handle.0.borrow_mut().last_item_size = None; }); row_height = new_row_height; cx.notify(); } }) .detach(); let mut this = GitGraph { focus_handle, git_store, search_state: SearchState { case_sensitive: false, editor: search_editor, matches: IndexSet::default(), selected_index: None, state: QueryState::Empty, }, workspace, graph_data: graph, _commit_diff_task: None, context_menu: None, table_interaction_state, column_widths, column_visibility, selected_entry_idx: None, hovered_entry_idx: None, graph_canvas_bounds: Rc::new(Cell::new(None)), selected_commit_diff: None, selected_commit_diff_stats: None, selected_commit_message: None, _selected_commit_message_task: None, log_source, log_order, commit_details_split_state: cx.new(|_cx| SplitState::new()), repo_id, changed_files_scroll_handle: UniformListScrollHandle::new(), changed_files_view_mode: ChangedFilesViewMode::default(), changed_files_expanded_dirs: HashMap::default(), pending_select_sha: None, }; this.fetch_initial_graph_data(cx); this } fn on_repository_event( &mut self, repository: Entity, event: &RepositoryEvent, cx: &mut Context, ) { match event { RepositoryEvent::GraphEvent((source, order), event) if source == &self.log_source && order == &self.log_order => { match event { GitGraphEvent::FullyLoaded => { if let Some(pending_sha_index) = self.pending_select_sha.take().and_then(|oid| { repository .read(cx) .get_graph_data(source.clone(), *order) .and_then(|data| data.commit_oid_to_index.get(&oid).copied()) }) { self.select_entry(pending_sha_index, ScrollStrategy::Nearest, cx); } let count = match self.graph_data.max_commit_count { AllCommitCount::FullyLoaded(count) | AllCommitCount::Loading(count) => { count } AllCommitCount::NotLoaded => 0, }; self.graph_data.max_commit_count = AllCommitCount::FullyLoaded(count); cx.notify(); } GitGraphEvent::LoadingError => { cx.notify(); } GitGraphEvent::CountUpdated(commit_count) => { let old_count = self.graph_data.commits.len(); if let Some(pending_selection_index) = repository.update(cx, |repository, cx| { let GraphDataResponse { commits, is_loading, error: _, } = repository.graph_data( source.clone(), *order, old_count..*commit_count, cx, ); self.graph_data.add_commits(commits); let pending_sha_index = self.pending_select_sha.and_then(|oid| { repository.get_graph_data(source.clone(), *order).and_then( |data| data.commit_oid_to_index.get(&oid).copied(), ) }); if !is_loading && pending_sha_index.is_none() { self.pending_select_sha.take(); } pending_sha_index }) { self.select_entry(pending_selection_index, ScrollStrategy::Nearest, cx); self.pending_select_sha.take(); } cx.notify(); } } } RepositoryEvent::HeadChanged | RepositoryEvent::BranchListChanged => { // Only invalidate if we scanned atleast once, // meaning we are not inside the initial repo loading state // NOTE: this fixes an loading performance regression if repository.read(cx).scan_id > 1 { self.pending_select_sha = None; self.invalidate_state(cx); } } RepositoryEvent::StashEntriesChanged if self.log_source == LogSource::All => { // Stash entries initial's scan id is 2, so we don't want to invalidate the graph before that if repository.read(cx).scan_id > 2 { self.pending_select_sha = None; self.invalidate_state(cx); } } RepositoryEvent::GraphEvent(_, _) => {} _ => {} } } fn fetch_initial_graph_data(&mut self, cx: &mut App) { if let Some(repository) = self.get_repository(cx) { repository.update(cx, |repository, cx| { let commits = repository .graph_data(self.log_source.clone(), self.log_order, 0..usize::MAX, cx) .commits; self.graph_data.add_commits(commits); }); } } fn get_repository(&self, cx: &App) -> Option> { let git_store = self.git_store.read(cx); git_store.repositories().get(&self.repo_id).cloned() } /// Checks whether a ref name from git's `%D` decoration /// format refers to the currently checked-out branch. fn is_head_ref(ref_name: &str, head_branch_name: &Option) -> bool { head_branch_name.as_ref().is_some_and(|head| { ref_name == head.as_ref() || ref_name.strip_prefix("HEAD -> ") == Some(head.as_ref()) }) } /// Extracts a ref name (branch, remote ref, or tag) from a decoration in /// git's `%D` format, returning `None` for a detached `HEAD`. fn ref_name_from_decoration(decoration: &str) -> Option { let name = decoration .strip_prefix("tag: ") .or_else(|| decoration.strip_prefix("HEAD -> ")) .unwrap_or(decoration); if name.is_empty() || name == "HEAD" { return None; } Some(SharedString::from(name.to_string())) } fn render_chip( &self, name: &SharedString, accent_color: gpui::Hsla, is_head: bool, ) -> impl IntoElement { Chip::new(name.clone()) .label_size(LabelSize::Small) .truncate() .tooltip({ let name = name.clone(); move |_, cx| Tooltip::simple(name.clone(), cx) }) .map(|chip| { if is_head { chip.icon(IconName::Check) .bg_color(accent_color.opacity(0.25)) .border_color(accent_color.opacity(0.5)) } else { chip.bg_color(accent_color.opacity(0.08)) .border_color(accent_color.opacity(0.25)) } }) } /// Renders a ref chip for the commit at `commit_idx`. Chips that name a ref /// (branch, remote ref, or tag) get a right-click handler that opens a /// ref-specific context menu, so that custom commands can be resolved /// against the clicked ref. fn render_ref_chip( &self, name: &SharedString, accent_color: gpui::Hsla, is_head: bool, commit_idx: usize, cx: &mut Context, ) -> AnyElement { let chip = self.render_chip(name, accent_color, is_head); let Some(ref_name) = Self::ref_name_from_decoration(name) else { return chip.into_any_element(); }; div() .min_w_0() .child(chip) .on_mouse_down( MouseButton::Right, cx.listener(move |this, event: &MouseDownEvent, window, cx| { this.deploy_entry_context_menu( event.position, commit_idx, Some(ref_name.clone()), window, cx, ); cx.stop_propagation(); }), ) .into_any_element() } fn render_table_rows( &mut self, range: Range, window: &mut Window, cx: &mut Context, ) -> Vec> { let repository = self.get_repository(cx); let head_branch_name: Option = repository.as_ref().and_then(|repo| { repo.read(cx) .snapshot() .branch .as_ref() .map(|branch| SharedString::from(branch.name().to_string())) }); let row_height = Self::row_height(window, cx); // We fetch data outside the visible viewport to avoid loading entries when // users scroll through the git graph if let Some(repository) = repository.as_ref() { const FETCH_RANGE: usize = 100; repository.update(cx, |repository, cx| { self.graph_data.commits[range.start.saturating_sub(FETCH_RANGE) ..(range.end + FETCH_RANGE) .min(self.graph_data.commits.len().saturating_sub(1))] .iter() .for_each(|commit| { repository.fetch_commit_data(commit.data.sha, false, cx); }); }); } range .map(|idx| { let Some((commit, repository)) = self.graph_data.commits.get(idx).zip(repository.as_ref()) else { return vec![ div().h(row_height).into_any_element(), div().h(row_height).into_any_element(), div().h(row_height).into_any_element(), div().h(row_height).into_any_element(), ]; }; let data = repository.update(cx, |repository, cx| { repository .fetch_commit_data(commit.data.sha, false, cx) .clone() }); let short_sha = commit.data.sha.display_short(); let mut formatted_time = String::new(); let subject: SharedString; let author_name: SharedString; if let CommitDataState::Loaded(ref data) = data { subject = data.subject.clone(); author_name = data.author_name.clone(); formatted_time = format_timestamp(data.commit_timestamp); } else { subject = "Loading…".into(); author_name = "".into(); } let accent_colors = cx.theme().accents(); let accent_color = accent_colors .0 .get(commit.color_idx) .copied() .unwrap_or_else(|| accent_colors.0.first().copied().unwrap_or_default()); let is_selected = self.selected_entry_idx == Some(idx); let is_matched = self.search_state.matches.contains(&commit.data.sha); let column_label = |label: SharedString| { Label::new(label) .when(!is_selected, |c| c.color(Color::Muted)) .truncate() .into_any_element() }; let subject_label = if is_matched { let query = match &self.search_state.state { QueryState::Confirmed((query, _)) => Some(query.clone()), _ => None, }; let highlight_ranges = query .and_then(|q| { let ranges = if self.search_state.case_sensitive { subject .match_indices(q.as_str()) .map(|(start, matched)| start..start + matched.len()) .collect::>() } else { let q = q.to_lowercase(); let subject_lower = subject.to_lowercase(); subject_lower .match_indices(&q) .filter_map(|(start, matched)| { let end = start + matched.len(); subject.is_char_boundary(start).then_some(()).and_then( |_| subject.is_char_boundary(end).then_some(start..end), ) }) .collect::>() }; (!ranges.is_empty()).then_some(ranges) }) .unwrap_or_default(); HighlightedLabel::from_ranges(subject, highlight_ranges) .when(!is_selected, |c| c.color(Color::Muted)) .truncate() .into_any_element() } else { column_label(subject) }; vec![ div() .id(ElementId::NamedInteger("commit-subject".into(), idx as u64)) .overflow_hidden() .child( h_flex() .gap_2() .overflow_hidden() .children((!commit.data.ref_names.is_empty()).then(|| { h_flex().gap_1().children(commit.data.ref_names.iter().map( |name| { let is_head = Self::is_head_ref(name.as_ref(), &head_branch_name); self.render_ref_chip( name, accent_color, is_head, idx, cx, ) }, )) })) .child(subject_label), ) .into_any_element(), column_label(formatted_time.into()), column_label(author_name), column_label(short_sha.into()), ] }) .collect() } fn cancel(&mut self, _: &Cancel, _window: &mut Window, cx: &mut Context) { self.selected_entry_idx = None; self.selected_commit_diff = None; self.selected_commit_diff_stats = None; self.changed_files_expanded_dirs.clear(); cx.emit(ItemEvent::Edit); cx.notify(); } fn select_first(&mut self, _: &SelectFirst, _window: &mut Window, cx: &mut Context) { self.select_entry(0, ScrollStrategy::Nearest, cx); } fn select_prev(&mut self, _: &SelectPrevious, window: &mut Window, cx: &mut Context) { if let Some(selected_entry_idx) = &self.selected_entry_idx { self.select_entry( selected_entry_idx.saturating_sub(1), ScrollStrategy::Nearest, cx, ); } else { self.select_first(&SelectFirst, window, cx); } } fn select_next(&mut self, _: &SelectNext, window: &mut Window, cx: &mut Context) { if let Some(selected_entry_idx) = &self.selected_entry_idx { self.select_entry( selected_entry_idx .saturating_add(1) .min(self.graph_data.commits.len().saturating_sub(1)), ScrollStrategy::Nearest, cx, ); } else { self.select_prev(&SelectPrevious, window, cx); } } fn select_last(&mut self, _: &SelectLast, _window: &mut Window, cx: &mut Context) { self.select_entry( self.graph_data.commits.len().saturating_sub(1), ScrollStrategy::Nearest, cx, ); } fn scroll_up(&mut self, _: &ScrollUp, window: &mut Window, cx: &mut Context) { let step = (self.visible_row_count(window, cx) / 2).max(1); let target_idx = self.selected_entry_idx.unwrap_or(0).saturating_sub(step); self.select_entry(target_idx, ScrollStrategy::Nearest, cx); } fn scroll_down(&mut self, _: &ScrollDown, window: &mut Window, cx: &mut Context) { let Some(last_entry_idx) = self.graph_data.commits.len().checked_sub(1) else { return; }; let step = (self.visible_row_count(window, cx) / 2).max(1); let target_idx = self .selected_entry_idx .unwrap_or(0) .saturating_add(step) .min(last_entry_idx); self.select_entry(target_idx, ScrollStrategy::Nearest, cx); } fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context) { self.open_selected_commit_view(window, cx); } fn toggle_changed_files_view( &mut self, _: &ToggleChangedFilesView, _window: &mut Window, cx: &mut Context, ) { self.changed_files_view_mode = self.changed_files_view_mode.toggled(); self.changed_files_scroll_handle .scroll_to_item(0, ScrollStrategy::Top); cx.notify(); } fn search(&mut self, query: SharedString, cx: &mut Context) { let Some(repo) = self.get_repository(cx) else { return; }; self.search_state.matches.clear(); self.search_state.selected_index = None; self.search_state.editor.update(cx, |editor, _cx| { editor.set_text_style_refinement(Default::default()); }); if query.as_str().is_empty() { self.search_state.state = QueryState::Empty; cx.notify(); return; } let (request_tx, request_rx) = async_channel::unbounded::(); repo.update(cx, |repo, cx| { repo.search_commits( self.log_source.clone(), SearchCommitArgs { query: query.clone(), case_sensitive: self.search_state.case_sensitive, }, request_tx, cx, ); }); let search_task = cx.spawn(async move |this, cx| { while let Ok(first_oid) = request_rx.recv().await { let mut pending_oids = vec![first_oid]; while let Ok(oid) = request_rx.try_recv() { pending_oids.push(oid); } this.update(cx, |this, cx| { if this.search_state.selected_index.is_none() { this.search_state.selected_index = Some(0); this.select_commit_by_sha(first_oid, cx); } this.search_state.matches.extend(pending_oids); cx.notify(); }) .ok(); } this.update(cx, |this, cx| { if this.search_state.matches.is_empty() { this.search_state.editor.update(cx, |editor, cx| { editor.set_text_style_refinement(TextStyleRefinement { color: Some(Color::Error.color(cx)), ..Default::default() }); }); } }) .ok(); }); self.search_state.state = QueryState::Confirmed((query, search_task)); cx.emit(ItemEvent::Edit); } fn confirm_search(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context) { let query = self.search_state.editor.read(cx).text(cx).into(); self.search(query, cx); } fn activate_search_editor_if_focused(&self, window: &mut Window, cx: &mut Context) { self.search_state.editor.update(cx, |editor, cx| { if editor.is_focused(window) { editor.select_all(&Default::default(), window, cx); editor.show_cursor(cx); } }); } fn focus_next_tab_stop( &mut self, _: &FocusNextTabStop, window: &mut Window, cx: &mut Context, ) { window.focus_next(cx); self.activate_search_editor_if_focused(window, cx); cx.stop_propagation(); cx.notify(); } fn focus_previous_tab_stop( &mut self, _: &FocusPreviousTabStop, window: &mut Window, cx: &mut Context, ) { window.focus_prev(cx); self.activate_search_editor_if_focused(window, cx); cx.stop_propagation(); cx.notify(); } fn select_entry( &mut self, idx: usize, scroll_strategy: ScrollStrategy, cx: &mut Context, ) { if self.selected_entry_idx == Some(idx) || idx >= self.graph_data.commits.len() { debug_assert!( idx < self.graph_data.commits.len(), "attempted to select out of bounds index: {idx}, commits.len: {}", self.graph_data.commits.len() ); return; } self.selected_entry_idx = Some(idx); self.selected_commit_diff = None; self.selected_commit_diff_stats = None; self.changed_files_expanded_dirs.clear(); self.changed_files_scroll_handle .scroll_to_item(0, ScrollStrategy::Top); self.table_interaction_state.update(cx, |state, cx| { state.scroll_handle.scroll_to_item(idx, scroll_strategy); cx.notify(); }); let Some(commit) = self.graph_data.commits.get(idx) else { return; }; let Some(repository) = self.get_repository(cx) else { return; }; let commit_message_handle = commit.data.sha; let diff_handle = commit.data.sha.to_string(); self.load_selected_commit_message(cx, &commit_message_handle, &repository); let diff_receiver = repository.update(cx, |repo, _| repo.load_commit_diff(diff_handle, false)); self._commit_diff_task = Some(cx.spawn(async move |this, cx| { if let Ok(Ok(diff)) = diff_receiver.await { this.update(cx, |this, cx| { let stats = compute_diff_stats(&diff); this.selected_commit_diff = Some(diff); this.selected_commit_diff_stats = Some(stats); cx.notify(); }) .ok(); } })); cx.emit(ItemEvent::Edit); cx.notify(); } fn load_selected_commit_message( &mut self, cx: &mut Context<'_, Self>, sha: &Oid, repository: &Entity, ) { if self .selected_commit_message .as_ref() .is_some_and(|old| old.sha == *sha) { return; } self._selected_commit_message_task = None; match repository.update(cx, |repo, cx| { repo.fetch_commit_data(*sha, true, cx).clone() }) { CommitDataState::Loaded(commit_data) => { self.set_selected_commit_message(cx, commit_data.sha, commit_data.message.clone()); } CommitDataState::Loading(Some(receiver)) => { self._selected_commit_message_task = Some(cx.spawn(async move |this, cx| { if let Ok(commit_data) = receiver.await { this.update(cx, |this, cx| { this.set_selected_commit_message( cx, commit_data.sha, commit_data.message.clone(), ); }) .log_err(); } })) } _ => { debug_panic!( "Fetched commit data asynchronously, but was not given a listener or cached commit data." ); } }; } fn set_selected_commit_message( &mut self, cx: &mut Context<'_, GitGraph>, sha: Oid, message: SharedString, ) { let languages = self .workspace .read_with(cx, |workspace, cx| { workspace.project().read(cx).languages().clone() }) .log_err(); self.selected_commit_message = Some(DetailPanelCommitMessage { sha, message: cx.new(|cx| Markdown::new(message, languages, None, cx)), scroll_handle: ScrollHandle::new(), }); self._selected_commit_message_task = None; cx.notify(); } fn select_previous_match(&mut self, cx: &mut Context) { if self.search_state.matches.is_empty() { return; } let mut prev_selection = self.search_state.selected_index.unwrap_or_default(); if prev_selection == 0 { prev_selection = self.search_state.matches.len() - 1; } else { prev_selection -= 1; } let Some(&oid) = self.search_state.matches.get_index(prev_selection) else { return; }; self.search_state.selected_index = Some(prev_selection); self.select_commit_by_sha(oid, cx); } fn select_next_match(&mut self, cx: &mut Context) { if self.search_state.matches.is_empty() { return; } let mut next_selection = self .search_state .selected_index .map(|index| index + 1) .unwrap_or_default(); if next_selection >= self.search_state.matches.len() { next_selection = 0; } let Some(&oid) = self.search_state.matches.get_index(next_selection) else { return; }; self.search_state.selected_index = Some(next_selection); self.select_commit_by_sha(oid, cx); } pub fn set_repo_id(&mut self, repo_id: RepositoryId, cx: &mut Context) { if repo_id != self.repo_id && self .git_store .read(cx) .repositories() .contains_key(&repo_id) { self.repo_id = repo_id; self.invalidate_state(cx); } } pub fn select_commit_by_sha(&mut self, sha: impl TryInto, cx: &mut Context) { fn inner(this: &mut GitGraph, oid: Oid, cx: &mut Context) { let Some(selected_repository) = this.get_repository(cx) else { return; }; let Some(index) = selected_repository .read(cx) .get_graph_data(this.log_source.clone(), this.log_order) .and_then(|data| data.commit_oid_to_index.get(&oid)) .copied() else { this.pending_select_sha = Some(oid); return; }; this.pending_select_sha = None; this.select_entry(index, ScrollStrategy::Center, cx); } if let Ok(oid) = sha.try_into() { inner(self, oid, cx); } } fn open_selected_commit_view(&mut self, window: &mut Window, cx: &mut Context) { let Some(selected_entry_index) = self.selected_entry_idx else { return; }; self.open_commit_view(selected_entry_index, window, cx); } fn open_commit_view( &mut self, entry_index: usize, window: &mut Window, cx: &mut Context, ) { let Some(commit_entry) = self.graph_data.commits.get(entry_index) else { return; }; let Some(repository) = self.get_repository(cx) else { return; }; CommitView::open( commit_entry.data.sha.to_string(), repository.downgrade(), self.workspace.clone(), None, None, window, cx, ); } fn copy_commit_sha(&mut self, entry_index: usize, cx: &mut Context) { let Some(commit) = self.graph_data.commits.get(entry_index) else { return; }; cx.write_to_clipboard(ClipboardItem::new_string(commit.data.sha.to_string())); } fn copy_selected_commit_sha( &mut self, _: &CopyCommitSha, _: &mut Window, cx: &mut Context, ) { let Some(selected_entry_index) = self.selected_entry_idx else { return; }; self.copy_commit_sha(selected_entry_index, cx); } fn copy_commit_tag(&mut self, entry_index: usize, window: &mut Window, cx: &mut Context) { let Some(commit) = self.graph_data.commits.get(entry_index) else { return; }; let tag_names = commit .data .tag_names() .into_iter() .map(|tag_name| SharedString::from(tag_name.to_string())) .collect::>(); match tag_names.as_slice() { [] => {} [tag_name] => cx.write_to_clipboard(ClipboardItem::new_string(tag_name.to_string())), _ => { self.workspace .update(cx, |workspace, cx| { workspace.toggle_modal(window, cx, |window, cx| { CommitTagPicker::new(tag_names, window, cx) }); }) .ok(); } } } fn copy_selected_commit_tag( &mut self, _: &CopyCommitTag, window: &mut Window, cx: &mut Context, ) { let Some(selected_entry_index) = self.selected_entry_idx else { return; }; self.copy_commit_tag(selected_entry_index, window, cx); } fn deploy_entry_context_menu( &mut self, position: Point, index: usize, ref_name: Option, window: &mut Window, cx: &mut Context, ) { let Some(commit) = self.graph_data.commits.get(index) else { return; }; let repository = self .get_repository(cx) .map(|repository| repository.downgrade()); let context_menu = commit_context_menu( CommitContextMenuData { sha: commit.data.sha, tag_names: commit .data .tag_names() .into_iter() .map(|tag_name| SharedString::from(tag_name.to_string())) .collect(), }, CommitContextMenuSource::GitGraph, ref_name, self.focus_handle.clone(), repository, self.workspace.clone(), window, cx, ); self.set_context_menu(context_menu, position, Some(index), window, cx); } fn set_context_menu( &mut self, context_menu: Entity, position: Point, target_entry_index: Option, window: &mut Window, cx: &mut Context, ) { window.focus(&context_menu.focus_handle(cx), cx); let subscription = cx.subscribe_in( &context_menu, window, |this, _, _: &DismissEvent, window, cx| { if this.context_menu.as_ref().is_some_and(|context_menu| { context_menu .menu .focus_handle(cx) .contains_focused(window, cx) }) { cx.focus_self(window); } this.context_menu.take(); cx.notify(); }, ); self.context_menu = Some(GitGraphContextMenu { menu: context_menu, position, target_entry_index, _subscription: subscription, }); cx.notify(); } fn toggle_column_visibility(&mut self, col_idx: usize, cx: &mut Context) { if let Some(slot) = self.column_visibility.as_mut_slice().get_mut(col_idx) { *slot = !*slot; // Column visibility is persisted per item, so schedule a workspace serialization. cx.emit(ItemEvent::Edit); } } fn deploy_header_context_menu( &mut self, position: Point, window: &mut Window, cx: &mut Context, ) { let is_path_history = matches!(self.log_source, LogSource::Path(_)); let columns: &[&str] = if is_path_history { &["Description", "Date", "Author", "Commit"] } else { &["Graph", "Description", "Date", "Author", "Commit"] }; let filter = self.column_visibility.clone(); let visible_count = filter .as_slice() .iter() .filter(|filtered| !**filtered) .count(); let focus_handle = self.focus_handle.clone(); let git_graph = cx.entity(); let context_menu = ContextMenu::build(window, cx, |mut context_menu, _window, _cx| { context_menu = context_menu.context(focus_handle).header("Columns"); for (col_idx, label) in columns.iter().enumerate() { let is_visible = !filter.get(col_idx).copied().unwrap_or(false); // Disable hiding the last remaining visible column. let can_toggle = !is_visible || visible_count > 1; let git_graph = git_graph.clone(); context_menu = context_menu.toggleable_entry_disabled_when( label.to_string(), is_visible, !can_toggle, IconPosition::End, None, move |_window, cx| { git_graph.update(cx, |this, cx| { this.toggle_column_visibility(col_idx, cx); cx.notify(); }); }, ); } context_menu }); self.set_context_menu(context_menu, position, None, window, cx); } fn render_search_bar(&self, cx: &mut Context) -> impl IntoElement { let color = cx.theme().colors(); let query_focus_handle = self .search_state .editor .focus_handle(cx) .tab_index(1) .tab_stop(true); h_flex() .key_context("GitGraphSearchBar") .tab_index(1) .tab_group() .tab_stop(false) .w_full() .p_1p5() .gap_1p5() .border_b_1() .border_color(color.border_variant) .child( h_flex() .h_8() .flex_1() .min_w_0() .px_1p5() .gap_1() .track_focus(&query_focus_handle) .border_1() .border_color(color.border_variant) .rounded_md() .bg(color.toolbar_background) .on_action(cx.listener(Self::confirm_search)) .child(self.search_state.editor.clone()) .child({ let focus_handle = query_focus_handle.clone(); IconButton::new("git-graph-search-case-sensitive", IconName::CaseSensitive) .shape(ui::IconButtonShape::Square) .toggle_state(self.search_state.case_sensitive) .on_click({ let focus_handle = query_focus_handle.clone(); move |_, window, cx| { if !focus_handle.is_focused(window) { window.focus(&focus_handle, cx); } window.dispatch_action(ToggleCaseSensitive.boxed_clone(), cx); } }) .tooltip(move |_window, cx| { Tooltip::for_action_in( "Match Case Sensitivity", &ToggleCaseSensitive, &focus_handle, cx, ) }) }), ) .child( h_flex() .min_w_64() .gap_1() .child({ let focus_handle = self.focus_handle.clone(); IconButton::new("git-graph-search-prev", IconName::ChevronLeft) .shape(ui::IconButtonShape::Square) .icon_size(IconSize::Small) .tooltip(move |_, cx| { Tooltip::for_action_in( "Select Previous Match", &SelectPreviousMatch, &focus_handle, cx, ) }) .map(|this| { if self.search_state.matches.is_empty() { this.disabled(true) } else { this.disabled(false).on_click(cx.listener(|this, _, _, cx| { this.select_previous_match(cx); })) } }) }) .child({ let focus_handle = self.focus_handle.clone(); IconButton::new("git-graph-search-next", IconName::ChevronRight) .shape(ui::IconButtonShape::Square) .icon_size(IconSize::Small) .tooltip(move |_, cx| { Tooltip::for_action_in( "Select Next Match", &SelectNextMatch, &focus_handle, cx, ) }) .map(|this| { if self.search_state.matches.is_empty() { this.disabled(true) } else { this.disabled(false).on_click(cx.listener(|this, _, _, cx| { this.select_next_match(cx); })) } }) }) .child( h_flex() .gap_1p5() .child( Label::new(format!( "{}/{}", self.search_state .selected_index .map(|index| index + 1) .unwrap_or(0), self.search_state.matches.len() )) .size(LabelSize::Small) .when(self.search_state.matches.is_empty(), |this| { this.color(Color::Disabled) }), ) .when( matches!( &self.search_state.state, QueryState::Confirmed((_, task)) if !task.is_ready() ), |this| { this.child( Icon::new(IconName::ArrowCircle) .color(Color::Accent) .size(IconSize::Small) .with_rotate_animation(2) .into_any_element(), ) }, ), ), ) } fn render_loading_spinner(&self, cx: &App) -> AnyElement { let rems = TextSize::Large.rems(cx); Icon::new(IconName::LoadCircle) .size(IconSize::Custom(rems)) .color(Color::Accent) .with_rotate_animation(3) .into_any_element() } fn render_commit_detail_panel( &self, window: &mut Window, cx: &mut Context, ) -> impl IntoElement { let Some(selected_idx) = self.selected_entry_idx else { return Empty.into_any_element(); }; let Some(commit_entry) = self.graph_data.commits.get(selected_idx) else { return Empty.into_any_element(); }; let Some(repository) = self.get_repository(cx) else { return Empty.into_any_element(); }; let data = repository.update(cx, |repository, cx| { repository .fetch_commit_data(commit_entry.data.sha, false, cx) .clone() }); let full_sha: SharedString = commit_entry.data.sha.to_string().into(); let ref_names = commit_entry.data.ref_names.clone(); let head_branch_name: Option = repository .read(cx) .snapshot() .branch .as_ref() .map(|branch| SharedString::from(branch.name().to_string())); let accent_colors = cx.theme().accents(); let accent_color = accent_colors .0 .get(commit_entry.color_idx) .copied() .unwrap_or_else(|| accent_colors.0.first().copied().unwrap_or_default()); let (author_name, author_email, commit_timestamp) = match &data { CommitDataState::Loaded(data) => ( data.author_name.clone(), data.author_email.clone(), Some(data.commit_timestamp), ), CommitDataState::Loading(_) => ("Loading…".into(), "".into(), None), }; let date_string = commit_timestamp .and_then(|ts| OffsetDateTime::from_unix_timestamp(ts).ok()) .map(|datetime| { let local_offset = UtcOffset::current_local_offset().unwrap_or(UtcOffset::UTC); let local_datetime = datetime.to_offset(local_offset); let format = time::format_description::parse("[month repr:short] [day], [year]").ok(); format .and_then(|f| local_datetime.format(&f).ok()) .unwrap_or_default() }) .unwrap_or_default(); let remote = repository.update(cx, |repo, cx| { let remote_url = repo.default_remote_url()?; let provider_registry = GitHostingProviderRegistry::default_global(cx); let (provider, parsed) = parse_git_remote_url(provider_registry, &remote_url)?; Some(GitRemote { host: provider, owner: parsed.owner.into(), repo: parsed.repo.into(), }) }); let avatar = { let author_email_for_avatar = if author_email.is_empty() { None } else { Some(author_email.clone()) }; CommitAvatar::new(&full_sha, author_email_for_avatar, remote.as_ref()) .size(px(32.)) .render(window, cx) }; let changed_files_count = self .selected_commit_diff .as_ref() .map(|diff| diff.files.len()) .unwrap_or(0); let (total_lines_added, total_lines_removed) = self.selected_commit_diff_stats.unwrap_or((0, 0)); let changed_file_entries: Vec = self .selected_commit_diff .as_ref() .map(|diff| { let mut files = diff.files.iter().collect::>(); if !self.changed_files_view_mode.is_tree() { files.sort_by_key(|file| file.status()); } files .into_iter() .map(|file| ChangedFileEntry::from_commit_file(file, cx)) .collect() }) .unwrap_or_default(); let changed_file_entries = Rc::new(changed_file_entries); let tree_entries: Rc> = if self.changed_files_view_mode.is_tree() { Rc::new(build_changed_file_tree_entries( changed_file_entries.as_ref().clone(), &self.changed_files_expanded_dirs, )) } else { Rc::default() }; let is_tree_view = self.changed_files_view_mode.is_tree(); let view_toggle = IconButton::new("toggle-changed-files-view", IconName::ListTree) .icon_size(IconSize::Small) .toggle_state(self.changed_files_view_mode.is_tree()) .tooltip({ let tooltip = if is_tree_view { "Show Flat View" } else { "Show Tree View" }; move |_, cx| Tooltip::for_action(tooltip, &ToggleChangedFilesView, cx) }) .on_click(cx.listener(|this, _, _window, cx| { this.changed_files_view_mode = this.changed_files_view_mode.toggled(); this.changed_files_scroll_handle .scroll_to_item(0, ScrollStrategy::Top); cx.notify(); })); v_flex() .min_w(px(300.)) .h_full() .bg(cx.theme().colors().editor_background) .flex_basis(DefiniteLength::Fraction( self.commit_details_split_state.read(cx).right_ratio(), )) .child( v_flex() .relative() .w_full() .p_2() .gap_2() .child( div().absolute().top_2().right_2().child( IconButton::new("close-detail", IconName::Close) .icon_size(IconSize::Small) .on_click(cx.listener(move |this, _, _, cx| { this.selected_entry_idx = None; this.selected_commit_diff = None; this.selected_commit_diff_stats = None; this.selected_commit_message = None; this._selected_commit_message_task = None; this.changed_files_expanded_dirs.clear(); this._commit_diff_task = None; cx.notify(); })), ), ) .child( v_flex() .py_1() .w_full() .items_center() .child(avatar) .child(Label::new(author_name).mt_1p5()) .child( Label::new(date_string) .color(Color::Muted) .size(LabelSize::Small), ), ) .children((!ref_names.is_empty()).then(|| { h_flex().gap_1().flex_wrap().justify_center().children( ref_names.iter().map(|name| { let is_head = Self::is_head_ref(name.as_ref(), &head_branch_name); self.render_ref_chip(name, accent_color, is_head, selected_idx, cx) }), ) })) .child( v_flex() .ml_neg_1() .gap_1p5() .when(!author_email.is_empty(), |this| { let copied_state: Entity = window.use_keyed_state( "author-email-copy", cx, CopiedState::new, ); let is_copied = copied_state.read(cx).is_copied(); let (icon, icon_color, tooltip_label) = if is_copied { (IconName::Check, Color::Success, "Email Copied!") } else { (IconName::Envelope, Color::Muted, "Copy Email") }; let copy_email = author_email.clone(); let author_email_for_tooltip = author_email.clone(); this.child( Button::new("author-email-copy", author_email.clone()) .start_icon( Icon::new(icon).size(IconSize::Small).color(icon_color), ) .label_size(LabelSize::Small) .truncate(true) .color(Color::Muted) .tooltip(move |_, cx| { Tooltip::with_meta( tooltip_label, None, author_email_for_tooltip.clone(), cx, ) }) .on_click(move |_, _, cx| { copied_state.update(cx, |state, _cx| { state.mark_copied(); }); cx.write_to_clipboard(ClipboardItem::new_string( copy_email.to_string(), )); let state_id = copied_state.entity_id(); cx.spawn(async move |cx| { cx.background_executor() .timer(COPIED_STATE_DURATION) .await; cx.update(|cx| { cx.notify(state_id); }) }) .detach(); }), ) }) .child({ let copy_sha = full_sha.clone(); let copied_state: Entity = window.use_keyed_state("sha-copy", cx, CopiedState::new); let is_copied = copied_state.read(cx).is_copied(); let (icon, icon_color, tooltip_label) = if is_copied { (IconName::Check, Color::Success, "Commit SHA Copied!") } else { (IconName::Hash, Color::Muted, "Copy Commit SHA") }; Button::new("sha-button", &full_sha) .start_icon( Icon::new(icon).size(IconSize::Small).color(icon_color), ) .label_size(LabelSize::Small) .truncate(true) .color(Color::Muted) .tooltip({ let full_sha = full_sha.clone(); move |_, cx| { Tooltip::with_meta( tooltip_label, None, full_sha.clone(), cx, ) } }) .on_click(move |_, _, cx| { copied_state.update(cx, |state, _cx| { state.mark_copied(); }); cx.write_to_clipboard(ClipboardItem::new_string( copy_sha.to_string(), )); let state_id = copied_state.entity_id(); cx.spawn(async move |cx| { cx.background_executor() .timer(COPIED_STATE_DURATION) .await; cx.update(|cx| { cx.notify(state_id); }) }) .detach(); }) }) .when_some(remote.clone(), |this, remote| { let provider_name = remote.host.name(); let icon = ui::git_hosting_provider_icon(provider_name.as_str()); let parsed_remote = ParsedGitRemote { owner: remote.owner.as_ref().into(), repo: remote.repo.as_ref().into(), }; let params = BuildCommitPermalinkParams { sha: full_sha.as_ref(), }; let url = remote .host .build_commit_permalink(&parsed_remote, params) .to_string(); this.child( Button::new( "view-on-provider", format!("View on {}", provider_name), ) .start_icon( Icon::new(icon).size(IconSize::Small).color(Color::Muted), ) .label_size(LabelSize::Small) .truncate(true) .color(Color::Muted) .on_click( move |_, _, cx| { cx.open_url(&url); }, ), ) }), ), ) .child(Divider::horizontal()) .child(self.render_commit_message(window, cx)) .child(Divider::horizontal()) .child( v_flex() .min_w_0() .flex_1() .overflow_hidden() .child( h_flex() .p_2() .pr_3() .pb_1() .gap_1() .w_full() .justify_between() .child( h_flex() .gap_1() .child( Label::new(format!( "{} Changed {}", changed_files_count, if changed_files_count == 1 { "File" } else { "Files" } )) .size(LabelSize::Small) .color(Color::Muted), ) .child(Divider::vertical()) .child(view_toggle), ) .child(DiffStat::new( "commit-diff-stat", total_lines_added, total_lines_removed, )), ) .child( div() .id("changed-files-container") .flex_1() .min_h_0() .child({ let flat_entries = changed_file_entries; let entry_count = if is_tree_view { tree_entries.len() } else { flat_entries.len() }; let commit_sha = full_sha.clone(); let repository = repository.downgrade(); let workspace = self.workspace.clone(); let git_graph = cx.weak_entity(); let indent_tree_entries = tree_entries.clone(); uniform_list( "changed-files-list", entry_count, move |range, _window, cx| { range .map(|ix| { if is_tree_view { match &tree_entries[ix] { ChangedFileTreeEntry::Directory(entry) => { entry.render(ix, git_graph.clone(), cx) } ChangedFileTreeEntry::File(entry) => { entry.entry.render( ix, entry.depth, None, commit_sha.clone(), repository.clone(), workspace.clone(), cx, ) } } } else { let directory_label = (!flat_entries[ix] .dir_path .is_empty()) .then(|| flat_entries[ix].dir_path.clone()); flat_entries[ix].render( ix, 0, directory_label, commit_sha.clone(), repository.clone(), workspace.clone(), cx, ) } }) .collect() }, ) .when(is_tree_view, |list| { list.with_decoration( ui::indent_guides( px(TREE_INDENT), IndentGuideColors::panel(cx), ) .with_left_offset( ui::LIST_ITEM_INDENT_GUIDE_LEFT_OFFSET - px(2.), ) .with_compute_indents_fn( cx.entity(), move |_, range, _window, _cx| { range .map(|ix| match indent_tree_entries.get(ix) { Some(ChangedFileTreeEntry::Directory( entry, )) => entry.depth, Some(ChangedFileTreeEntry::File(entry)) => { entry.depth } None => 0, }) .collect() }, ), ) }) .size_full() .track_scroll(&self.changed_files_scroll_handle) }) .vertical_scrollbar_for(&self.changed_files_scroll_handle, window, cx), ), ) .child(Divider::horizontal()) .child( h_flex().p_1p5().w_full().child( Button::new("view-commit", "View Commit") .full_width() .start_icon( Icon::new(IconName::GitCommit) .size(IconSize::Small) .color(Color::Muted), ) .style(ButtonStyle::OutlinedGhost) .on_click(cx.listener(|this, _, window, cx| { this.open_selected_commit_view(window, cx); })), ), ) .into_any_element() } fn render_graph_canvas(&self, window: &Window, cx: &mut Context) -> impl IntoElement { let row_height = Self::row_height(window, cx); let visible_row_count = self.visible_row_count(window, cx); let table_state = self.table_interaction_state.read(cx); let viewport_height = table_state .scroll_handle .0 .borrow() .last_item_size .map(|size| size.item.height) .unwrap_or(window.viewport_size().height); let loaded_commit_count = self.graph_data.commits.len(); let content_height = row_height * loaded_commit_count; let max_scroll = (content_height - viewport_height).max(px(0.)); let scroll_offset_y = (-table_state.scroll_offset().y).clamp(px(0.), max_scroll); let first_visible_row = (scroll_offset_y / row_height).floor() as usize; let vertical_scroll_offset = scroll_offset_y - (first_visible_row as f32 * row_height); let graph_viewport_width = self.graph_viewport_width(window, cx); let graph_width = if self.graph_canvas_content_width() > graph_viewport_width { self.graph_canvas_content_width() } else { graph_viewport_width }; let last_visible_row = first_visible_row + visible_row_count + 1; let viewport_range = first_visible_row.min(loaded_commit_count.saturating_sub(1)) ..(last_visible_row).min(loaded_commit_count); let rows = self.graph_data.commits[viewport_range.clone()].to_vec(); let commit_lines: Vec<_> = self .graph_data .lines .iter() .filter(|line| { line.full_interval.start <= viewport_range.end && line.full_interval.end >= viewport_range.start }) .cloned() .collect(); let mut lines: BTreeMap> = BTreeMap::new(); let hovered_entry_idx = self.hovered_entry_idx; let selected_entry_idx = self.selected_entry_idx; let context_menu_target_index = self .context_menu .as_ref() .and_then(|menu| menu.target_entry_index); let is_focused = self.focus_handle.is_focused(window); let graph_canvas_bounds = self.graph_canvas_bounds.clone(); gpui::canvas( move |_bounds, _window, _cx| {}, move |bounds: Bounds, _: (), window: &mut Window, cx: &mut App| { graph_canvas_bounds.set(Some(bounds)); window.paint_layer(bounds, |window| { let accent_colors = cx.theme().accents(); let hover_bg = cx.theme().colors().element_hover.opacity(0.6); let selected_bg = if is_focused { cx.theme().colors().element_selected } else { cx.theme().colors().element_hover }; for visible_row_idx in 0..rows.len() { let absolute_row_idx = first_visible_row + visible_row_idx; let is_hovered = hovered_entry_idx == Some(absolute_row_idx); let is_selected = selected_entry_idx == Some(absolute_row_idx); let is_context_menu_target = context_menu_target_index == Some(absolute_row_idx); if is_hovered || is_selected || is_context_menu_target { let row_y = bounds.origin.y + visible_row_idx as f32 * row_height - vertical_scroll_offset; let row_bounds = Bounds::new( point(bounds.origin.x, row_y), gpui::Size { width: bounds.size.width, height: row_height, }, ); let bg_color = if is_selected || is_context_menu_target { selected_bg } else { hover_bg }; window.paint_quad(gpui::fill(row_bounds, bg_color)); } } for (row_idx, row) in rows.into_iter().enumerate() { let row_color = accent_colors.color_for_index(row.color_idx as u32); let row_y_center = bounds.origin.y + row_idx as f32 * row_height + row_height / 2.0 - vertical_scroll_offset; let commit_x = lane_center_x(bounds, row.lane as f32); draw_commit_circle(commit_x, row_y_center, row_color, window); } for line in commit_lines { let Some((start_segment_idx, start_column)) = line.get_first_visible_segment_idx(first_visible_row) else { continue; }; let line_x = lane_center_x(bounds, start_column as f32); let start_row = line.full_interval.start as i32 - first_visible_row as i32; let from_y = bounds.origin.y + start_row as f32 * row_height + row_height / 2.0 - vertical_scroll_offset + COMMIT_CIRCLE_RADIUS; let mut current_row = from_y; let mut current_column = line_x; let mut builder = PathBuilder::stroke(LINE_WIDTH); builder.move_to(point(line_x, from_y)); let segments = &line.segments[start_segment_idx..]; let desired_curve_height = row_height / 3.0; let desired_curve_width = LANE_WIDTH / 3.0; for (segment_idx, segment) in segments.iter().enumerate() { let is_last = segment_idx + 1 == segments.len(); match segment { CommitLineSegment::Straight { to_row } => { let mut dest_row = to_row_center( to_row - first_visible_row, row_height, vertical_scroll_offset, bounds, ); if is_last { dest_row -= COMMIT_CIRCLE_RADIUS; } let dest_point = point(current_column, dest_row); current_row = dest_point.y; builder.line_to(dest_point); builder.move_to(dest_point); } CommitLineSegment::Curve { to_column, on_row, curve_kind, } => { let mut to_column = lane_center_x(bounds, *to_column as f32); let mut to_row = to_row_center( *on_row - first_visible_row, row_height, vertical_scroll_offset, bounds, ); // This means that this branch was a checkout let going_right = to_column > current_column; let column_shift = if going_right { COMMIT_CIRCLE_RADIUS + COMMIT_CIRCLE_STROKE_WIDTH } else { -COMMIT_CIRCLE_RADIUS - COMMIT_CIRCLE_STROKE_WIDTH }; match curve_kind { CurveKind::Checkout => { if is_last { to_column -= column_shift; } let available_curve_width = (to_column - current_column).abs(); let available_curve_height = (to_row - current_row).abs(); let curve_width = desired_curve_width.min(available_curve_width); let curve_height = desired_curve_height.min(available_curve_height); let signed_curve_width = if going_right { curve_width } else { -curve_width }; let curve_start = point(current_column, to_row - curve_height); let curve_end = point(current_column + signed_curve_width, to_row); let curve_control = point(current_column, to_row); builder.move_to(point(current_column, current_row)); builder.line_to(curve_start); builder.move_to(curve_start); builder.curve_to(curve_end, curve_control); builder.move_to(curve_end); builder.line_to(point(to_column, to_row)); } CurveKind::Merge => { if is_last { to_row -= COMMIT_CIRCLE_RADIUS; } let merge_start = point( current_column + column_shift, current_row - COMMIT_CIRCLE_RADIUS, ); let available_curve_width = (to_column - merge_start.x).abs(); let available_curve_height = (to_row - merge_start.y).abs(); let curve_width = desired_curve_width.min(available_curve_width); let curve_height = desired_curve_height.min(available_curve_height); let signed_curve_width = if going_right { curve_width } else { -curve_width }; let curve_start = point( to_column - signed_curve_width, merge_start.y, ); let curve_end = point(to_column, merge_start.y + curve_height); let curve_control = point(to_column, merge_start.y); builder.move_to(merge_start); builder.line_to(curve_start); builder.move_to(curve_start); builder.curve_to(curve_end, curve_control); builder.move_to(curve_end); builder.line_to(point(to_column, to_row)); } } current_row = to_row; current_column = to_column; builder.move_to(point(current_column, current_row)); } } } builder.close(); lines.entry(line.color_idx).or_default().push(builder); } for (color_idx, builders) in lines { let line_color = accent_colors.color_for_index(color_idx as u32); for builder in builders { if let Ok(path) = builder.build() { // we paint each color on it's own layer to stop overlapping lines // of different colors changing the color of a line window.paint_layer(bounds, |window| { window.paint_path(path, line_color); }); } } } }) }, ) .w(graph_width) .h_full() } fn row_at_position( &self, position_y: Pixels, window: &Window, cx: &Context, ) -> Option { let canvas_bounds = self.graph_canvas_bounds.get()?; let table_state = self.table_interaction_state.read(cx); let scroll_offset_y = -table_state.scroll_offset().y; let local_y = position_y - canvas_bounds.origin.y; if local_y >= px(0.) && local_y < canvas_bounds.size.height { let absolute_y = local_y + scroll_offset_y; let row_height = Self::row_height(window, cx); let absolute_row = (absolute_y / row_height).floor() as usize; if absolute_row < self.graph_data.commits.len() { return Some(absolute_row); } } None } fn handle_graph_mouse_move( &mut self, event: &gpui::MouseMoveEvent, window: &mut Window, cx: &mut Context, ) { if let Some(row) = self.row_at_position(event.position.y, window, cx) { if self.hovered_entry_idx != Some(row) { self.hovered_entry_idx = Some(row); cx.notify(); } } else if self.hovered_entry_idx.is_some() { self.hovered_entry_idx = None; cx.notify(); } } fn handle_entry_click( &mut self, entry_idx: usize, event: &ClickEvent, scroll_strategy: ScrollStrategy, focus_handle: Option<&FocusHandle>, window: &mut Window, cx: &mut Context, ) { // Right-clicks open the context menu, not the details panel. if event.is_right_click() { return; } if let Some(focus_handle) = focus_handle { focus_handle.focus(window, cx); } self.select_entry(entry_idx, scroll_strategy, cx); if event.click_count() >= 2 { self.open_commit_view(entry_idx, window, cx); } } fn handle_graph_click( &mut self, event: &ClickEvent, window: &mut Window, cx: &mut Context, ) { if let Some(row) = self.row_at_position(event.position().y, window, cx) { self.handle_entry_click(row, event, ScrollStrategy::Nearest, None, window, cx); } } fn handle_entry_secondary_mouse_down( &mut self, entry_idx: usize, event: &MouseDownEvent, window: &mut Window, cx: &mut Context, ) { self.deploy_entry_context_menu(event.position, entry_idx, None, window, cx); cx.stop_propagation(); } fn handle_graph_secondary_mouse_down( &mut self, event: &MouseDownEvent, window: &mut Window, cx: &mut Context, ) { let Some(row) = self.row_at_position(event.position.y, window, cx) else { return; }; self.handle_entry_secondary_mouse_down(row, event, window, cx); } fn handle_graph_scroll( &mut self, event: &ScrollWheelEvent, window: &mut Window, cx: &mut Context, ) { let line_height = window.line_height(); let delta = event.delta.pixel_delta(line_height); let table_state = self.table_interaction_state.read(cx); let current_offset = table_state.scroll_offset(); let viewport_height = table_state.scroll_handle.viewport().size.height; let commit_count = match self.graph_data.max_commit_count { AllCommitCount::Loading(count) => count, AllCommitCount::FullyLoaded(count) => count, AllCommitCount::NotLoaded => self.graph_data.commits.len(), }; let content_height = Self::row_height(window, cx) * commit_count; let max_vertical_scroll = (viewport_height - content_height).min(px(0.)); let new_y = (current_offset.y + delta.y).clamp(max_vertical_scroll, px(0.)); let new_offset = Point::new(current_offset.x, new_y); if new_offset != current_offset { table_state.set_scroll_offset(new_offset); cx.notify(); } } fn commit_count_and_loading_state(&mut self, cx: &mut Context) -> (usize, bool) { match self.graph_data.max_commit_count { AllCommitCount::FullyLoaded(count) => (count, false), AllCommitCount::Loading(count) => { let is_loading = self .get_repository(cx) .map(|repository| { repository.update(cx, |repository, cx| { repository .graph_data(self.log_source.clone(), self.log_order, 0..0, cx) .is_loading }) }) .unwrap_or(false); (count, is_loading) } AllCommitCount::NotLoaded => { let (commit_count, is_loading) = if let Some(repository) = self.get_repository(cx) { repository.update(cx, |repository, cx| { // Start loading the graph data if we haven't started already let GraphDataResponse { commits, is_loading, error: _, } = repository.graph_data( self.log_source.clone(), self.log_order, 0..usize::MAX, cx, ); self.graph_data.add_commits(commits); (commits.len(), is_loading) }) } else { (0, false) }; (commit_count, is_loading) } } } fn render_commit_view_resize_handle( &self, _window: &mut Window, cx: &mut Context, ) -> AnyElement { div() .id("commit-view-split-resize-container") .relative() .h_full() .flex_shrink_0() .w(px(1.)) .bg(cx.theme().colors().border_variant) .child( div() .id("commit-view-split-resize-handle") .absolute() .left(px(-RESIZE_HANDLE_WIDTH / 2.0)) .w(px(RESIZE_HANDLE_WIDTH)) .h_full() .cursor_col_resize() .block_mouse_except_scroll() .on_click(cx.listener(|this, event: &ClickEvent, _window, cx| { if event.click_count() >= 2 { this.commit_details_split_state.update(cx, |state, _| { state.on_double_click(); }); } cx.stop_propagation(); })) .on_drag(DraggedSplitHandle, |_, _, _, cx| cx.new(|_| gpui::Empty)), ) .into_any_element() } fn render_commit_message( &self, window: &mut Window, cx: &mut Context, ) -> impl IntoElement { let Some(DetailPanelCommitMessage { message, scroll_handle, .. }) = self.selected_commit_message.as_ref() else { return Empty.into_any_element(); }; let message_style = editor::hover_markdown_style(window, cx); let rem_size = window.rem_size(); let line_height = message_style .base_text_style .line_height_in_pixels(rem_size); div() // Using grid over flexbox because the structure of this side // panel prvents taffy from calculating a concrete width correctly, // which causes problems with text reflow when using flexbox. // grid, on the other hand, doesn't appear to give taffy the same // problems. .w_full() .py_2() .pl_2() .grid() .grid_cols(1) .gap_1() .child( div() .relative() .w_full() .child( div() .id("commit-message") .text_sm() .w_full() .max_h(line_height * 12.) .overflow_y_scroll() .track_scroll(scroll_handle) .child(MarkdownElement::new(message.clone(), message_style)), ) .vertical_scrollbar_for(scroll_handle, window, cx), ) .into_any_element() } } impl Render for GitGraph { fn render(&mut self, window: &mut Window, cx: &mut Context) -> impl IntoElement { // This happens when we changed branches, we should refresh our search as well if let QueryState::Pending(query) = &mut self.search_state.state { let query = std::mem::take(query); self.search_state.state = QueryState::Empty; self.search(query, cx); } let (commit_count, is_loading) = self.commit_count_and_loading_state(cx); let error = self.get_repository(cx).and_then(|repo| { repo.read(cx) .get_graph_data(self.log_source.clone(), self.log_order) .and_then(|data| data.error.clone()) }); let content = if commit_count == 0 { let message = if let Some(error) = &error { format!("Error loading: {}", error) } else if is_loading { "Loading".to_string() } else { "No commits found".to_string() }; let label = Label::new(message) .color(Color::Muted) .size(LabelSize::Large); h_flex() .size_full() .gap_1() .justify_center() .child(label) .when(is_loading && error.is_none(), |this| { this.child(self.render_loading_spinner(cx)) }) } else { let is_path_history = matches!(self.log_source, LogSource::Path(_)); let header_resize_info = HeaderResizeInfo::from_redistributable(&self.column_widths, cx); let column_filter = self.column_visibility.clone(); // The graph column (index 0) only exists in the non-path-history layout and is // rendered as a separate canvas outside the table. let graph_visible = is_path_history || !column_filter.get(0usize).copied().unwrap_or(false); let table_offset = if is_path_history { 0 } else { 1 }; let table_filter = column_filter .as_slice() .get(table_offset..table_offset + TABLE_COLUMN_COUNT) .map(|slice| TableRow::from_vec(slice.to_vec(), TABLE_COLUMN_COUNT)) .unwrap_or_else(|| TableRow::from_element(false, TABLE_COLUMN_COUNT)); let header_widths = redistribute_hidden_widths( &self.column_widths.read(cx).widths_to_render(), Some(&column_filter), ); let header_context = TableRenderContext::for_column_widths(Some(header_widths), true) .with_column_filter(Some(column_filter)); let [ graph_fraction, description_fraction, date_fraction, author_fraction, commit_fraction, ] = self.preview_column_fractions(window, cx); let table_fraction = description_fraction + date_fraction + author_fraction + commit_fraction; let table_width_config = self.table_column_width_config(window, cx); let table_collapsed = table_fraction <= f32::EPSILON; let graph_content_width = self.graph_canvas_content_width(); h_flex() .size_full() .child( v_flex() .flex_1() .min_w_0() .size_full() .flex() .flex_col() .child( div() .on_mouse_down( MouseButton::Right, cx.listener(|this, event: &MouseDownEvent, window, cx| { this.deploy_header_context_menu(event.position, window, cx); cx.stop_propagation(); }), ) .child(render_table_header( if !is_path_history { TableRow::from_vec( vec![ Label::new("Graph") .color(Color::Muted) .truncate() .into_any_element(), Label::new("Description") .color(Color::Muted) .into_any_element(), Label::new("Date") .color(Color::Muted) .into_any_element(), Label::new("Author") .color(Color::Muted) .into_any_element(), Label::new("Commit") .color(Color::Muted) .into_any_element(), ], 5, ) } else { TableRow::from_vec( vec![ Label::new("Description") .color(Color::Muted) .into_any_element(), Label::new("Date") .color(Color::Muted) .into_any_element(), Label::new("Author") .color(Color::Muted) .into_any_element(), Label::new("Commit") .color(Color::Muted) .into_any_element(), ], 4, ) }, header_context, Some(header_resize_info), Some(self.column_widths.entity_id()), cx, )), ) .child({ let row_height = Self::row_height(window, cx); let selected_entry_idx = self.selected_entry_idx; let hovered_entry_idx = self.hovered_entry_idx; let context_menu_target_index = self .context_menu .as_ref() .and_then(|menu| menu.target_entry_index); let weak_self = cx.weak_entity(); let focus_handle = self.focus_handle.clone(); let table_focus_handle = self.table_interaction_state.read(cx).focus_handle.clone(); let graph_canvas = div() .id("graph-canvas") .size_full() .overflow_hidden() .cursor_pointer() .child( div() .size_full() .child(self.render_graph_canvas(window, cx)), ) .on_scroll_wheel(cx.listener(Self::handle_graph_scroll)) .on_mouse_move(cx.listener(Self::handle_graph_mouse_move)) .on_click(cx.listener(Self::handle_graph_click)) .on_mouse_down( MouseButton::Right, cx.listener(Self::handle_graph_secondary_mouse_down), ) .on_hover(cx.listener(|this, &is_hovered: &bool, _, cx| { if !is_hovered && this.hovered_entry_idx.is_some() { this.hovered_entry_idx = None; cx.notify(); } })); let commits_table = Table::new(4) .interactable(&self.table_interaction_state) .hide_row_borders() .hide_row_hover() .width_config(table_width_config) .column_filter(table_filter) .map_row(move |(index, row), window, cx| { let is_selected = selected_entry_idx == Some(index); let is_hovered = hovered_entry_idx == Some(index); let is_context_menu_target = context_menu_target_index == Some(index); let table_focus_handle = table_focus_handle.clone(); let is_focused = focus_handle.is_focused(window) || table_focus_handle.is_focused(window); let weak = weak_self.clone(); let weak_for_hover = weak.clone(); let weak_for_context_menu = weak.clone(); let hover_bg = cx.theme().colors().element_hover.opacity(0.6); let selected_bg = if is_focused { cx.theme().colors().element_selected } else { cx.theme().colors().element_hover }; row.h(row_height) .cursor_pointer() .when(is_selected || is_context_menu_target, |row| { row.bg(selected_bg) }) .when( is_hovered && !is_selected && !is_context_menu_target, |row| row.bg(hover_bg), ) .on_hover(move |&is_hovered, _, cx| { weak_for_hover .update(cx, |this, cx| { if is_hovered { if this.hovered_entry_idx != Some(index) { this.hovered_entry_idx = Some(index); cx.notify(); } } else if this.hovered_entry_idx == Some(index) { this.hovered_entry_idx = None; cx.notify(); } }) .ok(); }) .on_click(move |event, window, cx| { weak.update(cx, |this, cx| { this.handle_entry_click( index, event, ScrollStrategy::Center, Some(&table_focus_handle), window, cx, ); }) .ok(); }) .on_mouse_down( MouseButton::Right, move |event: &MouseDownEvent, window, cx| { weak_for_context_menu .update(cx, |this, cx| { this.handle_entry_secondary_mouse_down( index, event, window, cx, ); }) .ok(); }, ) .into_any_element() }) .uniform_list( "git-graph-commits", commit_count, cx.processor(Self::render_table_rows), ); bind_redistributable_columns( div() .relative() .flex_1() .w_full() .overflow_hidden() .child( h_flex() .size_full() .when(!is_path_history && graph_visible, |this| { this.child( div() .map(|this| { if table_collapsed { this.w(graph_content_width) } else { this.w(DefiniteLength::Fraction( graph_fraction, )) } }) .h_full() .min_w_0() .overflow_hidden() .child(graph_canvas), ) }) .child( div() .tab_index(2) .tab_group() .tab_stop(false) .map(|this| { if table_collapsed { this.flex_1() } else { this.w(DefiniteLength::Fraction( table_fraction, )) } }) .h_full() .min_w_0() .child(commits_table), ), ) .child(render_redistributable_columns_resize_handles( &self.column_widths, Some(&self.column_visibility), window, cx, )), self.column_widths.clone(), Some(self.column_visibility.clone()), ) }), ) .on_drag_move::(cx.listener(|this, event, window, cx| { this.commit_details_split_state.update(cx, |state, cx| { state.on_drag_move(event, window, cx); }); })) .on_drop::(cx.listener(|this, _event, _window, cx| { this.commit_details_split_state.update(cx, |state, _cx| { state.commit_ratio(); }); })) .when(self.selected_entry_idx.is_some(), |this| { this.child(self.render_commit_view_resize_handle(window, cx)) .child(self.render_commit_detail_panel(window, cx)) }) }; div() .key_context("GitGraph") .track_focus(&self.focus_handle) .size_full() .bg(cx.theme().colors().editor_background) .on_action(cx.listener(|this, _: &OpenCommitView, window, cx| { this.open_selected_commit_view(window, cx); })) .on_action(cx.listener(Self::copy_selected_commit_sha)) .on_action(cx.listener(Self::copy_selected_commit_tag)) .on_action(cx.listener(Self::cancel)) .on_action(cx.listener(|this, _: &FocusSearch, window, cx| { this.search_state .editor .update(cx, |editor, cx| editor.focus_handle(cx).focus(window, cx)); this.activate_search_editor_if_focused(window, cx); })) .on_action(cx.listener(Self::select_first)) .on_action(cx.listener(Self::select_prev)) .on_action(cx.listener(Self::select_next)) .on_action(cx.listener(Self::select_last)) .on_action(cx.listener(Self::scroll_up)) .on_action(cx.listener(Self::scroll_down)) .on_action(cx.listener(Self::confirm)) .on_action(cx.listener(Self::toggle_changed_files_view)) .on_action(cx.listener(Self::focus_next_tab_stop)) .on_action(cx.listener(Self::focus_previous_tab_stop)) .on_action(cx.listener(|this, _: &SelectNextMatch, _window, cx| { this.select_next_match(cx); })) .on_action(cx.listener(|this, _: &SelectPreviousMatch, _window, cx| { this.select_previous_match(cx); })) .on_action(cx.listener(|this, _: &ToggleCaseSensitive, _window, cx| { this.search_state.case_sensitive = !this.search_state.case_sensitive; this.search_state.state.next_state(); cx.emit(ItemEvent::Edit); cx.notify(); })) .child( v_flex() .size_full() .child(self.render_search_bar(cx)) .child(div().flex_1().child(content)), ) .children(self.context_menu.as_ref().map(|context_menu| { deferred( anchored() .position(context_menu.position) .anchor(Anchor::TopLeft) .child(context_menu.menu.clone()), ) .with_priority(1) })) .on_action(cx.listener(|_, _: &buffer_search::Deploy, window, cx| { window.dispatch_action(Box::new(FocusSearch), cx); cx.stop_propagation(); })) } } impl EventEmitter for GitGraph {} impl Focusable for GitGraph { fn focus_handle(&self, cx: &App) -> FocusHandle { self.search_state.editor.read(cx).focus_handle(cx) } } impl Item for GitGraph { type Event = ItemEvent; fn tab_icon(&self, _window: &Window, _cx: &App) -> Option { Some(Icon::new(IconName::GitGraph)) } fn tab_tooltip_content(&self, cx: &App) -> Option { let repo_name = self.get_repository(cx).and_then(|repo| { repo.read(cx) .work_directory_abs_path .file_name() .map(|name| name.to_string_lossy().to_string()) }); let path_history_path = match &self.log_source { LogSource::Path(path) => Some(path.as_unix_str().to_string()), _ => None, }; Some(TabTooltipContent::Custom(Box::new(Tooltip::element({ move |_, _| { v_flex() .child(Label::new(if path_history_path.is_some() { "Path History" } else { "Git Graph" })) .when_some(path_history_path.clone(), |this, path| { this.child(Label::new(path).color(Color::Muted).size(LabelSize::Small)) }) .when_some(repo_name.clone(), |this, name| { this.child(Label::new(name).color(Color::Muted).size(LabelSize::Small)) }) .into_any_element() } })))) } fn tab_content_text(&self, _detail: usize, cx: &App) -> SharedString { if let LogSource::Path(path) = &self.log_source { return path .as_ref() .file_name() .map(|name| SharedString::from(name.to_string())) .unwrap_or_else(|| SharedString::from(path.as_unix_str().to_string())); } self.get_repository(cx) .and_then(|repo| { repo.read(cx) .work_directory_abs_path .file_name() .map(|name| name.to_string_lossy().to_string()) }) .map_or_else(|| "Git Graph".into(), |name| SharedString::from(name)) } fn show_toolbar(&self) -> bool { false } fn to_item_events(event: &Self::Event, f: &mut dyn FnMut(ItemEvent)) { f(*event) } } impl workspace::SerializableItem for GitGraph { fn serialized_item_kind() -> &'static str { "GitGraph" } fn cleanup( workspace_id: workspace::WorkspaceId, alive_items: Vec, _window: &mut Window, cx: &mut App, ) -> Task> { workspace::delete_unloaded_items( alive_items, workspace_id, "git_graphs", &persistence::GitGraphsDb::global(cx), cx, ) } fn deserialize( project: Entity, workspace: WeakEntity, workspace_id: workspace::WorkspaceId, item_id: workspace::ItemId, window: &mut Window, cx: &mut App, ) -> Task>> { let db = persistence::GitGraphsDb::global(cx); let Some(( repo_work_path, log_source_type, log_source_value, log_order, selected_sha, search_query, search_case_sensitive, hidden_columns, )) = db.get_git_graph(item_id, workspace_id).ok().flatten() else { return Task::ready(Err(anyhow::anyhow!("No git graph to deserialize"))); }; let state = persistence::SerializedGitGraphState { log_source_type, log_source_value, log_order, selected_sha, search_query, search_case_sensitive, hidden_columns, }; let window_handle = window.window_handle(); let project = project.read(cx); let git_store = project.git_store().clone(); let wait = project.wait_for_initial_scan(cx); cx.spawn(async move |cx| { wait.await; cx.update_window(window_handle, |_, window, cx| { let path = repo_work_path.as_path(); let repositories = git_store.read(cx).repositories(); let repo_id = repositories.iter().find_map(|(&repo_id, repo)| { if repo.read(cx).snapshot().work_directory_abs_path.as_ref() == path { Some(repo_id) } else { None } }); let Some(repo_id) = repo_id else { return Err(anyhow::anyhow!("Repository not found for path: {:?}", path)); }; let log_source = persistence::deserialize_log_source(&state); let log_order = persistence::deserialize_log_order(&state); let git_graph = cx.new(|cx| { let mut graph = GitGraph::new(repo_id, git_store, workspace, Some(log_source), window, cx); graph.log_order = log_order; if let Some(sha) = &state.selected_sha { graph.select_commit_by_sha(sha.as_str(), cx); } graph }); git_graph.update(cx, |graph, cx| { if let Some(bits) = state.hidden_columns { let cols = graph.column_visibility.cols(); let mask = persistence::deserialize_hidden_columns(bits, cols); // Never restore an all-hidden mask (e.g. from corrupt data); the UI // guarantees at least one column stays visible. if mask.iter().any(|is_hidden| !is_hidden) { graph.column_visibility = TableRow::from_vec(mask, cols); } } graph.search_state.case_sensitive = state.search_case_sensitive.unwrap_or(false); if let Some(query) = &state.search_query && !query.is_empty() { graph .search_state .editor .update(cx, |editor, cx| editor.set_text(query.as_str(), window, cx)); graph.search(query.clone().into(), cx); } }); Ok(git_graph) })? }) } fn serialize( &mut self, workspace: &mut Workspace, item_id: workspace::ItemId, _closing: bool, cx: &mut Context, ) -> Option>> { let workspace_id = workspace.database_id()?; let repo = self.get_repository(cx)?; let repo_working_path = repo .read(cx) .snapshot() .work_directory_abs_path .to_string_lossy() .to_string(); let selected_sha = self .selected_entry_idx .and_then(|idx| self.graph_data.commits.get(idx)) .map(|commit| commit.data.sha.to_string()); let search_query = self.search_state.editor.read(cx).text(cx); let search_query = if search_query.is_empty() { None } else { Some(search_query) }; let log_source_type = Some(persistence::serialize_log_source_type(&self.log_source)); let log_source_value = persistence::serialize_log_source_value(&self.log_source); let log_order = Some(persistence::serialize_log_order(&self.log_order)); let search_case_sensitive = Some(self.search_state.case_sensitive); let hidden_columns = Some(persistence::serialize_hidden_columns( self.column_visibility.as_slice(), )); let db = persistence::GitGraphsDb::global(cx); Some(cx.background_spawn(async move { db.save_git_graph( item_id, workspace_id, repo_working_path, log_source_type, log_source_value, log_order, selected_sha, search_query, search_case_sensitive, hidden_columns, ) .await })) } fn should_serialize(&self, event: &Self::Event) -> bool { match event { ItemEvent::UpdateTab | ItemEvent::Edit => true, _ => false, } } } mod persistence { use std::{path::PathBuf, str::FromStr}; use db::{ query, sqlez::{domain::Domain, thread_safe_connection::ThreadSafeConnection}, sqlez_macros::sql, }; use git::{ Oid, repository::{LogOrder, LogSource, RepoPath}, }; use workspace::WorkspaceDb; pub struct GitGraphsDb(ThreadSafeConnection); impl Domain for GitGraphsDb { const NAME: &str = stringify!(GitGraphsDb); const MIGRATIONS: &[&str] = &[ sql!( CREATE TABLE git_graphs ( workspace_id INTEGER, item_id INTEGER UNIQUE, is_open INTEGER DEFAULT FALSE, PRIMARY KEY(workspace_id, item_id), FOREIGN KEY(workspace_id) REFERENCES workspaces(workspace_id) ON DELETE CASCADE ) STRICT; ), sql!( ALTER TABLE git_graphs ADD COLUMN repo_working_path TEXT; ), sql!( ALTER TABLE git_graphs ADD COLUMN log_source_type TEXT; ALTER TABLE git_graphs ADD COLUMN log_source_value TEXT; ALTER TABLE git_graphs ADD COLUMN log_order TEXT; ALTER TABLE git_graphs ADD COLUMN selected_sha TEXT; ALTER TABLE git_graphs ADD COLUMN search_query TEXT; ALTER TABLE git_graphs ADD COLUMN search_case_sensitive INTEGER; ), sql!( ALTER TABLE git_graphs ADD COLUMN hidden_columns INTEGER; ), ]; } db::static_connection!(GitGraphsDb, [WorkspaceDb]); pub const LOG_SOURCE_ALL: i32 = 0; pub const LOG_SOURCE_BRANCH: i32 = 1; pub const LOG_SOURCE_SHA: i32 = 2; pub const LOG_SOURCE_PATH: i32 = 3; pub const LOG_ORDER_DATE: i32 = 0; pub const LOG_ORDER_TOPO: i32 = 1; pub const LOG_ORDER_AUTHOR_DATE: i32 = 2; pub const LOG_ORDER_REVERSE: i32 = 3; pub fn serialize_log_source_type(log_source: &LogSource) -> i32 { match log_source { LogSource::All => LOG_SOURCE_ALL, LogSource::Branch(_) => LOG_SOURCE_BRANCH, LogSource::Sha(_) => LOG_SOURCE_SHA, LogSource::Path(_) => LOG_SOURCE_PATH, } } pub fn serialize_log_source_value(log_source: &LogSource) -> Option { match log_source { LogSource::All => None, LogSource::Branch(branch) => Some(branch.to_string()), LogSource::Sha(oid) => Some(oid.to_string()), LogSource::Path(path) => Some(path.as_unix_str().to_string()), } } pub fn serialize_log_order(log_order: &LogOrder) -> i32 { match log_order { LogOrder::DateOrder => LOG_ORDER_DATE, LogOrder::TopoOrder => LOG_ORDER_TOPO, LogOrder::AuthorDateOrder => LOG_ORDER_AUTHOR_DATE, LogOrder::ReverseChronological => LOG_ORDER_REVERSE, } } pub fn deserialize_log_source(state: &SerializedGitGraphState) -> LogSource { match state.log_source_type { Some(LOG_SOURCE_ALL) => LogSource::All, Some(LOG_SOURCE_BRANCH) => state .log_source_value .as_ref() .map(|v| LogSource::Branch(v.clone().into())) .unwrap_or_default(), Some(LOG_SOURCE_SHA) => state .log_source_value .as_ref() .and_then(|v| Oid::from_str(v).ok()) .map(LogSource::Sha) .unwrap_or_default(), Some(LOG_SOURCE_PATH) => state .log_source_value .as_ref() .and_then(|v| RepoPath::new(v).ok()) .map(LogSource::Path) .unwrap_or_default(), None | Some(_) => LogSource::default(), } } pub fn deserialize_log_order(state: &SerializedGitGraphState) -> LogOrder { match state.log_order { Some(LOG_ORDER_DATE) => LogOrder::DateOrder, Some(LOG_ORDER_TOPO) => LogOrder::TopoOrder, Some(LOG_ORDER_AUTHOR_DATE) => LogOrder::AuthorDateOrder, Some(LOG_ORDER_REVERSE) => LogOrder::ReverseChronological, _ => LogOrder::default(), } } /// Packs the per-column visibility mask into a bitmask (bit `i` set means column `i` is /// hidden), so it fits in a single integer database column regardless of column count. pub fn serialize_hidden_columns(hidden: &[bool]) -> i32 { hidden.iter().enumerate().fold( 0, |bits, (idx, &is_hidden)| { if is_hidden { bits | (1 << idx) } else { bits } }, ) } /// Inverse of [`serialize_hidden_columns`]. Bits beyond `cols` are ignored, and missing /// bits default to visible, so a mask saved with a different column count degrades safely. pub fn deserialize_hidden_columns(bits: i32, cols: usize) -> Vec { (0..cols).map(|idx| bits & (1 << idx) != 0).collect() } #[derive(Debug, Default, Clone)] pub struct SerializedGitGraphState { pub log_source_type: Option, pub log_source_value: Option, pub log_order: Option, pub selected_sha: Option, pub search_query: Option, pub search_case_sensitive: Option, pub hidden_columns: Option, } impl GitGraphsDb { query! { pub async fn save_git_graph( item_id: workspace::ItemId, workspace_id: workspace::WorkspaceId, repo_working_path: String, log_source_type: Option, log_source_value: Option, log_order: Option, selected_sha: Option, search_query: Option, search_case_sensitive: Option, hidden_columns: Option ) -> Result<()> { INSERT OR REPLACE INTO git_graphs( item_id, workspace_id, repo_working_path, log_source_type, log_source_value, log_order, selected_sha, search_query, search_case_sensitive, hidden_columns ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) } } query! { pub fn get_git_graph( item_id: workspace::ItemId, workspace_id: workspace::WorkspaceId ) -> Result, Option, Option, Option, Option, Option, Option )>> { SELECT repo_working_path, log_source_type, log_source_value, log_order, selected_sha, search_query, search_case_sensitive, hidden_columns FROM git_graphs WHERE item_id = ? AND workspace_id = ? } } } } #[cfg(any(test, feature = "test-support"))] impl GitGraph { pub fn search_for_test(&mut self, query: SharedString, cx: &mut Context) { self.search(query, cx); } pub fn search_matches_for_test(&self) -> Vec { self.search_state.matches.iter().copied().collect() } pub fn initial_commit_data_for_test(&self) -> Vec> { self.graph_data .commits .iter() .map(|commit| commit.data.clone()) .collect() } pub fn commit_count_and_loading_state_for_test( &mut self, cx: &mut Context, ) -> (usize, bool) { self.commit_count_and_loading_state(cx) } pub fn log_source_for_test(&self) -> &LogSource { &self.log_source } } /// Generates a random commit DAG suitable for testing git graph rendering. /// /// The commits are ordered newest-first (like git log output), so: /// - Index 0 = most recent commit (HEAD) /// - Last index = oldest commit (root, has no parents) /// - Parents of commit at index I must have index > I /// /// When `adversarial` is true, generates complex topologies with many branches /// and octopus merges. Otherwise generates more realistic linear histories /// with occasional branches. #[cfg(any(test, feature = "test-support"))] pub fn generate_random_commit_dag( rng: &mut rand::rngs::StdRng, num_commits: usize, adversarial: bool, ) -> Vec> { use rand::Rng as _; if num_commits == 0 { return Vec::new(); } let mut commits: Vec> = Vec::with_capacity(num_commits); let oids: Vec = (0..num_commits).map(|_| Oid::random(rng)).collect(); for i in 0..num_commits { let sha = oids[i]; let parents = if i == num_commits - 1 { smallvec![] } else { generate_parents_from_oids(rng, &oids, i, num_commits, adversarial) }; let ref_names = if i == 0 { vec!["HEAD".into(), "main".into()] } else if adversarial && rng.random_bool(0.1) { vec![format!("branch-{i}").into()] } else { Vec::new() }; commits.push(Arc::new(InitialGraphCommitData { sha, parents, ref_names, })); } commits } #[cfg(any(test, feature = "test-support"))] fn generate_parents_from_oids( rng: &mut rand::rngs::StdRng, oids: &[Oid], current_idx: usize, num_commits: usize, adversarial: bool, ) -> SmallVec<[Oid; 1]> { use rand::{Rng as _, seq::SliceRandom as _}; let remaining = num_commits - current_idx - 1; if remaining == 0 { return smallvec![]; } if adversarial { let merge_chance = 0.4; let octopus_chance = 0.15; if remaining >= 3 && rng.random_bool(octopus_chance) { let num_parents = rng.random_range(3..=remaining.min(5)); let mut parent_indices: Vec = (current_idx + 1..num_commits).collect(); parent_indices.shuffle(rng); parent_indices .into_iter() .take(num_parents) .map(|idx| oids[idx]) .collect() } else if remaining >= 2 && rng.random_bool(merge_chance) { let mut parent_indices: Vec = (current_idx + 1..num_commits).collect(); parent_indices.shuffle(rng); parent_indices .into_iter() .take(2) .map(|idx| oids[idx]) .collect() } else { let parent_idx = rng.random_range(current_idx + 1..num_commits); smallvec![oids[parent_idx]] } } else { let merge_chance = 0.15; let skip_chance = 0.1; if remaining >= 2 && rng.random_bool(merge_chance) { let first_parent = current_idx + 1; let second_parent = rng.random_range(current_idx + 2..num_commits); smallvec![oids[first_parent], oids[second_parent]] } else if rng.random_bool(skip_chance) && remaining >= 2 { let skip = rng.random_range(1..remaining.min(3)); smallvec![oids[current_idx + 1 + skip]] } else { smallvec![oids[current_idx + 1]] } } } #[cfg(test)] mod tests { use super::*; use anyhow::{Context, Result, bail}; use collections::{HashMap, HashSet}; use fs::FakeFs; use git::Oid; use git::repository::{CommitData, InitialGraphCommitData}; use gpui::{TestAppContext, UpdateGlobal}; use project::git_store::{GitStoreEvent, RepositoryEvent}; use project::{ GIT_COMMAND_TASK_TAG, Project, TaskSourceKind, task_store::TaskSettingsLocation, }; use rand::prelude::*; use serde_json::json; use settings::{SettingsStore, ThemeSettingsContent}; use smallvec::{SmallVec, smallvec}; use std::path::Path; use std::sync::{Arc, Mutex}; fn init_test(cx: &mut TestAppContext) { cx.update(|cx| { let settings_store = SettingsStore::test(cx); cx.set_global(settings_store); theme_settings::init(theme::LoadThemes::JustBase, cx); language_model::init(cx); crate::init(cx); }); } fn build_oid_to_row_map(graph: &GraphData) -> HashMap { graph .commits .iter() .enumerate() .map(|(idx, entry)| (entry.data.sha, idx)) .collect() } fn verify_commit_order( graph: &GraphData, commits: &[Arc], ) -> Result<()> { if graph.commits.len() != commits.len() { bail!( "Commit count mismatch: graph has {} commits, expected {}", graph.commits.len(), commits.len() ); } for (idx, (graph_commit, expected_commit)) in graph.commits.iter().zip(commits.iter()).enumerate() { if graph_commit.data.sha != expected_commit.sha { bail!( "Commit order mismatch at index {}: graph has {:?}, expected {:?}", idx, graph_commit.data.sha, expected_commit.sha ); } } Ok(()) } fn verify_line_endpoints(graph: &GraphData, oid_to_row: &HashMap) -> Result<()> { for line in &graph.lines { let child_row = *oid_to_row .get(&line.child) .context("Line references non-existent child commit")?; let parent_row = *oid_to_row .get(&line.parent) .context("Line references non-existent parent commit")?; if child_row >= parent_row { bail!( "child_row ({}) must be < parent_row ({})", child_row, parent_row ); } if line.full_interval.start != child_row { bail!( "full_interval.start ({}) != child_row ({})", line.full_interval.start, child_row ); } if line.full_interval.end != parent_row { bail!( "full_interval.end ({}) != parent_row ({})", line.full_interval.end, parent_row ); } if let Some(last_segment) = line.segments.last() { let segment_end_row = match last_segment { CommitLineSegment::Straight { to_row } => *to_row, CommitLineSegment::Curve { on_row, .. } => *on_row, }; if segment_end_row != line.full_interval.end { bail!( "last segment ends at row {} but full_interval.end is {}", segment_end_row, line.full_interval.end ); } } } Ok(()) } fn verify_column_correctness( graph: &GraphData, oid_to_row: &HashMap, ) -> Result<()> { for line in &graph.lines { let child_row = *oid_to_row .get(&line.child) .context("Line references non-existent child commit")?; let parent_row = *oid_to_row .get(&line.parent) .context("Line references non-existent parent commit")?; let child_lane = graph.commits[child_row].lane; if line.child_column != child_lane { bail!( "child_column ({}) != child's lane ({})", line.child_column, child_lane ); } let mut current_column = line.child_column; for segment in &line.segments { if let CommitLineSegment::Curve { to_column, .. } = segment { current_column = *to_column; } } let parent_lane = graph.commits[parent_row].lane; if current_column != parent_lane { bail!( "ending column ({}) != parent's lane ({})", current_column, parent_lane ); } } Ok(()) } fn verify_segment_continuity(graph: &GraphData) -> Result<()> { for line in &graph.lines { if line.segments.is_empty() { bail!("Line has no segments"); } let mut current_row = line.full_interval.start; for (idx, segment) in line.segments.iter().enumerate() { let segment_end_row = match segment { CommitLineSegment::Straight { to_row } => *to_row, CommitLineSegment::Curve { on_row, .. } => *on_row, }; if segment_end_row < current_row { bail!( "segment {} ends at row {} which is before current row {}", idx, segment_end_row, current_row ); } current_row = segment_end_row; } } Ok(()) } fn verify_line_overlaps(graph: &GraphData) -> Result<()> { for line in &graph.lines { let child_row = line.full_interval.start; let mut current_column = line.child_column; let mut current_row = child_row; for segment in &line.segments { match segment { CommitLineSegment::Straight { to_row } => { for row in (current_row + 1)..*to_row { if row < graph.commits.len() { let commit_at_row = &graph.commits[row]; if commit_at_row.lane == current_column { bail!( "straight segment from row {} to {} in column {} passes through commit {:?} at row {}", current_row, to_row, current_column, commit_at_row.data.sha, row ); } } } current_row = *to_row; } CommitLineSegment::Curve { to_column, on_row, .. } => { current_column = *to_column; current_row = *on_row; } } } } Ok(()) } fn verify_keep_shared_parents_on_leftmost_lane(graph: &GraphData) -> Result<()> { let mut active_lane_parents: Vec> = Vec::new(); let mut parent_to_lanes: HashMap> = HashMap::default(); for (row, entry) in graph.commits.iter().enumerate() { let pending_lanes = parent_to_lanes.remove(&entry.data.sha).unwrap_or_default(); if pending_lanes.len() > 1 && let Some(expected_lane) = pending_lanes.iter().copied().min() && entry.lane != expected_lane { bail!( "commit {:?} at row {} uses lane {}, but shared parent should use leftmost pending lane {} from {:?}", entry.data.sha, row, entry.lane, expected_lane, pending_lanes ); } for lane in pending_lanes { let Some(active_lane_parent) = active_lane_parents.get_mut(lane) else { bail!( "commit {:?} at row {} was pending on missing lane {}", entry.data.sha, row, lane ); }; if *active_lane_parent != Some(entry.data.sha) { bail!( "commit {:?} at row {} was pending on lane {}, but that lane points to {:?}", entry.data.sha, row, lane, active_lane_parent ); } *active_lane_parent = None; } for (parent_index, parent) in entry.data.parents.iter().enumerate() { let lane = if parent_index == 0 { entry.lane } else if let Some(empty_lane) = active_lane_parents.iter().position(Option::is_none) { empty_lane } else { active_lane_parents.push(None); active_lane_parents.len() - 1 }; if lane >= active_lane_parents.len() { active_lane_parents.resize(lane + 1, None); } active_lane_parents[lane] = Some(*parent); parent_to_lanes.entry(*parent).or_default().push(lane); } } Ok(()) } fn verify_coverage(graph: &GraphData) -> Result<()> { let mut expected_edges: HashSet<(Oid, Oid)> = HashSet::default(); for entry in &graph.commits { for parent in &entry.data.parents { expected_edges.insert((entry.data.sha, *parent)); } } let mut found_edges: HashSet<(Oid, Oid)> = HashSet::default(); for line in &graph.lines { let edge = (line.child, line.parent); if !found_edges.insert(edge) { bail!( "Duplicate line found for edge {:?} -> {:?}", line.child, line.parent ); } if !expected_edges.contains(&edge) { bail!( "Orphan line found: {:?} -> {:?} is not in the commit graph", line.child, line.parent ); } } for (child, parent) in &expected_edges { if !found_edges.contains(&(*child, *parent)) { bail!("Missing line for edge {:?} -> {:?}", child, parent); } } assert_eq!( expected_edges.symmetric_difference(&found_edges).count(), 0, "The symmetric difference should be zero" ); Ok(()) } fn verify_merge_line_optimality( graph: &GraphData, oid_to_row: &HashMap, ) -> Result<()> { for line in &graph.lines { let first_segment = line.segments.first(); let is_merge_line = matches!( first_segment, Some(CommitLineSegment::Curve { curve_kind: CurveKind::Merge, .. }) ); if !is_merge_line { continue; } let child_row = *oid_to_row .get(&line.child) .context("Line references non-existent child commit")?; let parent_row = *oid_to_row .get(&line.parent) .context("Line references non-existent parent commit")?; let parent_lane = graph.commits[parent_row].lane; let Some(CommitLineSegment::Curve { to_column, .. }) = first_segment else { continue; }; let curves_directly_to_parent = *to_column == parent_lane; if !curves_directly_to_parent { continue; } let curve_row = child_row + 1; let has_commits_in_path = graph.commits[curve_row..parent_row] .iter() .any(|c| c.lane == parent_lane); if has_commits_in_path { bail!( "Merge line from {:?} to {:?} curves directly to parent lane {} but there are commits in that lane between rows {} and {}", line.child, line.parent, parent_lane, curve_row, parent_row ); } let curve_ends_at_parent = curve_row == parent_row; if curve_ends_at_parent { if line.segments.len() != 1 { bail!( "Merge line from {:?} to {:?} curves directly to parent (curve_row == parent_row), but has {} segments instead of 1 [MergeCurve]", line.child, line.parent, line.segments.len() ); } } else { if line.segments.len() != 2 { bail!( "Merge line from {:?} to {:?} curves directly to parent lane without overlap, but has {} segments instead of 2 [MergeCurve, Straight]", line.child, line.parent, line.segments.len() ); } let is_straight_segment = matches!( line.segments.get(1), Some(CommitLineSegment::Straight { .. }) ); if !is_straight_segment { bail!( "Merge line from {:?} to {:?} curves directly to parent lane without overlap, but second segment is not a Straight segment", line.child, line.parent ); } } } Ok(()) } fn verify_all_invariants( graph: &GraphData, commits: &[Arc], ) -> Result<()> { let oid_to_row = build_oid_to_row_map(graph); verify_commit_order(graph, commits).context("commit order")?; verify_line_endpoints(graph, &oid_to_row).context("line endpoints")?; verify_column_correctness(graph, &oid_to_row).context("column correctness")?; verify_segment_continuity(graph).context("segment continuity")?; verify_merge_line_optimality(graph, &oid_to_row).context("merge line optimality")?; verify_keep_shared_parents_on_leftmost_lane(graph) .context("keep shared parents on leftmost lane")?; verify_coverage(graph).context("coverage")?; verify_line_overlaps(graph).context("line overlaps")?; Ok(()) } #[test] fn test_git_graph_merge_commits() { let mut rng = StdRng::seed_from_u64(42); let oid1 = Oid::random(&mut rng); let oid2 = Oid::random(&mut rng); let oid3 = Oid::random(&mut rng); let oid4 = Oid::random(&mut rng); let commits = vec![ Arc::new(InitialGraphCommitData { sha: oid1, parents: smallvec![oid2, oid3], ref_names: vec!["HEAD".into()], }), Arc::new(InitialGraphCommitData { sha: oid2, parents: smallvec![oid4], ref_names: vec![], }), Arc::new(InitialGraphCommitData { sha: oid3, parents: smallvec![oid4], ref_names: vec![], }), Arc::new(InitialGraphCommitData { sha: oid4, parents: smallvec![], ref_names: vec![], }), ]; let mut graph_data = GraphData::new(8); graph_data.add_commits(&commits); if let Err(error) = verify_all_invariants(&graph_data, &commits) { panic!("Graph invariant violation for merge commits:\n{}", error); } } #[test] fn test_git_graph_linear_commits() { let mut rng = StdRng::seed_from_u64(42); let oid1 = Oid::random(&mut rng); let oid2 = Oid::random(&mut rng); let oid3 = Oid::random(&mut rng); let commits = vec![ Arc::new(InitialGraphCommitData { sha: oid1, parents: smallvec![oid2], ref_names: vec!["HEAD".into()], }), Arc::new(InitialGraphCommitData { sha: oid2, parents: smallvec![oid3], ref_names: vec![], }), Arc::new(InitialGraphCommitData { sha: oid3, parents: smallvec![], ref_names: vec![], }), ]; let mut graph_data = GraphData::new(8); graph_data.add_commits(&commits); if let Err(error) = verify_all_invariants(&graph_data, &commits) { panic!("Graph invariant violation for linear commits:\n{}", error); } } #[test] fn test_git_graph_random_commits() { for seed in 0..100 { let mut rng = StdRng::seed_from_u64(seed); let adversarial = rng.random_bool(0.2); let num_commits = if adversarial { rng.random_range(10..100) } else { rng.random_range(5..50) }; let commits = generate_random_commit_dag(&mut rng, num_commits, adversarial); assert_eq!( num_commits, commits.len(), "seed={}: Generate random commit dag didn't generate the correct amount of commits", seed ); let mut graph_data = GraphData::new(8); graph_data.add_commits(&commits); if let Err(error) = verify_all_invariants(&graph_data, &commits) { panic!( "Graph invariant violation (seed={}, adversarial={}, num_commits={}):\n{:#}", seed, adversarial, num_commits, error ); } } } // The full integration test has less iterations because it's significantly slower // than the random commit test #[gpui::test(iterations = 10)] async fn test_git_graph_random_integration(mut rng: StdRng, cx: &mut TestAppContext) { init_test(cx); let adversarial = rng.random_bool(0.2); let num_commits = if adversarial { rng.random_range(10..100) } else { rng.random_range(5..50) }; let commits = generate_random_commit_dag(&mut rng, num_commits, adversarial); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), json!({ ".git": {}, "file.txt": "content", }), ) .await; fs.set_graph_commits(Path::new("/project/.git"), commits.clone()); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); repository.update(cx, |repo, cx| { repo.graph_data(LogSource::default(), LogOrder::default(), 0..usize::MAX, cx); }); cx.run_until_parked(); let graph_commits: Vec> = repository.update(cx, |repo, cx| { repo.graph_data(LogSource::default(), LogOrder::default(), 0..usize::MAX, cx) .commits .to_vec() }); let mut graph_data = GraphData::new(8); graph_data.add_commits(&graph_commits); if let Err(error) = verify_all_invariants(&graph_data, &commits) { panic!( "Graph invariant violation (adversarial={}, num_commits={}):\n{:#}", adversarial, num_commits, error ); } } #[gpui::test] async fn test_empty_nested_repository_graph_stops_loading(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), json!({ "repo_a": { ".git": {}, "file_a.txt": "content", }, "repo_b": { ".git": {}, "file_b.txt": "content", }, }), ) .await; let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; project .update(cx, |project, cx| project.git_scans_complete(cx)) .await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { assert_eq!(project.repositories(cx).len(), 2); project .active_repository(cx) .expect("should have an active repository") }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade()); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace, None, window, cx, ) }); cx.run_until_parked(); let (commit_count, is_loading) = git_graph.update(cx, |graph, cx| { graph.commit_count_and_loading_state_for_test(cx) }); assert_eq!(commit_count, 0); assert!(!is_loading, "empty graph data should stop loading"); } #[gpui::test] async fn test_initial_graph_data_not_cleared_on_initial_loading(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), json!({ ".git": {}, "file.txt": "content", }), ) .await; let mut rng = StdRng::seed_from_u64(42); let commits = generate_random_commit_dag(&mut rng, 10, false); fs.set_graph_commits(Path::new("/project/.git"), commits.clone()); let project = Project::test(fs.clone(), [], cx).await; let observed_repository_events = Arc::new(Mutex::new(Vec::new())); project.update(cx, |project, cx| { let observed_repository_events = observed_repository_events.clone(); cx.subscribe(project.git_store(), move |_, _, event, _| { if let GitStoreEvent::RepositoryUpdated(_, repository_event, true) = event { observed_repository_events .lock() .expect("repository event mutex should be available") .push(repository_event.clone()); } }) .detach(); }); project .update(cx, |project, cx| { project.create_worktree("/project", true, cx) }) .await .unwrap(); cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); repository.update(cx, |repo, cx| { repo.graph_data(LogSource::default(), LogOrder::default(), 0..usize::MAX, cx); }); project .update(cx, |project, cx| project.git_scans_complete(cx)) .await; cx.run_until_parked(); let observed_repository_events = observed_repository_events .lock() .expect("repository event mutex should be available"); assert!( observed_repository_events .iter() .any(|event| matches!(event, RepositoryEvent::HeadChanged)), "initial repository scan should emit HeadChanged" ); let commit_count_after = repository.read_with(cx, |repo, _| { repo.get_graph_data(LogSource::default(), LogOrder::default()) .map(|data| data.commit_data.len()) .unwrap() }); assert_eq!( commits.len(), commit_count_after, "initial_graph_data should remain populated after events emitted by initial repository scan" ); } #[gpui::test] async fn test_initial_graph_data_propagates_error(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), json!({ ".git": {}, "file.txt": "content", }), ) .await; fs.set_graph_error( Path::new("/project/.git"), Some("fatal: bad default revision 'HEAD'".to_string()), ); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); repository.update(cx, |repo, cx| { repo.graph_data(LogSource::default(), LogOrder::default(), 0..usize::MAX, cx); }); cx.run_until_parked(); let error = repository.read_with(cx, |repo, _| { repo.get_graph_data(LogSource::default(), LogOrder::default()) .and_then(|data| data.error.clone()) }); assert!( error.is_some(), "graph data should contain an error after initial_graph_data fails" ); let error_message = error.unwrap(); assert!( error_message.contains("bad default revision"), "error should contain the git error message, got: {}", error_message ); } #[gpui::test] async fn test_graph_data_repopulated_from_cache_after_repo_switch(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project_a"), json!({ ".git": {}, "file.txt": "content", }), ) .await; fs.insert_tree( Path::new("/project_b"), json!({ ".git": {}, "other.txt": "content", }), ) .await; let mut rng = StdRng::seed_from_u64(42); let commits = generate_random_commit_dag(&mut rng, 10, false); fs.set_graph_commits(Path::new("/project_a/.git"), commits.clone()); let project = Project::test( fs.clone(), [Path::new("/project_a"), Path::new("/project_b")], cx, ) .await; cx.run_until_parked(); let (first_repository, second_repository) = project.read_with(cx, |project, cx| { let mut first_repository = None; let mut second_repository = None; for repository in project.repositories(cx).values() { let work_directory_abs_path = &repository.read(cx).work_directory_abs_path; if work_directory_abs_path.as_ref() == Path::new("/project_a") { first_repository = Some(repository.clone()); } else if work_directory_abs_path.as_ref() == Path::new("/project_b") { second_repository = Some(repository.clone()); } } ( first_repository.expect("should have repository for /project_a"), second_repository.expect("should have repository for /project_b"), ) }); first_repository.update(cx, |repository, cx| repository.set_as_active_repository(cx)); cx.run_until_parked(); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace_weak = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade()); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( first_repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak, None, window, cx, ) }); cx.run_until_parked(); // Verify initial graph data is loaded let initial_commit_count = git_graph.read_with(&*cx, |graph, _| graph.graph_data.commits.len()); assert!( initial_commit_count > 0, "graph data should have been loaded, got 0 commits" ); git_graph.update(cx, |graph, cx| { graph.set_repo_id(second_repository.read(cx).id, cx) }); cx.run_until_parked(); let commit_count_after_clear = git_graph.read_with(&*cx, |graph, _| graph.graph_data.commits.len()); assert_eq!( commit_count_after_clear, 0, "graph_data should be cleared after switching away" ); git_graph.update(cx, |graph, cx| { graph.set_repo_id(first_repository.read(cx).id, cx) }); cx.run_until_parked(); cx.draw( point(px(0.), px(0.)), gpui::size(px(1200.), px(800.)), |_, _| git_graph.clone().into_any_element(), ); cx.run_until_parked(); // Verify graph data is reloaded from repository cache on switch back let reloaded_commit_count = git_graph.read_with(&*cx, |graph, _| graph.graph_data.commits.len()); assert_eq!( reloaded_commit_count, commits.len(), "graph data should be reloaded after switching back" ); } #[gpui::test] async fn test_file_history_action_uses_git_panel_and_editor_sources(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new(util::path!("/project")), json!({ ".git": {}, "tracked1.txt": "tracked 1", "tracked2.txt": "tracked 2", }), ) .await; fs.set_status_for_repo( Path::new(util::path!("/project/.git")), &[ ("tracked1.txt", StatusCode::Modified.worktree()), ("tracked2.txt", StatusCode::Modified.worktree()), ], ); let commits = vec![Arc::new(InitialGraphCommitData { sha: Oid::from_bytes(&[1; 20]).unwrap(), parents: smallvec![], ref_names: vec!["HEAD".into(), "refs/heads/main".into()], })]; fs.set_graph_commits(Path::new(util::path!("/project/.git")), commits); let project = Project::test(fs.clone(), [Path::new(util::path!("/project"))], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have active repository") }); let tracked1_repo_path = RepoPath::new(&"tracked1.txt").unwrap(); let tracked2_repo_path = RepoPath::new(&"tracked2.txt").unwrap(); let tracked1 = repository .read_with(cx, |repository, cx| { repository.repo_path_to_project_path(&tracked1_repo_path, cx) }) .expect("tracked1 should resolve to project path"); let tracked2 = repository .read_with(cx, |repository, cx| { repository.repo_path_to_project_path(&tracked2_repo_path, cx) }) .expect("tracked2 should resolve to project path"); let workspace_window = cx.add_window(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace = workspace_window .read_with(cx, |multi, _| multi.workspace().clone()) .expect("workspace should exist"); let (weak_workspace, async_window_cx) = workspace_window .update(cx, |multi, window, cx| { (multi.workspace().downgrade(), window.to_async(cx)) }) .expect("window should be available"); cx.background_executor.allow_parking(); let git_panel = cx .foreground_executor() .clone() .block_test(crate::git_panel::GitPanel::load( weak_workspace, async_window_cx, )) .expect("git panel should load"); cx.background_executor.forbid_parking(); workspace_window .update(cx, |multi, window, cx| { let workspace = multi.workspace(); workspace.update(cx, |workspace, cx| { workspace.add_panel(git_panel.clone(), window, cx); }); }) .expect("workspace window should be available"); cx.executor().advance_clock(Duration::from_millis(100)); cx.run_until_parked(); workspace_window .update(cx, |_, window, cx| { git_panel.update(cx, |panel, cx| { panel.select_entry_by_path(tracked1.clone(), window, cx); }); git_panel.update(cx, |panel, cx| { panel.focus_handle(cx).focus(window, cx); }); }) .expect("workspace window should be available"); cx.run_until_parked(); workspace_window .update(cx, |_, window, cx| { window.dispatch_action(Box::new(git::FileHistory), cx); }) .expect("workspace window should be available"); cx.run_until_parked(); workspace.read_with(cx, |workspace, cx| { let graphs = workspace.items_of_type::(cx).collect::>(); assert_eq!(graphs.len(), 1); assert_eq!( graphs[0].read(cx).log_source, LogSource::Path(tracked1_repo_path.clone()) ); }); workspace_window .update(cx, |_, window, cx| { git_panel.update(cx, |panel, cx| { panel.select_entry_by_path(tracked1.clone(), window, cx); }); git_panel.update(cx, |panel, cx| { panel.focus_handle(cx).focus(window, cx); }); }) .expect("workspace window should be available"); cx.run_until_parked(); workspace_window .update(cx, |_, window, cx| { window.dispatch_action(Box::new(git::FileHistory), cx); }) .expect("workspace window should be available"); cx.run_until_parked(); workspace.read_with(cx, |workspace, cx| { let graphs = workspace.items_of_type::(cx).collect::>(); assert_eq!(graphs.len(), 1); assert_eq!( graphs[0].read(cx).log_source, LogSource::Path(tracked1_repo_path.clone()) ); }); let tracked1_buffer = project .update(cx, |project, cx| project.open_buffer(tracked1.clone(), cx)) .await .expect("tracked1 buffer should open"); let tracked2_buffer = project .update(cx, |project, cx| project.open_buffer(tracked2.clone(), cx)) .await .expect("tracked2 buffer should open"); workspace_window .update(cx, |multi, window, cx| { let workspace = multi.workspace(); let multibuffer = cx.new(|cx| { let mut multibuffer = editor::MultiBuffer::new(language::Capability::ReadWrite); multibuffer.set_excerpts_for_buffer( tracked1_buffer.clone(), [Default::default()..tracked1_buffer.read(cx).max_point()], 0, cx, ); multibuffer.set_excerpts_for_buffer( tracked2_buffer.clone(), [Default::default()..tracked2_buffer.read(cx).max_point()], 0, cx, ); multibuffer }); let editor = cx.new(|cx| { Editor::for_multibuffer(multibuffer, Some(project.clone()), window, cx) }); workspace.update(cx, |workspace, cx| { workspace.add_item_to_active_pane( Box::new(editor.clone()), None, true, window, cx, ); }); editor.update(cx, |editor, cx| { let snapshot = editor.buffer().read(cx).snapshot(cx); let second_excerpt_point = snapshot .range_for_buffer(tracked2_buffer.read(cx).remote_id()) .expect("tracked2 excerpt should exist") .start; let anchor = snapshot.anchor_before(second_excerpt_point); editor.change_selections( editor::SelectionEffects::no_scroll(), window, cx, |selections| { selections.select_anchor_ranges([anchor..anchor]); }, ); window.focus(&editor.focus_handle(cx), cx); }); }) .expect("workspace window should be available"); cx.run_until_parked(); workspace_window .update(cx, |_, window, cx| { window.dispatch_action(Box::new(git::FileHistory), cx); }) .expect("workspace window should be available"); cx.run_until_parked(); workspace.read_with(cx, |workspace, cx| { let graphs = workspace.items_of_type::(cx).collect::>(); assert_eq!(graphs.len(), 2); let latest = graphs .into_iter() .max_by_key(|graph| graph.entity_id()) .expect("expected a git graph"); assert_eq!( latest.read(cx).log_source, LogSource::Path(tracked2_repo_path) ); }); } #[gpui::test] fn test_serialized_state_roundtrip(_cx: &mut TestAppContext) { use persistence::SerializedGitGraphState; let path = RepoPath::new(&"src/main.rs").unwrap(); let sha = Oid::from_bytes(&[0xab; 20]).unwrap(); let state = SerializedGitGraphState { log_source_type: Some(persistence::LOG_SOURCE_PATH), log_source_value: Some("src/main.rs".to_string()), log_order: Some(persistence::LOG_ORDER_TOPO), selected_sha: Some(sha.to_string()), search_query: Some("fix bug".to_string()), search_case_sensitive: Some(true), hidden_columns: None, }; assert_eq!( persistence::deserialize_log_source(&state), LogSource::Path(path) ); assert!(matches!( persistence::deserialize_log_order(&state), LogOrder::TopoOrder )); assert_eq!( state.selected_sha.as_deref(), Some(sha.to_string()).as_deref() ); assert_eq!(state.search_query.as_deref(), Some("fix bug")); assert_eq!(state.search_case_sensitive, Some(true)); let all_state = SerializedGitGraphState { log_source_type: Some(persistence::LOG_SOURCE_ALL), log_source_value: None, log_order: Some(persistence::LOG_ORDER_DATE), selected_sha: None, search_query: None, search_case_sensitive: None, hidden_columns: None, }; assert_eq!( persistence::deserialize_log_source(&all_state), LogSource::All ); assert!(matches!( persistence::deserialize_log_order(&all_state), LogOrder::DateOrder )); let branch_state = SerializedGitGraphState { log_source_type: Some(persistence::LOG_SOURCE_BRANCH), log_source_value: Some("refs/heads/main".to_string()), ..Default::default() }; assert_eq!( persistence::deserialize_log_source(&branch_state), LogSource::Branch("refs/heads/main".into()) ); let sha_state = SerializedGitGraphState { log_source_type: Some(persistence::LOG_SOURCE_SHA), log_source_value: Some(sha.to_string()), ..Default::default() }; assert_eq!( persistence::deserialize_log_source(&sha_state), LogSource::Sha(sha) ); let empty_state = SerializedGitGraphState::default(); assert_eq!( persistence::deserialize_log_source(&empty_state), LogSource::All ); assert!(matches!( persistence::deserialize_log_order(&empty_state), LogOrder::DateOrder )); } #[gpui::test] fn test_hidden_columns_bitmask_roundtrip(_cx: &mut TestAppContext) { let mask = [false, true, false, true, false]; let bits = persistence::serialize_hidden_columns(&mask); assert_eq!( persistence::deserialize_hidden_columns(bits, mask.len()), mask.to_vec() ); assert_eq!(persistence::serialize_hidden_columns(&[false; 5]), 0); assert_eq!( persistence::deserialize_hidden_columns(0, 4), vec![false; 4] ); // A mask saved with more columns than we restore with is truncated safely, and one // saved with fewer columns defaults the extra columns to visible. let bits = persistence::serialize_hidden_columns(&[true, false, true, false, true]); assert_eq!( persistence::deserialize_hidden_columns(bits, 4), vec![true, false, true, false] ); assert_eq!( persistence::deserialize_hidden_columns(bits, 6), vec![true, false, true, false, true, false] ); } #[gpui::test] async fn test_git_graph_state_persists_across_serialization_roundtrip(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), json!({ ".git": {}, "file.txt": "content", }), ) .await; let mut rng = StdRng::seed_from_u64(99); let commits = generate_random_commit_dag(&mut rng, 20, false); fs.set_graph_commits(Path::new("/project/.git"), commits.clone()); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace_weak = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade()); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak.clone(), None, window, cx, ) }); cx.run_until_parked(); cx.draw( point(px(0.), px(0.)), gpui::size(px(1200.), px(800.)), |_, _| git_graph.clone().into_any_element(), ); cx.run_until_parked(); let commit_count = git_graph.read_with(&*cx, |graph, _| graph.graph_data.commits.len()); assert!(commit_count > 0, "graph should have loaded commits, got 0"); let target_sha = commits[5].sha; git_graph.update(cx, |graph, _| { graph.selected_entry_idx = Some(5); }); let selected_sha = git_graph.read_with(&*cx, |graph, _| { graph .selected_entry_idx .and_then(|idx| graph.graph_data.commits.get(idx)) .map(|c| c.data.sha.to_string()) }); assert_eq!(selected_sha, Some(target_sha.to_string())); let item_id = workspace::ItemId::from(999_u64); let workspace_db = cx.read(|cx| workspace::WorkspaceDb::global(cx)); let workspace_id = workspace_db .next_id() .await .expect("should create workspace id"); let db = cx.read(|cx| persistence::GitGraphsDb::global(cx)); // Hide the "Date" column (index 2 in the non-path-history layout). let hidden_columns = persistence::serialize_hidden_columns(&[false, false, true, false, false]); db.save_git_graph( item_id, workspace_id, "/project".to_string(), Some(persistence::LOG_SOURCE_ALL), None, Some(persistence::LOG_ORDER_DATE), selected_sha.clone(), Some("some query".to_string()), Some(true), Some(hidden_columns), ) .await .expect("save should succeed"); let restored_graph = cx .update(|window, cx| { ::deserialize( project.clone(), workspace_weak, workspace_id, item_id, window, cx, ) }) .await .expect("deserialization should succeed"); cx.run_until_parked(); cx.draw( point(px(0.), px(0.)), gpui::size(px(1200.), px(800.)), |_, _| restored_graph.clone().into_any_element(), ); cx.run_until_parked(); let restored_commit_count = restored_graph.read_with(&*cx, |graph, _| graph.graph_data.commits.len()); assert_eq!( restored_commit_count, commit_count, "restored graph should have the same number of commits" ); restored_graph.read_with(&*cx, |graph, _| { assert_eq!( graph.log_source, LogSource::All, "log_source should be restored" ); let restored_selected_sha = graph .selected_entry_idx .and_then(|idx| graph.graph_data.commits.get(idx)) .map(|c| c.data.sha.to_string()); assert_eq!( restored_selected_sha, selected_sha, "selected commit should be restored via pending_select_sha" ); assert_eq!( graph.search_state.case_sensitive, true, "search case sensitivity should be restored" ); assert_eq!( graph.column_visibility.as_slice(), &[false, false, true, false, false], "hidden columns should be restored" ); }); restored_graph.read_with(&*cx, |graph, cx| { let editor_text = graph.search_state.editor.read(cx).text(cx); assert_eq!( editor_text, "some query", "search query text should be restored in editor" ); }); } #[gpui::test] async fn test_git_graph_search_matches_commit_hash_prefix(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), json!({ ".git": {}, "file.txt": "content", }), ) .await; let first_sha = Oid::from_bytes(&[1; 20]).unwrap(); let target_sha = Oid::from_bytes(&[2; 20]).unwrap(); let third_sha = Oid::from_bytes(&[3; 20]).unwrap(); let commits = vec![ Arc::new(InitialGraphCommitData { sha: first_sha, parents: smallvec![target_sha], ref_names: vec!["HEAD".into(), "refs/heads/main".into()], }), Arc::new(InitialGraphCommitData { sha: target_sha, parents: smallvec![third_sha], ref_names: vec![], }), Arc::new(InitialGraphCommitData { sha: third_sha, parents: smallvec![], ref_names: vec![], }), ]; fs.set_graph_commits(Path::new("/project/.git"), commits); fs.set_commit_data( Path::new("/project/.git"), [ ( CommitData { sha: first_sha, parents: smallvec![target_sha], author_name: "Author".into(), author_email: "author@example.com".into(), commit_timestamp: 1, subject: "Add feature".into(), message: "Add feature".into(), }, false, ), ( CommitData { sha: target_sha, parents: smallvec![third_sha], author_name: "Author".into(), author_email: "author@example.com".into(), commit_timestamp: 2, subject: "Fix branch loading".into(), message: "Fix branch loading".into(), }, false, ), ( CommitData { sha: third_sha, parents: smallvec![], author_name: "Author".into(), author_email: "author@example.com".into(), commit_timestamp: 3, subject: "Update docs".into(), message: "Update docs".into(), }, false, ), ], ); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace_weak = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade()); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak, None, window, cx, ) }); cx.run_until_parked(); git_graph.update(cx, |graph, cx| { graph.search_for_test("0202020".into(), cx); }); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.search_matches_for_test(), vec![target_sha]); let selected_sha = graph .selected_entry_idx .and_then(|idx| graph.graph_data.commits.get(idx)) .map(|commit| commit.data.sha); assert_eq!(selected_sha, Some(target_sha)); }); git_graph.update(cx, |graph, cx| { graph.search_for_test("docs".into(), cx); }); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.search_matches_for_test(), vec![third_sha]); }); } #[gpui::test] async fn test_graph_data_reloaded_after_stash_change(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), json!({ ".git": {}, "file.txt": "content", }), ) .await; let initial_head = Oid::from_bytes(&[1; 20]).unwrap(); let initial_stash = Oid::from_bytes(&[2; 20]).unwrap(); let updated_head = Oid::from_bytes(&[3; 20]).unwrap(); let updated_stash = Oid::from_bytes(&[4; 20]).unwrap(); fs.set_graph_commits( Path::new("/project/.git"), vec![ Arc::new(InitialGraphCommitData { sha: initial_head, parents: smallvec![initial_stash], ref_names: vec!["HEAD".into(), "refs/heads/main".into()], }), Arc::new(InitialGraphCommitData { sha: initial_stash, parents: smallvec![], ref_names: vec!["refs/stash".into()], }), ], ); fs.with_git_state(Path::new("/project/.git"), true, |state| { state.stash_entries = git::stash::GitStash { entries: vec![git::stash::StashEntry { index: 0, oid: initial_stash, message: "initial stash".to_string(), branch: Some("main".to_string()), timestamp: 1, }] .into(), }; }) .unwrap(); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace_weak = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade()); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak, None, window, cx, ) }); cx.run_until_parked(); let initial_shas = git_graph.read_with(&*cx, |graph, _| { graph .graph_data .commits .iter() .map(|commit| commit.data.sha) .collect::>() }); assert_eq!(initial_shas, vec![initial_head, initial_stash]); fs.set_graph_commits( Path::new("/project/.git"), vec![ Arc::new(InitialGraphCommitData { sha: updated_head, parents: smallvec![updated_stash], ref_names: vec!["HEAD".into(), "refs/heads/main".into()], }), Arc::new(InitialGraphCommitData { sha: updated_stash, parents: smallvec![], ref_names: vec!["refs/stash".into()], }), ], ); fs.with_git_state(Path::new("/project/.git"), true, |state| { state.stash_entries = git::stash::GitStash { entries: vec![git::stash::StashEntry { index: 0, oid: updated_stash, message: "updated stash".to_string(), branch: Some("main".to_string()), timestamp: 1, }] .into(), }; }) .unwrap(); project .update(cx, |project, cx| project.git_scans_complete(cx)) .await; cx.run_until_parked(); cx.draw( point(px(0.), px(0.)), gpui::size(px(1200.), px(800.)), |_, _| git_graph.clone().into_any_element(), ); cx.run_until_parked(); let reloaded_shas = git_graph.read_with(&*cx, |graph, _| { graph .graph_data .commits .iter() .map(|commit| commit.data.sha) .collect::>() }); assert_eq!(reloaded_shas, vec![updated_head, updated_stash]); } #[gpui::test] async fn test_git_graph_row_at_position_rounding(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), serde_json::json!({ ".git": {}, "file.txt": "content", }), ) .await; let mut rng = StdRng::seed_from_u64(42); let commits = generate_random_commit_dag(&mut rng, 10, false); fs.set_graph_commits(Path::new("/project/.git"), commits.clone()); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace_weak = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade()); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak, None, window, cx, ) }); cx.run_until_parked(); git_graph.update_in(cx, |graph, window, cx| { assert!( graph.graph_data.commits.len() >= 10, "graph should load dummy commits" ); let row_height = GitGraph::row_height(window, cx); let origin_y = px(100.0); graph.graph_canvas_bounds.set(Some(Bounds { origin: point(px(0.0), origin_y), size: gpui::size(px(100.0), row_height * 50.0), })); // Scroll down by half a row so the row under a position near the // top of the canvas is row 1 rather than row 0. let scroll_offset = row_height * 0.75; graph.table_interaction_state.update(cx, |state, _| { state.set_scroll_offset(point(px(0.0), -scroll_offset)) }); let pos_y = origin_y + row_height * 0.5; let absolute_calc_row = graph.row_at_position(pos_y, window, cx); assert_eq!( absolute_calc_row, Some(1), "Row calculation should yield absolute row exactly" ); }); } #[gpui::test] async fn test_focus_handle_focuses_search_editor(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), serde_json::json!({ ".git": {}, "file.txt": "content", }), ) .await; let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace_weak = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade()); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak, None, window, cx, ) }); cx.run_until_parked(); git_graph.update_in(cx, |graph, window, cx| { window.focus(&graph.focus_handle(cx), cx); assert!( graph .search_state .editor .read(cx) .focus_handle(cx) .is_focused(window), "focusing the git graph item should focus the search editor" ); }); } #[gpui::test] async fn test_row_height_matches_uniform_list_item_height(cx: &mut TestAppContext) { init_test(cx); cx.update(|cx| { SettingsStore::update_global(cx, |store, cx| { store.update_user_settings(cx, |settings| { *settings.theme = ThemeSettingsContent { ui_font_size: Some(12.7.into()), ..Default::default() } }); }) }); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), serde_json::json!({ ".git": {}, "file.txt": "content", }), ) .await; let mut rng = StdRng::seed_from_u64(99); let commits = generate_random_commit_dag(&mut rng, 20, false); fs.set_graph_commits(Path::new("/project/.git"), commits); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace_weak = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade()); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak, None, window, cx, ) }); cx.run_until_parked(); cx.draw( point(px(0.), px(0.)), gpui::size(px(1200.), px(800.)), |_, _| git_graph.clone().into_any_element(), ); cx.run_until_parked(); git_graph.update_in(cx, |graph, window, cx| { let commit_count = graph.graph_data.commits.len(); assert!( commit_count > 0, "need at least one commit to measure item height" ); let table_state = graph.table_interaction_state.read(cx); let item_size = table_state.scroll_handle.0.borrow().last_item_size.expect( "uniform_list should have populated last_item_size after draw(); \ the table has not been laid out", ); let measured_item_height = item_size.contents.height / commit_count as f32; let computed_row_height = GitGraph::row_height(window, cx); assert_eq!( computed_row_height, measured_item_height, "GitGraph::row_height ({}) must exactly match the height that \ uniform_list measured for each table row ({}). \ A mismatch means the canvas and table rows will drift when scrolling.", computed_row_height, measured_item_height, ); }); } #[gpui::test] async fn test_copy_selected_commit_tag_with_one_tag_copies_to_clipboard( cx: &mut TestAppContext, ) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), serde_json::json!({ ".git": {}, "file.txt": "content", }), ) .await; let commit_sha = Oid::from_bytes(&[1; 20]).unwrap(); let commits = vec![Arc::new(InitialGraphCommitData { sha: commit_sha, parents: smallvec![], ref_names: vec![ SharedString::from("HEAD -> main"), SharedString::from("origin/main"), SharedString::from("tag: v1.0.0"), ], })]; fs.set_graph_commits(Path::new("/project/.git"), commits); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().clone()); let workspace_weak = workspace.downgrade(); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak, None, window, cx, ) }); cx.run_until_parked(); git_graph.update_in(cx, |graph, window, cx| { assert_eq!(graph.graph_data.commits.len(), 1); graph.selected_entry_idx = Some(0); graph.copy_selected_commit_tag(&CopyCommitTag, window, cx); }); assert_eq!( cx.read_from_clipboard().and_then(|item| item.text()), Some("v1.0.0".to_string()) ); } #[gpui::test] async fn test_copy_selected_commit_tag_with_multiple_tags_opens_picker_and_copies_selected_tag( cx: &mut TestAppContext, ) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), serde_json::json!({ ".git": {}, "file.txt": "content", }), ) .await; let commit_sha = Oid::from_bytes(&[1; 20]).unwrap(); let commits = vec![Arc::new(InitialGraphCommitData { sha: commit_sha, parents: smallvec![], ref_names: vec![ SharedString::from("HEAD -> main"), SharedString::from("origin/main"), SharedString::from("tag: v1.0.0"), SharedString::from("tag: v1.1.0"), ], })]; fs.set_graph_commits(Path::new("/project/.git"), commits); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().clone()); let workspace_weak = workspace.downgrade(); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak, None, window, cx, ) }); cx.run_until_parked(); git_graph.update_in(cx, |graph, window, cx| { assert_eq!(graph.graph_data.commits.len(), 1); graph.selected_entry_idx = Some(0); graph.copy_selected_commit_tag(&CopyCommitTag, window, cx); }); // Ensure that nothing has been copied at this point assert_eq!(cx.read_from_clipboard().and_then(|item| item.text()), None); let picker = workspace.update(cx, |workspace, cx| { workspace .active_modal::(cx) .expect("commit tag picker is not open") .read(cx) .picker .clone() }); picker.read_with(cx, |picker, _| { assert_eq!(picker.delegate.selected_index, 0); assert_eq!( picker.delegate.tag_names, [SharedString::from("v1.0.0"), SharedString::from("v1.1.0")] ); }); cx.dispatch_action(menu::Confirm); cx.run_until_parked(); assert_eq!( cx.read_from_clipboard().and_then(|item| item.text()), Some("v1.0.0".to_string()) ); } #[gpui::test] async fn test_open_at_commit_reuses_loaded_graph(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), json!({ ".git": {}, "file.txt": "content" }), ) .await; let first_sha = Oid::from_bytes(&[1; 20]).expect("valid commit SHA"); let second_sha = Oid::from_bytes(&[2; 20]).expect("valid commit SHA"); fs.set_graph_commits( Path::new("/project/.git"), vec![ Arc::new(InitialGraphCommitData { sha: second_sha, parents: smallvec![first_sha], ref_names: vec!["HEAD -> main".into()], }), Arc::new(InitialGraphCommitData { sha: first_sha, parents: smallvec![], ref_names: Vec::new(), }), ], ); fs.set_commit_data( Path::new("/project/.git"), [first_sha, second_sha].map(|sha| { ( CommitData { sha, parents: smallvec![], author_name: "Author".into(), author_email: "author@example.com".into(), commit_timestamp: 1_700_000_000, subject: "Commit subject".into(), message: "Commit message".into(), }, false, ) }), ); let project = Project::test(fs, [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().clone()); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace.downgrade(), None, window, cx, ) }); workspace.update_in(cx, |workspace, window, cx| { workspace.add_item_to_active_pane(Box::new(git_graph.clone()), None, true, window, cx); }); cx.run_until_parked(); git_graph.update(cx, |graph, cx| { graph.select_commit_by_sha(first_sha, cx); }); cx.run_until_parked(); git_graph.update(cx, |graph, cx| { graph.select_commit_by_sha(second_sha, cx); }); cx.run_until_parked(); workspace.update_in(cx, |workspace, window, cx| { open_or_reuse_graph( workspace, repository.read(cx).id, project.read(cx).git_store().clone(), LogSource::All, Some(first_sha.to_string()), window, cx, ); }); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.selected_entry_idx, Some(1)); }); } #[gpui::test] async fn test_git_graph_navigation(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), serde_json::json!({ ".git": {}, "file.txt": "content", }), ) .await; let mut rng = StdRng::seed_from_u64(42); let commits = generate_random_commit_dag(&mut rng, 10, false); fs.set_graph_commits(Path::new("/project/.git"), commits); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().clone()); let workspace_weak = workspace.downgrade(); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak, None, window, cx, ) }); cx.run_until_parked(); workspace.update_in(cx, |workspace, window, cx| { workspace.add_item_to_active_pane(Box::new(git_graph.clone()), None, true, window, cx); }); cx.run_until_parked(); git_graph.update_in(cx, |graph, window, cx| { graph.focus_handle(cx).focus(window, cx); }); cx.run_until_parked(); cx.draw( point(px(0.), px(0.)), gpui::size(px(1200.), px(800.)), |_, _| multi_workspace.clone().into_any_element(), ); cx.run_until_parked(); git_graph.update_in(cx, |graph, window, cx| { graph.focus_handle(cx).focus(window, cx); }); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.graph_data.commits.len(), 10); }); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.selected_entry_idx, None); }); git_graph.update_in(cx, |graph, window, cx| { graph.select_first(&menu::SelectFirst, window, cx); }); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.selected_entry_idx, Some(0)); }); let scroll_step = git_graph.update_in(cx, |graph, window, cx| { (graph.visible_row_count(window, cx) / 2).max(1) }); cx.dispatch_action(ScrollDown); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.selected_entry_idx, Some(scroll_step)); }); cx.dispatch_action(ScrollUp); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.selected_entry_idx, Some(0)); }); git_graph.update_in(cx, |graph, window, cx| { graph.select_next(&menu::SelectNext, window, cx); }); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.selected_entry_idx, Some(1)); }); git_graph.update_in(cx, |graph, window, cx| { graph.select_prev(&menu::SelectPrevious, window, cx); }); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.selected_entry_idx, Some(0)); }); git_graph.update_in(cx, |graph, window, cx| { graph.select_last(&menu::SelectLast, window, cx); }); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.selected_entry_idx, Some(9)); }); cx.dispatch_action(ScrollDown); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.selected_entry_idx, Some(9)); }); git_graph.update_in(cx, |graph, window, cx| { graph.select_next(&menu::SelectNext, window, cx); }); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.selected_entry_idx, Some(9)); }); git_graph.update_in(cx, |graph, window, cx| { graph.select_prev(&menu::SelectPrevious, window, cx); }); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.selected_entry_idx, Some(8)); }); git_graph.update(cx, |graph, cx| { graph.selected_entry_idx = None; cx.notify(); }); cx.run_until_parked(); git_graph.update_in(cx, |graph, window, cx| { graph.select_prev(&menu::SelectPrevious, window, cx); }); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.selected_entry_idx, Some(0)); }); git_graph.update(cx, |graph, cx| { graph.selected_entry_idx = None; cx.notify(); }); cx.run_until_parked(); git_graph.update_in(cx, |graph, window, cx| { graph.select_next(&menu::SelectNext, window, cx); }); cx.run_until_parked(); git_graph.read_with(&*cx, |graph, _| { assert_eq!(graph.selected_entry_idx, Some(0)); }); } #[gpui::test] async fn test_global_git_command_task_runs_from_context_menu(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), json!({ ".git": {}, "file.txt": "content", }), ) .await; let commit_sha = Oid::try_from("abcdef1234567890abcdef1234567890abcdef12") .expect("commit SHA should be valid"); fs.set_graph_commits( Path::new("/project/.git"), vec![Arc::new(InitialGraphCommitData { sha: commit_sha, parents: SmallVec::new(), ref_names: Vec::new(), })], ); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("project should have an active repository") }); let task_inventory = project.read_with(cx, |project, cx| { project .task_store() .read(cx) .task_inventory() .cloned() .expect("project should have a task inventory") }); task_inventory.update(cx, |inventory, _| { inventory .update_file_based_tasks( TaskSettingsLocation::Global(Path::new("/tasks.json")), Some( &serde_json::to_string(&json!([ // Tagged global task that should be scheduled from the Git graph context menu. { "label": "Git Show $ZED_GIT_SHA_SHORT", "command": "git", "args": ["show", "$ZED_GIT_SHA"], "cwd": "$ZED_GIT_REPOSITORY_PATH", "env": { "REPOSITORY": "$ZED_GIT_REPOSITORY_NAME", }, "tags": [GIT_COMMAND_TASK_TAG], }, // Untagged task that should not appear in the Git graph context menu. { "label": "Git Status", "command": "git", "args": ["status"], }, // Tagged task that still should not appear because Git graph task contexts // do not provide editor-specific variables. { "label": "Print File $ZED_FILE", "command": "echo", "args": ["$ZED_FILE"], "tags": [GIT_COMMAND_TASK_TAG], }, ])) .expect("tasks JSON should serialize"), ), ) .expect("tasks should parse"); }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace = multi_workspace.read_with(&*cx, |multi_workspace, _| { multi_workspace.workspace().clone() }); let workspace_weak = workspace.downgrade(); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak, None, window, cx, ) }); workspace.update_in(cx, |workspace, window, cx| { workspace.add_item_to_active_pane(Box::new(git_graph.clone()), None, true, window, cx); }); cx.run_until_parked(); git_graph.update_in(cx, |git_graph, window, cx| { assert_eq!(git_graph.graph_data.commits.len(), 1); git_graph.deploy_entry_context_menu(point(px(20.), px(20.)), 0, None, window, cx); }); cx.run_until_parked(); let context_menu = git_graph.read_with(&*cx, |git_graph, _| { git_graph .context_menu .as_ref() .expect("context menu should be open") .menu .clone() }); context_menu.update_in(cx, |context_menu, window, cx| { context_menu .select_last(window, cx) .expect("custom Git task should be selectable"); context_menu.confirm(&menu::Confirm, window, cx); }); cx.run_until_parked(); let (task_source_kind, resolved_task) = task_inventory.read_with(&*cx, |inventory, _| { inventory .last_scheduled_task(None) .expect("custom Git task should be scheduled") }); assert!( matches!(task_source_kind, TaskSourceKind::AbsPath { .. }), "scheduled task should come from global tasks" ); assert_eq!(resolved_task.resolved_label, "Git Show abcdef1"); assert_eq!(resolved_task.resolved.command, Some("git".to_string())); assert_eq!( resolved_task.resolved.args, vec![ "show".to_string(), "abcdef1234567890abcdef1234567890abcdef12".to_string(), ] ); assert_eq!( resolved_task.resolved.cwd, Some(Path::new("/project").to_path_buf()) ); assert_eq!( resolved_task.resolved.env.get("REPOSITORY"), Some(&"project".to_string()) ); } #[gpui::test] async fn test_global_git_command_task_runs_from_ref_context_menu(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), json!({ ".git": {}, "file.txt": "content", }), ) .await; let commit_sha = Oid::try_from("abcdef1234567890abcdef1234567890abcdef12") .expect("commit SHA should be valid"); fs.set_graph_commits( Path::new("/project/.git"), vec![Arc::new(InitialGraphCommitData { sha: commit_sha, parents: SmallVec::new(), ref_names: vec!["HEAD -> feature-x".into()], })], ); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("project should have an active repository") }); let task_inventory = project.read_with(cx, |project, cx| { project .task_store() .read(cx) .task_inventory() .cloned() .expect("project should have a task inventory") }); task_inventory.update(cx, |inventory, _| { inventory .update_file_based_tasks( TaskSettingsLocation::Global(Path::new("/tasks.json")), Some( &serde_json::to_string(&json!([ { "label": "Check out $ZED_GIT_REF", "command": "git", "args": ["checkout", "$ZED_GIT_REF"], "cwd": "$ZED_GIT_REPOSITORY_PATH", "tags": [GIT_COMMAND_TASK_TAG], }, ])) .expect("tasks JSON should serialize"), ), ) .expect("tasks should parse"); }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace = multi_workspace.read_with(&*cx, |multi_workspace, _| { multi_workspace.workspace().clone() }); let workspace_weak = workspace.downgrade(); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak, None, window, cx, ) }); workspace.update_in(cx, |workspace, window, cx| { workspace.add_item_to_active_pane(Box::new(git_graph.clone()), None, true, window, cx); }); cx.run_until_parked(); git_graph.update_in(cx, |git_graph, window, cx| { assert_eq!(git_graph.graph_data.commits.len(), 1); git_graph.deploy_entry_context_menu( point(px(20.), px(20.)), 0, Some("feature-x".into()), window, cx, ); }); cx.run_until_parked(); let context_menu = git_graph.read_with(&*cx, |git_graph, _| { git_graph .context_menu .as_ref() .expect("context menu should be open") .menu .clone() }); context_menu.update_in(cx, |context_menu, window, cx| { context_menu .select_last(window, cx) .expect("custom Git task should be selectable"); context_menu.confirm(&menu::Confirm, window, cx); }); cx.run_until_parked(); let (_task_source_kind, resolved_task) = task_inventory.read_with(&*cx, |inventory, _| { inventory .last_scheduled_task(None) .expect("custom Git task should be scheduled") }); assert_eq!(resolved_task.resolved_label, "Check out feature-x"); assert_eq!( resolved_task.resolved.args, vec!["checkout".to_string(), "feature-x".to_string()] ); } #[test] fn test_ref_name_from_decoration() { assert_eq!( GitGraph::ref_name_from_decoration("HEAD -> main"), Some("main".into()) ); assert_eq!( GitGraph::ref_name_from_decoration("main"), Some("main".into()) ); assert_eq!( GitGraph::ref_name_from_decoration("origin/main"), Some("origin/main".into()) ); assert_eq!( GitGraph::ref_name_from_decoration("tag: v1.0"), Some("v1.0".into()) ); assert_eq!(GitGraph::ref_name_from_decoration("HEAD"), None); } #[gpui::test] async fn test_commit_message_rendered_as_markdown(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), json!({ ".git": {}, "file.txt": "content" }), ) .await; let commit_sha = Oid::from_bytes(&[1; 20]).unwrap(); let commits = vec![Arc::new(InitialGraphCommitData { sha: commit_sha, parents: smallvec![], ref_names: vec!["HEAD -> main".into()], })]; fs.set_graph_commits(Path::new("/project/.git"), commits); fs.set_commit_data( Path::new("/project/.git"), [( CommitData { sha: commit_sha, parents: smallvec![], author_name: "Author".into(), author_email: "author@example.com".into(), commit_timestamp: 1_700_000_000, subject: "Fix crash".into(), message: "Fix crash\n\nThis fixes a crash that occurred when...".into(), }, false, )], ); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace_weak = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade()); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak, None, window, cx, ) }); cx.run_until_parked(); // Select the commit to trigger loading the commit message git_graph.update_in(cx, |graph, window, cx| { graph.select_first(&menu::SelectFirst, window, cx); }); cx.run_until_parked(); // Verify the commit message was loaded as markdown git_graph.read_with(&*cx, |graph, app| { let message = graph .selected_commit_message .as_ref() .expect("selected_commit_message should be Some"); assert_eq!(message.sha, commit_sha); let source = message.message.read_with(app, |m, _| m.source().to_owned()); assert!(source.contains("Fix crash")); assert!(source.contains("This fixes a crash")); }); } #[gpui::test] async fn test_long_commit_message_is_constrained_to_scroll_viewport(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), json!({ ".git": {}, "file.txt": "content" }), ) .await; let commit_sha = Oid::from_bytes(&[1; 20]).expect("commit SHA should be valid"); let commits = vec![Arc::new(InitialGraphCommitData { sha: commit_sha, parents: smallvec![], ref_names: vec!["HEAD -> main".into()], })]; fs.set_graph_commits(Path::new("/project/.git"), commits); let message = (0..40) .map(|line_number| { format!( "Line {line_number}: This commit message is long enough to require scrolling." ) }) .collect::>() .join("\n\n"); fs.set_commit_data( Path::new("/project/.git"), [( CommitData { sha: commit_sha, parents: smallvec![], author_name: "Author".into(), author_email: "author@example.com".into(), commit_timestamp: 1_700_000_000, subject: "Long commit message".into(), message: message.into(), }, false, )], ); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace_weak = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade()); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak, None, window, cx, ) }); cx.run_until_parked(); git_graph.update_in(cx, |graph, window, cx| { graph.select_first(&menu::SelectFirst, window, cx); }); cx.run_until_parked(); git_graph.update(cx, |graph, cx| { graph.selected_commit_diff = Some(CommitDiff { files: vec![CommitFile { path: RepoPath::new("file.txt").expect("repository path should be valid"), old_text: Some("content".into()), new_text: Some("updated content".into()), is_binary: false, }], is_shallow_boundary: false, }); graph.selected_commit_diff_stats = Some((1, 1)); cx.notify(); }); cx.draw( point(px(0.), px(0.)), gpui::size(px(1200.), px(800.)), |_, _| git_graph.clone().into_any_element(), ); cx.run_until_parked(); let (message_scroll_handle, changed_files_scroll_handle) = git_graph.read_with(&*cx, |graph, _| { ( graph .selected_commit_message .as_ref() .expect("selected commit message should be loaded") .scroll_handle .clone(), graph.changed_files_scroll_handle.clone(), ) }); let maximum_message_height = git_graph.update_in(cx, |_, window, cx| { editor::hover_markdown_style(window, cx) .base_text_style .line_height_in_pixels(window.rem_size()) * 12. }); let message_bounds = message_scroll_handle.bounds(); let changed_files_bounds = changed_files_scroll_handle.0.borrow().base_handle.bounds(); assert!( message_bounds.size.height <= maximum_message_height, "commit message viewport height ({}) should not exceed its maximum ({})", message_bounds.size.height, maximum_message_height, ); assert!( message_scroll_handle.max_offset().y > px(0.), "long commit message should be scrollable" ); assert!( message_bounds.bottom() <= changed_files_bounds.top(), "commit message viewport {message_bounds:?} should not overlap changed files {changed_files_bounds:?}" ); } #[gpui::test] async fn test_commit_message_not_reloaded_for_same_sha(cx: &mut TestAppContext) { init_test(cx); let fs = FakeFs::new(cx.executor()); fs.insert_tree( Path::new("/project"), json!({ ".git": {}, "file.txt": "content" }), ) .await; let commit_sha = Oid::from_bytes(&[1; 20]).unwrap(); let commits = vec![Arc::new(InitialGraphCommitData { sha: commit_sha, parents: smallvec![], ref_names: vec!["HEAD -> main".into()], })]; fs.set_graph_commits(Path::new("/project/.git"), commits); fs.set_commit_data( Path::new("/project/.git"), [( CommitData { sha: commit_sha, parents: smallvec![], author_name: "Author".into(), author_email: "author@example.com".into(), commit_timestamp: 1_700_000_000, subject: "Fix crash".into(), message: "Fix crash\n\nBody text.".into(), }, false, )], ); let project = Project::test(fs.clone(), [Path::new("/project")], cx).await; cx.run_until_parked(); let repository = project.read_with(cx, |project, cx| { project .active_repository(cx) .expect("should have a repository") }); let (multi_workspace, cx) = cx.add_window_view(|window, cx| { workspace::MultiWorkspace::test_new(project.clone(), window, cx) }); let workspace_weak = multi_workspace.read_with(&*cx, |multi, _| multi.workspace().downgrade()); let git_graph = cx.new_window_entity(|window, cx| { GitGraph::new( repository.read(cx).id, project.read(cx).git_store().clone(), workspace_weak, None, window, cx, ) }); cx.run_until_parked(); // Select the commit to load the message git_graph.update_in(cx, |graph, window, cx| { graph.select_first(&menu::SelectFirst, window, cx); }); cx.run_until_parked(); // Verify message is loaded let message_entity_id = git_graph.read_with(&*cx, |graph, _| { graph .selected_commit_message .as_ref() .map(|m| m.message.entity_id()) }); assert!(message_entity_id.is_some()); // Select the same commit again to trigger the early-return logic git_graph.update_in(cx, |graph, window, cx| { graph.select_first(&menu::SelectFirst, window, cx); }); cx.run_until_parked(); // Verify the message entity is the same (not replaced) git_graph.read_with(&*cx, |graph, _| { let new_entity_id = graph .selected_commit_message .as_ref() .map(|m| m.message.entity_id()); assert_eq!(message_entity_id, new_entity_id); }); } }