Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-01 14:01:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
128,164 Commits 3,746 Branches 361 Tags
fca5600bbdb557edcf92f73839a55ef4cf6d6355
Commit Graph

522 Commits

Author SHA1 Message Date
Ladislau Szomoru
f5e5ee4b29 SCM - remove more debt from the quick diff (#236318) 2024-12-17 10:14:27 +01:00
Ladislau Szomoru
ca3ff9f564 SCM - quick diff should better handle untracked files (#236315) 2024-12-17 09:26:30 +01:00
Ladislau Szomoru
864d5d8aff Revert "Git - ignore changes reported to the submodule folder (#205125) (#236098)" (#236206) 
This reverts commit 899afc0311.
 2024-12-16 11:28:44 +01:00
Ladislau Szomoru
899afc0311 Git - ignore changes reported to the submodule folder (#205125) (#236098) 2024-12-13 13:01:05 -08:00
Ladislau Szomoru
4b254c2da5 Git - auto stash should restore the stash when the operation fails (#232929) (#236059) 2024-12-13 17:21:25 +01:00
Ladislau Szomoru
1590668ba7 Git - add the ability to continue merge/rebase if there are no changes (#236045) 2024-12-13 14:22:40 +01:00
Ladislau Szomoru
5addad41b0 Git/SCM - fix GC warnings (#235464) 2024-12-06 09:25:12 +01:00
Ladislau Szomoru
026a7b195c Git - add action button logging (#234939) 2024-12-01 09:54:53 +00:00
Ladislau Szomoru
3067477dd7 Git - extract staged resource quick diff provider (#234425) 
* Git - extract staged resource quick diff provider

* Fix the build
 2024-11-22 15:40:25 +00:00
Ladislau Szomoru
d8d0ddba9c Git Blame - refactor implementation to use an additional dirty diff provider (#234420) 
* Initial implementation using a quick diff provider

* Add proposed API to hide a dirty diff decorator
 2024-11-22 14:12:32 +00:00
Ladislau Szomoru
927f53de44 Git - tweak git blame computation (#234386) 
* Helper methods

* Finished implementing the prototype

* Command handled model creation/disposal

* Cache staged resources diff information
 2024-11-21 14:18:49 -08:00
Ladislau Szomoru
80635b487b Git - experimental git blame editor decoration (#234209) 
* Initial implementation

* Add setting, and cache blame information more aggressively
 2024-11-19 22:05:19 +01:00
Ladislau Szomoru
d085816005 Git - better handle conflict during cherry-pick (#230312) 2024-10-02 16:39:30 +02:00
Johannes
e6f315d2fc eng - use esModuleInterop for extensions 2024-10-01 21:57:30 +02:00
Ladislau Szomoru
cf4bc01bfb Git - correctly detect merge base when creating a branch from a remote branch (#228942) 2024-09-18 17:02:02 +02:00
Ladislau Szomoru
a8343f15fa Git - retrieve references as part of updating the model (#228609) 
* Git - retrieve references as part of updating the model

* Remove extra import
 2024-09-13 15:31:26 -07:00
Ladislau Szomoru
8a9caf323a SCM Graph - Add "Create Tag" action to history item context menu (#228428) 2024-09-13 10:17:44 +02:00
Ladislau Szomoru
a3aedeae3e SCM - cleanup SourceControlHistoryProvider api (#227376) 
* Remove provideHistoryItemSummary

* Remove resolveHistoryItemGroupCommonAncestor

* Remove provideHistoryItems

* Rename methods and remove unused code

* Remove duplicated code
 2024-09-02 15:52:05 +02:00
Ladislau Szomoru
88810d83f6 SCM - graph progress indicator improvements (#226482) 2024-08-23 21:50:46 +02:00
Ladislau Szomoru
dad736b252 Git - handle files that contain [ in their name when adding to .gitignore (#224777) 2024-08-05 09:33:22 +02:00
Ladislau Szomoru
9c9ef6614b Git - improve handling of first commit (#224165) 2024-07-29 11:01:34 +02:00
Ladislau Szomoru
c040699c44 Git - standardize logging in the git extension (#220043) 
* Git - more logging

* Git - more logging changes
 2024-07-05 11:26:48 +02:00
Ladislau Szomoru
68ca9a7f4c SCM - improve merge-base detection (#216823) 2024-06-21 17:53:13 +02:00
yutotnh
3ab7948e14 Add the ability to specify a list of candidate encodings when guessing encoding (#36951) (#208550) 
* Allow to configure a list of encodings to use when guessing #36951

* Bump up the jschardet version into 3.1.2 #36951

* missing merge

* some polish

* renames

* some polish

* some polish

* cleanup

---------

Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
 2024-06-05 10:23:20 +00:00
Connor Peet
6629c4e0a9 git: allow querying whether files are gitignore (#212982) 
* git: allow querying whether files are gitignore

This exposes `checkIgnore`, which I want to use in copilot to determine
which files I should go into when checking references.

* rename method
 2024-05-23 21:28:04 +02:00
Pig Fang
a7d0bc8982 Auto close Git multi-diff editor when all files staged or comitted (#210327) 
* auto close multi-diff editor when all files staged or comitted

* remove unused vars
 2024-04-17 11:16:33 +00:00
Ladislau Szomoru
a7f384badb Git - remove deprecated extension API (#209010) 2024-03-28 05:25:40 -07:00
Ladislau Szomoru
85eea4a9b2 Git - emit change event as soon as file is staged (#208376) 2024-03-22 08:53:04 +01:00
Ladislau Szomoru
9b0d74345c Git - remove git.experimental.inputValidation setting (#205550) 
* Git - remove git.experimental.inputValidation setting

* Fix compilation error

* Fix migration code
 2024-02-19 10:45:24 -08:00
Ladislau Szomoru
9576c1a7c5 Git - Add button/setting to always replace local tags in case of a conflict during the pull operation (#205148) 2024-02-13 22:04:29 +01:00
Ladislau Szomoru
0679fa72d5 Git - adjust branch base computation (#204585) 2024-02-07 12:43:16 +01:00
Ladislau Szomoru
2ba398845f Git - extract toMultiFileDiffEditorUris (#203688) 2024-01-29 13:53:28 +01:00
Ladislau Szomoru
fe0632cbb2 Git - handle stashes that contain untracked files (#203572) 2024-01-26 14:28:45 -08:00
Ladislau Szomoru
97b8727343 Git - fix viewing stahes with added/deleted/renamed files (#203341) 2024-01-24 16:09:02 +01:00
Henning Dieterichs
db62e3b46c Fixes multi file diff editor bug that deleted files would be shown as added files. 2024-01-22 16:35:32 +01:00
Ladislau Szomoru
4a5169c7e0 Git - 💄 remove unused event handlers (#202727) 2024-01-18 15:25:31 +01:00
Ladislau Szomoru
697936c5f8 Git - update getBranchBase so that it returns an upstream branch (#202586) 2024-01-16 16:17:40 +01:00
Henning Dieterichs
05dfba857a Adopts #199291 for SCM view changes. (#202077) 2024-01-09 22:28:08 +01:00
Ladislau Szomoru
891a17ab57 Git - move "Open Commit" command from core to the git extension (#202042) 
* Initial implementation

* Move the command to the git extension

* Add missing enablement property
 2024-01-08 13:39:07 -07:00
Ladislau Szomoru
cfebdd863a Git - add open stash command (#201970) 
* Initial implementation

* Add button to quick pick

* Improve stash picker

* Remove quick pick buttons
 2024-01-08 09:48:51 +01:00
Ladislau Szomoru
9098f756e8 Git - add missing error handler (#201160) 2023-12-18 14:43:44 -08:00
Ladislau Szomoru
b0b6913211 Git - gif config should not throw if key does not exist (#200358) 2023-12-08 15:10:52 +01:00
Ladislau Szomoru
1466cbfcdf SCM - delete scmInputBoxActionButton proposal (#200012) 2023-12-05 10:52:01 +01:00
Ladislau Szomoru
18b2c92451 Git - remove history provider action button (#199764) 
* Git - remove history provider action button

* Remove debug messages
 2023-12-01 16:10:44 +01:00
Ladislau Szomoru
a776d5fe0a SCM - input box value provider rendering (#198923) 
* Initial implementation

* Remove debug messages

* Implementation using a custom ActionViewItem

* Switched to using a custom action along with the custom action view item

* Switch to using arrays

* Refactored code (single provider is working)

* Add ActionRunner to options

* WIP - saving my work

* Refactor things to support one provider

* Add setting to enable/disable input action button

* Add sourceControlId to the proposed API

* Fix issue related to enablement

* Remove code that is not in scope

* Have the old action bar work with the setting

* Remove code that was commented out

* Add extension API changes

* Update extensions/git/src/commitMessageProvider.ts

Co-authored-by: João Moreno <joao.moreno@microsoft.com>

* Fix compilation errors

---------

Co-authored-by: João Moreno <joao.moreno@microsoft.com>
 2023-11-23 16:39:53 +01:00
Ladislau Szomoru
e0b70e58b3 SCM - add caching layer to incoming/outgoing tree nodes (#198306) 
* Upstream commit + improve onDidChangeCurrentHistoryItemGroup

* Refactor expanding a history item group

* Wire up caching

* Invoking the git.refresh command invalidates the cache

* Clean up cache data structure
 2023-11-15 15:09:18 +01:00
Ladislau Szomoru
ed30010d3f Git - better error handling for git merge-base (#198208) 2023-11-14 14:51:17 +01:00
Ladislau Szomoru
2095b6f5a3 Git - fix readOnly for the Config operation (#197918) 2023-11-10 15:05:39 +01:00
Ladislau Szomoru
64783a4eb9 Git - incoming/outgoing polish (#197877) 
* Git - refactor diffBetweenShortStat to return an object with files, insertions, and deletions

* Add statistics label tooltip
 2023-11-10 02:40:58 +01:00
Henning Dieterichs
090fd2c772 Implements first iteration of multi diff editors. 
Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2023-11-07 16:51:38 +01:00