git: Add diff view for stash entries (#38280)

Continues the work from #35927 to add a git diff view for stash entries. [Screencast From 2025-09-17 19-46-01.webm](https://github.com/user-attachments/assets/ded33782-adef-4696-8e34-3665911c09c7) Stash entries are [represented as commits](https://git-scm.com/docs/git-stash#_discussion) except they have up to 3 parents: ``` .----W (this is the stash entry) / /| -----H----I | \| U ``` Where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `U` is another commit that records untracked files (when using `git stash -u`). Given this, I modified the existing commit view struct to allow loading stash and commits entries with git sha identifier so that we can get a similar git diff view for both of them. The stash diff is generated by comparing the stash commit with its parent (`<commit>^` or `H` in the diagram) which generates the same diff as doing `git stash show -p <stash entry>`. This *can* be counter-intuitive since a user may expect the comparison to be made between the stash commit and the current commit (`HEAD`), but given that the default behavior in git cli is to compare with the stash parent, I went for that approach. Hoping to get some feedback from a Zed team member to see if they agree with this approach. Release Notes: - Add git diff view for stash entries - Add toolbar on git diff view for stash entries - Prompt before executing a destructive stash action on diff view - Fix commit view for merge commits (see #38289)

Alvaro Parker committed 1 year ago

Commit db404fc1 parent eda7a4911 files · +461 −57Browse files

Unified · Split

11 files

assets/keymaps/default-linux.json +10 −1
assets/keymaps/default-macos.json +11 −1
assets/keymaps/default-windows.json +11 −1
crates/git/src/repository.rs +4 −4
crates/git_ui/src/blame_ui.rs +6 −25
crates/git_ui/src/commit_tooltip.rs +2 −1
crates/git_ui/src/commit_view.rs +337 −17
crates/git_ui/src/git_panel.rs +2 −1
crates/git_ui/src/git_ui.rs +2 −1
crates/git_ui/src/stash_picker.rs +73 −5
crates/zed/src/zed.rs +3 −0

assets/keymaps/default-linux.json+10−1

   {
     "context": "StashList || (StashList > Picker > Editor)",
     "bindings": {
-      "ctrl-shift-backspace": "stash_picker::DropStashItem"
+      "ctrl-shift-backspace": "stash_picker::DropStashItem",
+      "ctrl-shift-v": "stash_picker::ShowStashItem"
     }
   },
   {
       "ctrl-pagedown": "settings_editor::FocusNextFile"
     }
   },
+  {
+    "context": "StashDiff > Editor",
+    "bindings": {
+      "ctrl-space": "git::ApplyCurrentStash",
+      "ctrl-shift-space": "git::PopCurrentStash",
+      "ctrl-shift-backspace": "git::DropCurrentStash"
+    }
+  },
   {
     "context": "SettingsWindow > NavigationMenu",
     "use_key_equivalents": true,

assets/keymaps/default-macos.json+11−1

     "context": "StashList || (StashList > Picker > Editor)",
     "use_key_equivalents": true,
     "bindings": {
-      "ctrl-shift-backspace": "stash_picker::DropStashItem"
+      "ctrl-shift-backspace": "stash_picker::DropStashItem",
+      "ctrl-shift-v": "stash_picker::ShowStashItem"
     }
   },
   {
       "cmd-}": "settings_editor::FocusNextFile"
     }
   },
+  {
+    "context": "StashDiff > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-space": "git::ApplyCurrentStash",
+      "ctrl-shift-space": "git::PopCurrentStash",
+      "ctrl-shift-backspace": "git::DropCurrentStash"
+    }
+  },
   {
     "context": "SettingsWindow > NavigationMenu",
     "use_key_equivalents": true,

assets/keymaps/default-windows.json+11−1

     "context": "StashList || (StashList > Picker > Editor)",
     "use_key_equivalents": true,
     "bindings": {
-      "ctrl-shift-backspace": "stash_picker::DropStashItem"
+      "ctrl-shift-backspace": "stash_picker::DropStashItem",
+      "ctrl-shift-v": "stash_picker::ShowStashItem"
     }
   },
   {
       "ctrl-pagedown": "settings_editor::FocusNextFile"
     }
   },
+  {
+    "context": "StashDiff > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "ctrl-space": "git::ApplyCurrentStash",
+      "ctrl-shift-space": "git::PopCurrentStash",
+      "ctrl-shift-backspace": "git::DropCurrentStash"
+    }
+  },
   {
     "context": "SettingsWindow > NavigationMenu",
     "use_key_equivalents": true,

crates/git/src/repository.rs+4−4

                 .args([
                     "--no-optional-locks",
                     "show",
-                    "--format=%P",
+                    "--format=",
                     "-z",
                     "--no-renames",
                     "--name-status",
+                    "--first-parent",
                 ])
                 .arg(&commit)
                 .stdin(Stdio::null())
                 .context("starting git show process")?;
             let show_stdout = String::from_utf8_lossy(&show_output.stdout);
-            let mut lines = show_stdout.split('\n');
+            let changes = parse_git_diff_name_status(&show_stdout);
-            let parent_sha = lines.next().unwrap().trim().trim_end_matches('\0');
+            let parent_sha = format!("{}^", commit);
-            let changes = parse_git_diff_name_status(lines.next().unwrap_or(""));
             let mut cat_file_process = util::command::new_smol_command(&git_binary_path)
                 .current_dir(&working_directory)

crates/git_ui/src/blame_ui.rs+6−25

                             let workspace = workspace.clone();
                             move |_, window, cx| {
                                 CommitView::open(
-                                    CommitSummary {
+                                    blame_entry.sha.to_string(),
-                                        sha: blame_entry.sha.to_string().into(),
-                                        subject: blame_entry
-                                            .summary
-                                            .clone()
-                                            .unwrap_or_default()
-                                            .into(),
-                                        commit_timestamp: blame_entry
-                                            .committer_time
-                                            .unwrap_or_default(),
-                                        author_name: blame_entry
-                                            .committer_name
-                                            .clone()
-                                            .unwrap_or_default()
-                                            .into(),
-                                        has_parent: true,
-                                    },
                                     repository.downgrade(),
                                     workspace.clone(),
+                                    None,
                                     window,
                                     cx,
                                 )
                                                 .icon_size(IconSize::Small)
                                                 .on_click(move |_, window, cx| {
                                                     CommitView::open(
-                                                        commit_summary.clone(),
+                                                        commit_summary.sha.clone().into(),
                                                         repository.downgrade(),
                                                         workspace.clone(),
+                                                        None,
                                                         window,
                                                         cx,
                                                     );
         cx: &mut App,
     ) {
         CommitView::open(
-            CommitSummary {
+            blame_entry.sha.to_string(),
-                sha: blame_entry.sha.to_string().into(),
-                subject: blame_entry.summary.clone().unwrap_or_default().into(),
-                commit_timestamp: blame_entry.committer_time.unwrap_or_default(),
-                author_name: blame_entry.committer_name.unwrap_or_default().into(),
-                has_parent: true,
-            },
             repository.downgrade(),
             workspace,
+            None,
             window,
             cx,
         )

crates/git_ui/src/commit_tooltip.rs+2−1

                                             .on_click(
                                                 move |_, window, cx| {
                                                     CommitView::open(
-                                                        commit_summary.clone(),
+                                                        commit_summary.sha.to_string(),
                                                         repo.downgrade(),
                                                         workspace.clone(),
+                                                        None,
                                                         window,
                                                         cx,
                                                     );

crates/git_ui/src/commit_view.rs+337−17

@@ -1,10 +1,11 @@
1	use anyhow::{Context as _, Result};	1	use anyhow::{Context as _, Result};
2	use buffer_diff::{BufferDiff, BufferDiffSnapshot};	2	use buffer_diff::{BufferDiff, BufferDiffSnapshot};
3	use editor::{Editor, EditorEvent, MultiBuffer, SelectionEffects, multibuffer_context_lines};	3	use editor::{Editor, EditorEvent, MultiBuffer, SelectionEffects, multibuffer_context_lines};
4	use git::repository::{CommitDetails, CommitDiff, CommitSummary, RepoPath};	4	use git::repository::{CommitDetails, CommitDiff, RepoPath};
5	use gpui::{	5	use gpui::{
6	AnyElement, AnyView, App, AppContext as _, AsyncApp, Context, Entity, EventEmitter,	6	Action, AnyElement, AnyView, App, AppContext as _, AsyncApp, AsyncWindowContext, Context,
7	FocusHandle, Focusable, IntoElement, Render, WeakEntity, Window,	7	Entity, EventEmitter, FocusHandle, Focusable, IntoElement, PromptLevel, Render, WeakEntity,
		8	Window, actions,
8	};	9	};
9	use language::{	10	use language::{
10	Anchor, Buffer, Capability, DiskState, File, LanguageRegistry, LineEnding, OffsetRangeExt as _,	11	Anchor, Buffer, Capability, DiskState, File, LanguageRegistry, LineEnding, OffsetRangeExt as _,
@@ -18,17 +19,42 @@ use std::{ · 7 unmodified lines
18	path::PathBuf,	19	path::PathBuf,
19	sync::Arc,	20	sync::Arc,
20	};	21	};
21	use ui::{Color, Icon, IconName, Label, LabelCommon as _, SharedString};	22	use ui::{
		23	Button, Color, Icon, IconName, Label, LabelCommon as _, SharedString, Tooltip, prelude::*,
		24	};
22	use util::{ResultExt, paths::PathStyle, rel_path::RelPath, truncate_and_trailoff};	25	use util::{ResultExt, paths::PathStyle, rel_path::RelPath, truncate_and_trailoff};
23	use workspace::{	26	use workspace::{
24	Item, ItemHandle as _, ItemNavHistory, ToolbarItemLocation, Workspace,	27	Item, ItemHandle, ItemNavHistory, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
		28	Workspace,
25	item::{BreadcrumbText, ItemEvent, TabContentParams},	29	item::{BreadcrumbText, ItemEvent, TabContentParams},
		30	notifications::NotifyTaskExt,
		31	pane::SaveIntent,
26	searchable::SearchableItemHandle,	32	searchable::SearchableItemHandle,
27	};	33	};
28		34
		35	use crate::git_panel::GitPanel;
		36
		37	actions!(git, [ApplyCurrentStash, PopCurrentStash, DropCurrentStash,]);
		38
		39	pub fn init(cx: &mut App) {
		40	cx.observe_new(\|workspace: &mut Workspace, _window, _cx\| {
		41	register_workspace_action(workspace, \|toolbar, _: &ApplyCurrentStash, window, cx\| {
		42	toolbar.apply_stash(window, cx);
		43	});
		44	register_workspace_action(workspace, \|toolbar, _: &DropCurrentStash, window, cx\| {
		45	toolbar.remove_stash(window, cx);
		46	});
		47	register_workspace_action(workspace, \|toolbar, _: &PopCurrentStash, window, cx\| {
		48	toolbar.pop_stash(window, cx);
		49	});
		50	})
		51	.detach();
		52	}
		53
29	pub struct CommitView {	54	pub struct CommitView {
30	commit: CommitDetails,	55	commit: CommitDetails,
31	editor: Entity<Editor>,	56	editor: Entity<Editor>,
		57	stash: Option<usize>,
32	multibuffer: Entity<MultiBuffer>,	58	multibuffer: Entity<MultiBuffer>,
33	}	59	}
34		60
@@ -48,17 +74,18 @@ const FILE_NAMESPACE_SORT_PREFIX: u64 = 1; · 13 unmodified lines
48		74
49	impl CommitView {	75	impl CommitView {
50	pub fn open(	76	pub fn open(
51	commit: CommitSummary,	77	commit_sha: String,
52	repo: WeakEntity<Repository>,	78	repo: WeakEntity<Repository>,
53	workspace: WeakEntity<Workspace>,	79	workspace: WeakEntity<Workspace>,
		80	stash: Option<usize>,
54	window: &mut Window,	81	window: &mut Window,
55	cx: &mut App,	82	cx: &mut App,
56	) {	83	) {
57	let commit_diff = repo	84	let commit_diff = repo
58	.update(cx, \|repo, _\| repo.load_commit_diff(commit.sha.to_string()))	85	.update(cx, \|repo, _\| repo.load_commit_diff(commit_sha.clone()))
59	.ok();	86	.ok();
60	let commit_details = repo	87	let commit_details = repo
61	.update(cx, \|repo, _\| repo.show(commit.sha.to_string()))	88	.update(cx, \|repo, _\| repo.show(commit_sha.clone()))
62	.ok();	89	.ok();
63		90
64	window	91	window
@@ -77,6 +104,7 @@ impl CommitView { · 12 unmodified lines
77	commit_diff,	104	commit_diff,
78	repo,	105	repo,
79	project.clone(),	106	project.clone(),
		107	stash,
80	window,	108	window,
81	cx,	109	cx,
82	)	110	)
@@ -87,7 +115,7 @@ impl CommitView { · 4 unmodified lines
87	let ix = pane.items().position(\|item\| {	115	let ix = pane.items().position(\|item\| {
88	let commit_view = item.downcast::<CommitView>();	116	let commit_view = item.downcast::<CommitView>();
89	commit_view	117	commit_view
90	.is_some_and(\|view\| view.read(cx).commit.sha == commit.sha)	118	.is_some_and(\|view\| view.read(cx).commit.sha == commit_sha)
91	});	119	});
92	if let Some(ix) = ix {	120	if let Some(ix) = ix {
93	pane.activate_item(ix, true, true, window, cx);	121	pane.activate_item(ix, true, true, window, cx);
@@ -106,6 +134,7 @@ impl CommitView { · 12 unmodified lines
106	commit_diff: CommitDiff,	134	commit_diff: CommitDiff,
107	repository: Entity<Repository>,	135	repository: Entity<Repository>,
108	project: Entity<Project>,	136	project: Entity<Project>,
		137	stash: Option<usize>,
109	window: &mut Window,	138	window: &mut Window,
110	cx: &mut Context<Self>,	139	cx: &mut Context<Self>,
111	) -> Self {	140	) -> Self {
@@ -127,10 +156,13 @@ impl CommitView { · 15 unmodified lines
127		156
128	let mut metadata_buffer_id = None;	157	let mut metadata_buffer_id = None;
129	if let Some(worktree_id) = first_worktree_id {	158	if let Some(worktree_id) = first_worktree_id {
		159	let title = if let Some(stash) = stash {
		160	format!("stash@{{{}}}", stash)
		161	} else {
		162	format!("commit {}", commit.sha)
		163	};
130	let file = Arc::new(CommitMetadataFile {	164	let file = Arc::new(CommitMetadataFile {
131	title: RelPath::unix(&format!("commit {}", commit.sha))	165	title: RelPath::unix(&title).unwrap().into(),
132	.unwrap()
133	.into(),
134	worktree_id,	166	worktree_id,
135	});	167	});
136	let buffer = cx.new(\|cx\| {	168	let buffer = cx.new(\|cx\| {
@@ -138,7 +170,7 @@ impl CommitView { · 1 unmodified line
138	ReplicaId::LOCAL,	170	ReplicaId::LOCAL,
139	cx.entity_id().as_non_zero_u64().into(),	171	cx.entity_id().as_non_zero_u64().into(),
140	LineEnding::default(),	172	LineEnding::default(),
141	format_commit(&commit).into(),	173	format_commit(&commit, stash.is_some()).into(),
142	);	174	);
143	metadata_buffer_id = Some(buffer.remote_id());	175	metadata_buffer_id = Some(buffer.remote_id());
144	Buffer::build(buffer, Some(file.clone()), Capability::ReadWrite)	176	Buffer::build(buffer, Some(file.clone()), Capability::ReadWrite)
@@ -211,6 +243,7 @@ impl CommitView { · 66 unmodified lines
211	commit,	243	commit,
212	editor,	244	editor,
213	multibuffer,	245	multibuffer,
		246	stash,
214	}	247	}
215	}	248	}
216	}	249	}
@@ -369,9 +402,13 @@ async fn build_buffer_diff( · 152 unmodified lines
369	})	402	})
370	}	403	}
371		404
372	fn format_commit(commit: &CommitDetails) -> String {	405	fn format_commit(commit: &CommitDetails, is_stash: bool) -> String {
373	let mut result = String::new();	406	let mut result = String::new();
374	writeln!(&mut result, "commit {}", commit.sha).unwrap();	407	if is_stash {
		408	writeln!(&mut result, "stash commit {}", commit.sha).unwrap();
		409	} else {
		410	writeln!(&mut result, "commit {}", commit.sha).unwrap();
		411	}
375	writeln!(	412	writeln!(
376	&mut result,	413	&mut result,
377	"Author: {} <{}>",	414	"Author: {} <{}>",
@@ -538,13 +575,296 @@ impl Item for CommitView { · 160 unmodified lines
538	editor,	575	editor,
539	multibuffer,	576	multibuffer,
540	commit: self.commit.clone(),	577	commit: self.commit.clone(),
		578	stash: self.stash,
541	}	579	}
542	}))	580	}))
543	}	581	}
544	}	582	}
545		583
546	impl Render for CommitView {	584	impl Render for CommitView {
547	fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {	585	fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
548	self.editor.clone()	586	let is_stash = self.stash.is_some();
		587	div()
		588	.key_context(if is_stash { "StashDiff" } else { "CommitDiff" })
		589	.bg(cx.theme().colors().editor_background)
		590	.flex()
		591	.items_center()
		592	.justify_center()
		593	.size_full()
		594	.child(self.editor.clone())
		595	}
		596	}
		597
		598	pub struct CommitViewToolbar {
		599	commit_view: Option<WeakEntity<CommitView>>,
		600	workspace: WeakEntity<Workspace>,
		601	}
		602
		603	impl CommitViewToolbar {
		604	pub fn new(workspace: &Workspace, _: &mut Context<Self>) -> Self {
		605	Self {
		606	commit_view: None,
		607	workspace: workspace.weak_handle(),
		608	}
		609	}
		610
		611	fn commit_view(&self, _: &App) -> Option<Entity<CommitView>> {
		612	self.commit_view.as_ref()?.upgrade()
		613	}
		614
		615	async fn close_commit_view(
		616	commit_view: Entity<CommitView>,
		617	workspace: WeakEntity<Workspace>,
		618	cx: &mut AsyncWindowContext,
		619	) -> anyhow::Result<()> {
		620	workspace
		621	.update_in(cx, \|workspace, window, cx\| {
		622	let active_pane = workspace.active_pane();
		623	let commit_view_id = commit_view.entity_id();
		624	active_pane.update(cx, \|pane, cx\| {
		625	pane.close_item_by_id(commit_view_id, SaveIntent::Skip, window, cx)
		626	})
		627	})?
		628	.await?;
		629	anyhow::Ok(())
		630	}
		631
		632	fn apply_stash(&mut self, window: &mut Window, cx: &mut Context<Self>) {
		633	self.stash_action(
		634	"Apply",
		635	window,
		636	cx,
		637	async move \|repository, sha, stash, commit_view, workspace, cx\| {
		638	let result = repository.update(cx, \|repo, cx\| {
		639	if !stash_matches_index(&sha, stash, repo) {
		640	return Err(anyhow::anyhow!("Stash has changed, not applying"));
		641	}
		642	Ok(repo.stash_apply(Some(stash), cx))
		643	})?;
		644
		645	match result {
		646	Ok(task) => task.await?,
		647	Err(err) => {
		648	Self::close_commit_view(commit_view, workspace, cx).await?;
		649	return Err(err);
		650	}
		651	};
		652	Self::close_commit_view(commit_view, workspace, cx).await?;
		653	anyhow::Ok(())
		654	},
		655	);
		656	}
		657
		658	fn pop_stash(&mut self, window: &mut Window, cx: &mut Context<Self>) {
		659	self.stash_action(
		660	"Pop",
		661	window,
		662	cx,
		663	async move \|repository, sha, stash, commit_view, workspace, cx\| {
		664	let result = repository.update(cx, \|repo, cx\| {
		665	if !stash_matches_index(&sha, stash, repo) {
		666	return Err(anyhow::anyhow!("Stash has changed, pop aborted"));
		667	}
		668	Ok(repo.stash_pop(Some(stash), cx))
		669	})?;
		670
		671	match result {
		672	Ok(task) => task.await?,
		673	Err(err) => {
		674	Self::close_commit_view(commit_view, workspace, cx).await?;
		675	return Err(err);
		676	}
		677	};
		678	Self::close_commit_view(commit_view, workspace, cx).await?;
		679	anyhow::Ok(())
		680	},
		681	);
		682	}
		683
		684	fn remove_stash(&mut self, window: &mut Window, cx: &mut Context<Self>) {
		685	self.stash_action(
		686	"Drop",
		687	window,
		688	cx,
		689	async move \|repository, sha, stash, commit_view, workspace, cx\| {
		690	let result = repository.update(cx, \|repo, cx\| {
		691	if !stash_matches_index(&sha, stash, repo) {
		692	return Err(anyhow::anyhow!("Stash has changed, drop aborted"));
		693	}
		694	Ok(repo.stash_drop(Some(stash), cx))
		695	})?;
		696
		697	match result {
		698	Ok(task) => task.await??,
		699	Err(err) => {
		700	Self::close_commit_view(commit_view, workspace, cx).await?;
		701	return Err(err);
		702	}
		703	};
		704	Self::close_commit_view(commit_view, workspace, cx).await?;
		705	anyhow::Ok(())
		706	},
		707	);
		708	}
		709
		710	fn stash_action<AsyncFn>(
		711	&mut self,
		712	str_action: &str,
		713	window: &mut Window,
		714	cx: &mut Context<Self>,
		715	callback: AsyncFn,
		716	) where
		717	AsyncFn: AsyncFnOnce(
		718	Entity<Repository>,
		719	&SharedString,
		720	usize,
		721	Entity<CommitView>,
		722	WeakEntity<Workspace>,
		723	&mut AsyncWindowContext,
		724	) -> anyhow::Result<()>
		725	+ 'static,
		726	{
		727	let Some(commit_view) = self.commit_view(cx) else {
		728	return;
		729	};
		730	let Some(stash) = commit_view.read(cx).stash else {
		731	return;
		732	};
		733	let sha = commit_view.read(cx).commit.sha.clone();
		734	let answer = window.prompt(
		735	PromptLevel::Info,
		736	&format!("{} stash@{{{}}}?", str_action, stash),
		737	None,
		738	&[str_action, "Cancel"],
		739	cx,
		740	);
		741
		742	let workspace = self.workspace.clone();
		743	cx.spawn_in(window, async move \|_, cx\| {
		744	if answer.await != Ok(0) {
		745	return anyhow::Ok(());
		746	}
		747	let repo = workspace.update(cx, \|workspace, cx\| {
		748	workspace
		749	.panel::<GitPanel>(cx)
		750	.and_then(\|p\| p.read(cx).active_repository.clone())
		751	})?;
		752
		753	let Some(repo) = repo else {
		754	return Ok(());
		755	};
		756	callback(repo, &sha, stash, commit_view, workspace, cx).await?;
		757	anyhow::Ok(())
		758	})
		759	.detach_and_notify_err(window, cx);
		760	}
		761	}
		762
		763	impl EventEmitter<ToolbarItemEvent> for CommitViewToolbar {}
		764
		765	impl ToolbarItemView for CommitViewToolbar {
		766	fn set_active_pane_item(
		767	&mut self,
		768	active_pane_item: Option<&dyn ItemHandle>,
		769	_: &mut Window,
		770	cx: &mut Context<Self>,
		771	) -> ToolbarItemLocation {
		772	if let Some(entity) = active_pane_item.and_then(\|i\| i.act_as::<CommitView>(cx))
		773	&& entity.read(cx).stash.is_some()
		774	{
		775	self.commit_view = Some(entity.downgrade());
		776	return ToolbarItemLocation::PrimaryRight;
		777	}
		778	ToolbarItemLocation::Hidden
		779	}
		780
		781	fn pane_focus_update(
		782	&mut self,
		783	_pane_focused: bool,
		784	_window: &mut Window,
		785	_cx: &mut Context<Self>,
		786	) {
		787	}
		788	}
		789
		790	impl Render for CommitViewToolbar {
		791	fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
		792	let Some(commit_view) = self.commit_view(cx) else {
		793	return div();
		794	};
		795
		796	let is_stash = commit_view.read(cx).stash.is_some();
		797	if !is_stash {
		798	return div();
		799	}
		800
		801	let focus_handle = commit_view.focus_handle(cx);
		802
		803	h_group_xl().my_neg_1().py_1().items_center().child(
		804	h_group_sm()
		805	.child(
		806	Button::new("apply-stash", "Apply")
		807	.tooltip(Tooltip::for_action_title_in(
		808	"Apply current stash",
		809	&ApplyCurrentStash,
		810	&focus_handle,
		811	))
		812	.on_click(cx.listener(\|this, _, window, cx\| this.apply_stash(window, cx))),
		813	)
		814	.child(
		815	Button::new("pop-stash", "Pop")
		816	.tooltip(Tooltip::for_action_title_in(
		817	"Pop current stash",
		818	&PopCurrentStash,
		819	&focus_handle,
		820	))
		821	.on_click(cx.listener(\|this, _, window, cx\| this.pop_stash(window, cx))),
		822	)
		823	.child(
		824	Button::new("remove-stash", "Remove")
		825	.icon(IconName::Trash)
		826	.tooltip(Tooltip::for_action_title_in(
		827	"Remove current stash",
		828	&DropCurrentStash,
		829	&focus_handle,
		830	))
		831	.on_click(cx.listener(\|this, _, window, cx\| this.remove_stash(window, cx))),
		832	),
		833	)
		834	}
		835	}
		836
		837	fn register_workspace_action<A: Action>(
		838	workspace: &mut Workspace,
		839	callback: fn(&mut CommitViewToolbar, &A, &mut Window, &mut Context<CommitViewToolbar>),
		840	) {
		841	workspace.register_action(move \|workspace, action: &A, window, cx\| {
		842	if workspace.has_active_modal(window, cx) {
		843	cx.propagate();
		844	return;
		845	}
		846
		847	workspace.active_pane().update(cx, \|pane, cx\| {
		848	pane.toolbar().update(cx, move \|workspace, cx\| {
		849	if let Some(toolbar) = workspace.item_of_type::<CommitViewToolbar>() {
		850	toolbar.update(cx, move \|toolbar, cx\| {
		851	callback(toolbar, action, window, cx);
		852	cx.notify();
		853	});
		854	}
		855	});
		856	})
		857	});
		858	}
		859
		860	fn stash_matches_index(sha: &str, index: usize, repo: &mut Repository) -> bool {
		861	match repo
		862	.cached_stash()
		863	.entries
		864	.iter()
		865	.find(\|entry\| entry.index == index)
		866	{
		867	Some(entry) => entry.oid.to_string() == sha,
		868	None => false,
549	}	869	}
550	}	870	}

crates/git_ui/src/git_panel.rs+2−1

                             let repo = active_repository.downgrade();
                             move |_, window, cx| {
                                 CommitView::open(
-                                    commit.clone(),
+                                    commit.sha.to_string(),
                                     repo.clone(),
                                     workspace.clone(),
+                                    None,
                                     window,
                                     cx,
                                 );

crates/git_ui/src/git_ui.rs+2−1

 pub mod branch_picker;
 mod commit_modal;
 pub mod commit_tooltip;
-mod commit_view;
+pub mod commit_view;
 mod conflict_view;
 pub mod file_diff_view;
 pub mod git_panel;
     GitPanelSettings::register(cx);
     editor::set_blame_renderer(blame_ui::GitBlameRenderer, cx);
+    commit_view::init(cx);
     cx.observe_new(|editor: &mut Editor, _, cx| {
         conflict_view::register_editor(editor, editor.buffer().clone(), cx);

crates/git_ui/src/stash_picker.rs+73−5

 use gpui::{
     Action, AnyElement, App, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
     InteractiveElement, IntoElement, Modifiers, ModifiersChangedEvent, ParentElement, Render,
-    SharedString, Styled, Subscription, Task, Window, actions, rems,
+    SharedString, Styled, Subscription, Task, WeakEntity, Window, actions, rems, svg,
 };
 use picker::{Picker, PickerDelegate};
 use project::git_store::{Repository, RepositoryEvent};
 use std::sync::Arc;
 use time::{OffsetDateTime, UtcOffset};
 use time_format;
-use ui::{HighlightedLabel, KeyBinding, ListItem, ListItemSpacing, Tooltip, prelude::*};
+use ui::{
+    ButtonLike, HighlightedLabel, KeyBinding, ListItem, ListItemSpacing, Tooltip, prelude::*,
+};
 use util::ResultExt;
 use workspace::notifications::DetachAndPromptErr;
 use workspace::{ModalView, Workspace};
+use crate::commit_view::CommitView;
 use crate::stash_picker;
 actions!(
     [
         /// Drop the selected stash entry.
         DropStashItem,
+        /// Show the diff view of the selected stash entry.
+        ShowStashItem,
     ]
 );
     cx: &mut Context<Workspace>,
 ) {
     let repository = workspace.project().read(cx).active_repository(cx);
+    let weak_workspace = workspace.weak_handle();
     workspace.toggle_modal(window, cx, |window, cx| {
-        StashList::new(repository, rems(34.), window, cx)
+        StashList::new(repository, weak_workspace, rems(34.), window, cx)
     })
 }
 impl StashList {
     fn new(
         repository: Option<Entity<Repository>>,
+        workspace: WeakEntity<Workspace>,
         width: Rems,
         window: &mut Window,
         cx: &mut Context<Self>,
         })
         .detach_and_log_err(cx);
-        let delegate = StashListDelegate::new(repository, window, cx);
+        let delegate = StashListDelegate::new(repository, workspace, window, cx);
         let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));
         let picker_focus_handle = picker.focus_handle(cx);
         picker.update(cx, |picker, _| {
         cx.notify();
     }
+    fn handle_show_stash(
+        &mut self,
+        _: &ShowStashItem,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.picker.update(cx, |picker, cx| {
+            picker
+                .delegate
+                .show_stash_at(picker.delegate.selected_index(), window, cx);
+        });
+        cx.notify();
+    }
     fn handle_modifiers_changed(
         &mut self,
         ev: &ModifiersChangedEvent,
             .w(self.width)
             .on_modifiers_changed(cx.listener(Self::handle_modifiers_changed))
             .on_action(cx.listener(Self::handle_drop_stash))
+            .on_action(cx.listener(Self::handle_show_stash))
             .child(self.picker.clone())
     }
 }
     matches: Vec<StashEntryMatch>,
     all_stash_entries: Option<Vec<StashEntry>>,
     repo: Option<Entity<Repository>>,
+    workspace: WeakEntity<Workspace>,
     selected_index: usize,
     last_query: String,
     modifiers: Modifiers,
 impl StashListDelegate {
     fn new(
         repo: Option<Entity<Repository>>,
+        workspace: WeakEntity<Workspace>,
         _window: &mut Window,
         cx: &mut Context<StashList>,
     ) -> Self {
         Self {
             matches: vec![],
             repo,
+            workspace,
             all_stash_entries: None,
             selected_index: 0,
             last_query: Default::default(),
         });
     }
+    fn show_stash_at(&self, ix: usize, window: &mut Window, cx: &mut Context<Picker<Self>>) {
+        let Some(entry_match) = self.matches.get(ix) else {
+            return;
+        };
+        let stash_sha = entry_match.entry.oid.to_string();
+        let stash_index = entry_match.entry.index;
+        let Some(repo) = self.repo.clone() else {
+            return;
+        };
+        CommitView::open(
+            stash_sha,
+            repo.downgrade(),
+            self.workspace.clone(),
+            Some(stash_index),
+            window,
+            cx,
+        );
+    }
     fn pop_stash(&self, stash_index: usize, window: &mut Window, cx: &mut Context<Picker<Self>>) {
         let Some(repo) = self.repo.clone() else {
             return;
         ix: usize,
         selected: bool,
         _window: &mut Window,
-        _cx: &mut Context<Picker<Self>>,
+        cx: &mut Context<Picker<Self>>,
     ) -> Option<Self::ListItem> {
         let entry_match = &self.matches[ix];
                     .size(LabelSize::Small),
             );
+        let show_button = div()
+            .group("show-button-hover")
+            .child(
+                ButtonLike::new("show-button")
+                    .child(
+                        svg()
+                            .size(IconSize::Medium.rems())
+                            .flex_none()
+                            .path(IconName::Eye.path())
+                            .text_color(Color::Default.color(cx))
+                            .group_hover("show-button-hover", |this| {
+                                this.text_color(Color::Accent.color(cx))
+                            })
+                            .hover(|this| this.text_color(Color::Accent.color(cx))),
+                    )
+                    .tooltip(Tooltip::for_action_title("Show Stash", &ShowStashItem))
+                    .on_click(cx.listener(move |picker, _, window, cx| {
+                        cx.stop_propagation();
+                        picker.delegate.show_stash_at(ix, window, cx);
+                    })),
+            )
+            .into_any_element();
         Some(
             ListItem::new(SharedString::from(format!("stash-{ix}")))
                 .inset(true)
                 .spacing(ListItemSpacing::Sparse)
                 .toggle_state(selected)
+                .end_slot(show_button)
                 .child(
                     v_flex()
                         .w_full()

crates/zed/src/zed.rs+3−0

 use fs::Fs;
 use futures::future::Either;
 use futures::{StreamExt, channel::mpsc, select_biased};
+use git_ui::commit_view::CommitViewToolbar;
 use git_ui::git_panel::GitPanel;
 use git_ui::project_diff::ProjectDiffToolbar;
 use gpui::{
             toolbar.add_item(migration_banner, window, cx);
             let project_diff_toolbar = cx.new(|cx| ProjectDiffToolbar::new(workspace, cx));
             toolbar.add_item(project_diff_toolbar, window, cx);
+            let commit_view_toolbar = cx.new(|cx| CommitViewToolbar::new(workspace, cx));
+            toolbar.add_item(commit_view_toolbar, window, cx);
             let agent_diff_toolbar = cx.new(AgentDiffToolbar::new);
             toolbar.add_item(agent_diff_toolbar, window, cx);
             let basedpyright_banner = cx.new(|cx| BasedPyrightBanner::new(workspace, cx));

git: Add diff view for stash entries (#38280)

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code