f58a56ea03
Handle worktree errors ( #259106 )
...
* fix worktree error handling
* remove print statement
* clean up
2025-07-31 16:38:57 -07:00
8e21fb0539
Fix PowerShell terminal suggestion performance by deduplicating concurrent requests ( #259051 )
2025-07-31 16:51:40 -04:00
986e46a1c3
Pick up TS 5.9 stable
...
Fixes #258302
2025-07-31 11:34:26 -07:00
1297e26760
Handle worktree errors ( #258867 )
...
* throw err when choosing already checked out branch
* fix two separate worktree error handling
* Validate branch as soon as it is selected
* Working path validation upfront
* normalize paths
---------
Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
2025-07-31 16:44:24 +00:00
35eddf193f
Revert "Git - honor detectSubmodules and detectWorktrees settings when opening a workspace from a file" ( #259005 )
...
This reverts commit 655258b05e
2025-07-31 15:26:48 +02:00
0b25736ee6
Git - detect worktrees when opening a worktree ( #258980 )
2025-07-31 10:52:07 +00:00
cc28f165ce
Git - add the ability to create a worktree from a worktree ( #258956 )
2025-07-31 11:59:33 +02:00
20724f79ba
fix default path bug related to branch prefix ( #258709 )
...
* fix default path bug related to branch prefix
* remove branch prefix first, then get last component
* replace / with -
* clean up
2025-07-30 15:02:35 +00:00
4baac87285
Git - polish worktree error handling ( #258806 )
2025-07-30 14:04:44 +00:00
61deced474
Git - fix git.stageFile and git.unstageFile commands so that they work when invoked using a keybinding ( #258771 )
2025-07-30 12:28:45 +02:00
860defc712
allow delete worktrees if worktrees are closed ( #258696 )
2025-07-29 16:21:38 -07:00
ed9f03c3aa
Error handle delete worktree within a worktree ( #258297 )
2025-07-28 18:43:58 +00:00
c580582216
Silence the "Comments are not permitted in JSON." error for emmet snippets.json files ( #257878 )
...
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
2025-07-28 10:21:05 -07:00
fd38deac92
Skip flaky notebook test ( #258223 )
...
Skip flaky test
2025-07-28 13:46:15 +00:00
510359a9a6
Enable angle bracket colorization for C# ( #247665 )
2025-07-26 14:06:27 +00:00
f496271cbd
filter only worktrees for open command ( #257933 )
2025-07-25 18:51:09 -07:00
4b9b99ba7a
Pick up latest md language server
...
For #248467
2025-07-25 16:07:10 -07:00
9ef59e22ed
Patch razor grammar to use html derivative ( #257827 )
...
Fixes #254686
2025-07-25 13:10:08 +00:00
90fcd05e94
GitHub - update remote order for git blame actions ( #257816 )
2025-07-25 12:06:47 +00:00
2f09f40b0b
Git - honor detectSubmodules and detectWorktrees settings when opening a workspace from a file ( #257813 )
2025-07-25 13:47:43 +02:00
b0fcb93a29
Pick up TS 5.9 rc
2025-07-24 15:40:45 -07:00
afd143299e
add Create New branch option in creating worktree ( #257701 )
...
* Create new branch option for creating worktrees
* clean up
* resolve esc flows
2025-07-24 17:59:16 +00:00
2446b91ada
revamp create worktree... flow ( #257603 )
...
* revamp create worktree... flow
* Cleanup code
---------
Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
2025-07-24 18:40:20 +10:00
cfc04dc5ba
Git - read the HEAD of each worktree ( #257532 )
2025-07-23 21:37:32 +00:00
04d3b0f0b3
Merge pull request #257510 from mjbvz/handsome-squirrel
...
Remove expandable hover setting
2025-07-23 13:38:36 -07:00
8bef53d4b6
refine default worktree name ( #257501 )
2025-07-23 13:35:43 -07:00
7094490c32
Remove expandable hover setting
...
Seems like there's no downside in keeping this enabled by default for everyone
2025-07-23 12:37:03 -07:00
b5c5403c61
create new branch in Create Worktree... command ( #257370 )
...
* create new branch in Create Worktree... command
* separator between creating branch and existing branch
* refine create branch
* clean up
* code clean up
* Update commands.ts
* resolve hygiene error
2025-07-23 17:41:02 +00:00
d421372b3e
Git - add the ability to create worktree from remote branches and tags ( #257461 )
2025-07-23 08:03:48 -07:00
ebd5fb15ef
Git - fix file path parsing issue in askpass ( #257422 )
...
Git - fix file path parsin issue in askpass
2025-07-23 12:33:33 +02:00
b78acaed0e
worktree error handling in creation of worktrees and checking out branches ( #257328 )
...
* worktree error handling in creation of worktrees and checking out branches
* code clean up
2025-07-22 15:10:03 -07:00
44bc33cc68
detect worktrees on by default ( #257282 )
2025-07-22 08:15:09 -07:00
4075a14638
Git: refine Delete worktree... command to populate repo picker if necessary ( #257279 )
...
refine Delete worktree... command
2025-07-22 14:58:35 +00:00
2b37aecab3
Error handling of create worktree and fix create worktree... command from command palette ( #257172 )
...
* esc when creating worktree name cancels create operation
* Find main repo for createworktree command palette to prevent repo picker
* error handling of creating worktree
* add back repo picker for create worktree... command
2025-07-22 07:37:50 -07:00
c7ad864491
Git - add the ability to limit command palatte commands to repository types ( #257261 )
2025-07-22 06:12:34 -07:00
1ddf2e846d
Fix git.diff.stageHunk command to work with keyboard shortcuts ( #254145 )
...
The command now falls back to cursor-based hunk staging when no context
is provided, enabling keyboard users to stage hunks without manual selection.
Fixes https://github.com/microsoft/vscode/issues/253895
2025-07-22 12:47:07 +00:00
5fa87f9356
SCM - worktree context menu improvements ( #257242 )
2025-07-22 12:23:39 +02:00
c937d1d05f
Open worktree in current or new window command ( #257139 )
...
* open worktree in window
* open worktree refinements
2025-07-21 11:46:07 -07:00
6187e6deb7
Git: Delete Worktree... command for command palette only ( #256827 )
...
* Delete worktree picker command palette
* clean up
* Only allow delete worktree picker from main repository
* Find main repository
* resolve hygiene formatting issues
2025-07-21 07:48:08 -07:00
e7be6e9cff
SCM - add proposed API to specify source control provider icons ( #256762 )
2025-07-18 12:54:18 -07:00
8551a1d51d
Finalize the bring your own key api ( #255892 )
...
* Start small
* start on new byok api
* Some more api work
* Hook up more of the API
* A single file with no errors yay!
* Some cleanup
* Slow and steady progress
* More code
* Add resolve
* Hate everything
* More progress on rewriting id
* Some error fixing
* Fix null service
* Use claude to fix tests
* Fix tests
* Fix tests
* More test fixing
* Some setup
* Some model picker stuff
* Fix model picker with new BYOK api
* Remove support for contirbuting to mdel picker action bar
* Adjust to allow for user prompting
* Add event
* Fix conflicts
2025-07-18 13:42:55 -04:00
dd052e8d44
rework deletion flow ( #256415 )
...
* rework deletion flow
* change delete label
* Revise deletion of worktree
* reopen correct repo
* clean up
* Refactor deleteWorkspace command
* Do not show deleteWorktree command in the command palette
---------
Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
2025-07-18 07:06:08 -07:00
faa9f0afcc
SCM - proposed API to represent parent/child relationship ( #256242 )
...
* Add plumbing for parent/child relationship
* Fix selected and view height
* More clean-up
* More fixes related to view height
* Dispose submodules and worktrees
* Add onDidDisposeParent event
2025-07-17 14:54:32 +00:00
d21a5769dd
Merge pull request #256256 from andy0130tw/andy0130tw/support-locale-argument-in-tsserver-web
...
Support the locale argument of TypeScript language server on the web version (#256252 )
2025-07-16 13:35:44 -07:00
72aaf2bc9f
Add worktree command ( #255945 )
...
* Basic functionality of adding worktree
* Code refactoring and clean up
* Remove accidentally added submodules
* Specify folder destination
* Remove default worktree path, always prompt for destination instead
* create worktree only displayed in repo's worktree subcommands
* Git - handle another error condition when detecting worktrees (#256278 )
* Rework creating worktree flow
* Include worktree name placeholder
---------
Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
2025-07-16 18:54:45 +00:00
cdc005d1cb
Fix a few expect error and bump web version
2025-07-16 11:10:43 -07:00
e624e6aee4
Pick up TS 5.9-beta for built-in support
2025-07-16 11:02:20 -07:00
0cfca3786c
Git - handle another error condition when detecting worktrees ( #256278 )
2025-07-16 09:15:33 -07:00
c0ceb8ca95
Git - fix regression related to worktree detection ( #256265 )
2025-07-16 08:10:22 -07:00
8c938d137a
Disable flaky workspace test ( #256250 )
...
See https://github.com/microsoft/vscode/issues/253863
2025-07-16 07:17:49 -07:00
Christy 😺