Fixes #4062 ensure creation of uncommitted commits

Author: eamodio

CHANGELOG.md

@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Fixed
 
+- Fixes regression where hovering over the Graph WIP row doesn't show up anymore ([#4062](https://github.com/gitkraken/vscode-gitlens/issues/4062))
 - Fixes Inspect & Graph Details: autolinks rendering when enabled setting is false ([#3841](https://github.com/gitkraken/vscode-gitlens/issues/3841))
 - Fixes comparison with Merge Target on Home fails to open a valid comparison ([#4060](https://github.com/gitkraken/vscode-gitlens/issues/4060))
 

src/env/node/git/sub-providers/commits.ts

@@ -27,6 +27,7 @@ import {
 } from '../../../../git/parsers/logParser';
 import { parseGitRefLog, parseGitRefLogDefaultFormat } from '../../../../git/parsers/reflogParser';
 import { getGitArgsFromSearchQuery } from '../../../../git/search';
+import { createUncommittedChangesCommit } from '../../../../git/utils/-webview/commit.utils';
 import { isRevisionRange, isSha, isUncommitted } from '../../../../git/utils/revision.utils';
 import { configuration } from '../../../../system/-webview/configuration';
 import { splitPath } from '../../../../system/-webview/path';
@@ -59,6 +60,15 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 
 	@log()
 	async getCommit(repoPath: string, rev: string): Promise<GitCommit | undefined> {
+		if (isUncommitted(rev, true)) {
+			return createUncommittedChangesCommit(
+				this.container,
+				repoPath,
+				rev,
+				await this.provider.config.getCurrentUser(repoPath),
+			);
+		}
+
 		const log = await this.getLog(repoPath, rev, { limit: 2 });
 		if (log == null) return undefined;
 

src/git/models/statusFile.ts

@@ -2,9 +2,10 @@
 import type { Uri } from 'vscode';
 import type { Container } from '../../container';
 import { memoize } from '../../system/decorators/-webview/memoize';
+import { createUncommittedChangesCommit } from '../utils/-webview/commit.utils';
 import { getGitFileFormattedDirectory, getGitFileFormattedPath } from '../utils/-webview/file.utils';
 import { getGitFileStatusText } from '../utils/fileStatus.utils';
-import { GitCommit, GitCommitIdentity } from './commit';
+import type { GitCommit } from './commit';
 import type { GitFile } from './file';
 import { GitFileChange } from './fileChange';
 import type { GitFileStatus } from './fileStatus';
@@ -140,19 +141,10 @@ export class GitStatusFile implements GitFile {
 				false,
 			);
 			return [
-				new GitCommit(
-					container,
-					this.repoPath,
-					uncommitted,
-					new GitCommitIdentity('You', user?.email ?? undefined, now),
-					new GitCommitIdentity('You', user?.email ?? undefined, now),
-					'Uncommitted changes',
-					['HEAD'],
-					'Uncommitted changes',
-					{ file: file, files: [file] },
-					undefined,
-					[],
-				),
+				createUncommittedChangesCommit(container, this.repoPath, uncommitted, user, {
+					files: { file: file, files: [file] },
+					parents: ['HEAD'],
+				}),
 			];
 		}
 
@@ -172,19 +164,10 @@ export class GitStatusFile implements GitFile {
 				false,
 			);
 			commits.push(
-				new GitCommit(
-					container,
-					this.repoPath,
-					uncommitted,
-					new GitCommitIdentity('You', user?.email ?? undefined, now),
-					new GitCommitIdentity('You', user?.email ?? undefined, now),
-					'Uncommitted changes',
-					[previousSha],
-					'Uncommitted changes',
-					{ file: file, files: [file] },
-					undefined,
-					[],
-				),
+				createUncommittedChangesCommit(container, this.repoPath, uncommitted, user, {
+					files: { file: file, files: [file] },
+					parents: [previousSha],
+				}),
 			);
 
 			// Decrements the date to guarantee the staged entry (if exists) will be sorted after the working entry (most recent first)
@@ -203,19 +186,10 @@ export class GitStatusFile implements GitFile {
 				true,
 			);
 			commits.push(
-				new GitCommit(
-					container,
-					this.repoPath,
-					uncommittedStaged,
-					new GitCommitIdentity('You', user?.email ?? undefined, now),
-					new GitCommitIdentity('You', user?.email ?? undefined, now),
-					'Uncommitted changes',
-					['HEAD'],
-					'Uncommitted changes',
-					{ file: file, files: [file] },
-					undefined,
-					[],
-				),
+				createUncommittedChangesCommit(container, this.repoPath, uncommittedStaged, user, {
+					files: { file: file, files: [file] },
+					parents: ['HEAD'],
+				}),
 			);
 		}
 

src/git/utils/-webview/commit.utils.ts

@@ -0,0 +1,33 @@
+import type { Container } from '../../../container';
+import type { GitCommitStats } from '../../models/commit';
+import { GitCommit, GitCommitIdentity } from '../../models/commit';
+import type { GitFileChange } from '../../models/fileChange';
+import { uncommittedStaged } from '../../models/revision';
+import type { GitUser } from '../../models/user';
+
+export function createUncommittedChangesCommit(
+	container: Container,
+	repoPath: string,
+	sha: string,
+	user: GitUser | undefined,
+	options?: {
+		files?: GitFileChange | GitFileChange[] | { file?: GitFileChange; files?: GitFileChange[] } | undefined;
+		parents?: string[];
+		stats?: GitCommitStats;
+	},
+): GitCommit {
+	const now = new Date();
+	return new GitCommit(
+		container,
+		repoPath,
+		sha,
+		new GitCommitIdentity('You', user?.email ?? undefined, now),
+		new GitCommitIdentity('You', user?.email ?? undefined, now),
+		'Uncommitted changes',
+		options?.parents ?? (sha === uncommittedStaged ? ['HEAD'] : []),
+		'Uncommitted changes',
+		options?.files,
+		options?.stats,
+		[],
+	);
+}

src/plus/integrations/providers/github/sub-providers/commits.ts

@@ -15,6 +15,7 @@ import type { GitRevisionRange } from '../../../../../git/models/revision';
 import { deletedOrMissing } from '../../../../../git/models/revision';
 import type { GitUser } from '../../../../../git/models/user';
 import { parseSearchQuery } from '../../../../../git/search';
+import { createUncommittedChangesCommit } from '../../../../../git/utils/-webview/commit.utils';
 import { createRevisionRange, isUncommitted } from '../../../../../git/utils/revision.utils';
 import { log } from '../../../../../system/decorators/log';
 import { filterMap, first, last, some } from '../../../../../system/iterable';
@@ -45,6 +46,15 @@ export class CommitsGitSubProvider implements GitCommitsSubProvider {
 		const scope = getLogScope();
 
 		try {
+			if (isUncommitted(rev, true)) {
+				return createUncommittedChangesCommit(
+					this.container,
+					repoPath,
+					rev,
+					await this.provider.config.getCurrentUser(repoPath),
+				);
+			}
+
 			const { metadata, github, session } = await this.provider.ensureRepositoryContext(repoPath);
 
 			const commit = await github.getCommit(