Revert "Revert "Fix microsoft#88294 Add commitData in commit interface""

joaomoreno · joaomoreno · commit fe884b305ebc · 2020-02-18T12:56:07.000+01:00
This reverts commit aa70f38.
diff --git a/extensions/git/src/api/git.d.ts b/extensions/git/src/api/git.d.ts
@@ -44,6 +44,7 @@ export interface Commit {
 	readonly authorDate?: Date;
 	readonly authorName?: string;
 	readonly authorEmail?: string;
+	readonly commitDate?: Date;
 }
 
 export interface Submodule {
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
@@ -333,7 +333,7 @@ function sanitizePath(path: string): string {
 	return path.replace(/^([a-z]):\\/i, (_, letter) => `${letter.toUpperCase()}:\\`);
 }
 
-const COMMIT_FORMAT = '%H%n%aN%n%aE%n%at%n%P%n%B';
+const COMMIT_FORMAT = '%H%n%aN%n%aE%n%at%n%ct%n%P%n%B';
 
 export class Git {
 
@@ -525,6 +525,7 @@ export interface Commit {
 	authorDate?: Date;
 	authorName?: string;
 	authorEmail?: string;
+	commitDate?: Date;
 }
 
 export class GitStatusParser {
@@ -655,15 +656,16 @@ export function parseGitmodules(raw: string): Submodule[] {
 	return result;
 }
 
-const commitRegex = /([0-9a-f]{40})\n(.*)\n(.*)\n(.*)\n(.*)(?:\n([^]*?))?(?:\x00)/gm;
+const commitRegex = /([0-9a-f]{40})\n(.*)\n(.*)\n(.*)\n(.*)\n(.*)(?:\n([^]*?))?(?:\x00)/gm;
 
 export function parseGitCommits(data: string): Commit[] {
 	let commits: Commit[] = [];
 
 	let ref;
-	let name;
-	let email;
-	let date;
+	let authorName;
+	let authorEmail;
+	let authorDate;
+	let commitDate;
 	let parents;
 	let message;
 	let match;
@@ -674,7 +676,7 @@ export function parseGitCommits(data: string): Commit[] {
 			break;
 		}
 
-		[, ref, name, email, date, parents, message] = match;
+		[, ref, authorName, authorEmail, authorDate, commitDate, parents, message] = match;
 
 		if (message[message.length - 1] === '\n') {
 			message = message.substr(0, message.length - 1);
@@ -685,9 +687,10 @@ export function parseGitCommits(data: string): Commit[] {
 			hash: ` ${ref}`.substr(1),
 			message: ` ${message}`.substr(1),
 			parents: parents ? parents.split(' ') : [],
-			authorDate: new Date(Number(date) * 1000),
-			authorName: ` ${name}`.substr(1),
-			authorEmail: ` ${email}`.substr(1)
+			authorDate: new Date(Number(authorDate) * 1000),
+			authorName: ` ${authorName}`.substr(1),
+			authorEmail: ` ${authorEmail}`.substr(1),
+			commitDate: new Date(Number(commitDate) * 1000),
 		});
 	} while (true);
 

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ export interface Commit {`
`44`	`44`	`readonly authorDate?: Date;`
`45`	`45`	`readonly authorName?: string;`
`46`	`46`	`readonly authorEmail?: string;`
	`47`	`+ readonly commitDate?: Date;`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`export interface Submodule {`