Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-22 19:29:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
142,726 Commits 2,494 Branches 340 Tags
dev/dmitriv/fix-tab-size-detection
Commit Graph

948 Commits

Author SHA1 Message Date
Ladislau Szomoru
abd691b025 Git - polish delete worktree picker (#284242) 2025-12-18 12:22:41 +00:00
Ladislau Szomoru
150682a14a Git - add worktrees node to the Repositories view (#284224) 
* Worktree node - initial implementation

* Wire up various commands
 2025-12-18 10:48:41 +00:00
Ladislau Szomoru
e255528ff0 Git - update branch protection dialog message (#284037) 2025-12-17 11:58:27 +00:00
Ladislau Szomoru
f297f37463 Git - add "Stashes" node to the repositories view (#279400) 
* WIP - Initial implementation

* Get author and committer date for a stash

* Add drop stash command

* More cleanup
 2025-11-25 17:13:48 +00:00
Ladislau Szomoru
9c36e3505a Git - add option to restore staged changes when aplying/popping a stash (#278556) 2025-11-20 11:13:37 +00:00
Ladislau Szomoru
7c999f6f62 Git - refactor migrate changes functionality (#278426) 
* Git - rework migrate changes

* Add extension API

* Revert some of the options

* Remove staged option

* More cleanup

* More command cleanup
 2025-11-19 12:55:43 -08:00
Ladislau Szomoru
5a1c4e6ca5 Git - refactor create/delete worktree and expose extension API (#278107) 
* Git - refactor create/delete worktree and expose extension API

* Pull request feedback

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-11-18 15:37:56 +00:00
Ladislau Szomoru
ae77536e70 Git - cleanup delete worktree command implementation (#278018) 2025-11-18 00:17:55 -08:00
Ladislau Szomoru
2b52b93770 Git - enable ESLint rule for git extensions (#277156) 
* Initial commit with all exceptions

* First pass of fixing

* Add ignored files explicitly
 2025-11-13 15:35:01 +00:00
Ladislau Szomoru
89fd28901e Git - only dispose worktree repository after it has been deleted (#276207) 2025-11-07 13:55:40 -08:00
Ladislau Szomoru
cc5d8fd3ee Git - do not show warning dialog when you do a non-interactive worktree migration (#276177) 
* Git - do not show warning dialog when you do a non-interactive worktree migration

* Fix condition 🤦‍♂️
 2025-11-07 12:31:18 -08:00
Ladislau Szomoru
7bdbccd240 Git - improve logic to pick a worktree to migrate changes from (#276048) 2025-11-07 11:38:52 +00:00
Dmitriy Vasyura
90281f7d43 Revert "Git - adopt new QuickInputButton location (#275071)" (#275465) 
This reverts commit e092054c98.
 2025-11-05 07:24:33 +01:00
Ladislau Szomoru
4e72c81a4e Git - fix editor tab labels and notifications when comparing references (#275292) 2025-11-04 20:17:45 +00:00
Ladislau Szomoru
e092054c98 Git - adopt new QuickInputButton location (#275071) 2025-11-04 10:49:32 +00:00
Ladislau Szomoru
e3babad841 SCM - use unicode codes in labels (#274786) 2025-11-03 16:02:24 +00:00
Ladislau Szomoru
1690fee7d8 Git - improve compare reference notification (#274776) 
SCM - improve compare reference notification
 2025-11-03 15:13:39 +00:00
Abinash Karmakar
351475e460 fix: include original URI in resource filtering for multi-file diff e… (#271512) 
fix: include original URI in resource filtering for multi-file diff editor (#271506)
 2025-11-02 18:38:10 +00:00
Ladislau Szomoru
d219d2999a Git - adjust warning message and actions (#274508) 2025-11-01 14:57:40 +00:00
Ladislau Szomoru
69e17b67f1 Git - add more commands to repositories view (#274484) 
* Git - add actions to delete branch/tag

* Fix rebase action label

* Git - add more commands
 2025-11-01 13:27:56 +01:00
Ladislau Szomoru
c0755c9484 Git - add actions to merge/rebase to repositories view (#274480) 2025-11-01 08:08:31 +00:00
Ladislau Szomoru
edf5868b02 SCM - more improvements to the repositories view (#274438) 
* SCM - tweak artifact folder compression

* SCM - fixed more commands and layout

* SCM - more compression changes
 2025-10-31 21:49:50 +00:00
Osvaldo Ortega
444b1cb403 Command to create worktrees with defaults (#268398) 
* Command to create worktrees with defaults

* Update extensions/git/src/commands.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-10-31 11:39:12 -07:00
Ladislau Szomoru
e82ab3b366 SCM - add more commands to the repositories view (#274352) 
* SCM - artifact tree improvements

* Add support for compression

* Add more commands
 2025-10-31 15:44:15 +01:00
Ladislau Szomoru
105d8dd583 SCM - 💄some follow-up cleanup (#274193) 2025-10-30 13:55:23 -07:00
Ladislau Szomoru
9e8f5336da SCM - plumbing to support artifacts in the repositories view (#274173) 
* WIP - ported changes from the old branch

* More work getting the changes ready

* Tweak things

* Git - wire-up checkout command
 2025-10-30 12:37:22 -07:00
Ladislau Szomoru
f46638bfc7 Git - improve reference comparison commands (#274143) 
* Git - improve compare commands

* Remove an extra check

* Fix bad manual merge
 2025-10-30 17:00:30 +00:00
Ladislau Szomoru
16f58dd3ac SCM - add incoming/outgoing nodes to graph (#274059) 2025-10-30 17:04:24 +01:00
Ladislau Szomoru
20ded57d68 Git - use diff instead of diff-tree for showing commit data and comparing branches (#273969) 2025-10-29 16:28:46 +01:00
Ladislau Szomoru
5840155ace Git - add commands to easily compare a local branch with upstream and merge base (#273839) 2025-10-28 17:22:06 -07:00
Ladislau Szomoru
90627f0950 Git - unify compare commands for the graph (#273771) 
* Git - unify compare commands for the graph

* Update placeholder

* More changes
 2025-10-28 16:00:51 +00:00
Ladislau Szomoru
294b045d4b Git - fix bug with comparing with a remote branch (#273705) 
* Git - fix bug with comparing with a remote branch

* Update placeholder
 2025-10-28 11:10:07 +01:00
Ladislau Szomoru
124710c5ff Git - add command to compare a tag (#273694) 
* Git - update command label

* Git - add command to compare a tag
 2025-10-28 06:43:12 +00:00
Ladislau Szomoru
3fff78b18a Graph - add command to compare references (#273635) 2025-10-27 15:37:10 -07:00
Ladislau Szomoru
24dc95ef64 Git - add telemetry to track down stale diagnostics (#273565) 2025-10-27 07:42:35 -07:00
Alex Ross
3cc447e709 Improve layering for git model (#272857) 
* Improve layering for git model
- Git clone doesn't belong in the model, removed it
- All the extra repo picking didn't seem to fit into `Git` though, as that is really about git operations
- Added a `CloneUtils` namespace for all the clone stuff to live.

* Update extensions/git/src/clone.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* CloneManager class

* public/private
 2025-10-23 16:04:35 +02:00
Alex Ross
dda6e09f62 Update git clone to use new repo cache (#272276) 2025-10-22 21:06:20 +02:00
Baptiste Girardeau
62ff0cceb4 fix: resolve renamed paths on merge editor (#254677) 2025-10-15 14:53:12 +00:00
Ladislau Szomoru
c244c79cd4 Git - remove the usages of any (#270179) 
* Git - remove the usages of `any`

* Remove debug message
 2025-10-07 08:14:52 -04:00
Ladislau Szomoru
bbe85db188 Git - remove usages of any (#270075) 
* Git - remove usages of `any`

* 💄 fix check
 2025-10-06 18:23:03 +00:00
Matt Bierner
360c9fd134 Add lint rule for as any and bulk ignore all existing breaks 
For #269213

This adds a new eslint rule for `as any` and `<any>({... })`. We'd like to remove almost all of these, however right now the first goal is to prevent them in new code. That's why with this first PR I simply add `eslint-disable` comments for all breaks

Trying to get this change in soon after branching off for release to hopefully minimize disruption during debt week work
 2025-10-02 23:38:33 -07:00
Ladislau Szomoru
597148770d SCM - use subject as the title of the multi-file diff editor (#269347) 2025-10-01 16:55:05 +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
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 😺
01d448dc0c fix worktree label (#260627) 
fix label
 2025-08-08 11:00:37 -07:00