ref microsoft#44776 Get previous commits as part of commit info

ryu1kn · ryu1kn · commit 3fdf0bcc56da · 2018-04-10T21:01:41.000+10:00
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
@@ -481,6 +481,7 @@ export class Git {
 export interface Commit {
 	hash: string;
 	message: string;
+	previousHashes: string[];
 }
 
 export class GitStatusParser {
@@ -1287,14 +1288,14 @@ export class Repository {
 	}
 
 	async getCommit(ref: string): Promise<Commit> {
-		const result = await this.run(['show', '-s', '--format=%H\n%B', ref]);
-		const match = /^([0-9a-f]{40})\n([^]*)$/m.exec(result.stdout.trim());
+		const result = await this.run(['show', '-s', '--format=%H\n%P\n%B', ref]);
+		const match = /^([0-9a-f]{40})\n(.*)\n([^]*)$/m.exec(result.stdout.trim());
 
 		if (!match) {
 			return Promise.reject<Commit>('bad commit format');
 		}
 
-		return { hash: match[1], message: match[2] };
+		return { hash: match[1], message: match[3], previousHashes: [match[2]] };
 	}
 
 	async updateSubmodules(paths: string[]): Promise<void> {
diff --git a/extensions/git/src/test/git.test.ts b/extensions/git/src/test/git.test.ts
@@ -181,16 +181,18 @@ suite('git', () => {
 		test('get commit', async () => {
 			const spawnOption = {};
 			const gitOutput = `52c293a05038d865604c2284aa8698bd087915a1
+8e5a374372b8393906c7e380dbb09349c5385554
 This is a commit message.`;
 			const git = sinon.createStubInstance(Git);
 			git.exec = sinon.stub()
-				.withArgs('REPOSITORY_ROOT', ['show', '-s', '--format=%H\n%B', 'REF'], spawnOption)
+				.withArgs('REPOSITORY_ROOT', ['show', '-s', '--format=%H\n%P\n%B', 'REF_SINGLE_PARENT'], spawnOption)
 				.returns(Promise.resolve({stdout: gitOutput}));
 			const repository = new Repository(git, 'REPOSITORY_ROOT');
 
-			assert.deepEqual(await repository.getCommit('REF'), {
+			assert.deepEqual(await repository.getCommit('REF_SINGLE_PARENT'), {
 				hash: '52c293a05038d865604c2284aa8698bd087915a1',
-				message: 'This is a commit message.'
+				message: 'This is a commit message.',
+				previousHashes: ['8e5a374372b8393906c7e380dbb09349c5385554']
 			});
 		});
 	});

Original file line number	Diff line number	Diff line change
`@@ -481,6 +481,7 @@ export class Git {`
`481`	`481`	`export interface Commit {`
`482`	`482`	`hash: string;`
`483`	`483`	`message: string;`
	`484`	`+ previousHashes: string[];`
`484`	`485`	`}`
`485`	`486`
`486`	`487`	`export class GitStatusParser {`
`@@ -1287,14 +1288,14 @@ export class Repository {`
`1287`	`1288`	`}`
`1288`	`1289`
`1289`	`1290`	`async getCommit(ref: string): Promise<Commit> {`
`1290`		`- const result = await this.run(['show', '-s', '--format=%H\n%B', ref]);`
`1291`		`- const match = /^([0-9a-f]{40})\n([^]*)$/m.exec(result.stdout.trim());`
	`1291`	`+ const result = await this.run(['show', '-s', '--format=%H\n%P\n%B', ref]);`
	`1292`	`+ const match = /^([0-9a-f]{40})\n(.)\n([^])$/m.exec(result.stdout.trim());`
`1292`	`1293`
`1293`	`1294`	`if (!match) {`
`1294`	`1295`	`return Promise.reject<Commit>('bad commit format');`
`1295`	`1296`	`}`
`1296`	`1297`
`1297`		`- return { hash: match[1], message: match[2] };`
	`1298`	`+ return { hash: match[1], message: match[3], previousHashes: [match[2]] };`
`1298`	`1299`	`}`
`1299`	`1300`
`1300`	`1301`	`async updateSubmodules(paths: string[]): Promise<void> {`