Release 1.29.0 package & documentation changes.

Author: mhutchie

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 1.29.0 - 2021-02-28
+* #390 When creating a branch or adding a tag, the name is now checked against all existing branches and tags in the repository. If a branch / tag already exists with the same name, a new dialog is displayed that allows you to: replace the existing branch / tag, or to choose another name.
+* #402 New mode for the Find Widget, which will additionally open the Commit Details View as you navigate through each of the matched commits. This mode is enabled / disabled via a new button on the Find Widget.
+* #404 New context menu on all link elements (e.g. Issue Links, URL's in commit messages, author email addresses), enabling the URL to be copied to the clipboard.
+* #417 New context menu actions for branches, to select / unselect the branch in the Branches Dropdown.
+* #424 Consume Git configuration variables (`remote.pushDefault`, `branch.<name>.remote` & `branch.<name>.pushRemote`) to set the default remote to push branches and tags to (when multiple remotes are configured for a repository).
+* #426 If a diff tool is configured in Git (`diff.tool` or `diff.guitool`), you can now open a directory diff in the configured tool from the Commit Details View Control Bar. Note: `diff.tool` is opened via a Visual Studio Code Terminal, whereas `diff.guitool` is opened via a background process.
+* #427 When deleting a branch that is not fully merged, and "Force Delete" is not set on the "Delete Branch" dialog, a new dialog is subsequently shown to allow one-click force deletion, instead of displaying the error message returned by Git.
+* #429 Stashes can be hidden on the Git Graph View by disabling the new extension setting `git-graph.repository.showStashes`. It can be overridden per repository in the Git Graph View's Repository Settings Widget.
+* #452 Explicitly override the Git configuration variable `log.showSignature` to ensure consistent parsing of commits.
+* Significant code and UI improvements.
+
 ## 1.28.0 - 2020-12-01
 * #399 Sign Commits and Tags created by actions in the Git Graph View, by enabling the new extension settings `git-graph.repository.sign.commits` and `git-graph.repository.sign.tags` respectively. This is an alternative to the existing method using Git config (`commit.gpgSign` and `tag.gpgSign`).
 * #406 The keybindings for all Git Graph View keyboard shortcuts can now be configured using new extension settings `git-graph.keyboardShortcut.*`.

README.md

@@ -125,6 +125,7 @@ A summary of the Git Graph extension settings are:
     * **Show Commits Only Referenced By Tags**: Show Commits that are only referenced by tags in Git Graph.
     * **Show Remote Branches**: Show Remote Branches in Git Graph by default.
     * **Show Remote Heads**: Show Remote HEAD Symbolic References in Git Graph.
+    * **Show Stashes**: Show Stashes in Git Graph by default.
     * **Show Tags**: Show Tags in Git Graph by default.
     * **Show Uncommitted Changes**: Show uncommitted changes. If you work on large repositories, disabling this setting can reduce the load time of the Git Graph View.
     * **Show Untracked Files**: Show untracked files when viewing the uncommitted changes. If you work on large repositories, disabling this setting can reduce the load time of the Git Graph View.

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "git-graph",
 	"displayName": "Git Graph",
-	"version": "1.28.0",
+	"version": "1.29.0",
 	"publisher": "mhutchie",
 	"author": {
 		"name": "Michael Hutchison",

src/dataSource.ts

@@ -307,7 +307,7 @@ export class DataSource extends Disposable {
 					branches: branches,
 					diffTool: getConfigValue(consolidatedConfigs, GIT_CONFIG.DIFF.TOOL),
 					guiDiffTool: getConfigValue(consolidatedConfigs, GIT_CONFIG.DIFF.GUI_TOOL),
-					pushDefault: getConfigValue(localConfigs, GIT_CONFIG.REMOTE.PUSH_DEFAULT),
+					pushDefault: getConfigValue(consolidatedConfigs, GIT_CONFIG.REMOTE.PUSH_DEFAULT),
 					remotes: remotes.map((remote) => ({
 						name: remote,
 						url: getConfigValue(localConfigs, 'remote.' + remote + '.url'),
@@ -1344,7 +1344,7 @@ export class DataSource extends Disposable {
 	 * Get the configuration list of a repository.
 	 * @param repo The path of the repository.
 	 * @param location The location of the configuration to be listed.
-	 * @returns A set key-value pairs of Git configuration records.
+	 * @returns A set of key-value pairs of Git configuration records.
 	 */
 	private getConfigList(repo: string, location?: GitConfigLocation): Promise<GitConfigSet> {
 		const args = ['--no-pager', 'config', '--list', '-z', '--includes'];
@@ -1800,6 +1800,11 @@ function removeTrailingBlankLines(lines: string[]) {
 	return lines;
 }
 
+/**
+ * Get all the unique strings from an array of strings.
+ * @param items The array of strings with duplicates.
+ * @returns An array of unique strings.
+ */
 function unique(items: ReadonlyArray<string>) {
 	const uniqueItems: { [item: string]: true } = {};
 	items.forEach((item) => uniqueItems[item] = true);

tests/dataSource.test.ts

@@ -2358,7 +2358,8 @@ describe('DataSource', () => {
 			mockGitSuccessOnce(
 				'user.name\nLocal Name\0' +
 				'diff.tool\nabc\0' +
-				'diff.guitool\ndef\0'
+				'diff.guitool\ndef\0' +
+				'remote.pushdefault\norigin\0'
 			);
 			mockGitSuccessOnce(
 				'user.name\nLocal Name\0' +
@@ -2406,7 +2407,7 @@ describe('DataSource', () => {
 					},
 					diffTool: 'abc',
 					guiDiffTool: 'def',
-					pushDefault: null,
+					pushDefault: 'origin',
 					remotes: [
 						{
 							name: 'origin',

tests/repoManager.test.ts

@@ -1702,81 +1702,81 @@ describe('RepoManager', () => {
 			});
 
 			describe('fileViewType', () => {
-				it('Should export FileViewType.Tree correctly', testApplyField('fileViewType', FileViewType.Tree, 'fileViewType', ExternalRepoConfig.FileViewType.Tree));
-				it('Should export FileViewType.List correctly', testApplyField('fileViewType', FileViewType.List, 'fileViewType', ExternalRepoConfig.FileViewType.List));
+				it('Should import FileViewType.Tree correctly', testApplyField('fileViewType', FileViewType.Tree, 'fileViewType', ExternalRepoConfig.FileViewType.Tree));
+				it('Should import FileViewType.List correctly', testApplyField('fileViewType', FileViewType.List, 'fileViewType', ExternalRepoConfig.FileViewType.List));
 			});
 
 			describe('hideRemotes', () => {
-				it('Should export hideRemotes correctly', testApplyField('hideRemotes', ['origin'], 'hideRemotes', ['origin']));
+				it('Should import hideRemotes correctly', testApplyField('hideRemotes', ['origin'], 'hideRemotes', ['origin']));
 			});
 
 			describe('includeCommitsMentionedByReflogs', () => {
-				it('Should export BooleanOverride.Enabled correctly', testApplyField('includeCommitsMentionedByReflogs', BooleanOverride.Enabled, 'includeCommitsMentionedByReflogs', true));
-				it('Should export BooleanOverride.Disabled correctly', testApplyField('includeCommitsMentionedByReflogs', BooleanOverride.Disabled, 'includeCommitsMentionedByReflogs', false));
+				it('Should import BooleanOverride.Enabled correctly', testApplyField('includeCommitsMentionedByReflogs', BooleanOverride.Enabled, 'includeCommitsMentionedByReflogs', true));
+				it('Should import BooleanOverride.Disabled correctly', testApplyField('includeCommitsMentionedByReflogs', BooleanOverride.Disabled, 'includeCommitsMentionedByReflogs', false));
 			});
 
 			describe('issueLinkingConfig', () => {
-				it('Should export issueLinkingConfig correctly', testApplyField('issueLinkingConfig', { issue: 'x', url: 'y' }, 'issueLinkingConfig', { issue: 'x', url: 'y' }));
+				it('Should import issueLinkingConfig correctly', testApplyField('issueLinkingConfig', { issue: 'x', url: 'y' }, 'issueLinkingConfig', { issue: 'x', url: 'y' }));
 			});
 
 			describe('name', () => {
-				it('Should export name correctly', testApplyField('name', 'Name', 'name', 'Name'));
+				it('Should import name correctly', testApplyField('name', 'Name', 'name', 'Name'));
 			});
 
 			describe('onlyFollowFirstParent', () => {
-				it('Should export BooleanOverride.Enabled correctly', testApplyField('onlyFollowFirstParent', BooleanOverride.Enabled, 'onlyFollowFirstParent', true));
-				it('Should export BooleanOverride.Disabled correctly', testApplyField('onlyFollowFirstParent', BooleanOverride.Disabled, 'onlyFollowFirstParent', false));
+				it('Should import BooleanOverride.Enabled correctly', testApplyField('onlyFollowFirstParent', BooleanOverride.Enabled, 'onlyFollowFirstParent', true));
+				it('Should import BooleanOverride.Disabled correctly', testApplyField('onlyFollowFirstParent', BooleanOverride.Disabled, 'onlyFollowFirstParent', false));
 			});
 
 			describe('onRepoLoadShowCheckedOutBranch', () => {
-				it('Should export BooleanOverride.Enabled correctly', testApplyField('onRepoLoadShowCheckedOutBranch', BooleanOverride.Enabled, 'onRepoLoadShowCheckedOutBranch', true));
-				it('Should export BooleanOverride.Disabled correctly', testApplyField('onRepoLoadShowCheckedOutBranch', BooleanOverride.Disabled, 'onRepoLoadShowCheckedOutBranch', false));
+				it('Should import BooleanOverride.Enabled correctly', testApplyField('onRepoLoadShowCheckedOutBranch', BooleanOverride.Enabled, 'onRepoLoadShowCheckedOutBranch', true));
+				it('Should import BooleanOverride.Disabled correctly', testApplyField('onRepoLoadShowCheckedOutBranch', BooleanOverride.Disabled, 'onRepoLoadShowCheckedOutBranch', false));
 			});
 
 			describe('onRepoLoadShowSpecificBranches', () => {
-				it('Should export onRepoLoadShowSpecificBranches correctly', testApplyField('onRepoLoadShowSpecificBranches', ['master'], 'onRepoLoadShowSpecificBranches', ['master']));
+				it('Should import onRepoLoadShowSpecificBranches correctly', testApplyField('onRepoLoadShowSpecificBranches', ['master'], 'onRepoLoadShowSpecificBranches', ['master']));
 			});
 
 			describe('pullRequestConfig', () => {
-				it('Should export a Bitbucket config correctly', testApplyField(
+				it('Should import a Bitbucket config correctly', testApplyField(
 					'pullRequestConfig', { provider: PullRequestProvider.Bitbucket, custom: null, hostRootUrl: 'a', sourceRemote: 'b', sourceOwner: 'c', sourceRepo: 'd', destRemote: 'e', destOwner: 'f', destRepo: 'g', destProjectId: 'h', destBranch: 'i' },
 					'pullRequestConfig', { provider: ExternalRepoConfig.PullRequestProvider.Bitbucket, custom: null, hostRootUrl: 'a', sourceRemote: 'b', sourceOwner: 'c', sourceRepo: 'd', destRemote: 'e', destOwner: 'f', destRepo: 'g', destProjectId: 'h', destBranch: 'i' }
 				));
 
-				it('Should export a Custom config correctly', testApplyField(
+				it('Should import a Custom config correctly', testApplyField(
 					'pullRequestConfig', { provider: PullRequestProvider.Custom, custom: { name: 'Name', templateUrl: '$1/$2/$3/$4/$5/$6/$8' }, hostRootUrl: 'a', sourceRemote: 'b', sourceOwner: 'c', sourceRepo: 'd', destRemote: 'e', destOwner: 'f', destRepo: 'g', destProjectId: 'h', destBranch: 'i' },
 					'pullRequestConfig', { provider: ExternalRepoConfig.PullRequestProvider.Custom, custom: { name: 'Name', templateUrl: '$1/$2/$3/$4/$5/$6/$8' }, hostRootUrl: 'a', sourceRemote: 'b', sourceOwner: 'c', sourceRepo: 'd', destRemote: 'e', destOwner: 'f', destRepo: 'g', destProjectId: 'h', destBranch: 'i' }
 				));
 
-				it('Should export a GitHub config correctly', testApplyField(
+				it('Should import a GitHub config correctly', testApplyField(
 					'pullRequestConfig', { provider: PullRequestProvider.GitHub, custom: null, hostRootUrl: 'a', sourceRemote: 'b', sourceOwner: 'c', sourceRepo: 'd', destRemote: 'e', destOwner: 'f', destRepo: 'g', destProjectId: 'h', destBranch: 'i' },
 					'pullRequestConfig', { provider: ExternalRepoConfig.PullRequestProvider.GitHub, custom: null, hostRootUrl: 'a', sourceRemote: 'b', sourceOwner: 'c', sourceRepo: 'd', destRemote: 'e', destOwner: 'f', destRepo: 'g', destProjectId: 'h', destBranch: 'i' }
 				));
 
-				it('Should export a GitLab config correctly', testApplyField(
+				it('Should import a GitLab config correctly', testApplyField(
 					'pullRequestConfig', { provider: PullRequestProvider.GitLab, custom: null, hostRootUrl: 'a', sourceRemote: 'b', sourceOwner: 'c', sourceRepo: 'd', destRemote: 'e', destOwner: 'f', destRepo: 'g', destProjectId: 'h', destBranch: 'i' },
 					'pullRequestConfig', { provider: ExternalRepoConfig.PullRequestProvider.GitLab, custom: null, hostRootUrl: 'a', sourceRemote: 'b', sourceOwner: 'c', sourceRepo: 'd', destRemote: 'e', destOwner: 'f', destRepo: 'g', destProjectId: 'h', destBranch: 'i' }
 				));
 
-				it('Should export a GitHub config with no destination remote correctly', testApplyField(
+				it('Should import a GitHub config with no destination remote correctly', testApplyField(
 					'pullRequestConfig', { provider: PullRequestProvider.GitHub, custom: null, hostRootUrl: 'a', sourceRemote: 'b', sourceOwner: 'c', sourceRepo: 'd', destRemote: null, destOwner: 'f', destRepo: 'g', destProjectId: 'h', destBranch: 'i' },
 					'pullRequestConfig', { provider: ExternalRepoConfig.PullRequestProvider.GitHub, custom: null, hostRootUrl: 'a', sourceRemote: 'b', sourceOwner: 'c', sourceRepo: 'd', destRemote: null, destOwner: 'f', destRepo: 'g', destProjectId: 'h', destBranch: 'i' }
 				));
 			});
 
 			describe('showRemoteBranches', () => {
-				it('Should export BooleanOverride.Enabled correctly', testApplyField('showRemoteBranchesV2', BooleanOverride.Enabled, 'showRemoteBranches', true));
-				it('Should export BooleanOverride.Disabled correctly', testApplyField('showRemoteBranchesV2', BooleanOverride.Disabled, 'showRemoteBranches', false));
+				it('Should import BooleanOverride.Enabled correctly', testApplyField('showRemoteBranchesV2', BooleanOverride.Enabled, 'showRemoteBranches', true));
+				it('Should import BooleanOverride.Disabled correctly', testApplyField('showRemoteBranchesV2', BooleanOverride.Disabled, 'showRemoteBranches', false));
 			});
 
 			describe('showStashes', () => {
-				it('Should export BooleanOverride.Enabled correctly', testApplyField('showStashes', BooleanOverride.Enabled, 'showStashes', true));
-				it('Should export BooleanOverride.Disabled correctly', testApplyField('showStashes', BooleanOverride.Disabled, 'showStashes', false));
+				it('Should import BooleanOverride.Enabled correctly', testApplyField('showStashes', BooleanOverride.Enabled, 'showStashes', true));
+				it('Should import BooleanOverride.Disabled correctly', testApplyField('showStashes', BooleanOverride.Disabled, 'showStashes', false));
 			});
 
 			describe('showTags', () => {
-				it('Should export BooleanOverride.Enabled correctly', testApplyField('showTags', BooleanOverride.Enabled, 'showTags', true));
-				it('Should export BooleanOverride.Disabled correctly', testApplyField('showTags', BooleanOverride.Disabled, 'showTags', false));
+				it('Should import BooleanOverride.Enabled correctly', testApplyField('showTags', BooleanOverride.Enabled, 'showTags', true));
+				it('Should import BooleanOverride.Disabled correctly', testApplyField('showTags', BooleanOverride.Disabled, 'showTags', false));
 			});
 		});
 

web/dropdown.ts

@@ -145,14 +145,6 @@ class Dropdown {
 			// Select the option with the specified value
 			this.optionsSelected[optionIndex] = true;
 
-			if (this.optionsSelected.slice(1).every((selected) => selected)) {
-				// All options are selected, so simplify selected items to just be "Show All"
-				this.optionsSelected[0] = true;
-				for (let i = 1; i < this.optionsSelected.length; i++) {
-					this.optionsSelected[i] = false;
-				}
-			}
-
 			// A change has occurred, re-render the dropdown options
 			const menuScroll = this.menuElem.scrollTop;
 			this.render();

web/findWidget.ts

@@ -394,9 +394,7 @@ class FindWidget {
 		if (workspaceState.findOpenCommitDetailsView) {
 			const commitHash = this.getCurrentHash();
 			if (commitHash !== null && !this.view.isCdvOpen(commitHash, null)) {
-				const commitId = this.view.getCommitId(commitHash);
-				const commitElems = getCommitElems();
-				const commitElem = findCommitElemWithId(commitElems, commitId);
+				const commitElem = findCommitElemWithId(getCommitElems(), this.view.getCommitId(commitHash));
 				if (commitElem !== null) {
 					this.view.loadCommitDetails(commitElem);
 				}

web/main.ts

@@ -2611,14 +2611,14 @@ class GitGraphView {
 			if (externalDiffPossible) {
 				document.getElementById('cdvExternalDiff')!.addEventListener('click', () => {
 					const expandedCommit = this.expandedCommit;
-					if (expandedCommit === null) return;
+					if (expandedCommit === null || this.gitConfig === null || (this.gitConfig.diffTool === null && this.gitConfig.guiDiffTool === null)) return;
 					const commitOrder = this.getCommitOrder(expandedCommit.commitHash, expandedCommit.compareWithHash === null ? expandedCommit.commitHash : expandedCommit.compareWithHash);
 					runAction({
 						command: 'openExternalDirDiff',
 						repo: this.currentRepo,
 						fromHash: commitOrder.from,
 						toHash: commitOrder.to,
-						isGui: this.gitConfig !== null && this.gitConfig.guiDiffTool !== null
+						isGui: this.gitConfig.guiDiffTool !== null
 					}, 'Opening External Directory Diff');
 				});
 			}
@@ -2969,7 +2969,7 @@ class GitGraphView {
 		const externalDiffBtnElem = document.getElementById('cdvExternalDiff');
 		if (externalDiffBtnElem === null) return;
 
-		alterClass(externalDiffBtnElem, CLASS_DISABLED, this.gitConfig === null || (this.gitConfig.diffTool === null && this.gitConfig.guiDiffTool === null));
+		alterClass(externalDiffBtnElem, CLASS_ENABLED, this.gitConfig !== null && (this.gitConfig.diffTool !== null || this.gitConfig.guiDiffTool !== null));
 		const toolName = this.gitConfig !== null
 			? this.gitConfig.guiDiffTool !== null
 				? this.gitConfig.guiDiffTool

web/styles/main.css

@@ -356,9 +356,12 @@ body.selection-background-color-exists ::selection{
 	background-color:rgba(128,128,128,0.125);
 }
 
-#cdvExternalDiff.disabled{
+#cdvExternalDiff{
 	display:none;
 }
+#cdvExternalDiff.enabled{
+	display:block;
+}
 
 .cdvControlBtn svg{
 	position:absolute;