Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-22 10:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
140,342 Commits 2,994 Branches 347 Tags
2bb08a4d8aeed8464b1cff15e1de19aea31e1eb5
Commit Graph

530 Commits

Author SHA1 Message Date
Ladislau Szomoru
d2c16dbf3e Git - use git diff-tree only for the first commit in the repository (#274107) 2025-10-30 17:53:37 +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
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
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
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
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
0b25736ee6 Git - detect worktrees when opening a worktree (#258980) 2025-07-31 10:52:07 +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 😺
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
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
Christy 😺
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
Christy 😺
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
Ladislau Szomoru
0cfca3786c Git - handle another error condition when detecting worktrees (#256278) 2025-07-16 09:15:33 -07:00
Ladislau Szomoru
c0ceb8ca95 Git - fix regression related to worktree detection (#256265) 2025-07-16 08:10:22 -07:00
Christy 😺
4576aa4385 Enable viewing of worktrees under Repositories (#254992) 
* init

* fix: correct configuration key for detecting Git worktrees

* Fixed misspelling of worktrees and populated worktree list

* exported parseGitWorktrees

* Replaced git commands with file system reader

* Removed trailing './git' from path

* Prevent errors when accessing empty worktree directory

* Enable worktree deletion

* code clean up

* Remove exposure to git extension

* labeling and minor fixes

* throw error when no worktrees created

* Error handling when getting worktrees

---------

Co-authored-by: bhavyaus <bhavyau@microsoft.com>
 2025-07-14 11:27:00 -07:00
Ladislau Szomoru
6c8a25ae47 Git - distinguish between repository, submodule, and worktree (#255374) 2025-07-11 15:35:09 +02:00
Ladislau Szomoru
ea92c32109 Git - fix race condition with computing teh branch base (#251374) 2025-06-13 13:41:51 +02:00
Ladislau Szomoru
6e189da432 Git - add extension API to get the repository root (#250044) 
* Git - add extension API to get the repository root

* Pull request feedback
 2025-05-30 18:13:55 +00:00
Ladislau Szomoru
761976573f SCM - add the ability to search for a history item (#249819) 
* WIP implementation illustrating the problem

* Tweak searching

* Saving my work

* Use the cancellation token

* Adopt delayer

* Remove debug messages
 2025-05-26 17:16:06 +02:00
Ladislau Szomoru
28b55a766c SCM - add cancellation token to history provider (#249808) 2025-05-26 03:26:40 -07:00
Ladislau Szomoru
c1ed063624 Git - sequantialize calls to git config (#249709) 2025-05-24 07:22:35 -07:00
Jean Pierre
36ce9d0b7c Fix timeline git requests are not cancelled when switching editors too fast (#244335) 
* Cancel git log commands from timeline

* Don't delete timeline requests when cancelled as they already got deleted

---------

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2025-05-23 17:30:56 +00:00
Ladislau Szomoru
daab3ffa1e SCM - add the capability to attach a history item as chat context (#249073) 
* Saving my work

* Got the variable widget working

* Refactored the variable widget

* Clean up the attachment widget

* Content provider stub

* Add proposed API for chat context

* Add method to get the complete details of a commit
 2025-05-16 01:09:12 -07:00
Ladislau Szomoru
6cdea9ec05 Git - fallback to relative() when computing relative paths (#247848) 2025-04-30 15:29:15 +02:00
Ladislau Szomoru
82839a3b65 Git - improvements to relative path calculation (#245001) 
Git - relative path using both the repository root and repository real root
 2025-03-28 20:15:52 +01:00
Ladislau Szomoru
2365ea12ec Git - display ahead/behind information in the checkout picker (#244003) 
* Initial implementation

* Handle scenario where the git version does not support ahead/behind
 2025-03-19 16:04:58 +01:00
Ladislau Szomoru
9bed6c5a5f Git - use committerDate in the ref picker (#243974) 2025-03-19 11:22:05 +01:00
Ladislau Szomoru
757405278f Git - do not expose ref commit details to extensions (#243970) 2025-03-19 10:49:00 +01:00
Ladislau Szomoru
46a9b7e644 Git - remove another usage of iconv (#243902) 2025-03-18 13:35:33 -07:00
Ladislau Szomoru
76b21c4817 Git - cleanup ref parsing (#243899) 2025-03-18 20:46:11 +01:00
Ladislau Szomoru
f9d810d1fd Git - remove the usage of jschardet and iconv-lite-umd (#243843) 2025-03-18 09:53:58 +00:00
Ladislau Szomoru
0a7b6a0f8b Git - add commit details to ref pickers (#243582) 
* Refactor ref parsing

* Initial implementation of getting the commit details

* Show additional information in the pickers
 2025-03-14 10:52:13 -07:00
Ladislau Szomoru
7c46bee91e Git - handle both absolute and relative paths (#243571) 2025-03-14 17:25:33 +01:00
Ladislau Szomoru
04260cb17b Git - use relative path when running git commands (#242889) 2025-03-07 16:30:39 +01:00
Ladislau Szomoru
f7bc839df9 Git - 💄 add path delimiter when calling git blame (#242553) 2025-03-04 13:04:14 +01:00
Tushar Sadhwani
3b55994f24 Make git show ref argument unambiguous (#242483) 
make `git show` ref argument unambiguous
 2025-03-04 09:28:33 +00:00
Ladislau Szomoru
f11a86a05f Revert "Git - remove jschardet (#241256)" (#242469) 
This reverts commit 6fdb41922c.
 2025-03-03 16:00:53 +01:00
Ladislau Szomoru
6fdb41922c Git - remove jschardet (#241256) 
* Adopt API for stage

* Adopt API for show

* Remove package
 2025-02-20 07:11:11 +01:00
Ladislau Szomoru
60240d261a Git - fix regression related to editing the merge commit message (#241061) 2025-02-18 10:31:00 +01:00
Ladislau Szomoru
afa8e16e50 Git - handle submodule HEAD file (#240357) 
* Git - handle submodule HEAD file

* 💄

* Better fix
 2025-02-11 12:28:56 +01:00
Ladislau Szomoru
85e32ec765 Git - handle deleted remote branches (#239723) 2025-02-05 21:14:31 +01:00
Ladislau Szomoru
297a228fb8 Git - refactor delete remote tag (#239684) 
* Git - refactor delete remote tag

* 💄 fix parameter name

* 💄 add missing parameter name
 2025-02-05 15:41:30 +01:00
Vitaly
a2a0272687 [Git] Migrate to git autostash when pulling for better performance (#187850) 
* git: migrate to git autostash when pulling (better performance)

* should be implemented correctly!

* refactor other op

* Pull request feedback

---------

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2025-02-04 15:35:47 +00:00
Ladislau Szomoru
8ef59e9a68 Git - select the correct object for a merge conflict ref (#238560) 2025-01-23 13:57:38 +01:00
Ladislau Szomoru
4a5645c3df Git - handle merge conflict refs (#238557) 2025-01-23 13:06:28 +01:00
Ladislau Szomoru
42e96916ac Git - handle local tracking branches (#238503) 2025-01-22 12:51:31 -08:00
Ladislau Szomoru
a0ecf511fd Git - pass the similarityThreshold to git diff-tree (#238367) 2025-01-21 15:38:47 +01:00
Ladislau Szomoru
1600fb4c76 GitHub - avatar resolution improvements (#238239) 
* Add support for size

* Add support for extracting user id from GitHub no-reply email addresses

* Fix git blame email parsing

* Extrat link into function
 2025-01-19 16:44:40 +01:00