Closes #4542 adds restore previous changes command

Author: eamodio

CHANGELOG.md

@@ -31,6 +31,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
   - Updates `gitlens.graph.multiselect` setting to default to `topological`; set to `true` to allow selecting multiple commits without restriction
 - Adds ability to switch between open repositories on the _Visual History_
 - Adds _Visualize Repository History_ commands to the SCM menus
+- Adds _Restore Previous Changes_ command to files in the views ([#4542](https://github.com/gitkraken/vscode-gitlens/issues/4542))
 
 ### Changed
 

contributions.json

@@ -3941,6 +3941,40 @@
 			"label": "Reset Views Layout",
 			"commandPalette": true
 		},
+		"gitlens.restore.file:views": {
+			"label": "Restore Changes (Checkout)",
+			"menus": {
+				"view/item/context": [
+					{
+						"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+stashed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+						"group": "1_gitlens_actions",
+						"order": 3
+					},
+					{
+						"when": "viewItem =~ /gitlens:file\\b((?=.*?\\b\\+committed\\b)|:results\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+						"group": "8_gitlens_actions",
+						"order": 3
+					}
+				]
+			}
+		},
+		"gitlens.restorePrevious.file:views": {
+			"label": "Restore Previous Changes",
+			"menus": {
+				"view/item/context": [
+					{
+						"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+stashed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+						"group": "1_gitlens_actions",
+						"order": 4
+					},
+					{
+						"when": "viewItem =~ /gitlens:file\\b((?=.*?\\b\\+committed\\b)|:results\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+						"group": "8_gitlens_actions",
+						"order": 4
+					}
+				]
+			}
+		},
 		"gitlens.revealCommitInView": {
 			"label": "Reveal Commit in Side Bar",
 			"commandPalette": "resource in gitlens:tabs:blameable",
@@ -12077,24 +12111,6 @@
 				]
 			}
 		},
-		"gitlens.views.restore": {
-			"label": "Restore (Checkout)",
-			"icon": "$(gitlens-switch)",
-			"menus": {
-				"view/item/context": [
-					{
-						"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+stashed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
-						"group": "1_gitlens_actions",
-						"order": 3
-					},
-					{
-						"when": "viewItem =~ /gitlens:file\\b((?=.*?\\b\\+committed\\b)|:results\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
-						"group": "8_gitlens_actions",
-						"order": 3
-					}
-				]
-			}
-		},
 		"gitlens.views.revealRepositoryInExplorer": {
 			"label": "Reveal in File Explorer",
 			"menus": {

package.json

@@ -7725,6 +7725,14 @@
 				"title": "Reset Views Layout",
 				"category": "GitLens"
 			},
+			{
+				"command": "gitlens.restore.file:views",
+				"title": "Restore Changes (Checkout)"
+			},
+			{
+				"command": "gitlens.restorePrevious.file:views",
+				"title": "Restore Previous Changes"
+			},
 			{
 				"command": "gitlens.revealCommitInView",
 				"title": "Reveal Commit in Side Bar",
@@ -9629,11 +9637,6 @@
 				"title": "Reset Current Branch to Tip...",
 				"enablement": "!operationInProgress"
 			},
-			{
-				"command": "gitlens.views.restore",
-				"title": "Restore (Checkout)",
-				"icon": "$(gitlens-switch)"
-			},
 			{
 				"command": "gitlens.views.revealRepositoryInExplorer",
 				"title": "Reveal in File Explorer"
@@ -12171,6 +12174,14 @@
 					"command": "gitlens.regenerateMarkdownDocument",
 					"when": "false"
 				},
+				{
+					"command": "gitlens.restore.file:views",
+					"when": "false"
+				},
+				{
+					"command": "gitlens.restorePrevious.file:views",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.revealCommitInView",
 					"when": "resource in gitlens:tabs:blameable"
@@ -13687,10 +13698,6 @@
 					"command": "gitlens.views.resetToTip",
 					"when": "false"
 				},
-				{
-					"command": "gitlens.views.restore",
-					"when": "false"
-				},
 				{
 					"command": "gitlens.views.revealRepositoryInExplorer",
 					"when": "false"
@@ -18093,10 +18100,15 @@
 					"group": "1_gitlens_actions@2"
 				},
 				{
-					"command": "gitlens.views.restore",
+					"command": "gitlens.restore.file:views",
 					"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+stashed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
 					"group": "1_gitlens_actions@3"
 				},
+				{
+					"command": "gitlens.restorePrevious.file:views",
+					"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+stashed\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+					"group": "1_gitlens_actions@4"
+				},
 				{
 					"command": "gitlens.views.openChanges",
 					"when": "viewItem =~ /gitlens:file\\b/ && !listMultiSelection",
@@ -18189,10 +18201,15 @@
 					"group": "8_gitlens_actions@2"
 				},
 				{
-					"command": "gitlens.views.restore",
+					"command": "gitlens.restore.file:views",
 					"when": "viewItem =~ /gitlens:file\\b((?=.*?\\b\\+committed\\b)|:results\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
 					"group": "8_gitlens_actions@3"
 				},
+				{
+					"command": "gitlens.restorePrevious.file:views",
+					"when": "viewItem =~ /gitlens:file\\b((?=.*?\\b\\+committed\\b)|:results\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+					"group": "8_gitlens_actions@4"
+				},
 				{
 					"command": "gitlens.views.stageDirectory",
 					"when": "viewItem =~ /gitlens:folder\\b(?=.*?\\b\\+working\\b)/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",

src/constants.commands.generated.ts

@@ -177,6 +177,8 @@ export type ContributedCommands =
 	| 'gitlens.openWorkingFile:editor/title'
 	| 'gitlens.plus.cloudIntegrations.connect'
 	| 'gitlens.regenerateMarkdownDocument'
+	| 'gitlens.restore.file:views'
+	| 'gitlens.restorePrevious.file:views'
 	| 'gitlens.setUpstream:graph'
 	| 'gitlens.setUpstream:views'
 	| 'gitlens.showInCommitGraph'
@@ -503,7 +505,6 @@ export type ContributedCommands =
 	| 'gitlens.views.resetCommit'
 	| 'gitlens.views.resetToCommit'
 	| 'gitlens.views.resetToTip'
-	| 'gitlens.views.restore'
 	| 'gitlens.views.revealRepositoryInExplorer'
 	| 'gitlens.views.revealWorktreeInExplorer'
 	| 'gitlens.views.revert'

src/git/actions/commit.ts

@@ -663,31 +663,35 @@ export async function openFilesAtRevision(
 	);
 }
 
-export async function restoreFile(file: string | GitFile, revision: GitRevisionReference): Promise<void> {
+export async function restoreFile(
+	file: string | GitFile,
+	revision: GitRevisionReference,
+	previous?: boolean,
+): Promise<void> {
 	let path;
-	let ref;
+	let rev;
 	if (typeof file === 'string') {
 		path = file;
-		ref = revision.ref;
+		rev = previous ? `${revision.ref}^` : revision.ref;
 	} else {
 		path = file.path;
 		if (file.status === 'D') {
 			// If the file is deleted, check to see if it exists, if so, restore it from the previous commit, otherwise restore it from the current commit
 			const uri = GitUri.fromFile(file, revision.repoPath);
 			try {
 				await workspace.fs.stat(uri);
-				ref = `${revision.ref}^`;
+				rev = `${revision.ref}^`;
 			} catch {
-				ref = revision.ref;
+				rev = previous ? `${revision.ref}^` : revision.ref;
 			}
 		} else if (file.status === '?') {
-			ref = `${revision.ref}^3`;
+			rev = `${revision.ref}^3`;
 		} else {
-			ref = revision.ref;
+			rev = previous ? `${revision.ref}^` : revision.ref;
 		}
 	}
 
-	await Container.instance.git.getRepositoryService(revision.repoPath).checkout(ref, { path: path });
+	await Container.instance.git.getRepositoryService(revision.repoPath).checkout(rev, { path: path });
 }
 
 export function revealCommit(commit: GitRevisionReference, options?: RevealOptions): Promise<ViewNode | undefined> {

src/views/viewCommands.ts

@@ -993,14 +993,22 @@ export class ViewCommands implements Disposable {
 		);
 	}
 
-	@command('gitlens.views.restore')
+	@command('gitlens.restore.file:views')
 	@log()
-	private restore(node: ViewRefFileNode) {
+	private restoreFile(node: ViewRefFileNode) {
 		if (!(node instanceof ViewRefFileNode)) return Promise.resolve();
 
 		return CommitActions.restoreFile(node.file, node.ref);
 	}
 
+	@command('gitlens.restorePrevious.file:views')
+	@log()
+	private restorePreviousFile(node: ViewRefFileNode) {
+		if (!(node instanceof ViewRefFileNode)) return Promise.resolve();
+
+		return CommitActions.restoreFile(node.file, node.ref, true);
+	}
+
 	@command('gitlens.views.revealRepositoryInExplorer')
 	@log()
 	private revealRepositoryInExplorer(node: RepositoryNode) {