Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-01 05:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
131,762 Commits 3,747 Branches 361 Tags
f2513b5ea75e33b9727fe8e1aa50d931c4d0e735
Commit Graph

558 Commits

Author SHA1 Message Date
Ladislau Szomoru
3ea8791964 Git - fix issue with losing merge state when discarding untracked file (#244247) 2025-03-21 14:23:16 +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
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
f9d810d1fd Git - remove the usage of jschardet and iconv-lite-umd (#243843) 2025-03-18 09:53:58 +00:00
Ladislau Szomoru
04260cb17b Git - use relative path when running git commands (#242889) 2025-03-07 16:30:39 +01:00
Ladislau Szomoru
e4e03ebce9 Git - fix data shape issue for the merge base (#242544) 2025-03-04 12:16:09 +01:00
Ladislau Szomoru
f11a86a05f Revert "Git - remove jschardet (#241256)" (#242469) 
This reverts commit 6fdb41922c.
 2025-03-03 16:00:53 +01:00
João Moreno
25c371614f disable untrackedChangesEnableTrash in linux snap (#242188) 
* disable untrackedChangesEnableTrash in linux snap

related to #241476
cc @lszomoru

* missing isLinuxSnap check
 2025-02-27 16:36:12 +01:00
João Moreno
6a06fb719e rename untrackedChangesEnableTrash to discardUntrackedChangesToTrash (#242186) 2025-02-27 15:42:12 +01:00
Ladislau Szomoru
497645a3f7 Git - rename "untrackedChangesSoftDelete" to "untrackedChangesEnableTrash" (#241953) 2025-02-25 21:51:51 +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
bd05fbbcb0 Git - disable untracked file soft-delete when connected to a remote (#240805) 2025-02-14 16:32:35 +01:00
Ladislau Szomoru
bf983f7351 Git - use relative path when getting blame information (#240784) 2025-02-14 13:08:18 +01:00
Ladislau Szomoru
db0b398727 Git - use relative path in getObjectDetails() (#240783) 
* Git - use relative path in `getObjectDetails()`

* 💄
 2025-02-14 11:58:04 +00:00
Ladislau Szomoru
deb13fce88 Git - polish discard changes dialogs (#240519) 
* Git - polish git clean dialog

* Remove duplication

* More polish of the dialogs
 2025-02-12 15:39:58 +01:00
Ladislau Szomoru
6272008be1 Git - add setting for untracked changes soft delete (#240387) 2025-02-11 17:20:26 +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
45212e10fc Git - use base branch to calculate unpublished commits (#239226) 2025-01-30 16:52:17 +01:00
Ladislau Szomoru
00d093ea29 Git - fix autostash to work with staged changes (#238719) 2025-01-24 21:38:37 +01:00
Ladislau Szomoru
a0ecf511fd Git - pass the similarityThreshold to git diff-tree (#238367) 2025-01-21 15:38:47 +01:00
Ladislau Szomoru
7610cc1d19 Git - 💄 fix history item details provider name (#238045) 2025-01-16 20:25:19 +09:00
Ladislau Szomoru
eaba97f995 Git - extract history item detail provider (#238041) 
* Initial refactor of hover commands

* Delete old code for hover commands

* More refactoring
 2025-01-16 11:37:27 +01:00
Ladislau Szomoru
9ee0345b63 Git - fix "Open on GitHub" command (#237832) 2025-01-14 11:45:03 +01:00
Ladislau Szomoru
a26fe3e466 Git - do not show "Open on GitHub" action for commits that have not been pushed to the remote (#237605) 2025-01-09 15:20:57 -08:00
Ladislau Szomoru
dca80ea667 GitHub - add "Open on GitHub" to blame hover (#237514) 
* WIP - saving my work

* Refactor hover rendering code
 2025-01-08 11:34:54 -08:00
Ladislau Szomoru
cbb7f99ba8 Git - remove hard coded remote name when detecting the default branch (#237423) 2025-01-07 20:07:07 +01:00
Ladislau Szomoru
e258958d35 Git - expose unsetConfig through the extension API (#237393) 2025-01-07 05:46:07 -08:00
Ladislau Szomoru
eab8316ec8 Git - switch back to using options instead of subcomands (#237390) 2025-01-07 12:48:35 +01:00
Ladislau Szomoru
3548eae0e1 Git - add git.commitShortHashLength setting (#237343) 2025-01-06 16:05:37 +00:00
Ladislau Szomoru
4fa5611d67 Git - handle the diff editor for untracked files now that we throw FileNotFound if the file does not exist (#236863) 2024-12-24 12:02:40 +11:00
Ladislau Szomoru
b8b4db329e Git - cleanup vscode-merge-base git config key when deleteing a branch (#236716) 2024-12-20 16:51:58 +01:00
zWing
1730c76f6b fix(git-ext): fix limitWarning block the git status progress (#226577) 2024-12-20 10:29:31 +00:00
Ladislau Szomoru
25b88b7e4a Git - fix encoding issue with stage selected ranges (#236484) 2024-12-19 15:46:46 +01:00
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