Merge branch 'main' into main

Author: mogelbrod

.devcontainer/devcontainer.json

@@ -0,0 +1,22 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
+{
+	"name": "Node.js & TypeScript",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/typescript-node:1-20-bullseye"
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "yarn install",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

CHANGELOG.md

@@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+### Added
+
+- Adds a _Refresh_ action to the _Commit Details_ view
+
+### Fixed
+
+- Fixes [#2850](https://github.com/gitkraken/vscode-gitlens/issues/2850) - For custom remotes, the URL resulting from the branches is truncated
+- Fixes [#2841](https://github.com/gitkraken/vscode-gitlens/issues/2841) - Error when trying to browse commits
+- Fixes [#2847](https://github.com/gitkraken/vscode-gitlens/issues/2847) - 14.2.0 Breaks "pull" action works fine in 14.1.1
+
 ## [14.2.0] - 2023-08-04
 
 ### Added

ThirdPartyNotices.txt

@@ -7,15 +7,15 @@ This project incorporates components from the projects listed below.
 2. @microsoft/fast-react-wrapper version 0.3.18 (https://github.com/Microsoft/fast)
 3. @octokit/core version 4.2.4 (https://github.com/octokit/core.js)
 4. @opentelemetry/api version 1.4.1 (https://github.com/open-telemetry/opentelemetry-js)
-5. @opentelemetry/exporter-trace-otlp-http version 0.41.1 (https://github.com/open-telemetry/opentelemetry-js)
-6. @opentelemetry/sdk-trace-base version 1.15.1 (https://github.com/open-telemetry/opentelemetry-js)
+5. @opentelemetry/exporter-trace-otlp-http version 0.41.2 (https://github.com/open-telemetry/opentelemetry-js)
+6. @opentelemetry/sdk-trace-base version 1.15.2 (https://github.com/open-telemetry/opentelemetry-js)
 7. @vscode/codicons version 0.0.33 (https://github.com/microsoft/vscode-codicons)
 8. @vscode/webview-ui-toolkit version 1.2.2 (https://github.com/microsoft/vscode-webview-ui-toolkit)
 9. ansi-regex version 6.0.1 (https://github.com/chalk/ansi-regex)
-10. billboard.js version 3.9.1 (https://github.com/naver/billboard.js)
+10. billboard.js version 3.9.3 (https://github.com/naver/billboard.js)
 11. https-proxy-agent version 5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent)
 12. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite)
-13. lit version 2.7.6 (https://github.com/lit/lit)
+13. lit version 2.8.0 (https://github.com/lit/lit)
 14. microsoft/vscode (https://github.com/microsoft/vscode)
 15. node-fetch version 2.6.9 (https://github.com/bitinn/node-fetch)
 16. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify)

package.json

@@ -66,41 +66,41 @@
 		"configuration": [
 			{
 				"id": "current-line-blame",
-				"title": "Current Line Blame",
+				"title": "Inline Blame",
 				"order": 10,
 				"properties": {
 					"gitlens.currentLine.enabled": {
 						"type": "boolean",
 						"default": true,
-						"markdownDescription": "Specifies whether to provide a blame annotation for the current line, by default. Use the `Toggle Line Blame Annotations` command (`gitlens.toggleLineBlame`) to toggle the annotations on and off for the current window",
+						"markdownDescription": "Specifies whether to provide an inline blame annotation for the current line, by default. Use the `Toggle Line Blame Annotations` command (`gitlens.toggleLineBlame`) to toggle the annotations on and off for the current window",
 						"scope": "window",
 						"order": 10
 					},
 					"gitlens.currentLine.pullRequests.enabled": {
 						"type": "boolean",
 						"default": true,
-						"markdownDescription": "Specifies whether to provide information about the Pull Request (if any) that introduced the commit in the current line blame annotation. Requires a connection to a supported remote service (e.g. GitHub)",
+						"markdownDescription": "Specifies whether to provide information about the Pull Request (if any) that introduced the commit in the inline blame annotation. Requires a connection to a supported remote service (e.g. GitHub)",
 						"scope": "window",
 						"order": 20
 					},
 					"gitlens.currentLine.format": {
 						"type": "string",
 						"default": "${author, }${agoOrDate}${' via 'pullRequest}${ • message|50?}",
-						"markdownDescription": "Specifies the format of the current line blame annotation. See [_Commit Tokens_](https://github.com/gitkraken/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs. Date formatting is controlled by the `#gitlens.currentLine.dateFormat#` setting",
+						"markdownDescription": "Specifies the format of the inline blame annotation. See [_Commit Tokens_](https://github.com/gitkraken/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs. Date formatting is controlled by the `#gitlens.currentLine.dateFormat#` setting",
 						"scope": "window",
 						"order": 30
 					},
 					"gitlens.currentLine.uncommittedChangesFormat": {
 						"type": "string",
 						"default": null,
-						"markdownDescription": "Specifies the uncommitted changes format of the current line blame annotation. See [_Commit Tokens_](https://github.com/gitkraken/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs. Date formatting is controlled by the `#gitlens.currentLine.dateFormat#` setting.\n\n**NOTE**: Setting this to an empty string will disable current line blame annotations for uncommitted changes.",
+						"markdownDescription": "Specifies the uncommitted changes format of the inline blame annotation. See [_Commit Tokens_](https://github.com/gitkraken/vscode-gitlens/wiki/Custom-Formatting#commit-tokens) in the GitLens docs. Date formatting is controlled by the `#gitlens.currentLine.dateFormat#` setting.\n\n**NOTE**: Setting this to an empty string will disable inline blame annotations for uncommitted changes.",
 						"scope": "window",
 						"order": 31
 					},
 					"gitlens.currentLine.scrollable": {
 						"type": "boolean",
 						"default": true,
-						"markdownDescription": "Specifies whether the current line blame annotation can be scrolled into view when it is outside the viewport. **NOTE**: Setting this to `false` will inhibit the hovers from showing over the annotation; Set `#gitlens.hovers.currentLine.over#` to `line` to enable the hovers to show anywhere over the line.",
+						"markdownDescription": "Specifies whether the inline blame annotation can be scrolled into view when it is outside the viewport. **NOTE**: Setting this to `false` will inhibit the hovers from showing over the annotation; Set `#gitlens.hovers.currentLine.over#` to `line` to enable the hovers to show anywhere over the line.",
 						"scope": "window",
 						"order": 40
 					},
@@ -110,7 +110,7 @@
 							"null"
 						],
 						"default": null,
-						"markdownDescription": "Specifies how to format absolute dates (e.g. using the `${date}` token) for the current line blame annotation. See the [Moment.js docs](https://momentjs.com/docs/#/displaying/format/) for supported formats",
+						"markdownDescription": "Specifies how to format absolute dates (e.g. using the `${date}` token) for the cinline blame annotation. See the [Moment.js docs](https://momentjs.com/docs/#/displaying/format/) for supported formats",
 						"scope": "window",
 						"order": 50
 					}
@@ -3444,7 +3444,7 @@
 									},
 									"currentLine": {
 										"type": "boolean",
-										"description": "Specifies whether to show a blame annotation for the current line when this user-defined mode is active"
+										"description": "Specifies whether to show an inline blame annotation for the current line when this user-defined mode is active"
 									},
 									"hovers": {
 										"type": "boolean",
@@ -3477,7 +3477,7 @@
 									},
 									"currentLine": {
 										"type": "boolean",
-										"description": "Specifies whether to show a blame annotation for the current line when this user-defined mode is active"
+										"description": "Specifies whether to show an inline blame annotation for the current line when this user-defined mode is active"
 									},
 									"hovers": {
 										"type": "boolean",
@@ -3528,7 +3528,7 @@
 								},
 								"currentLine": {
 									"type": "boolean",
-									"description": "Specifies whether to show a blame annotation for the current line when this user-defined mode is active"
+									"description": "Specifies whether to show an inline blame annotation for the current line when this user-defined mode is active"
 								},
 								"hovers": {
 									"type": "boolean",
@@ -3831,6 +3831,13 @@
 						"scope": "window",
 						"order": 110
 					},
+					"gitlens.experimental.nativeGit": {
+						"type": "boolean",
+						"default": false,
+						"markdownDescription": "(Experimental) Specifies whether to use Git directly for fetch/push/pull operation instead of relying on VS Code's built-in Git implementation",
+						"scope": "window",
+						"order": 120
+					},
 					"gitlens.advanced.useSymmetricDifferenceNotation": {
 						"deprecationMessage": "Deprecated. This setting is no longer used",
 						"markdownDescription": "Deprecated. This setting is no longer used"
@@ -4017,7 +4024,7 @@
 			},
 			{
 				"id": "gitlens.trailingLineBackgroundColor",
-				"description": "Specifies the background color of the blame annotation for the current line",
+				"description": "Specifies the background color of the inline blame annotation for the current line",
 				"defaults": {
 					"dark": "#00000000",
 					"light": "#00000000",
@@ -4026,7 +4033,7 @@
 			},
 			{
 				"id": "gitlens.trailingLineForegroundColor",
-				"description": "Specifies the foreground color of the blame annotation for the current line",
+				"description": "Specifies the foreground color of the inline blame annotation for the current line",
 				"defaults": {
 					"dark": "#99999959",
 					"light": "#99999959",
@@ -6280,6 +6287,12 @@
 				"title": "Hide Branch Pull Requests",
 				"category": "GitLens"
 			},
+			{
+				"command": "gitlens.views.commitDetails.refresh",
+				"title": "Refresh",
+				"category": "GitLens",
+				"icon": "$(refresh)"
+			},
 			{
 				"command": "gitlens.views.commits.copy",
 				"title": "Copy",
@@ -6485,6 +6498,12 @@
 				"title": "Hide Avatars",
 				"category": "GitLens"
 			},
+			{
+				"command": "gitlens.views.graphDetails.refresh",
+				"title": "Refresh",
+				"category": "GitLens",
+				"icon": "$(refresh)"
+			},
 			{
 				"command": "gitlens.views.home.refresh",
 				"title": "Refresh",
@@ -9075,6 +9094,10 @@
 					"command": "gitlens.views.branches.setShowBranchPullRequestOff",
 					"when": "false"
 				},
+				{
+					"command": "gitlens.views.commitDetails.refresh",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.views.commits.copy",
 					"when": "false"
@@ -9223,6 +9246,10 @@
 					"command": "gitlens.views.fileHistory.setShowAvatarsOff",
 					"when": "false"
 				},
+				{
+					"command": "gitlens.views.graphDetails.refresh",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.views.home.refresh",
 					"when": "false"
@@ -10590,6 +10617,11 @@
 					"when": "view =~ /^gitlens\\.views\\.commits/ && gitlens:plus:enabled",
 					"group": "navigation@11"
 				},
+				{
+					"command": "gitlens.views.commitDetails.refresh",
+					"when": "view =~ /^gitlens\\.views\\.commitDetails/",
+					"group": "navigation@99"
+				},
 				{
 					"command": "gitlens.views.commits.setMyCommitsOnlyOff",
 					"when": "view =~ /^gitlens\\.views\\.commits/ && gitlens:views:commits:myCommitsOnly",
@@ -10785,6 +10817,11 @@
 					"when": "view =~ /^gitlens\\.views\\.fileHistory/ && config.gitlens.views.fileHistory.avatars",
 					"group": "5_gitlens@0"
 				},
+				{
+					"command": "gitlens.views.graphDetails.refresh",
+					"when": "view =~ /^gitlens\\.views\\.graphDetails/",
+					"group": "navigation@99"
+				},
 				{
 					"command": "gitlens.views.home.refresh",
 					"when": "view =~ /^gitlens\\.views\\.home/",
@@ -14714,21 +14751,21 @@
 		"vscode:prepublish": "yarn run bundle"
 	},
 	"dependencies": {
-		"@gitkraken/gitkraken-components": "10.1.9",
+		"@gitkraken/gitkraken-components": "10.1.12",
 		"@gitkraken/shared-web-components": "^0.1.1-rc.6",
 		"@microsoft/fast-element": "1.12.0",
 		"@microsoft/fast-react-wrapper": "0.3.18",
 		"@octokit/core": "4.2.4",
 		"@opentelemetry/api": "1.4.1",
-		"@opentelemetry/exporter-trace-otlp-http": "0.41.1",
-		"@opentelemetry/sdk-trace-base": "1.15.1",
+		"@opentelemetry/exporter-trace-otlp-http": "0.41.2",
+		"@opentelemetry/sdk-trace-base": "1.15.2",
 		"@vscode/codicons": "0.0.33",
 		"@vscode/webview-ui-toolkit": "1.2.2",
 		"ansi-regex": "6.0.1",
-		"billboard.js": "3.9.1",
+		"billboard.js": "3.9.3",
 		"https-proxy-agent": "5.0.1",
 		"iconv-lite": "0.6.3",
-		"lit": "2.7.6",
+		"lit": "2.8.0",
 		"node-fetch": "2.6.9",
 		"os-browserify": "0.3.0",
 		"path-browserify": "1.0.1",
@@ -14743,11 +14780,11 @@
 		"@types/react-dom": "17.0.17",
 		"@types/sortablejs": "1.15.1",
 		"@types/vscode": "1.78.1",
-		"@typescript-eslint/eslint-plugin": "6.2.1",
-		"@typescript-eslint/parser": "6.2.1",
+		"@typescript-eslint/eslint-plugin": "6.3.0",
+		"@typescript-eslint/parser": "6.3.0",
 		"@vscode/test-electron": "2.3.4",
 		"@vscode/test-web": "0.0.44",
-		"@vscode/vsce": "2.20.0",
+		"@vscode/vsce": "2.20.1",
 		"circular-dependency-plugin": "5.2.2",
 		"clean-webpack-plugin": "4.0.0",
 		"concurrently": "8.2.0",
@@ -14756,16 +14793,16 @@
 		"css-loader": "6.8.1",
 		"css-minimizer-webpack-plugin": "5.0.1",
 		"cssnano-preset-advanced": "6.0.1",
-		"esbuild": "0.17.19",
-		"esbuild-loader": "3.0.1",
+		"esbuild": "0.19.0",
+		"esbuild-loader": "4.0.0",
 		"esbuild-sass-plugin": "2.10.0",
 		"eslint": "8.46.0",
 		"eslint-cli": "1.1.1",
-		"eslint-config-prettier": "8.9.0",
-		"eslint-import-resolver-typescript": "3.5.5",
+		"eslint-config-prettier": "9.0.0",
+		"eslint-import-resolver-typescript": "3.6.0",
 		"eslint-plugin-anti-trojan-source": "1.1.1",
 		"eslint-plugin-import": "2.28.0",
-		"eslint-plugin-lit": "1.8.3",
+		"eslint-plugin-lit": "1.9.1",
 		"eslint-plugin-wc": "1.5.0",
 		"fantasticon": "1.2.3",
 		"fork-ts-checker-webpack-plugin": "6.5.3",
@@ -14777,16 +14814,16 @@
 		"lz-string": "1.5.0",
 		"mini-css-extract-plugin": "2.7.6",
 		"mocha": "10.2.0",
-		"prettier": "3.0.0",
-		"sass": "1.64.2",
+		"prettier": "3.0.1",
+		"sass": "1.65.0",
 		"sass-loader": "13.3.2",
 		"schema-utils": "4.2.0",
 		"sharp": "0.32.4",
 		"svgo": "3.0.2",
 		"terser-webpack-plugin": "5.3.9",
 		"ts-loader": "9.4.4",
 		"tsc-alias": "1.8.7",
-		"typescript": "5.2.0-beta",
+		"typescript": "5.2.1-rc",
 		"webpack": "5.88.2",
 		"webpack-bundle-analyzer": "4.9.0",
 		"webpack-cli": "5.1.4",

src/codelens/codeLensProvider.ts

@@ -31,6 +31,7 @@ import { configuration } from '../system/configuration';
 import { is, once } from '../system/function';
 import { filterMap, find, first, join, map } from '../system/iterable';
 import { Logger } from '../system/logger';
+import { pluralize } from '../system/string';
 import { isVirtualUri } from '../system/utils';
 
 class GitRecentChangeCodeLens extends CodeLens {
@@ -477,10 +478,10 @@ export class GitCodeLensProvider implements CodeLensProvider {
 
 	private resolveGitRecentChangeCodeLens(lens: GitRecentChangeCodeLens, _token: CancellationToken): CodeLens {
 		const blame = lens.getBlame();
-		if (blame == null) return lens;
+		if (blame == null) return applyCommandWithNoClickAction('Unknown, (Blame failed)', lens);
 
 		const recentCommit = first(blame.commits.values());
-		if (recentCommit == null) return lens;
+		if (recentCommit == null) return applyCommandWithNoClickAction('Unknown, (Blame failed)', lens);
 
 		// TODO@eamodio This is FAR too expensive, but this accounts for commits that delete lines -- is there another way?
 		// if (lens.uri != null) {
@@ -553,12 +554,12 @@ export class GitCodeLensProvider implements CodeLensProvider {
 
 	private resolveGitAuthorsCodeLens(lens: GitAuthorsCodeLens, _token: CancellationToken): CodeLens {
 		const blame = lens.getBlame();
-		if (blame == null) return lens;
+		if (blame == null) return applyCommandWithNoClickAction('? authors (Blame failed)', lens);
 
 		const count = blame.authors.size;
 		const author = first(blame.authors.values())?.name ?? 'Unknown';
 
-		let title = `${count} ${count > 1 ? 'authors' : 'author'} (${author}${count > 1 ? ' and others' : ''})`;
+		let title = `${pluralize('author', count, { zero: '?' })} (${author}${count > 1 ? ' and others' : ''})`;
 		if (configuration.get('debug')) {
 			title += ` [${lens.languageId}: ${SymbolKind[lens.symbol.kind]}(${lens.range.start.character}-${
 				lens.range.end.character
@@ -577,7 +578,7 @@ export class GitCodeLensProvider implements CodeLensProvider {
 		}
 
 		const commit = find(blame.commits.values(), c => c.author.name === author) ?? first(blame.commits.values());
-		if (commit == null) return lens;
+		if (commit == null) return applyCommandWithNoClickAction(title, lens);
 
 		switch (lens.desiredCommand) {
 			case CodeLensCommand.CopyRemoteCommitUrl: