Add commit list to 'Changes in Pull Request' section, fixes #34

Author: Rachel Macfarlane

src/common/diffHunk.ts

@@ -248,6 +248,21 @@ async function parseModifiedHunkFast(modifyDiffInfo, a, b) {
 	return new RichFileChange(contentPath, originalContentPath, GitChangeType.MODIFY, b, diffHunks);
 }
 
+export function getGitChangeType(status: string): GitChangeType {
+	switch (status) {
+		case 'removed':
+			return GitChangeType.DELETE;
+		case 'added':
+			return GitChangeType.ADD;
+		case 'renamed':
+			return GitChangeType.RENAME;
+		case 'modified':
+			return GitChangeType.MODIFY;
+		default:
+			return GitChangeType.UNKNOWN
+	}
+}
+
 export async function parseDiff(reviews: any[], repository: Repository, parentCommit: string): Promise<RichFileChange[]> {
 	let richFileChanges: RichFileChange[] = [];
 	for (let i = 0; i < reviews.length; i++) {
@@ -270,21 +285,7 @@ export async function parseDiff(reviews: any[], repository: Repository, parentCo
 				continue;
 			}
 
-			let gitChangeType = GitChangeType.UNKNOWN;
-			switch (review.status) {
-				case 'removed':
-					gitChangeType = GitChangeType.DELETE;
-					break;
-				case 'added':
-					gitChangeType = GitChangeType.ADD;
-					break;
-				case 'renamed':
-					gitChangeType = GitChangeType.RENAME;
-					break;
-				default:
-					break;
-			}
-
+			const gitChangeType = getGitChangeType(review.status);
 			let contentArray = [];
 			let fileName = review.filename;
 			let prDiffReader = parseDiffHunk(review.patch);

src/github/interface.ts

@@ -65,6 +65,35 @@ export interface IPullRequest {
 	user: any;
 }
 
+export interface FileChange {
+	additions: number;
+	blob_url: string;
+	changes: number;
+	contents_url: string;
+	deletions: number;
+	filename: string;
+	patch?: string;
+	raw_url: string;
+	sha: string;
+	status: string;
+}
+
+export interface Commit {
+	author: {
+		login: string;
+	};
+	commit: {
+		author: {
+			name: string;
+			date: string;
+			email: string;
+		};
+		message: string;
+	};
+	html_url: string;
+	sha: string;
+	parents: any;
+}
 
 export interface IPullRequestModel {
 	prNumber: number;
@@ -99,14 +128,16 @@ export interface IPullRequestManager {
 	getPullRequests(type: PRType, options?: IPullRequestsPagingOptions):Promise<[IPullRequestModel[], boolean]>;
 	mayHaveMorePages(): boolean;
 	getPullRequestComments(pullRequest: IPullRequestModel): Promise<Comment[]>;
+	getPullRequestCommits(pullRequest: IPullRequestModel): Promise<Commit[]>;
+	getCommitChangedFiles(pullRequest: IPullRequestModel, commit: Commit): Promise<FileChange[]>;
 	getReviewComments(pullRequest: IPullRequestModel, reviewId: string): Promise<Comment[]>;
 	getTimelineEvents(pullRequest: IPullRequestModel): Promise<TimelineEvent[]>;
 	getIssueComments(pullRequest: IPullRequestModel): Promise<Comment[]>;
 	createIssueComment(pullRequest: IPullRequestModel, text: string): Promise<Comment>;
 	createCommentReply(pullRequest: IPullRequestModel, body: string, reply_to: string);
 	createComment(pullRequest: IPullRequestModel, body: string, path: string, position: number);
 	closePullRequest(pullRequest: IPullRequestModel): Promise<any>;
-	getPullRequestChagnedFiles(pullRequest: IPullRequestModel): Promise<any>;
+	getPullRequestChangedFiles(pullRequest: IPullRequestModel): Promise<FileChange[]>;
 	fullfillPullRequestCommitInfo(pullRequest: IPullRequestModel): Promise<void>;
 	updateRepositories(): Promise<void>;
 

src/github/pullRequestManager.ts

@@ -10,11 +10,12 @@ import { Remote } from "../common/remote";
 import { Repository } from "../common/repository";
 import { TimelineEvent, EventType } from "../common/timelineEvent";
 import { GitHubRepository, PULL_REQUEST_PAGE_SIZE } from "./githubRepository";
-import { IPullRequestManager, IPullRequestModel, IPullRequestsPagingOptions, PRType } from "./interface";
+import { IPullRequestManager, IPullRequestModel, IPullRequestsPagingOptions, PRType, Commit, FileChange } from "./interface";
 import { PullRequestGitHelper } from "./pullRequestGitHelper";
 import { PullRequestModel } from "./pullRequestModel";
 import { parserCommentDiffHunk } from "../common/diffHunk";
 import { Configuration } from "../configuration";
+import { formatError } from '../common/utils';
 
 interface PageInformation {
 	pullRequestPage: number;
@@ -174,6 +175,38 @@ export class PullRequestManager implements IPullRequestManager {
 		return parserCommentDiffHunk(rawComments);
 	}
 
+	async getPullRequestCommits(pullRequest: IPullRequestModel): Promise<Commit[]> {
+		try {
+			const { octokit, remote } = (pullRequest as PullRequestModel).githubRepository;
+			const commitData = await octokit.pullRequests.getCommits({
+					number: pullRequest.prNumber,
+					owner: remote.owner,
+					repo: remote.repositoryName
+			});
+
+			return commitData.data;
+		} catch (e) {
+			vscode.window.showErrorMessage(`Fetching commits failed: ${formatError(e)}`);
+			return [];
+		}
+	}
+
+	async getCommitChangedFiles(pullRequest: IPullRequestModel, commit: Commit): Promise<FileChange[]> {
+		try {
+			const { octokit, remote } = (pullRequest as PullRequestModel).githubRepository;
+			const fullCommit = await octokit.repos.getCommit({
+				owner: remote.owner,
+				repo: remote.repositoryName,
+				sha: commit.sha
+			});
+
+			return fullCommit.data.files.filter(file => !!file.patch);
+		} catch (e) {
+			vscode.window.showErrorMessage(`Fetching commit file changes failed: ${formatError(e)}`);
+			return [];
+		}
+	}
+
 	async getReviewComments(pullRequest: IPullRequestModel, reviewId: string): Promise<Comment[]> {
 		let githubRepository = (pullRequest as PullRequestModel).githubRepository;
 		let octokit = githubRepository.octokit;
@@ -286,7 +319,7 @@ export class PullRequestManager implements IPullRequestManager {
 		return ret.data;
 	}
 
-	async getPullRequestChagnedFiles(pullRequest: IPullRequestModel): Promise<any> {
+	async getPullRequestChangedFiles(pullRequest: IPullRequestModel): Promise<FileChange[]> {
 		let githubRepository = (pullRequest as PullRequestModel).githubRepository;
 		let octokit = githubRepository.octokit;
 		let remote = githubRepository.remote;

src/view/prChangesTreeDataProvider.ts

@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as vscode from 'vscode';
+import { Resource } from '../common/resources';
+import { IPullRequestModel, IPullRequestManager } from '../github/interface';
+import { FileChangeNode } from './treeNodes/fileChangeNode';
+import { DescriptionNode } from './treeNodes/descriptionNode';
+import { TreeNode } from './treeNodes/treeNode';
+import { FilesCategoryNode } from './treeNodes/filesCategoryNode';
+import { CommitsNode } from './treeNodes/commitsCategoryNode';
+import { Comment } from '../common/comment';
+
+export class PullRequestChangesTreeDataProvider extends vscode.Disposable implements vscode.TreeDataProvider<TreeNode> {
+	private _onDidChangeTreeData = new vscode.EventEmitter<FileChangeNode | DescriptionNode>();
+	readonly onDidChangeTreeData = this._onDidChangeTreeData.event;
+
+	private _localFileChanges: FileChangeNode[] = [];
+	private _comments: Comment[] = [];
+	private _pullrequest: IPullRequestModel = null;
+	private _pullRequestManager: IPullRequestManager;
+
+	constructor(private context: vscode.ExtensionContext) {
+		super(() => this.dispose());
+		this.context.subscriptions.push(vscode.window.registerTreeDataProvider<TreeNode>('prStatus', this));
+	}
+
+	async showPullRequestFileChanges(pullRequestManager: IPullRequestManager, pullrequest: IPullRequestModel, fileChanges: FileChangeNode[], comments: Comment[]) {
+		this._pullRequestManager = pullRequestManager;
+		this._pullrequest = pullrequest;
+		this._comments = comments;
+
+		await vscode.commands.executeCommand(
+			'setContext',
+			'github:inReviewMode',
+			true
+		);
+
+		this._localFileChanges = fileChanges;
+		this._onDidChangeTreeData.fire();
+	}
+
+	async hide() {
+		await vscode.commands.executeCommand(
+			'setContext',
+			'github:inReviewMode',
+			false
+		);
+	}
+
+	getTreeItem(element: TreeNode): vscode.TreeItem | Thenable<vscode.TreeItem> {
+		return element.getTreeItem();
+	}
+
+	getChildren(element?: FileChangeNode): vscode.ProviderResult<TreeNode[]> {
+		if (!element) {
+			const descriptionNode = new DescriptionNode('Description',
+				{
+					light: Resource.icons.light.Description,
+					dark: Resource.icons.dark.Description
+				}, this._pullrequest);
+			const filesCategoryNode = new FilesCategoryNode(this._localFileChanges);
+			const commitsCategoryNode = new CommitsNode(this._pullRequestManager, this._pullrequest, this._comments);
+			return [ descriptionNode, filesCategoryNode, commitsCategoryNode ];
+		} else {
+			return element.getChildren();
+		}
+	}
+}