Adds index (staged changes) to timeline

Eric Amodio · eamodio · commit 2dc90b814031 · 2020-01-27T15:28:33.000-05:00
diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
@@ -2334,6 +2334,10 @@ export class CommandCenter {
 
 	@command('git.openDiff', { repository: false })
 	async openDiff(uri: Uri, hash: string) {
+		if (hash === '~') {
+			return commands.executeCommand('vscode.diff', toGitUri(uri, hash), toGitUri(uri, `HEAD`));
+		}
+
 		return commands.executeCommand('vscode.diff', toGitUri(uri, hash), toGitUri(uri, `${hash}^`));
 	}
 
diff --git a/extensions/git/src/timelineProvider.ts b/extensions/git/src/timelineProvider.ts
@@ -60,7 +60,7 @@ export class GitTimelineProvider implements TimelineProvider {
 
 		console.log(`GitTimelineProvider.provideTimeline: commits=${commits.length}`);
 
-		return commits.map<TimelineItem>(c => {
+		const items = commits.map<TimelineItem>(c => {
 			let message = c.message;
 
 			const index = message.indexOf('\n');
@@ -82,6 +82,26 @@ export class GitTimelineProvider implements TimelineProvider {
 				}
 			};
 		});
+
+		const index = repo.indexGroup.resourceStates.find(r => r.resourceUri.fsPath === uri.fsPath);
+		if (index) {
+			items.push({
+				id: '~',
+				// TODO: Fix the date
+				date: Date.now(),
+				iconPath: new ThemeIcon('git-commit'),
+				label: 'Staged Changes',
+				description: '',
+				detail: '',
+				command: {
+					title: 'Open Diff',
+					command: 'git.openDiff',
+					arguments: [uri, '~']
+				}
+			});
+		}
+
+		return items;
 	}
 
 	@debounce(500)

Original file line number	Diff line number	Diff line change
`@@ -2334,6 +2334,10 @@ export class CommandCenter {`
`2334`	`2334`
`2335`	`2335`	`@command('git.openDiff', { repository: false })`
`2336`	`2336`	`async openDiff(uri: Uri, hash: string) {`
	`2337`	`+ if (hash === '~') {`
	`2338`	+ return commands.executeCommand('vscode.diff', toGitUri(uri, hash), toGitUri(uri, `HEAD`));
	`2339`	`+ }`
	`2340`	`+`
`2337`	`2341`	return commands.executeCommand('vscode.diff', toGitUri(uri, hash), toGitUri(uri, `${hash}^`));
`2338`	`2342`	`}`
`2339`	`2343`