Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 04:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
142,715 Commits 2,498 Branches 340 Tags
copilot/fix-shell-integration-issue
Commit Graph

2861 Commits

Author SHA1 Message Date
Ladislau Szomoru
a1c9bc01e7 Chat - add support to attach a history item change range to chat (#266022) 
* Chat - add ISCMHistoryItemChangeRangeVariableEntry

* Chat - add content provider for ISCMHistoryItemChangeRangeVariableEntry
 2025-09-10 14:16:38 +00:00
Ladislau Szomoru
f3d0305959 SCM - add method to resolve a source control history item (#265844) 2025-09-09 15:40:52 +02:00
Christy 😺
8bdbcf0e32 compare with workspace use diff editor instead of merge editor (#265054) 
compare with workspace use diff editor instead of merge
 2025-09-03 20:33:10 -07:00
Christy 😺
901aa3b820 directly call simplified merge editor for worktree merges (#265024) 
directly call own simplified merge editor for worktree merges
 2025-09-03 14:45:41 -07:00
Christy 😺
f562c9d3e8 Enable users to view and apply changes from worktree to main repo, per file (#263927) 
* enable compare with workspace command

* add context to command

* clean up
 2025-09-02 15:28:07 +02:00
Christy 😺
211615d751 Git: Fix worktree checkout default actions (#262414) 
* fix worktree checkout default action

* remove comments

* clean up

* fix returns

* change action to 'cancel'
 2025-09-01 15:46:09 +02:00
Christy 😺
9c9a837573 clean up dialog and add additional warning (#263908) 
* restrict dialog to less than 5 files

* add warning dialog
 2025-08-28 15:34:27 -07:00
Christy 😺
79712fb87f migrate worktree changes (#262656) 
* migrate worktree changes

* detect LocalChangesOverwritten error before creating & applying stash

* error handle

* make error label clearer

* delete redundant stash length check

* clean up error handling
 2025-08-28 07:57:26 -07:00
Ladislau Szomoru
a63acf5e40 Git - accept working set changes when a resource is staged/committed (#262885) 2025-08-25 08:07:51 -07:00
Ladislau Szomoru
845601668b Git - fix commit signing regression (#262479) 
* Git - fix commit signing regression

* Extract file name when signing commit
 2025-08-20 10:55:44 +00:00
Ladislau Szomoru
792addc4a2 Git - reveal specific file in the multi-file diff editor (#262458) 
Git - reveal specific file in the multi-file diff ediotr
 2025-08-20 08:46:53 +00:00
Christy 😺
6518fe6990 separate open and delete worktree action (#262175) 2025-08-18 11:30:03 -07:00
Christy 😺
e14542e646 add delete worktree command to context menu (#261711) 2025-08-14 22:07:40 +00:00
Christy 😺
01d448dc0c fix worktree label (#260627) 
fix label
 2025-08-08 11:00:37 -07:00
Matt Bierner
ed71020bfc Convert extension webpack scripts to modules 2025-08-07 17:20:22 -07:00
Matt Bierner
1908c48d3c Update decorator signature 2025-08-06 14:52:15 -07:00
Matt Bierner
3e7a233c64 Revert git api change 2025-08-06 14:38:32 -07:00
Matt Bierner
2baf1b4cde Runtime fixes for stage 3 decorators 2025-08-06 14:32:43 -07:00
Matt Bierner
d8c9852fe9 Don't use experimental decorators in extensions 
Seeing if we can compile our extensions using TS native which doesn't support these. The usage is so low that I think we can just remove them
 2025-08-06 13:24:19 -07:00
Matt Bierner
30b93b1217 Bump extensions to target es2024 
I reviewed the various changes and library additions of es2024 and it seems they are widely supported across node and modern browsers
 2025-08-05 10:40:33 -07:00
Christy 😺
cb1290bcb1 Add create new branch option (create worktree) (#259599) 
* add create branch option on current branch

* fix override
 2025-08-04 18:28:27 +00:00
Christy 😺
f58a56ea03 Handle worktree errors (#259106) 
* fix worktree error handling

* remove print statement

* clean up
 2025-07-31 16:38:57 -07:00
Christy 😺
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
Ladislau Szomoru
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
Ladislau Szomoru
0b25736ee6 Git - detect worktrees when opening a worktree (#258980) 2025-07-31 10:52:07 +00:00
Ladislau Szomoru
cc28f165ce Git - add the ability to create a worktree from a worktree (#258956) 2025-07-31 11:59:33 +02:00
Christy 😺
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
Ladislau Szomoru
4baac87285 Git - polish worktree error handling (#258806) 2025-07-30 14:04:44 +00:00
Ladislau Szomoru
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
Christy 😺
860defc712 allow delete worktrees if worktrees are closed (#258696) 2025-07-29 16:21:38 -07:00
Christy 😺
ed9f03c3aa Error handle delete worktree within a worktree (#258297) 2025-07-28 18:43:58 +00:00
Christy 😺
f496271cbd filter only worktrees for open command (#257933) 2025-07-25 18:51:09 -07:00
Ladislau Szomoru
2f09f40b0b Git - honor detectSubmodules and detectWorktrees settings when opening a workspace from a file (#257813) 2025-07-25 13:47:43 +02:00
Christy 😺
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
Christy 😺
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
Ladislau Szomoru
cfc04dc5ba Git - read the HEAD of each worktree (#257532) 2025-07-23 21:37:32 +00:00
Christy 😺
8bef53d4b6 refine default worktree name (#257501) 2025-07-23 13:35:43 -07:00
Christy 😺
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
Ladislau Szomoru
d421372b3e Git - add the ability to create worktree from remote branches and tags (#257461) 2025-07-23 08:03:48 -07:00
Ladislau Szomoru
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
Christy 😺
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
Christy 😺
44bc33cc68 detect worktrees on by default (#257282) 2025-07-22 08:15:09 -07:00
Christy 😺
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
Christy 😺
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
Ladislau Szomoru
c7ad864491 Git - add the ability to limit command palatte commands to repository types (#257261) 2025-07-22 06:12:34 -07:00
isomo
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
Ladislau Szomoru
5fa87f9356 SCM - worktree context menu improvements (#257242) 2025-07-22 12:23:39 +02:00
Christy 😺
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
Christy 😺
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
Ladislau Szomoru
e7be6e9cff SCM - add proposed API to specify source control provider icons (#256762) 2025-07-18 12:54:18 -07:00