Closes #4726 adds is:tip filter support to Graph

Author: eamodio

CHANGELOG.md

@@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Adds a new _Safe Hard Reset_ (`--keep`) option to Git _reset_ command
 - Adds support for reference or range commit searches on the _Commit Graph_, _Search & Compare_ view, and in the _Search Commits_ command ([#4723](https://github.com/gitkraken/vscode-gitlens/issues/4723))
   - Adds natural language support to allow for more powerful queries
+- Adds ability to filter/search to branch & tag tips on the _Commit Graph_ ([#4726](https://github.com/gitkraken/vscode-gitlens/issues/4726))
 - Adds a navigable search history to the search box on the _Commit Graph_ ([#4724](https://github.com/gitkraken/vscode-gitlens/issues/4724))
 - Adds ability to show file or folder histories on the _Commit Graph_ ([#4725](https://github.com/gitkraken/vscode-gitlens/issues/4725))
   - Adds _Open File History in Commit Graph_ command to files in views

src/commands/git/search.ts

@@ -337,7 +337,7 @@ export class SearchGitCommand extends QuickCommand<State> {
 			items.push(
 				{
 					label: searchOperatorToTitleMap.get('type:')!,
-					description: 'type:stash or is:stash',
+					description: 'type:stash or is:stash; type:tip or is:tip',
 					alwaysShow: true,
 					item: { type: 'add', operator: 'type:' },
 				},

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

@@ -1267,6 +1267,8 @@ async function parseCommits(
 	let countStashChildCommits = 0;
 	const commits = new Map<string, GitCommit>();
 
+	const tipsOnly = searchFilters?.type === 'tip';
+
 	if (resultOrStream instanceof Promise) {
 		const result = await resultOrStream;
 
@@ -1276,8 +1278,10 @@ async function parseCommits(
 		if (stashes?.size) {
 			const allowFilteredFiles = searchFilters?.files ?? false;
 			const stashesOnly = searchFilters?.type === 'stash';
+
 			for (const c of parser.parse(result.stdout)) {
 				if (stashesOnly && !stashes?.has(c.sha)) continue;
+				if (tipsOnly && !c.tips) continue;
 
 				count++;
 				if (limit && count > limit) break;
@@ -1307,6 +1311,8 @@ async function parseCommits(
 			}
 		} else {
 			for (const c of parser.parse(result.stdout)) {
+				if (tipsOnly && !c.tips) continue;
+
 				count++;
 				if (limit && count > limit) break;
 
@@ -1322,8 +1328,10 @@ async function parseCommits(
 	if (stashes?.size) {
 		const allowFilteredFiles = searchFilters?.files ?? false;
 		const stashesOnly = searchFilters?.type === 'stash';
+
 		for await (const c of parser.parseAsync(resultOrStream)) {
 			if (stashesOnly && !stashes?.has(c.sha)) continue;
+			if (tipsOnly && !c.tips) continue;
 
 			count++;
 			if (limit && count > limit) break;
@@ -1353,6 +1361,8 @@ async function parseCommits(
 		}
 	} else {
 		for await (const c of parser.parseAsync(resultOrStream)) {
+			if (tipsOnly && !c.tips) continue;
+
 			count++;
 			if (limit && count > limit) break;
 

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

@@ -637,23 +637,23 @@ export class GraphGitSubProvider implements GitGraphSubProvider {
 
 		const comparisonKey = getSearchQueryComparisonKey(search);
 		try {
-			const parser = getShaAndDatesLogParser();
+			const currentUser = search.query.includes('@me')
+				? await this.provider.config.getCurrentUser(repoPath)
+				: undefined;
+
+			const { args: searchArgs, files, shas, filters } = parseSearchQueryCommand(search, currentUser);
+
+			const tipsOnly = filters.type === 'tip';
+			const parser = getShaAndDatesLogParser(tipsOnly);
 
 			const similarityThreshold = configuration.get('advanced.similarityThreshold');
 			const args = [
 				'log',
-
 				...parser.arguments,
 				`-M${similarityThreshold == null ? '' : `${similarityThreshold}%`}`,
 				'--use-mailmap',
 			];
 
-			const currentUser = search.query.includes('@me')
-				? await this.provider.config.getCurrentUser(repoPath)
-				: undefined;
-
-			const { args: searchArgs, files, shas, filters } = parseSearchQueryCommand(search, currentUser);
-
 			let stashes: Map<string, GitStashCommit> | undefined;
 			let stdin: string | undefined;
 			let remappedIds: Map<string, string>;
@@ -736,7 +736,7 @@ export class GraphGitSubProvider implements GitGraphSubProvider {
 
 						count++;
 						sha = remappedIds.get(r.sha) ?? r.sha;
-						if (results.has(sha) || (stashesOnly && !stashes?.has(sha))) {
+						if (results.has(sha) || (stashesOnly && !stashes?.has(sha)) || (tipsOnly && !r.tips)) {
 							continue;
 						}
 

src/git/parsers/logParser.ts

@@ -99,11 +99,19 @@ export function getShaLogParser(): ShaLogParser {
 }
 
 const shaAndDateMapping = { sha: '%H', authorDate: '%at', committerDate: '%ct' };
+const shaAndDateAndTipsMapping = { sha: '%H', authorDate: '%at', committerDate: '%ct', tips: '%D' };
 
-type ShaAndDatesLogParser = LogParser<typeof shaAndDateMapping>;
+type ShaAndDatesLogParser = LogParser<typeof shaAndDateMapping & { tips?: string }>;
 let _shaAndDatesParser: ShaAndDatesLogParser | undefined;
+type ShaAndDatesAndTipsLogParser = LogParser<typeof shaAndDateAndTipsMapping>;
+let _shaAndDatesAndTipsParser: ShaAndDatesAndTipsLogParser | undefined;
+
+export function getShaAndDatesLogParser(includeTips?: boolean): ShaAndDatesLogParser | ShaAndDatesAndTipsLogParser {
+	if (includeTips) {
+		_shaAndDatesAndTipsParser ??= createLogParser(shaAndDateAndTipsMapping);
+		return _shaAndDatesAndTipsParser;
+	}
 
-export function getShaAndDatesLogParser(): ShaAndDatesLogParser {
 	_shaAndDatesParser ??= createLogParser(shaAndDateMapping);
 	return _shaAndDatesParser;
 }

src/git/search.ts

@@ -197,8 +197,8 @@ export function parseSearchQuery(search: SearchQuery, validate: boolean = false)
 export interface SearchQueryFilters {
 	/** Specifies whether the search results will be filtered to specific files */
 	files: boolean;
-	/** Specifies whether the search results will be filtered to a specific type, only `stash` is supported */
-	type?: 'stash';
+	/** Specifies whether the search results will be filtered to a specific type, only `stash` and `tip` are supported */
+	type?: 'stash' | 'tip';
 	/** Specifies whether the search results will be filtered to a specific ref or ref range */
 	refs: boolean;
 }
@@ -306,6 +306,8 @@ export function parseSearchQueryCommand(search: SearchQuery, currentUser: GitUse
 						if (value === 'stash') {
 							filters.type = 'stash';
 							searchArgs.add('--no-walk');
+						} else if (value === 'tip') {
+							filters.type = 'tip';
 						}
 					}
 

src/plus/ai/prompts.ts

@@ -350,7 +350,7 @@ Available search operators:
 - 'commit:' - Search by a specific commit SHA (e.g. 'commit:4ce3a')
 - 'file:' - Search by file path (e.g. 'file:"package.json"', 'file:"*.ts"'); maps to \`git log -- <value>\`
 - 'change:' - Search by specific code changes using regular expressions (e.g. 'change:"function.*auth"', 'change:"import.*react"'); maps to \`git log -G<value>\`
-- 'type:' - Search by type -- only stash is currently supported (e.g. 'type:stash')
+- 'type:' - Search by type -- supports stash and tip (e.g. 'type:stash', 'type:tip')
 - 'ref:' - Search for commits reachable by a reference (branch, tag, commit) or reference range. Supports single refs (e.g. 'ref:main', 'ref:v1.0'), two-dot ranges (e.g. 'ref:main..feature' for commits in feature but not in main), three-dot ranges (e.g. 'ref:main...feature' for symmetric difference), and relative refs (e.g. 'ref:HEAD~5..HEAD'); maps to \`git log <ref>\`
 - 'after:' - Search for commits after a certain date or range (e.g. 'after:2023-01-01', 'after:"6 months ago"', 'after:"last Tuesday"', 'after:"noon"', 'after:"1 month 2 days ago"'); maps to \`git log --since=<value>\`
 - 'before:' - Search for commits before a certain date or range (e.g. 'before:2023-01-01', 'before:"6 months ago"', 'before:"yesterday"', 'before:"3PM GMT"'); maps to \`git log --until=<value>\`

src/webviews/apps/shared/components/search/search-input.ts

@@ -225,7 +225,7 @@ export class GlSearchInput extends GlElement {
 		}
 
 		.menu-button {
-			display: block;
+			display: flex;
 			width: 100%;
 			padding: 0.1rem 0.6rem 0 0.6rem;
 			line-height: 2.2rem;
@@ -234,6 +234,12 @@ export class GlSearchInput extends GlElement {
 			border-radius: 3px;
 		}
 
+		.menu-button small {
+			margin-left: auto;
+			padding-left: 1.5rem;
+			opacity: 0.8;
+		}
+
 		.menu-button:hover {
 			color: var(--vscode-menu-selectionForeground);
 			background-color: var(--vscode-menu-selectionBackground);
@@ -834,7 +840,7 @@ export class GlSearchInput extends GlElement {
 				>`;
 			case 'type:':
 				return html`<span
-					>Type: use <code>stash</code> to search only stashes, e.g. <code>type:stash</code></span
+					>Type: use <code>is:stash</code> for stashes or <code>is:tip</code> for branch & tag tips</span
 				>`;
 			case 'file:':
 				return html`<span
@@ -907,9 +913,15 @@ export class GlSearchInput extends GlElement {
 						Ref <small>ref: or ^:</small>
 					</button>
 				</menu-item>
+				<menu-divider></menu-divider>
+				<menu-item role="none">
+					<button class="menu-button" type="button" @click="${() => this.handleInsertToken('is:stash')}">
+						Stashes <small>is:stash or type:stash</small>
+					</button>
+				</menu-item>
 				<menu-item role="none">
-					<button class="menu-button" type="button" @click="${() => this.handleInsertToken('type:stash')}">
-						Type <small>type:stash or is:stash</small>
+					<button class="menu-button" type="button" @click="${() => this.handleInsertToken('is:tip')}">
+						Branch & Tag Tips <small>is:tip or type:tip</small>
 					</button>
 				</menu-item>
 				<menu-divider></menu-divider>