Enable users to view and apply changes from worktree to main repo, per file #263927
+67
−13
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lszomoru
requested changes
Aug 29, 2025
extensions/git/src/repository.ts
Outdated
| @@ -182,6 +182,7 @@ export class Resource implements SourceControlResourceState { | |||
| get type(): Status { return this._type; } | |||
| get original(): Uri { return this._resourceUri; } | |||
| get renameResourceUri(): Uri | undefined { return this._renameResourceUri; } | |||
| get contextValue(): string | undefined { return this._repository?.kind; } | |||
There was a problem hiding this comment.
In the package.json where I set scmResourceState == worktree
https://github.com/microsoft/vscode/blob/main/src/vscode-dts/vscode.d.ts#L16389
lszomoru
requested changes
Sep 1, 2025
extensions/git/src/repository.ts
Outdated
| @@ -310,6 +311,7 @@ export class Resource implements SourceControlResourceState { | |||
| private _type: Status, | |||
| private _useIcons: boolean, | |||
| private _renameResourceUri?: Uri, | |||
| private _repository?: Repository, | |||
There was a problem hiding this comment.
Got it. Let's not pass in the complete repository object but just pass in the repository kind (similar to how the ResourceGroupType is being passed in.
There was a problem hiding this comment.
Updated. Lmk if you'd eventually like to make RepositoryKind an enum. I just didn't do it here because I didn't want to make a bigger change than necessary to other files.
lszomoru
approved these changes
Sep 2, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
'Compare with Workspace' is only available from a worktree's context menu under 'Changes' and opens the merge editor where users can apply changes from a worktree to its main repository.
