Merge branch 'hansu-develop'

Author: hansu

.gitignore

@@ -1,5 +1,6 @@
 coverage
 media
 node_modules
+node_modules_
 out
 *.vsix

README.md

@@ -1,8 +1,14 @@
 # Git Graph extension for Visual Studio Code
 
-View a Git Graph of your repository, and easily perform Git actions from the graph. Configurable to look the way you want!
+Extended version of mhutchies Git Graph.
+Following features were added:
 
-![Recording of Git Graph](https://github.com/mhutchie/vscode-git-graph/raw/master/resources/demo.gif)
+* Added sticky header option (mhutchie#394)
+* Added author filter (hansu#1)
+* Resize column width without header (hansu#4)
+* Added collapse/expand buttons to commit diff view (hansu#6)
+
+![Additions](https://github.com/hansu/vscode-git-graph/raw/hansu-mod/resources/demo.gif)
 
 ## Features
 

package.json

@@ -169,6 +169,10 @@
 									"type": "boolean",
 									"title": "Push Branch..."
 								},
+								"viewIssue": {
+									"type": "boolean",
+									"title": "View Issue"
+								},
 								"createPullRequest": {
 									"type": "boolean",
 									"title": "Create Pull Request..."
@@ -240,6 +244,47 @@
 								}
 							}
 						},
+						"commitDetailsViewFile": {
+							"type": "object",
+							"properties": {
+								"viewDiff": {
+									"type": "boolean",
+									"title": "View Diff"
+								},
+								"viewFileAtThisRevision": {
+									"type": "boolean",
+									"title": "View File at this Revision"
+								},
+								"viewDiffWithWorkingFile": {
+									"type": "boolean",
+									"title": "View Diff with Working File"
+								},
+								"openFile": {
+									"type": "boolean",
+									"title": "Open File"
+								},
+								"markAsReviewed": {
+									"type": "boolean",
+									"title": "Mark as Reviewed"
+								},
+								"markAsNotReviewed": {
+									"type": "boolean",
+									"title": "Mark as Not Reviewed"
+								},
+								"resetFileToThisRevision": {
+									"type": "boolean",
+									"title": "Reset File to this Revision..."
+								},
+								"copyAbsoluteFilePath": {
+									"type": "boolean",
+									"title": "Copy Absolute File Path to Clipboard"
+								},
+								"copyRelativeFilePath": {
+									"type": "boolean",
+									"title": "Copy Relative File Path to Clipboard"
+								}
+							}
+						},
 						"remoteBranch": {
 							"type": "object",
 							"properties": {
@@ -263,6 +308,10 @@
 									"type": "boolean",
 									"title": "Pull into current branch..."
 								},
+								"viewIssue": {
+									"type": "boolean",
+									"title": "View Issue"
+								},
 								"createPullRequest": {
 									"type": "boolean",
 									"title": "Create Pull Request"
@@ -493,6 +542,11 @@
 					},
 					"description": "An object specifying the default visibility of the Date, Author & Commit columns. Example: {\"Date\": true, \"Author\": true, \"Commit\": true}"
 				},
+				"git-graph.stickyHeader": {
+					"type": "boolean",
+					"default": true,
+					"description": "Keeps the header visible when the view is scrolled"
+				},
 				"git-graph.dialog.addTag.pushToRemote": {
 					"type": "boolean",
 					"default": false,

resources/demo.gif

@@ -134,10 +134,11 @@ export class AvatarManager extends Disposable {
 
 	/**
 	 * Remove all avatars from the cache.
+	 * @returns A Thenable resolving to the ErrorInfo that resulted from executing this method.
 	 */
 	public clearCache() {
 		this.avatars = {};
-		this.extensionState.clearAvatarCache();
+		return this.extensionState.clearAvatarCache();
 	}
 
 	/**

src/avatarManager.ts

@@ -8,7 +8,7 @@ import { CodeReviewData, CodeReviews, ExtensionState } from './extensionState';
 import { GitGraphView } from './gitGraphView';
 import { Logger } from './logger';
 import { RepoManager } from './repoManager';
-import { GitExecutable, UNABLE_TO_FIND_GIT_MSG, abbrevCommit, abbrevText, copyToClipboard, doesVersionMeetRequirement, getExtensionVersion, getPathFromUri, getRelativeTimeDiff, getRepoName, getSortedRepositoryPaths, isPathInWorkspace, openFile, resolveToSymbolicPath, showErrorMessage, showInformationMessage } from './utils';
+import { GitExecutable, UNABLE_TO_FIND_GIT_MSG, VsCodeVersionRequirement, abbrevCommit, abbrevText, copyToClipboard, doesVersionMeetRequirement, getExtensionVersion, getPathFromUri, getRelativeTimeDiff, getRepoName, getSortedRepositoryPaths, isPathInWorkspace, openFile, resolveToSymbolicPath, showErrorMessage, showInformationMessage } from './utils';
 import { Disposable } from './utils/disposable';
 import { Event } from './utils/event';
 
@@ -65,7 +65,7 @@ export class CommandManager extends Disposable {
 
 		// Register Extension Contexts
 		try {
-			this.registerContext('git-graph:codiconsSupported', doesVersionMeetRequirement(vscode.version, '1.42.0'));
+			this.registerContext('git-graph:codiconsSupported', doesVersionMeetRequirement(vscode.version, VsCodeVersionRequirement.Codicons));
 		} catch (_) {
 			this.logger.logError('Unable to set Visual Studio Code Context "git-graph:codiconsSupported"');
 		}
@@ -78,7 +78,10 @@ export class CommandManager extends Disposable {
 	 */
 	private registerCommand(command: string, callback: (...args: any[]) => any) {
 		this.registerDisposable(
-			vscode.commands.registerCommand(command, callback)
+			vscode.commands.registerCommand(command, (...args: any[]) => {
+				this.logger.log('Command Invoked: ' + command);
+				callback(...args);
+			})
 		);
 	}
 
@@ -180,7 +183,15 @@ export class CommandManager extends Disposable {
 	 * The method run when the `git-graph.clearAvatarCache` command is invoked.
 	 */
 	private clearAvatarCache() {
-		this.avatarManager.clearCache();
+		this.avatarManager.clearCache().then((errorInfo) => {
+			if (errorInfo === null) {
+				showInformationMessage('The Avatar Cache was successfully cleared.');
+			} else {
+				showErrorMessage(errorInfo);
+			}
+		}, () => {
+			showErrorMessage('An unexpected error occurred while running the command "Clear Avatar Cache".');
+		});
 	}
 
 	/**

src/commands.ts

@@ -81,9 +81,10 @@ class Config {
 	get contextMenuActionsVisibility(): ContextMenuActionsVisibility {
 		const userConfig = this.config.get('contextMenuActionsVisibility', {});
 		const config: ContextMenuActionsVisibility = {
-			branch: { checkout: true, rename: true, delete: true, merge: true, rebase: true, push: true, createPullRequest: true, createArchive: true, selectInBranchesDropdown: true, unselectInBranchesDropdown: true, copyName: true },
+			branch: { checkout: true, rename: true, delete: true, merge: true, rebase: true, push: true, viewIssue: true, createPullRequest: true, createArchive: true, selectInBranchesDropdown: true, unselectInBranchesDropdown: true, copyName: true },
 			commit: { addTag: true, createBranch: true, checkout: true, cherrypick: true, revert: true, drop: true, merge: true, rebase: true, reset: true, copyHash: true, copySubject: true },
-			remoteBranch: { checkout: true, delete: true, fetch: true, merge: true, pull: true, createPullRequest: true, createArchive: true, selectInBranchesDropdown: true, unselectInBranchesDropdown: true, copyName: true },
+			commitDetailsViewFile: { viewDiff: true, viewFileAtThisRevision: true, viewDiffWithWorkingFile: true, openFile: true, markAsReviewed: true, markAsNotReviewed: true, resetFileToThisRevision: true, copyAbsoluteFilePath: true, copyRelativeFilePath: true },
+			remoteBranch: { checkout: true, delete: true, fetch: true, merge: true, pull: true, viewIssue: true, createPullRequest: true, createArchive: true, selectInBranchesDropdown: true, unselectInBranchesDropdown: true, copyName: true },
 			stash: { apply: true, createBranch: true, pop: true, drop: true, copyName: true, copyHash: true },
 			tag: { viewDetails: true, delete: true, push: true, createArchive: true, copyName: true },
 			uncommittedChanges: { stash: true, reset: true, clean: true, openSourceControlView: true }
@@ -545,6 +546,13 @@ class Config {
 		return !!this.config.get('showStatusBarItem', true);
 	}
 
+	/**
+	 * Get the value of the `git-graph.stickyHeader` Extension Setting.
+	 */
+	get stickyHeader() {
+		return !!this.config.get('stickyHeader', true);
+	}
+
 	/**
 	 * Get the value of the `git-graph.tabIconColourTheme` Extension Setting.
 	 */