Implement command to open commit changes in multi diff editor

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

src/commands.ts

@@ -6,7 +6,6 @@
 
 import * as pathLib from 'path';
 import * as vscode from 'vscode';
-import { Repository } from './api/api';
 import { GitErrorCodes } from './api/api1';
 import { CommentReply, findActiveHandler, resolveCommentHandler } from './commentHandlerResolver';
 import { COPILOT_LOGINS } from './common/copilot';
@@ -56,7 +55,7 @@ const DISCARD_CHANGES = vscode.l10n.t('Discard changes');
  * @param repository The git repository with uncommitted changes
  * @returns Promise<boolean> true if user chose to proceed (after staging/discarding), false if cancelled
  */
-async function handleUncommittedChanges(repository: Repository): Promise<boolean> {
+async function handleUncommittedChanges(repository: any): Promise<boolean> {
 	const hasWorkingTreeChanges = repository.state.workingTreeChanges.length > 0;
 	const hasIndexChanges = repository.state.indexChanges.length > 0;
 
@@ -521,19 +520,19 @@ export function registerCommands(
 		);
 	}
 
-	function isSourceControl(x: any): x is Repository {
+	function isSourceControl(x: any): x is any {
 		return !!x?.rootUri;
 	}
 
 	context.subscriptions.push(
 		vscode.commands.registerCommand(
 			'pr.create',
-			async (args?: { repoPath: string; compareBranch: string } | Repository) => {
+			async (args?: { repoPath: string; compareBranch: string } | any) => {
 				// The arguments this is called with are either from the SCM view, or manually passed.
 				if (isSourceControl(args)) {
 					(await chooseReviewManager(args.rootUri.fsPath))?.createPullRequest();
 				} else {
-					(await chooseReviewManager(args?.repoPath))?.createPullRequest(args?.compareBranch);
+					(await chooseReviewManager((args as any)?.repoPath))?.createPullRequest((args as any)?.compareBranch);
 				}
 			},
 		),
@@ -542,7 +541,7 @@ export function registerCommands(
 	context.subscriptions.push(
 		vscode.commands.registerCommand(
 			'pr.pushAndCreate',
-			async (args?: any | Repository) => {
+			async (args?: any) => {
 				if (isSourceControl(args)) {
 					const reviewManager = await chooseReviewManager(args.rootUri.fsPath);
 					const folderManager = reposManager.getManagerForFile(args.rootUri);
@@ -577,7 +576,7 @@ export function registerCommands(
 			}
 
 			let pullRequestModel: PullRequestModel;
-			let repository: Repository | undefined;
+			let repository: any | undefined;
 
 			if (pr instanceof PRNode || pr instanceof RepositoryChangesNode) {
 				pullRequestModel = pr.pullRequestModel;
@@ -654,6 +653,79 @@ export function registerCommands(
 		}),
 	);
 
+	context.subscriptions.push(
+		vscode.commands.registerCommand('pr.openCommitChanges', async (commitShaOrUrl: string, folderManager?: FolderRepositoryManager) => {
+			try {
+				// Extract commit SHA from GitHub URL if needed
+				let commitSha: string;
+				if (commitShaOrUrl.includes('github.com') && commitShaOrUrl.includes('/commit/')) {
+					const match = commitShaOrUrl.match(/\/commit\/([a-f0-9]{7,40})/);
+					if (!match) {
+						vscode.window.showErrorMessage(vscode.l10n.t('Invalid commit URL: {0}', commitShaOrUrl));
+						return;
+					}
+					commitSha = match[1];
+				} else {
+					commitSha = commitShaOrUrl;
+				}
+
+				// Use provided folder manager or try to find one for the active workspace
+				if (!folderManager) {
+					folderManager = reposManager.folderManagers.find(fm => fm.repository.rootUri.fsPath === vscode.workspace.workspaceFolders?.[0]?.uri.fsPath);
+					if (!folderManager) {
+						vscode.window.showErrorMessage(vscode.l10n.t('No repository found to show commit changes.'));
+						return;
+					}
+				}
+
+				const repository = folderManager.repository;
+				
+				// Get the changes for this commit
+				const changes = await repository.diffBetween(commitSha + '^', commitSha);
+				
+				if (changes.length === 0) {
+					vscode.window.showInformationMessage(vscode.l10n.t('No file changes found in commit {0}', commitSha.substring(0, 7)));
+					return;
+				}
+
+				// Build arguments for vscode.changes command
+				const args: [vscode.Uri, vscode.Uri | undefined, vscode.Uri | undefined][] = [];
+				for (const change of changes) {
+					// For each changed file, create URIs for before and after
+					const parentCommit = commitSha + '^';
+					let beforeUri: vscode.Uri | undefined;
+					let afterUri: vscode.Uri | undefined;
+
+					if (change.status === 7) { // DELETED
+						// File was deleted, show old version vs empty
+						beforeUri = change.uri.with({ scheme: 'git', authority: parentCommit });
+						afterUri = undefined;
+					} else if (change.status === 1 || change.status === 11) { // INDEX_ADDED || ADDED_BY_US
+						// File was added, show empty vs new version
+						beforeUri = undefined;
+						afterUri = change.uri.with({ scheme: 'git', authority: commitSha });
+					} else {
+						// File was modified, show old vs new
+						beforeUri = change.uri.with({ scheme: 'git', authority: parentCommit });
+						afterUri = change.uri.with({ scheme: 'git', authority: commitSha });
+					}
+
+					args.push([change.uri, beforeUri, afterUri]);
+				}
+
+				// Send telemetry
+				folderManager.telemetry.sendTelemetryEvent('pr.openCommitChanges');
+
+				// Open multi diff editor
+				return vscode.commands.executeCommand('vscode.changes', vscode.l10n.t('Changes in Commit {0}', commitSha.substring(0, 7)), args);
+
+			} catch (error) {
+				Logger.error(`Failed to open commit changes: ${formatError(error)}`, 'Commands');
+				vscode.window.showErrorMessage(vscode.l10n.t('Failed to open commit changes: {0}', formatError(error)));
+			}
+		}),
+	);
+
 	let isCheckingOutFromReadonlyFile = false;
 	context.subscriptions.push(vscode.commands.registerCommand('pr.checkoutFromReadonlyFile', async () => {
 		const uri = vscode.window.activeTextEditor?.document.uri;

src/github/pullRequestOverview.ts

@@ -386,6 +386,8 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				return this.openSessionLog(message);
 			case 'pr.cancel-coding-agent':
 				return this.cancelCodingAgent(message);
+			case 'pr.openCommitChanges':
+				return this.openCommitChanges(message);
 		}
 	}
 
@@ -525,6 +527,16 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 		}
 	}
 
+	private async openCommitChanges(message: IRequestMessage<{ commitShaOrUrl: string }>): Promise<void> {
+		try {
+			const { commitShaOrUrl } = message.args;
+			await vscode.commands.executeCommand('pr.openCommitChanges', commitShaOrUrl, this._folderRepositoryManager);
+		} catch (error) {
+			Logger.error(`Failed to open commit changes: ${formatError(error)}`, PullRequestOverviewPanel.ID);
+			vscode.window.showErrorMessage(vscode.l10n.t('Failed to open commit changes: {0}', formatError(error)));
+		}
+	}
+
 	private async openChanges(message?: IRequestMessage<{ openToTheSide?: boolean }>): Promise<void> {
 		const openToTheSide = message?.args?.openToTheSide || false;
 		return PullRequestModel.openChanges(this._folderRepositoryManager, this._item, openToTheSide);

webviews/common/context.tsx

@@ -254,6 +254,8 @@ export class PRContext {
 
 	public openSessionLog = (link: SessionLinkInfo, openToTheSide?: boolean) => this.postMessage({ command: 'pr.open-session-log', args: { link, openToTheSide } });
 
+	public openCommitChanges = (commitShaOrUrl: string) => this.postMessage({ command: 'pr.openCommitChanges', args: { commitShaOrUrl } });
+
 	setPR = (pr: PullRequest) => {
 		this.pr = pr;
 		setState(this.pr);

webviews/components/timeline.tsx

@@ -105,28 +105,37 @@ export const Timeline = ({ events, isIssue }: { events: TimelineEvent[], isIssue
 
 export default Timeline;
 
-const CommitEventView = (event: CommitEvent) => (
-	<div className="comment-container commit">
-		<div className="commit-message">
-			{commitIcon}
-			{nbsp}
-			<div className="avatar-container">
-				<Avatar for={event.author} />
+const CommitEventView = (event: CommitEvent) => {
+	const context = useContext(PullRequestContext);
+	
+	const handleCommitClick = (e: React.MouseEvent) => {
+		e.preventDefault();
+		context.openCommitChanges(event.htmlUrl);
+	};
+
+	return (
+		<div className="comment-container commit">
+			<div className="commit-message">
+				{commitIcon}
+				{nbsp}
+				<div className="avatar-container">
+					<Avatar for={event.author} />
+				</div>
+				<div className="message-container">
+					<a className="message" onClick={handleCommitClick} style={{ cursor: 'pointer' }} title={event.htmlUrl}>
+						{event.message.substr(0, event.message.indexOf('\n') > -1 ? event.message.indexOf('\n') : event.message.length)}
+					</a>
+				</div>
 			</div>
-			<div className="message-container">
-				<a className="message" href={event.htmlUrl} title={event.htmlUrl}>
-					{event.message.substr(0, event.message.indexOf('\n') > -1 ? event.message.indexOf('\n') : event.message.length)}
+			<div className="timeline-detail">
+				<a className="sha" onClick={handleCommitClick} style={{ cursor: 'pointer' }} title={event.htmlUrl}>
+					{event.sha.slice(0, 7)}
 				</a>
+				<Timestamp date={event.committedDate} />
 			</div>
 		</div>
-		<div className="timeline-detail">
-			<a className="sha" href={event.htmlUrl} title={event.htmlUrl}>
-				{event.sha.slice(0, 7)}
-			</a>
-			<Timestamp date={event.committedDate} />
-		</div>
-	</div>
-);
+	);
+};
 
 const NewCommitsSinceReviewEventView = () => {
 	const { gotoChangesSinceReview } = useContext(PullRequestContext);
@@ -300,7 +309,12 @@ function AddReviewSummaryComment() {
 const CommentEventView = (event: CommentEvent) => <CommentView headerInEditMode comment={event} />;
 
 const MergedEventView = (event: MergedEvent) => {
-	const { revert, pr } = useContext(PullRequestContext);
+	const { revert, pr, openCommitChanges } = useContext(PullRequestContext);
+
+	const handleCommitClick = (e: React.MouseEvent) => {
+		e.preventDefault();
+		openCommitChanges(event.commitUrl);
+	};
 
 	return (
 		<div className="comment-container commit">
@@ -313,7 +327,7 @@ const MergedEventView = (event: MergedEvent) => {
 				<AuthorLink for={event.user} />
 				<div className="message">
 					merged commit{nbsp}
-					<a className="sha" href={event.commitUrl} title={event.commitUrl}>
+					<a className="sha" onClick={handleCommitClick} style={{ cursor: 'pointer' }} title={event.commitUrl}>
 						{event.sha.substr(0, 7)}
 					</a>
 					{nbsp}