Merge branch 'main' into main

Author: mogelbrod

.vscode/tasks.json

@@ -20,18 +20,13 @@
 			"type": "npm",
 			"script": "build",
 			"group": "build",
-			"problemMatcher": [
-				"$ts-checker-webpack",
-				"$ts-checker-eslint-webpack"
-			]
+			"problemMatcher": ["$ts-checker-webpack", "$ts-checker-eslint-webpack"]
 		},
 		{
 			"type": "npm",
 			"script": "lint",
 			"group": "build",
-			"problemMatcher": [
-				"$eslint-stylish"
-			]
+			"problemMatcher": ["$eslint-stylish"]
 		},
 		{
 			"type": "npm",
@@ -44,10 +39,7 @@
 			"presentation": {
 				"group": "watchers"
 			},
-			"problemMatcher": [
-				"$ts-checker-webpack-watch",
-				"$ts-checker-eslint-webpack-watch"
-			]
+			"problemMatcher": ["$ts-checker-webpack-watch", "$ts-checker-eslint-webpack-watch"]
 		},
 		{
 			"label": "Run (local web)",

CHANGELOG.md

@@ -6,9 +6,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+## [14.2.0] - 2023-08-04
+
 ### Added
 
-- Improve  support for opening files from other branches — thanks to [PR #2825](https://github.com/gitkraken/vscode-gitlens/pull/2825) by Victor Hallberg ([@mogelbrod](https://github.com/mogelbrod))
+- Improves the _Focus_ view experience
+  - Unifies pull requests and issues into a single view
+  - Adds tabs to switch between showing Pull Requests, Issues, or All
+  - Adds a filter/search box to quickly find pull request or issues by title
+  - Adds ability to click on a branch name to show the branch on the _Commit Graph_
+- Adds a new command _Open Changed & Close Unchanged Files..._ to the command palette, the context menu of the _Commit Graph_ work-in-progress (WIP) row, and the SCM group context menu to open all changed files and close all unchanged files.
+- Adds a new command _Reset Current Branch to Tip..._ to branch context menus in the _Commit Graph_ and in GitLens views to reset the current branch to the commit at the chosen branch's tip.
+- Improve support for opening files from other branches — thanks to [PR #2825](https://github.com/gitkraken/vscode-gitlens/pull/2825) by Victor Hallberg ([@mogelbrod](https://github.com/mogelbrod))
   - Open any file using new _Open File by Revision..._ command
   - Improve _Open File at Revision..._ commands by prompting user for file to open when the requested path doesn't exist in the specified revision
 
@@ -21,6 +30,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ### Fixed
 
 - Fixes [#2823](https://github.com/gitkraken/vscode-gitlens/issues/2823) - Handle stdout/stderr Buffers in shell run() — thanks to [PR #2824](https://github.com/gitkraken/vscode-gitlens/pull/2824) by Victor Hallberg ([@mogelbrod](https://github.com/mogelbrod))
+- Fixes issues with missing worktrees breaking the Worktrees view and Worktree quick pick menus
 
 ## [14.1.1] - 2023-07-18
 
@@ -4895,7 +4905,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Initial release but still heavily a work in progress.
 
-[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v14.1.1...HEAD
+[unreleased]: https://github.com/gitkraken/vscode-gitlens/compare/v14.2.0...HEAD
+[14.2.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.1.1...gitkraken:v14.2.0
 [14.1.1]: https://github.com/gitkraken/vscode-gitlens/compare/v14.1.0...gitkraken:v14.1.1
 [14.1.0]: https://github.com/gitkraken/vscode-gitlens/compare/v14.0.1...gitkraken:v14.1.0
 [14.0.1]: https://github.com/gitkraken/vscode-gitlens/compare/v14.0.0...gitkraken:v14.0.1

ThirdPartyNotices.txt

@@ -7,12 +7,12 @@ 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.0 (https://github.com/open-telemetry/opentelemetry-js)
-6. @opentelemetry/sdk-trace-base version 1.15.0 (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)
 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.0 (https://github.com/naver/billboard.js)
+10. billboard.js version 3.9.1 (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)

package.json

@@ -2,7 +2,7 @@
 	"name": "gitlens",
 	"displayName": "GitLens — Git supercharged",
 	"description": "Supercharge Git within VS Code — Visualize code authorship at a glance via Git blame annotations and CodeLens, seamlessly navigate and explore Git repositories, gain valuable insights via rich visualizations and powerful comparison commands, and so much more",
-	"version": "14.1.1",
+	"version": "14.2.0",
 	"engines": {
 		"vscode": "^1.78.0"
 	},
@@ -4268,14 +4268,23 @@
 				}
 			},
 			{
-				"id": "gitlens.decorations.worktreeView.hasUncommittedChangesForegroundColor",
+				"id": "gitlens.decorations.worktreeHasUncommittedChangesForegroundColor",
 				"description": "Specifies the decoration foreground color for worktrees that have uncommitted changes",
 				"defaults": {
 					"light": "#895503",
 					"dark": "#E2C08D",
 					"highContrast": "#E2C08D"
 				}
 			},
+			{
+				"id": "gitlens.decorations.worktreeMissingForegroundColor",
+				"description": "Specifies the decoration foreground color for worktrees cannot be found on disk",
+				"defaults": {
+					"light": "#ad0707",
+					"dark": "#c74e39",
+					"highContrast": "#c74e39"
+				}
+			},
 			{
 				"id": "gitlens.graphLane1Color",
 				"description": "Specifies the color for the first commit lane of the _Commit Graph_ visualization",
@@ -5279,6 +5288,11 @@
 				"title": "Open Changed Files",
 				"category": "GitLens"
 			},
+			{
+				"command": "gitlens.openOnlyChangedFiles",
+				"title": "Open Changed & Close Unchanged Files",
+				"category": "GitLens"
+			},
 			{
 				"command": "gitlens.openBranchesOnRemote",
 				"title": "Open Branches on Remote",
@@ -5873,6 +5887,11 @@
 				"title": "Open Files at Revision",
 				"category": "GitLens"
 			},
+			{
+				"command": "gitlens.views.openOnlyChangedFiles",
+				"title": "Open Changed & Close Unchanged Files",
+				"category": "GitLens"
+			},
 			{
 				"command": "gitlens.views.applyChanges",
 				"title": "Apply Changes",
@@ -6097,6 +6116,12 @@
 				"category": "GitLens",
 				"enablement": "!operationInProgress"
 			},
+			{
+				"command": "gitlens.views.resetToTip",
+				"title": "Reset Current Branch to Tip...",
+				"category": "GitLens",
+				"enablement": "!operationInProgress"
+			},
 			{
 				"command": "gitlens.views.revert",
 				"title": "Revert Commit...",
@@ -7324,6 +7349,12 @@
 				"category": "GitLens",
 				"enablement": "!operationInProgress"
 			},
+			{
+				"command": "gitlens.graph.resetToTip",
+				"title": "Reset Current Branch to Tip...",
+				"category": "GitLens",
+				"enablement": "!operationInProgress"
+			},
 			{
 				"command": "gitlens.graph.revert",
 				"title": "Revert Commit...",
@@ -7454,6 +7485,11 @@
 				"title": "Open Files at Revision",
 				"category": "GitLens"
 			},
+			{
+				"command": "gitlens.graph.openOnlyChangedFiles",
+				"title": "Open Changed & Close Unchanged Files",
+				"category": "GitLens"
+			},
 			{
 				"command": "gitlens.graph.addAuthor",
 				"title": "Add as Co-author",
@@ -8391,6 +8427,10 @@
 					"command": "gitlens.openChangedFiles",
 					"when": "gitlens:enabled"
 				},
+				{
+					"command": "gitlens.openOnlyChangedFiles",
+					"when": "gitlens:enabled"
+				},
 				{
 					"command": "gitlens.openBranchesOnRemote",
 					"when": "gitlens:hasRemotes"
@@ -8767,6 +8807,10 @@
 					"command": "gitlens.views.openChangedFileRevisions",
 					"when": "false"
 				},
+				{
+					"command": "gitlens.views.openOnlyChangedFiles",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.views.applyChanges",
 					"when": "false"
@@ -8899,6 +8943,10 @@
 					"command": "gitlens.views.resetToCommit",
 					"when": "false"
 				},
+				{
+					"command": "gitlens.views.resetToTip",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.views.revert",
 					"when": "false"
@@ -9775,6 +9823,10 @@
 					"command": "gitlens.graph.resetToCommit",
 					"when": "false"
 				},
+				{
+					"command": "gitlens.graph.resetToTip",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.graph.revert",
 					"when": "false"
@@ -9859,6 +9911,10 @@
 					"command": "gitlens.graph.openChangedFileRevisions",
 					"when": "false"
 				},
+				{
+					"command": "gitlens.graph.openOnlyChangedFiles",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.graph.addAuthor",
 					"when": "false"
@@ -10228,7 +10284,7 @@
 				},
 				{
 					"command": "gitlens.focus.refresh",
-					"when": "gitlens:focus:focused",
+					"when": "gitlens:webview:focus:active",
 					"group": "navigation@-98"
 				}
 			],
@@ -10386,6 +10442,11 @@
 					"command": "gitlens.closeUnchangedFiles",
 					"when": "gitlens:enabled && scmProvider == git && scmResourceGroup =~ /^(workingTree|index)$/ && config.gitlens.menus.scmGroup.openClose",
 					"group": "3_gitlens@2"
+				},
+				{
+					"command": "gitlens.openOnlyChangedFiles",
+					"when": "gitlens:enabled && scmProvider == git && scmResourceGroup =~ /^(workingTree|index)$/ && config.gitlens.menus.scmGroup.openClose",
+					"group": "3_gitlens@2"
 				}
 			],
 			"scm/resourceState/context": [
@@ -11565,6 +11626,11 @@
 					"when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:commit\\b/",
 					"group": "1_gitlens_actions@4"
 				},
+				{
+					"command": "gitlens.views.resetToTip",
+					"when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:branch\\b/",
+					"group": "1_gitlens_actions@4"
+				},
 				{
 					"command": "gitlens.views.resetCommit",
 					"when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && viewItem =~ /gitlens:commit\\b/",
@@ -12731,6 +12797,11 @@
 					"when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && webviewItem =~ /gitlens:commit\\b/",
 					"group": "1_gitlens_actions@4"
 				},
+				{
+					"command": "gitlens.graph.resetToTip",
+					"when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && webviewItem =~ /gitlens:branch\\b/",
+					"group": "1_gitlens_actions@4"
+				},
 				{
 					"command": "gitlens.graph.resetCommit",
 					"when": "!gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders && webviewItem =~ /gitlens:commit\\b/",
@@ -13116,6 +13187,10 @@
 				{
 					"command": "gitlens.views.openChangedFileRevisions",
 					"group": "2_gitlens@2"
+				},
+				{
+					"command": "gitlens.views.openOnlyChangedFiles",
+					"group": "2_gitlens@3"
 				}
 			],
 			"gitlens/graph/commit/changes": [
@@ -13135,6 +13210,10 @@
 				{
 					"command": "gitlens.graph.openChangedFileRevisions",
 					"group": "2_gitlens@2"
+				},
+				{
+					"command": "gitlens.graph.openOnlyChangedFiles",
+					"group": "2_gitlens@3"
 				}
 			],
 			"gitlens/commit/file/commit": [
@@ -14613,6 +14692,7 @@
 		"package": "vsce package --yarn",
 		"package-pre": "yarn run patch-pre && yarn run package --pre-release",
 		"patch-pre": "node ./scripts/applyPreReleasePatch.js",
+		"prep-release": "node ./scripts/prep-release.js",
 		"pretty": "prettier --config .prettierrc --log-level warn --write .",
 		"pub": "vsce publish --yarn",
 		"pub-pre": "vsce publish --yarn --pre-release",
@@ -14635,16 +14715,17 @@
 	},
 	"dependencies": {
 		"@gitkraken/gitkraken-components": "10.1.9",
+		"@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.0",
-		"@opentelemetry/sdk-trace-base": "1.15.0",
+		"@opentelemetry/exporter-trace-otlp-http": "0.41.1",
+		"@opentelemetry/sdk-trace-base": "1.15.1",
 		"@vscode/codicons": "0.0.33",
 		"@vscode/webview-ui-toolkit": "1.2.2",
 		"ansi-regex": "6.0.1",
-		"billboard.js": "3.9.0",
+		"billboard.js": "3.9.1",
 		"https-proxy-agent": "5.0.1",
 		"iconv-lite": "0.6.3",
 		"lit": "2.7.6",
@@ -14662,11 +14743,11 @@
 		"@types/react-dom": "17.0.17",
 		"@types/sortablejs": "1.15.1",
 		"@types/vscode": "1.78.1",
-		"@typescript-eslint/eslint-plugin": "6.0.0",
-		"@typescript-eslint/parser": "6.0.0",
-		"@vscode/test-electron": "2.3.3",
+		"@typescript-eslint/eslint-plugin": "6.2.1",
+		"@typescript-eslint/parser": "6.2.1",
+		"@vscode/test-electron": "2.3.4",
 		"@vscode/test-web": "0.0.44",
-		"@vscode/vsce": "2.19.0",
+		"@vscode/vsce": "2.20.0",
 		"circular-dependency-plugin": "5.2.2",
 		"clean-webpack-plugin": "4.0.0",
 		"concurrently": "8.2.0",
@@ -14678,13 +14759,14 @@
 		"esbuild": "0.17.19",
 		"esbuild-loader": "3.0.1",
 		"esbuild-sass-plugin": "2.10.0",
-		"eslint": "8.44.0",
+		"eslint": "8.46.0",
 		"eslint-cli": "1.1.1",
-		"eslint-config-prettier": "8.8.0",
+		"eslint-config-prettier": "8.9.0",
 		"eslint-import-resolver-typescript": "3.5.5",
 		"eslint-plugin-anti-trojan-source": "1.1.1",
-		"eslint-plugin-import": "2.27.5",
+		"eslint-plugin-import": "2.28.0",
 		"eslint-plugin-lit": "1.8.3",
+		"eslint-plugin-wc": "1.5.0",
 		"fantasticon": "1.2.3",
 		"fork-ts-checker-webpack-plugin": "6.5.3",
 		"glob": "10.3.3",
@@ -14696,16 +14778,16 @@
 		"mini-css-extract-plugin": "2.7.6",
 		"mocha": "10.2.0",
 		"prettier": "3.0.0",
-		"sass": "1.63.6",
+		"sass": "1.64.2",
 		"sass-loader": "13.3.2",
 		"schema-utils": "4.2.0",
-		"sharp": "0.32.2",
+		"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",
-		"webpack": "5.88.1",
+		"webpack": "5.88.2",
 		"webpack-bundle-analyzer": "4.9.0",
 		"webpack-cli": "5.1.4",
 		"webpack-node-externals": "3.0.0",