Adds ability to copy changes between worktrees

Changes "Explain WIP" to only show on worktrees if there are changes

Author: eamodio

contributions.json

@@ -136,7 +136,7 @@
 			"menus": {
 				"view/item/context": [
 					{
-						"when": "viewItem =~ /gitlens:(worktree|uncommitted)\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
+						"when": "viewItem =~ /gitlens:(worktree\\b(?=.*?\\b\\+working\\b)|uncommitted)\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
 						"group": "3_gitlens_ai",
 						"order": 1
 					}
@@ -895,6 +895,18 @@
 			"label": "Copy Working Changes to Worktree...",
 			"commandPalette": "gitlens:enabled && !gitlens:untrusted && !gitlens:hasVirtualFolders"
 		},
+		"gitlens.copyWorkingChangesToWorktree:views": {
+			"label": "Copy Working Changes to Worktree...",
+			"menus": {
+				"view/item/context": [
+					{
+						"when": "viewItem =~ /gitlens:(worktree\\b(?=.*?\\b\\+working\\b)|uncommitted)\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+						"group": "3_gitlens",
+						"order": 99
+					}
+				]
+			}
+		},
 		"gitlens.createCloudPatch": {
 			"label": "Create Patch...",
 			"commandPalette": "gitlens:enabled && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled",

package.json

@@ -6394,6 +6394,10 @@
 				"title": "Copy Working Changes to Worktree...",
 				"category": "GitLens"
 			},
+			{
+				"command": "gitlens.copyWorkingChangesToWorktree:views",
+				"title": "Copy Working Changes to Worktree..."
+			},
 			{
 				"command": "gitlens.createCloudPatch",
 				"title": "Create Patch...",
@@ -10702,6 +10706,10 @@
 					"command": "gitlens.copyWorkingChangesToWorktree",
 					"when": "gitlens:enabled && !gitlens:untrusted && !gitlens:hasVirtualFolders"
 				},
+				{
+					"command": "gitlens.copyWorkingChangesToWorktree:views",
+					"when": "false"
+				},
 				{
 					"command": "gitlens.createCloudPatch",
 					"when": "gitlens:enabled && gitlens:gk:organization:drafts:enabled && config.gitlens.cloudPatches.enabled"
@@ -17965,9 +17973,14 @@
 					"when": "viewItem =~ /gitlens:tags\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
 					"group": "1_gitlens_actions@1"
 				},
+				{
+					"command": "gitlens.copyWorkingChangesToWorktree:views",
+					"when": "viewItem =~ /gitlens:(worktree\\b(?=.*?\\b\\+working\\b)|uncommitted)\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && !gitlens:hasVirtualFolders",
+					"group": "3_gitlens@99"
+				},
 				{
 					"command": "gitlens.ai.explainWip:views",
-					"when": "viewItem =~ /gitlens:(worktree|uncommitted)\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
+					"when": "viewItem =~ /gitlens:(worktree\\b(?=.*?\\b\\+working\\b)|uncommitted)\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
 					"group": "3_gitlens_ai@1"
 				},
 				{

src/commands/explainWip.ts

@@ -11,6 +11,7 @@ import { command } from '../system/-webview/command';
 import { showMarkdownPreview } from '../system/-webview/markdown';
 import { createMarkdownCommandLink } from '../system/commands';
 import { Logger } from '../system/logger';
+import { capitalize } from '../system/string';
 import { GlCommandBase } from './commandBase';
 import { getCommandUri } from './commandBase.utils';
 import type { CommandContext } from './commandContext';
@@ -67,23 +68,22 @@ export class ExplainWipCommand extends GlCommandBase {
 		}
 
 		try {
-			// If args?.staged is undefined, get all changes (staged and unstaged)?
-			let stagedLabel;
+			let label;
 			let to;
 			if (args?.staged === true) {
-				stagedLabel = 'Staged';
+				label = 'staged';
 				to = uncommittedStaged;
 			} else if (args?.staged === false) {
-				stagedLabel = 'Unstaged';
+				label = 'unstaged';
 				to = uncommitted;
 			} else {
-				stagedLabel = 'Uncommitted';
+				label = 'working';
 				to = '';
 			}
 
 			const diff = await svc.diff.getDiff(to, undefined);
 			if (!diff?.contents) {
-				void showGenericErrorMessage('No working changes found to explain');
+				void showGenericErrorMessage(`No ${label} changes found to explain`);
 				return;
 			}
 
@@ -109,7 +109,7 @@ export class ExplainWipCommand extends GlCommandBase {
 			const result = await this.container.ai.explainChanges(
 				{
 					diff: diff.contents,
-					message: `${stagedLabel} working changes${worktreeInfo}`,
+					message: `${capitalize(label)} changes${worktreeInfo}`,
 				},
 				{
 					...args.source,
@@ -119,18 +119,18 @@ export class ExplainWipCommand extends GlCommandBase {
 				{
 					progress: {
 						location: ProgressLocation.Notification,
-						title: `Explaining working changes${worktreeInfo}...`,
+						title: `Explaining ${label} changes${worktreeInfo}...`,
 					},
 				},
 			);
 
 			if (result == null) {
-				void showGenericErrorMessage('Unable to explain working changes');
+				void showGenericErrorMessage(`Unable to explain ${label} changes`);
 				return;
 			}
 
-			const title = `Working Changes Summary${worktreeDisplayName}`;
-			const content = `# ${title}\n\n> Generated by ${result.model.name}\n\n## ${stagedLabel} Changes\n\n${result.parsed.summary}\n\n${result.parsed.body}`;
+			const title = `${capitalize(label)} Changes Summary${worktreeDisplayName}`;
+			const content = `# ${title}\n\n> Generated by ${result.model.name}\n\n## ${label} Changes\n\n${result.parsed.summary}\n\n${result.parsed.body}`;
 
 			void showMarkdownPreview(content);
 		} catch (ex) {

src/commands/git/worktree.ts

@@ -147,7 +147,9 @@ interface OpenState {
 interface CopyChangesState {
 	subcommand: 'copy-changes';
 	repo: string | Repository;
-	worktree: GitWorktree;
+	/** Optional source worktree, defaults to the current worktree if not provided */
+	source?: GitWorktree;
+	target: GitWorktree;
 	changes:
 		| { baseSha?: string; contents?: string; type: 'index' | 'working-tree' }
 		| { baseSha: string; contents: string; type?: 'index' | 'working-tree' };
@@ -228,7 +230,7 @@ export class WorktreeGitCommand extends QuickCommand<State> {
 
 					break;
 				case 'copy-changes':
-					if (args.state.worktree != null) {
+					if (args.state.target != null) {
 						counter++;
 					}
 
@@ -1153,39 +1155,46 @@ export class WorktreeGitCommand extends QuickCommand<State> {
 		while (this.canStepsContinue(state)) {
 			context.title = state?.overrides?.title ?? getTitle(state.subcommand);
 
-			if (state.counter < 3 || state.worktree == null) {
+			if (state.counter < 3 || state.target == null) {
 				context.worktrees ??= (await state.repo.git.worktrees?.getWorktrees()) ?? [];
 
 				let placeholder;
 				switch (state.changes.type) {
 					case 'index':
-						context.title = state?.overrides?.title ?? 'Copy Staged Changes to Worktree';
-						placeholder = 'Choose a worktree to copy your staged changes to';
+						context.title =
+							state?.overrides?.title ??
+							`Copy Staged${state.source?.name ? ' Worktree' : ''} Changes to Worktree`;
+						placeholder = `Choose a worktree to copy your staged${
+							state.source?.name ? ' Worktree' : ''
+						} changes to`;
 						break;
 					case 'working-tree':
-						context.title = state?.overrides?.title ?? 'Copy Working Changes to Worktree';
-						placeholder = 'Choose a worktree to copy your working changes to';
-						break;
 					default:
-						context.title = state?.overrides?.title ?? 'Copy Changes to Worktree';
-						placeholder = 'Choose a worktree to copy changes to';
+						context.title =
+							state?.overrides?.title ??
+							`Copy Working${state.source?.name ? ' Worktree' : ''} Changes to Worktree`;
+						placeholder = `Choose a worktree to copy your working${
+							state.source?.name ? ' worktree' : ''
+						} changes to`;
 						break;
 				}
 
 				const result = yield* pickWorktreeStep(state, context, {
 					excludeOpened: true,
 					includeStatus: true,
-					picked: state.worktree?.uri?.toString(),
+					picked: state.target?.uri?.toString(),
 					placeholder: placeholder,
 				});
 				// Always break on the first step (so we will go back)
 				if (result === StepResultBreak) break;
 
-				state.worktree = result;
+				state.target = result;
 			}
 
+			const sourceSvc = this.container.git.getRepositoryService(state.source?.uri ?? state.repo.uri);
+
 			if (!state.changes.contents || !state.changes.baseSha) {
-				const diff = await state.repo.git.diff.getDiff?.(
+				const diff = await sourceSvc.diff.getDiff?.(
 					state.changes.type === 'index' ? uncommittedStaged : uncommitted,
 					'HEAD',
 					{
@@ -1204,7 +1213,7 @@ export class WorktreeGitCommand extends QuickCommand<State> {
 			}
 
 			if (!isSha(state.changes.baseSha)) {
-				const sha = (await state.repo.git.revision.resolveRevision(state.changes.baseSha)).sha;
+				const sha = (await sourceSvc.revision.resolveRevision(state.changes.baseSha)).sha;
 				if (sha != null) {
 					state.changes.baseSha = sha;
 				}
@@ -1218,15 +1227,15 @@ export class WorktreeGitCommand extends QuickCommand<State> {
 			endSteps(state);
 
 			try {
-				const svc = this.container.git.getRepositoryService(state.worktree.uri);
-				const commit = await svc.patch?.createUnreachableCommitForPatch(
+				const commit = await sourceSvc.patch?.createUnreachableCommitForPatch(
 					state.changes.baseSha,
 					'Copied Changes',
 					state.changes.contents,
 				);
 				if (commit == null) return;
 
-				await svc.patch?.applyUnreachableCommitForPatch(commit.sha, { stash: false });
+				const targetSvc = this.container.git.getRepositoryService(state.target.uri);
+				await targetSvc.patch?.applyUnreachableCommitForPatch(commit.sha, { stash: false });
 				void window.showInformationMessage(`Changes copied successfully`);
 			} catch (ex) {
 				if (ex instanceof CancellationError) return;
@@ -1253,7 +1262,7 @@ export class WorktreeGitCommand extends QuickCommand<State> {
 				{
 					subcommand: 'open',
 					repo: state.repo,
-					worktree: state.worktree,
+					worktree: state.target,
 					flags: [],
 					counter: 3,
 					confirm: true,
@@ -1277,37 +1286,23 @@ export class WorktreeGitCommand extends QuickCommand<State> {
 			case 'index':
 				confirmations.push({
 					label: 'Copy Staged Changes to Worktree',
-					detail: `Will copy the staged changes${
-						count > 0 ? ` (${pluralize('file', count)})` : ''
-					} to worktree '${state.worktree.name}'`,
+					detail: `Will copy the staged changes${count > 0 ? ` (${pluralize('file', count)})` : ''}${
+						state.source ? ` from worktree '${state.source.name}'` : ''
+					} to worktree '${state.target.name}'`,
 				});
 				break;
 			case 'working-tree':
+			default:
 				confirmations.push({
 					label: 'Copy Working Changes to Worktree',
-					detail: `Will copy the working changes${
-						count > 0 ? ` (${pluralize('file', count)})` : ''
-					} to worktree '${state.worktree.name}'`,
+					detail: `Will copy the working changes${count > 0 ? ` (${pluralize('file', count)})` : ''}${
+						state.source ? ` from worktree '${state.source.name}'` : ''
+					} to worktree '${state.target.name}'`,
 				});
 				break;
-
-			default:
-				confirmations.push(
-					createFlagsQuickPickItem([], [], {
-						label: 'Copy Changes to Worktree',
-						detail: `Will copy the changes${
-							count > 0 ? ` (${pluralize('file', count)})` : ''
-						} to worktree '${state.worktree.name}'`,
-					}),
-				);
-				break;
 		}
 
-		const step = createConfirmStep(
-			`Confirm ${context.title} \u2022 ${state.worktree.name}`,
-			confirmations,
-			context,
-		);
+		const step = createConfirmStep(`Confirm ${context.title} \u2022 ${state.target.name}`, confirmations, context);
 
 		const selection: StepSelection<typeof step> = yield step;
 		return canPickStepContinue(step, state, selection) ? undefined : StepResultBreak;

src/constants.commands.generated.ts

@@ -34,6 +34,7 @@ export type ContributedCommands =
 	| 'gitlens.copyRemoteFileUrlWithoutRange'
 	| 'gitlens.copyRemotePullRequestUrl'
 	| 'gitlens.copyRemoteRepositoryUrl'
+	| 'gitlens.copyWorkingChangesToWorktree:views'
 	| 'gitlens.ghpr.views.openOrCreateWorktree'
 	| 'gitlens.graph.addAuthor'
 	| 'gitlens.graph.associateIssueWithBranch'

src/git/actions/worktree.ts

@@ -42,17 +42,17 @@ export async function create(
 export function copyChangesToWorktree(
 	type: 'working-tree' | 'index',
 	repo?: string | Repository,
-	worktree?: GitWorktree,
+	target?: GitWorktree,
+	source?: GitWorktree,
 ): Promise<void> {
 	return executeGitCommand({
 		command: 'worktree',
 		state: {
 			subcommand: 'copy-changes',
 			repo: repo,
-			worktree: worktree,
-			changes: {
-				type: type,
-			},
+			source: source,
+			target: target,
+			changes: { type: type },
 		},
 	});
 }

src/views/nodes/utils/-webview/node.utils.ts

@@ -27,6 +27,7 @@ import type { StashNode } from '../../stashNode';
 import type { StatusFileNode } from '../../statusFileNode';
 import type { TagNode } from '../../tagNode';
 import type { UncommittedFileNode } from '../../UncommittedFileNode';
+import type { WorktreeNode } from '../../worktreeNode';
 
 // prettier-ignore
 export type TreeViewNodesByType = {
@@ -78,6 +79,8 @@ export type TreeViewNodesByType = {
 		? BranchTrackingStatusFilesNode
 		: T extends 'uncommitted-file'
 		? UncommittedFileNode
+		: T extends 'worktree'
+		? WorktreeNode
 		: ViewNode<T>;
 };
 

src/views/nodes/worktreeNode.ts

@@ -400,7 +400,7 @@ export class WorktreeNode extends CacheableChildrenViewNode<'worktree', ViewsWit
 		item.description = description;
 		item.contextValue = `${ContextValues.Worktree}${this.worktree.isDefault ? '+default' : ''}${
 			this.worktree.opened ? '+active' : ''
-		}`;
+		}${hasChanges ? '+working' : ''}`;
 		item.iconPath =
 			pendingPullRequest != null
 				? new ThemeIcon('loading~spin')

src/views/viewCommands.ts

@@ -105,6 +105,7 @@ import type { StashNode } from './nodes/stashNode';
 import type { StatusFileNode } from './nodes/statusFileNode';
 import type { TagNode } from './nodes/tagNode';
 import type { TagsNode } from './nodes/tagsNode';
+import type { UncommittedFilesNode } from './nodes/UncommittedFilesNode';
 import type { WorktreeNode } from './nodes/worktreeNode';
 import type { WorktreesNode } from './nodes/worktreesNode';
 
@@ -1769,6 +1770,20 @@ export class ViewCommands implements Disposable {
 			source: { source: 'view', detail: node.is('branch') ? 'branch' : 'tag' },
 		});
 	}
+
+	@command('gitlens.copyWorkingChangesToWorktree:views')
+	@log()
+	private async copyWorkingChangesToWorktree(node: WorktreeNode | UncommittedFilesNode) {
+		if (node.is('uncommitted-files')) {
+			const parent = node.getParent()!;
+			if (parent?.is('worktree')) {
+				node = parent;
+			}
+		}
+		if (!node.is('worktree')) return;
+
+		return WorktreeActions.copyChangesToWorktree('working-tree', node.worktree.repoPath, undefined, node.worktree);
+	}
 }
 
 interface CompareSelectedInfo {