Fixes #4778 selecting revs/refs in views

 - Switches to a unified comparison picker dialog for selecting refs
 - Simplifies command handling and context state management
 - Removes the custom compare picker node and related tree view logic

Author: eamodio

contributions.json

@@ -8169,7 +8169,7 @@
 					{
 						"when": "webviewItem =~ /gitlens:file\\b/ && !listMultiSelection && gitlens:views:canCompare:file && webview == gitlens.views.commitDetails",
 						"group": "4_gitlens_compare",
-						"order": 99
+						"order": 98
 					}
 				]
 			}
@@ -8181,7 +8181,7 @@
 					{
 						"when": "webviewItem =~ /gitlens:file\\b/ && !listMultiSelection && gitlens:views:canCompare:file && webview == gitlens.views.graphDetails",
 						"group": "4_gitlens_compare",
-						"order": 99
+						"order": 98
 					}
 				]
 			}

package.json

@@ -25124,12 +25124,12 @@
 				{
 					"command": "gitlens.views.compareFileWithSelected:commitDetails",
 					"when": "webviewItem =~ /gitlens:file\\b/ && !listMultiSelection && gitlens:views:canCompare:file && webview == gitlens.views.commitDetails",
-					"group": "4_gitlens_compare@99"
+					"group": "4_gitlens_compare@98"
 				},
 				{
 					"command": "gitlens.views.compareFileWithSelected:graphDetails",
 					"when": "webviewItem =~ /gitlens:file\\b/ && !listMultiSelection && gitlens:views:canCompare:file && webview == gitlens.views.graphDetails",
-					"group": "4_gitlens_compare@99"
+					"group": "4_gitlens_compare@98"
 				},
 				{
 					"command": "gitlens.views.selectFileForCompare:commitDetails",

src/commands/compareWith.ts

@@ -1,6 +1,8 @@
 import type { TextEditor, Uri } from 'vscode';
 import type { Container } from '../container';
+import { createReference } from '../git/utils/reference.utils';
 import { showGenericErrorMessage } from '../messages';
+import { showComparisonPicker } from '../quickpicks/comparisonPicker';
 import { getBestRepositoryOrShowPicker } from '../quickpicks/repositoryPicker';
 import { command } from '../system/-webview/command';
 import { Logger } from '../system/logger';
@@ -68,10 +70,19 @@ export class CompareWithCommand extends ActiveEditorCommand {
 			const repoPath = (await getBestRepositoryOrShowPicker(this.container, uri, editor, title))?.path;
 			if (!repoPath) return;
 
+			if (args.ref1 == null || args.ref2 == null) {
+				const result = await showComparisonPicker(this.container, repoPath, {
+					head: args.ref1 != null ? createReference(args.ref1, repoPath) : undefined,
+					base: args.ref2 != null ? createReference(args.ref2, repoPath) : undefined,
+				});
+				if (result == null) return;
+
+				args.ref1 = result.head.ref;
+				args.ref2 = result.base.ref;
+			}
+
 			if (args.ref1 != null && args.ref2 != null) {
 				await this.container.views.searchAndCompare.compare(repoPath, args.ref1, args.ref2);
-			} else {
-				this.container.views.searchAndCompare.selectForCompare(repoPath, args.ref1, { prompt: true });
 			}
 		} catch (ex) {
 			Logger.error(ex, 'CompareWithCommmand');

src/constants.commands.ts

@@ -90,8 +90,6 @@ type InternalScmGroupedViewCommands =
 	| 'gitlens.views.scm.grouped.welcome.dismiss'
 	| 'gitlens.views.scm.grouped.welcome.restore';
 
-type InternalSearchAndCompareViewCommands = 'gitlens.views.searchAndCompare.compareWithSelected';
-
 type InternalTimelineWebviewViewCommands = 'gitlens.views.timeline.openInTab';
 
 type InternalViewCommands = 'gitlens.views.loadMoreChildren';
@@ -165,7 +163,6 @@ type InternalGlCommands =
 	| InternalPlusCommands
 	| InternalPullRequestViewCommands
 	| InternalScmGroupedViewCommands
-	| InternalSearchAndCompareViewCommands
 	| InternalTimelineWebviewViewCommands
 	| InternalViewCommands
 	| InternalWalkthroughCommands;

src/constants.context.ts

@@ -9,6 +9,12 @@ import type { OrgAIProviders } from './plus/gk/models/organization';
 import type { PromoKeys } from './plus/gk/models/promo';
 import type { SubscriptionPlanIds } from './plus/gk/models/subscription';
 
+interface CompareSelectedInfo {
+	label: string;
+	ref: string;
+	repoPath: string;
+}
+
 interface CompareSelectedFileInfo {
 	ref: string;
 	repoPath: string | undefined;
@@ -54,7 +60,7 @@ export type ContextKeys = {
 	'gitlens:tabs:blameable': Uri[];
 	'gitlens:tabs:tracked': Uri[];
 	'gitlens:untrusted': boolean;
-	'gitlens:views:canCompare': boolean;
+	'gitlens:views:canCompare': CompareSelectedInfo;
 	'gitlens:views:canCompare:file': CompareSelectedFileInfo;
 	'gitlens:views:commits:filtered': boolean;
 	'gitlens:views:commits:hideMergeCommits': boolean;

src/constants.views.ts

@@ -151,7 +151,6 @@ export type TreeViewNodeTypes =
 	| 'autolink'
 	| 'branch-tag-folder'
 	| 'branches'
-	| 'compare-picker'
 	| 'contributor'
 	| 'contributors'
 	| 'conflict-files'

src/views/nodes/abstract/viewNode.ts

@@ -55,8 +55,6 @@ export const enum ContextValues {
 	CommitsCurrentBranch = 'gitlens:commits:current-branch',
 	Compare = 'gitlens:compare',
 	CompareBranch = 'gitlens:compare:branch',
-	ComparePicker = 'gitlens:compare:picker',
-	ComparePickerWithRef = 'gitlens:compare:picker:ref',
 	CompareResults = 'gitlens:compare:results',
 	CompareResultsCommits = 'gitlens:compare:results:commits',
 	Contributor = 'gitlens:contributor',

src/views/nodes/comparePickerNode.ts

@@ -20,7 +20,6 @@ import type { CommitNode } from '../../commitNode';
 import type { PagerNode } from '../../common';
 import { MessageNode } from '../../common';
 import type { CompareBranchNode } from '../../compareBranchNode';
-import type { ComparePickerNode } from '../../comparePickerNode';
 import type { CompareResultsNode } from '../../compareResultsNode';
 import type { ContributorNode } from '../../contributorNode';
 import type { ContributorsNode } from '../../contributorsNode';
@@ -82,8 +81,6 @@ export type TreeViewNodesByType = {
 		? CommitsCurrentBranchNode
 		: T extends 'compare-branch'
 		? CompareBranchNode
-		: T extends 'compare-picker'
-		? ComparePickerNode
 		: T extends 'compare-results'
 		? CompareResultsNode
 		: T extends 'conflict-current-changes'