Fixes gitkraken#2515 - Adds openFileByRevision command

Author: mogelbrod

CHANGELOG.md

@@ -8,7 +8,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Added
 
-- Adds support for opening renamed/deleted files using the _Open File at Revision..._ commands by showing a quickpicker prompt if the requested file doesn't exist in the selected revision — thanks to [PR #2825](https://github.com/gitkraken/vscode-gitlens/pull/2825) by Victor Hallberg ([@mogelbrod](https://github.com/mogelbrod))
+- Improve  support for opening files from other branches — thanks to [PR #2825](https://github.com/gitkraken/vscode-gitlens/pull/2825) by Victor Hallberg ([@mogelbrod](https://github.com/mogelbrod))
+  - Open any file using new _Open File by Revision..._ command
+  - Improve _Open File at Revision..._ commands by prompting user for file to open when the requested path doesn't exist in the specified revision
 
 ### Changed
 

package.json

@@ -5416,6 +5416,12 @@
 				"icon": "$(gitlens-open-revision)",
 				"category": "GitLens"
 			},
+			{
+				"command": "gitlens.openFileByRevision",
+				"title": "Open File by Revision...",
+				"icon": "$(gitlens-open-revision)",
+				"category": "GitLens"
+			},
 			{
 				"command": "gitlens.openAutolinkUrl",
 				"title": "Open Autolink URL",

src/commands.ts

@@ -34,6 +34,7 @@ export * from './commands/openFileFromRemote';
 export * from './commands/openFileOnRemote';
 export * from './commands/openFileAtRevision';
 export * from './commands/openFileAtRevisionFrom';
+export * from './commands/openFileByRevision';
 export * from './commands/openOnRemote';
 export * from './commands/openIssueOnRemote';
 export * from './commands/openPullRequestOnRemote';

src/commands/openFileByRevision.ts

@@ -0,0 +1,80 @@
+import type { TextDocumentShowOptions, TextEditor, Uri } from 'vscode';
+import type { FileAnnotationType } from '../config';
+import { Commands } from '../constants';
+import type { Container } from '../container';
+import { openFileAtRevision, pickFileAtRevision } from '../git/actions/commit';
+import { GitUri } from '../git/gitUri';
+import { showNoRepositoryWarningMessage } from '../messages';
+import { showReferencePicker } from '../quickpicks/referencePicker';
+import { command } from '../system/command';
+import { ActiveEditorCommand, getCommandUri } from './base';
+
+export interface OpenFileByRevisionCommandArgs {
+	revisionUri?: Uri;
+
+	line?: number;
+	showOptions?: TextDocumentShowOptions;
+	annotationType?: FileAnnotationType;
+}
+
+@command()
+export class OpenFileByRevisionCommand extends ActiveEditorCommand {
+	constructor(private readonly container: Container) {
+		super([
+			Commands.OpenFileByRevision /*, Commands.OpenFileByRevisionInDiffLeft, Commands.OpenFileByRevisionInDiffRight*/,
+		]);
+	}
+
+	async execute(editor?: TextEditor, uri?: Uri, args?: OpenFileByRevisionCommandArgs) {
+		uri = getCommandUri(uri, editor);
+		if (uri == null) return;
+
+		const gitUri = await GitUri.fromUri(uri);
+		if (!gitUri.repoPath) {
+			void showNoRepositoryWarningMessage('Unable to determine repository path');
+			return;
+		}
+
+		args = { ...args };
+
+		if (args.revisionUri == null) {
+			let resolveKeyboardPickPromise: (reference: Uri) => void;
+			const keyboardPickPromise = new Promise<Uri>(resolve => { resolveKeyboardPickPromise = resolve; });
+			const referencePickPromise = showReferencePicker(
+				gitUri.repoPath,
+				`Select Branch or Tag to browse for File`,
+				'Choose a branch or tag',
+				{
+					allowEnteringRefs: true,
+					keys: ['right', 'alt+right', 'ctrl+right'],
+					onDidPressKey: (key, quickpick) => {
+						const [item] = quickpick.activeItems;
+						if (item != null) {
+							const refUri = this.container.git.getRevisionUri(item.ref, gitUri.fsPath, gitUri.repoPath!);
+							resolveKeyboardPickPromise(refUri);
+						}
+					},
+				},
+			).then(commit => {
+				return commit ? new GitUri(gitUri, commit) : undefined;
+			});
+			const revision = await Promise.race([keyboardPickPromise, referencePickPromise]);
+			if (revision == null) return;
+			args.revisionUri = revision;
+		}
+
+		const revUri = await GitUri.fromUri(args.revisionUri);
+		const file = await pickFileAtRevision(revUri, {
+			title: 'Select File to open',
+			initialPath: gitUri.relativePath,
+		});
+
+		if (!file) return;
+
+		await openFileAtRevision(file, {
+			annotationType: args.annotationType,
+			line: args.line,
+			...args.showOptions,
+		});
+	}
+}

src/constants.ts

@@ -178,6 +178,7 @@ export const enum Commands {
 	OpenFileOnRemoteFrom = 'gitlens.openFileOnRemoteFrom',
 	OpenFileAtRevision = 'gitlens.openFileRevision',
 	OpenFileAtRevisionFrom = 'gitlens.openFileRevisionFrom',
+	OpenFileByRevision = 'gitlens.openFileByRevision',
 	OpenFolderHistory = 'gitlens.openFolderHistory',
 	OpenOnRemote = 'gitlens.openOnRemote',
 	OpenIssueOnRemote = 'gitlens.openIssueOnRemote',