Adds support for recomposing selected commits in graph and composer (#4771)

* Adds support for recomposing selected commits in graph and composer

* Prevents draft commits from being dragged across locked commits

* Fixes undo after recompose

Author: axosoft-ramint

ThirdPartyNotices.txt

@@ -27,19 +27,18 @@ This project incorporates components from the projects listed below.
 22. fflate version 0.8.2 (https://github.com/101arrowz/fflate)
 23. https-proxy-agent version 5.0.1 (https://github.com/TooTallNate/node-https-proxy-agent)
 24. iconv-lite version 0.6.3 (https://github.com/ashtuchkin/iconv-lite)
-25. ignore version 7.0.5 (https://github.com/kaelzhang/node-ignore)
-26. lit version 3.3.1 (https://github.com/lit/lit)
-27. marked version 17.0.0 (https://github.com/markedjs/marked)
-28. microsoft/vscode (https://github.com/microsoft/vscode)
-29. node-fetch version 2.7.0 (https://github.com/bitinn/node-fetch)
-30. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify)
-31. path-browserify version 1.0.1 (https://github.com/browserify/path-browserify)
-32. react-dom version 19.2.0 (https://github.com/facebook/react)
-33. react version 19.2.0 (https://github.com/facebook/react)
-34. signal-utils version 0.21.1 (https://github.com/proposal-signals/signal-utils)
-35. slug version 11.0.1 (https://github.com/Trott/slug)
-36. sortablejs version 1.15.6 (https://github.com/SortableJS/Sortable)
-37. vscode-uri version 3.1.0 (https://github.com/microsoft/vscode-uri)
+25. lit version 3.3.1 (https://github.com/lit/lit)
+26. marked version 17.0.0 (https://github.com/markedjs/marked)
+27. microsoft/vscode (https://github.com/microsoft/vscode)
+28. node-fetch version 2.7.0 (https://github.com/bitinn/node-fetch)
+29. os-browserify version 0.3.0 (https://github.com/CoderPuppy/os-browserify)
+30. path-browserify version 1.0.1 (https://github.com/browserify/path-browserify)
+31. react-dom version 19.2.0 (https://github.com/facebook/react)
+32. react version 19.2.0 (https://github.com/facebook/react)
+33. signal-utils version 0.21.1 (https://github.com/proposal-signals/signal-utils)
+34. slug version 11.0.1 (https://github.com/Trott/slug)
+35. sortablejs version 1.15.6 (https://github.com/SortableJS/Sortable)
+36. vscode-uri version 3.1.0 (https://github.com/microsoft/vscode-uri)
 
 %% @gk-nzaytsev/fast-string-truncated-width NOTICES AND INFORMATION BEGIN HERE
 =========================================
@@ -2077,32 +2076,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =========================================
 END OF  iconv-lite NOTICES AND INFORMATION
 
-%% ignore NOTICES AND INFORMATION BEGIN HERE
-=========================================
-Copyright (c) 2013 Kael Zhang <[email protected]>, contributors
-http://kael.me/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=========================================
-END OF  ignore NOTICES AND INFORMATION
-
 %% lit NOTICES AND INFORMATION BEGIN HERE
 =========================================
 BSD 3-Clause License

contributions.json

@@ -4495,6 +4495,23 @@
 				]
 			}
 		},
+		"gitlens.recomposeSelectedCommits": {
+			"label": "Recompose Selected Commits (Preview)...",
+			"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
+		},
+		"gitlens.recomposeSelectedCommits:graph": {
+			"label": "Recompose Selected Commits (Preview)",
+			"icon": "$(sparkle)",
+			"menus": {
+				"webview/context": [
+					{
+						"when": "webviewItem =~ /gitlens:commit\\b(?=.*?\\b\\+unique\\b)/ && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && listContiguousSelection && listUniqueBranchSelection",
+						"group": "1_gitlens_actions_1",
+						"order": 3
+					}
+				]
+			}
+		},
 		"gitlens.regenerateMarkdownDocument": {
 			"label": "Regenerate",
 			"icon": "$(refresh)",

package.json

@@ -7993,6 +7993,16 @@
 				"title": "Recompose Commits (Preview)",
 				"icon": "$(sparkle)"
 			},
+			{
+				"command": "gitlens.recomposeSelectedCommits",
+				"title": "Recompose Selected Commits (Preview)...",
+				"category": "GitLens"
+			},
+			{
+				"command": "gitlens.recomposeSelectedCommits:graph",
+				"title": "Recompose Selected Commits (Preview)",
+				"icon": "$(sparkle)"
+			},
 			{
 				"command": "gitlens.regenerateMarkdownDocument",
 				"title": "Regenerate",
@@ -12929,6 +12939,14 @@
 					"command": "gitlens.recomposeBranch:views",
 					"when": "false"
 				},
+				{
+					"command": "gitlens.recomposeSelectedCommits",
+					"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
+				},
+				{
+					"command": "gitlens.recomposeSelectedCommits:graph",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.regenerateMarkdownDocument",
 					"when": "false"
@@ -24944,6 +24962,11 @@
 					"when": "webviewItem =~ /gitlens:(commit|stash)\\b/ && !listMultiSelection && !gitlens:untrusted && !gitlens:hasVirtualFolders && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled",
 					"group": "1_gitlens_actions_1@3"
 				},
+				{
+					"command": "gitlens.recomposeSelectedCommits:graph",
+					"when": "webviewItem =~ /gitlens:commit\\b(?=.*?\\b\\+unique\\b)/ && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && listContiguousSelection && listUniqueBranchSelection",
+					"group": "1_gitlens_actions_1@3"
+				},
 				{
 					"command": "gitlens.graph.createTag",
 					"when": "webviewItem =~ /gitlens:commit\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",

src/commands/recomposeBranch.ts

@@ -14,13 +14,14 @@ import { isCommandContextViewNodeHasBranch } from './commandContext.utils';
 export interface RecomposeBranchCommandArgs {
 	repoPath?: string;
 	branchName?: string;
+	commitShas?: string[];
 	source?: Sources;
 }
 
 @command()
 export class RecomposeBranchCommand extends GlCommandBase {
 	constructor(private readonly container: Container) {
-		super(['gitlens.recomposeBranch', 'gitlens.recomposeBranch:views']);
+		super(['gitlens.recomposeBranch', 'gitlens.recomposeBranch:views', 'gitlens.recomposeSelectedCommits']);
 	}
 
 	protected override preExecute(context: CommandContext, args?: RecomposeBranchCommandArgs): Promise<void> {
@@ -92,6 +93,7 @@ export class RecomposeBranchCommand extends GlCommandBase {
 				source: args?.source,
 				mode: 'preview',
 				branchName: branchName,
+				commitShas: args?.commitShas,
 			});
 		} catch (ex) {
 			void window.showErrorMessage(`Failed to recompose branch: ${ex}`);

src/constants.commands.generated.ts

@@ -254,6 +254,7 @@ export type ContributedCommands =
 	| 'gitlens.quickOpenFileHistory:graphDetails'
 	| 'gitlens.recomposeBranch:graph'
 	| 'gitlens.recomposeBranch:views'
+	| 'gitlens.recomposeSelectedCommits:graph'
 	| 'gitlens.regenerateMarkdownDocument'
 	| 'gitlens.restore.file:commitDetails'
 	| 'gitlens.restore.file:graphDetails'
@@ -958,6 +959,7 @@ export type ContributedPaletteCommands =
 	| 'gitlens.pushRepositories'
 	| 'gitlens.quickOpenFileHistory'
 	| 'gitlens.recomposeBranch'
+	| 'gitlens.recomposeSelectedCommits'
 	| 'gitlens.reset'
 	| 'gitlens.resetViewsLayout'
 	| 'gitlens.revealCommitInView'

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

@@ -156,6 +156,7 @@ export class GraphGitSubProvider implements GitGraphSubProvider {
 		const avatars = new Map<string, string>();
 		const ids = new Set<string>();
 		const reachableFromHEAD = new Set<string>();
+		const reachableFromBranches = new Map<string, Set<string>>();
 		const rowStats: GitGraphRowsStats = new Map<string, GitGraphRowStats>();
 		let pendingRowsStatsCount = 0;
 		let iterations = 0;
@@ -454,6 +455,31 @@ export class GraphGitSubProvider implements GitGraphSubProvider {
 						}
 					}
 
+					if (refHeads.length > 0) {
+						let branches = reachableFromBranches.get(shaOrRemapped);
+						if (branches == null) {
+							branches = new Set<string>();
+							reachableFromBranches.set(shaOrRemapped, branches);
+						}
+						for (const refHead of refHeads) {
+							branches.add(refHead.name);
+						}
+					}
+
+					const currentBranches = reachableFromBranches.get(shaOrRemapped);
+					if (currentBranches != null && currentBranches.size > 0) {
+						for (parent of parents) {
+							let parentBranches = reachableFromBranches.get(parent);
+							if (parentBranches == null) {
+								parentBranches = new Set<string>();
+								reachableFromBranches.set(parent, parentBranches);
+							}
+							for (const branchName of currentBranches) {
+								parentBranches.add(branchName);
+							}
+						}
+					}
+
 					stash = gitStash?.stashes.get(shaOrRemapped);
 					if (stash != null) {
 						contexts.row = serializeWebviewItemContext<GraphItemRefContext>({
@@ -469,6 +495,7 @@ export class GraphGitSubProvider implements GitGraphSubProvider {
 							},
 						});
 
+						const branches = reachableFromBranches.get(shaOrRemapped);
 						rows.push({
 							sha: shaOrRemapped,
 							// Always only return the first parent for stashes, as it is a Git implementation for the index and untracked files
@@ -482,6 +509,7 @@ export class GraphGitSubProvider implements GitGraphSubProvider {
 							remotes: refRemoteHeads,
 							tags: refTags,
 							contexts: contexts,
+							reachableFromBranches: branches ? Array.from(branches) : undefined,
 						});
 
 						if (stash.stats != null) {
@@ -501,10 +529,14 @@ export class GraphGitSubProvider implements GitGraphSubProvider {
 							}
 						}
 
+						const branches = reachableFromBranches.get(shaOrRemapped);
+						const isUniqueToBranch =
+							branches?.size === 1 && refTags.length === 0 && refRemoteHeads.length === 0;
+
 						contexts.row = serializeWebviewItemContext<GraphItemRefContext>({
 							webviewItem: `gitlens:commit${head ? '+HEAD' : ''}${
 								reachableFromHEAD.has(shaOrRemapped) ? '+current' : ''
-							}`,
+							}${isUniqueToBranch ? '+unique' : ''}`,
 							webviewItemValue: {
 								type: 'commit',
 								ref: createReference(shaOrRemapped, repoPath, {
@@ -537,6 +569,7 @@ export class GraphGitSubProvider implements GitGraphSubProvider {
 							remotes: refRemoteHeads,
 							tags: refTags,
 							contexts: contexts,
+							reachableFromBranches: branches ? Array.from(branches) : undefined,
 						});
 
 						if (commit.stats != null) {

src/git/models/graph.ts

@@ -34,6 +34,7 @@ export interface GitGraphRow extends GraphRow {
 	remotes?: GitGraphRowRemoteHead[];
 	tags?: GitGraphRowTag[];
 	contexts?: GitGraphRowContexts;
+	reachableFromBranches?: string[];
 }
 
 export interface GitGraph {