Updates Git version feature checks

- Adds warning message when worktrees are not supported

Author: eamodio

contributions.json

@@ -13987,7 +13987,7 @@
 				},
 				{
 					"contents": "[Create Worktree...](command:gitlens.views.createWorktree)",
-					"when": "gitlens:views:scm:grouped:view == worktrees && !gitlens:plus:required"
+					"when": "gitlens:views:scm:grouped:view == worktrees && !gitlens:plus:required && !gitlens:feature:unsupported:git:worktrees"
 				},
 				{
 					"contents": "[Resend Verification Email](command:gitlens.plus.resendVerification?%7B%22source%22%3A%22worktrees%22%7D)\n\nYou must verify your email before you can continue or [recheck Status](command:gitlens.plus.validate?%7B%22source%22%3A%22worktrees%22%7D).",
@@ -14024,6 +14024,10 @@
 				{
 					"contents": "Use on privately-hosted repos require [GitLens Pro](https://help.gitkraken.com/gitlens/gitlens-community-vs-gitlens-pro/).",
 					"when": "gitlens:views:scm:grouped:view == worktrees && gitlens:plus:state != 6"
+				},
+				{
+					"contents": "⚠ Worktrees are not supported by your version of Git. Please upgrade to a more recent version.",
+					"when": "gitlens:views:scm:grouped:view == worktrees && !gitlens:plus:required && gitlens:feature:unsupported:git:worktrees"
 				}
 			]
 		},
@@ -14121,7 +14125,7 @@
 				},
 				{
 					"contents": "[Create Worktree...](command:gitlens.views.createWorktree)",
-					"when": "!gitlens:plus:required"
+					"when": "!gitlens:plus:required && !gitlens:feature:unsupported:git:worktrees"
 				},
 				{
 					"contents": "[Resend Verification Email](command:gitlens.plus.resendVerification?%7B%22source%22%3A%22worktrees%22%7D)\n\nYou must verify your email before you can continue or [recheck Status](command:gitlens.plus.validate?%7B%22source%22%3A%22worktrees%22%7D).",
@@ -14158,6 +14162,10 @@
 				{
 					"contents": "Use on privately-hosted repos require [GitLens Pro](https://help.gitkraken.com/gitlens/gitlens-community-vs-gitlens-pro/).",
 					"when": "gitlens:plus:state != 6"
+				},
+				{
+					"contents": "⚠ Worktrees are not supported by your version of Git. Please upgrade to a more recent version.",
+					"when": "!gitlens:plus:required && gitlens:feature:unsupported:git:worktrees"
 				}
 			]
 		}

package.json

@@ -21040,7 +21040,7 @@
 			{
 				"view": "gitlens.views.scm.grouped",
 				"contents": "[Create Worktree...](command:gitlens.views.createWorktree)",
-				"when": "gitlens:views:scm:grouped:view == worktrees && !gitlens:plus:required"
+				"when": "gitlens:views:scm:grouped:view == worktrees && !gitlens:plus:required && !gitlens:feature:unsupported:git:worktrees"
 			},
 			{
 				"view": "gitlens.views.scm.grouped",
@@ -21087,6 +21087,11 @@
 				"contents": "Use on privately-hosted repos require [GitLens Pro](https://help.gitkraken.com/gitlens/gitlens-community-vs-gitlens-pro/).",
 				"when": "gitlens:views:scm:grouped:view == worktrees && gitlens:plus:state != 6"
 			},
+			{
+				"view": "gitlens.views.scm.grouped",
+				"contents": "⚠ Worktrees are not supported by your version of Git. Please upgrade to a more recent version.",
+				"when": "gitlens:views:scm:grouped:view == worktrees && !gitlens:plus:required && gitlens:feature:unsupported:git:worktrees"
+			},
 			{
 				"view": "gitlens.views.searchAndCompare",
 				"contents": "Search for commits by [message](command:gitlens.views.searchAndCompare.searchCommits?%7B%22search%22%3A%7B%22query%22%3A%22message%3A%22%7D%2C%22prefillOnly%22%3Atrue%7D), [author](command:gitlens.views.searchAndCompare.searchCommits?%7B%22search%22%3A%7B%22query%22%3A%22author%3A%22%7D%2C%22prefillOnly%22%3Atrue%7D), [SHA](command:gitlens.views.searchAndCompare.searchCommits?%7B%22search%22%3A%7B%22query%22%3A%22commit%3A%22%7D%2C%22prefillOnly%22%3Atrue%7D), [file](command:gitlens.views.searchAndCompare.searchCommits?%7B%22search%22%3A%7B%22query%22%3A%22file%3A%22%7D%2C%22prefillOnly%22%3Atrue%7D), or [changes](command:gitlens.views.searchAndCompare.searchCommits?%7B%22search%22%3A%7B%22query%22%3A%22change%3A%22%7D%2C%22prefillOnly%22%3Atrue%7D)\n\n[Search Commits...](command:gitlens.views.searchAndCompare.searchCommits)",
@@ -21128,7 +21133,7 @@
 			{
 				"view": "gitlens.views.worktrees",
 				"contents": "[Create Worktree...](command:gitlens.views.createWorktree)",
-				"when": "!gitlens:plus:required"
+				"when": "!gitlens:plus:required && !gitlens:feature:unsupported:git:worktrees"
 			},
 			{
 				"view": "gitlens.views.worktrees",
@@ -21174,6 +21179,11 @@
 				"view": "gitlens.views.worktrees",
 				"contents": "Use on privately-hosted repos require [GitLens Pro](https://help.gitkraken.com/gitlens/gitlens-community-vs-gitlens-pro/).",
 				"when": "gitlens:plus:state != 6"
+			},
+			{
+				"view": "gitlens.views.worktrees",
+				"contents": "⚠ Worktrees are not supported by your version of Git. Please upgrade to a more recent version.",
+				"when": "!gitlens:plus:required && gitlens:feature:unsupported:git:worktrees"
 			}
 		],
 		"views": {

src/constants.context.ts

@@ -2,6 +2,7 @@ import type { Uri } from 'vscode';
 import type { AnnotationStatus, Keys } from './constants';
 import type { SubscriptionPlanId, SubscriptionState } from './constants.subscription';
 import type { CustomEditorTypes, GroupableTreeViewTypes, WebviewTypes, WebviewViewTypes } from './constants.views';
+import type { Features } from './features';
 import type { PromoKeys } from './plus/gk/models/promo';
 import type { WalkthroughContextKeys } from './telemetry/walkthroughStateProvider';
 
@@ -54,6 +55,7 @@ export type ContextKeys = {
 	'gitlens:vsls': boolean | 'host' | 'guest';
 	'gitlens:window:annotated': AnnotationStatus;
 } & Record<`gitlens:action:${string}`, number> &
+	Record<`gitlens:feature:unsupported:${Features}`, boolean> &
 	Record<`gitlens:key:${Keys}`, boolean> &
 	Record<`gitlens:views:scm:grouped:views:${GroupableTreeViewTypes}`, boolean> &
 	Record<`gitlens:webview:${WebviewTypes | CustomEditorTypes}:visible`, boolean> &

src/env/node/git/git.ts

@@ -7,7 +7,7 @@ import type { CancellationToken, OutputChannel } from 'vscode';
 import { env, Uri, window, workspace } from 'vscode';
 import { hrtime } from '@env/hrtime';
 import { GlyphChars } from '../../../constants';
-import type { GitFeature } from '../../../features';
+import type { FilteredGitFeatures, GitFeatureOrPrefix, GitFeatures } from '../../../features';
 import { gitFeaturesByVersion } from '../../../features';
 import type { GitCommandOptions, GitSpawnOptions } from '../../../git/commandOptions';
 import { GitErrorHandling } from '../../../git/commandOptions';
@@ -364,7 +364,7 @@ export class Git {
 		return (await this.getLocation()).path;
 	}
 
-	async ensureSupports(feature: GitFeature, prefix: string, suffix: string): Promise<void> {
+	async ensureSupports(feature: GitFeatures, prefix: string, suffix: string): Promise<void> {
 		const version = gitFeaturesByVersion.get(feature);
 		if (version == null) return;
 
@@ -376,7 +376,7 @@ export class Git {
 		);
 	}
 
-	supports(feature: GitFeature): boolean | Promise<boolean> {
+	supports(feature: GitFeatures): boolean | Promise<boolean> {
 		const version = gitFeaturesByVersion.get(feature);
 		if (version == null) return true;
 
@@ -385,6 +385,19 @@ export class Git {
 			: this.version().then(v => compare(fromString(v), fromString(version)) !== -1);
 	}
 
+	supported<T extends GitFeatureOrPrefix>(feature: T): FilteredGitFeatures<T>[] | Promise<FilteredGitFeatures<T>[]> {
+		function supportedCore(gitVersion: string): FilteredGitFeatures<T>[] {
+			return [...gitFeaturesByVersion]
+				.filter(([f, v]) => f.startsWith(feature) && compare(fromString(gitVersion), v) !== -1)
+				.map(([f]) => f as FilteredGitFeatures<T>);
+		}
+
+		if (this._gitLocation == null) {
+			return this.version().then(v => supportedCore(v));
+		}
+		return supportedCore(this._gitLocation.version);
+	}
+
 	async version(): Promise<string> {
 		return (await this.getLocation()).version;
 	}

src/env/node/git/localGitProvider.ts

@@ -60,6 +60,7 @@ import {
 } from '../../../messages';
 import { asRepoComparisonKey } from '../../../repositories';
 import { configuration } from '../../../system/-webview/configuration';
+import { setContext } from '../../../system/-webview/context';
 import { getBestPath, isFolderUri, relative, splitPath } from '../../../system/-webview/path';
 import { gate } from '../../../system/decorators/-webview/gate';
 import { debug, log } from '../../../system/decorators/log';
@@ -476,6 +477,7 @@ export class LocalGitProvider implements GitProvider, Disposable {
 				break;
 		}
 
+		void setContext(`gitlens:feature:unsupported:${feature}`, !supported);
 		this._supportedFeatures.set(feature, supported);
 		return supported;
 	}

src/env/node/git/sub-providers/worktrees.ts

@@ -93,7 +93,7 @@ export class WorktreesGitSubProvider implements GitWorktreesSubProvider {
 	@log()
 	async getWorktrees(repoPath: string): Promise<GitWorktree[]> {
 		await this.git.ensureSupports(
-			'git:worktrees:list',
+			'git:worktrees',
 			'Displaying worktrees',
 			' Please install a more recent version of Git and try again.',
 		);
@@ -165,7 +165,7 @@ export class WorktreesGitSubProvider implements GitWorktreesSubProvider {
 		const scope = getLogScope();
 
 		await this.git.ensureSupports(
-			'git:worktrees:delete',
+			'git:worktrees',
 			'Deleting worktrees',
 			' Please install a more recent version of Git and try again.',
 		);

src/features.ts

@@ -5,7 +5,7 @@ import type { RequiredSubscriptionPlans, Subscription } from './plus/gk/models/s
 import { capitalize } from './system/string';
 
 // GitFeature's must start with `git:` to be recognized in all usages
-export type GitFeature =
+export type GitFeatures =
 	| 'git:for-each-ref:worktreePath'
 	| 'git:ignoreRevsFile'
 	| 'git:merge-tree'
@@ -17,10 +17,20 @@ export type GitFeature =
 	| 'git:status:find-renames'
 	| 'git:status:porcelain-v2'
 	| 'git:worktrees'
-	| 'git:worktrees:delete'
-	| 'git:worktrees:list';
+	| 'git:worktrees';
 
-export const gitFeaturesByVersion = new Map<GitFeature, string>([
+type ExtractPrefix<T> = T extends `${infer Prefix}:${infer Rest}`
+	? Rest extends `${infer SubPrefix}:${string}`
+		? T | `${Prefix}:${SubPrefix}` | Prefix
+		: T | Prefix
+	: never;
+
+export type GitFeatureOrPrefix = ExtractPrefix<GitFeatures>;
+export type FilteredGitFeatures<T extends GitFeatureOrPrefix> = T extends GitFeatures
+	? T
+	: Extract<GitFeatures, T | `${T}:${string}`>;
+
+export const gitFeaturesByVersion = new Map<GitFeatures, string>([
 	['git:for-each-ref:worktreePath', '2.23'],
 	['git:ignoreRevsFile', '2.23'],
 	['git:merge-tree', '2.33'],
@@ -32,11 +42,9 @@ export const gitFeaturesByVersion = new Map<GitFeature, string>([
 	['git:status:find-renames', '2.18'],
 	['git:status:porcelain-v2', '2.11'],
 	['git:worktrees', '2.17.0'],
-	['git:worktrees:delete', '2.17.0'],
-	['git:worktrees:list', '2.7.6'],
 ]);
 
-export type Features = 'stashes' | 'timeline' | GitFeature;
+export type Features = 'stashes' | 'timeline' | GitFeatures;
 
 export type FeatureAccess =
 	| {

src/plus/integrations/providers/github/githubGitProvider.ts

@@ -243,12 +243,18 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 	}
 
 	async supports(feature: Features): Promise<boolean> {
+		let supported;
 		switch (feature) {
 			case 'timeline' satisfies Features:
-				return true;
+				supported = true;
+				break;
 			default:
-				return false;
+				supported = false;
+				break;
 		}
+
+		void setContext(`gitlens:feature:unsupported:${feature}`, !supported);
+		return supported;
 	}
 
 	async visibility(repoPath: string): Promise<[visibility: RepositoryVisibility, cacheKey: string | undefined]> {

src/views/worktreesView.ts

@@ -23,10 +23,7 @@ import { registerViewCommand } from './viewCommands';
 
 export class WorktreesRepositoryNode extends RepositoryFolderNode<WorktreesView, WorktreesNode> {
 	getChildren(): Promise<ViewNode[]> {
-		if (this.child == null) {
-			this.child = new WorktreesNode(this.uri, this.view, this, this.repo);
-		}
-
+		this.child ??= new WorktreesNode(this.uri, this.view, this, this.repo);
 		return this.child.getChildren();
 	}
 
@@ -69,6 +66,12 @@ export class WorktreesViewNode extends RepositoriesSubscribeableNode<WorktreesVi
 				return [];
 			}
 
+			const repo = this.view.container.git.getBestRepositoryOrFirst();
+			if (repo != null && !(await repo.git.supports('git:worktrees'))) {
+				// this.view.message = 'Worktrees are not supported by your version of Git.';
+				return [];
+			}
+
 			if (configuration.get('views.collapseWorktreesWhenPossible')) {
 				const grouped = await groupRepositories(repositories);
 				repositories = [...grouped.keys()];