Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-22 18:55:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
144,137 Commits 2,993 Branches 347 Tags
2b514ef2024945bee2e4e5163d30cb2cb2d71b63
Commit Graph

417 Commits

Author SHA1 Message Date
Dmitriy Vasyura
0e28a4b760 Add Git: Delete action to run git rm command on the current document (#285411) 2026-01-16 21:36:23 +01:00
Ladislau Szomoru
4f24fc8b8f Git - add git.worktreeIncludeFiles setting (#286816) 
* Add setting, and initial implementation

* Tweak the implementation

* Factor in git ignored files

* No need to use split chunks with check-ignore

* Switch to a faster approach to copy the files

* Update extensions/git/src/repository.ts

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

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2026-01-09 13:22:35 -08:00
Ladislau Szomoru
6d28298bb5 Git - add option to ignore whitespace for the blame information (#284260) 2025-12-18 15:53:58 +01: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
62887266ea Adjust the setting name to disableHover 2025-12-16 16:51:43 +01:00
Dmitriy Vasyura
717fe89d29 Add setting to disable blame editor decoration preview on hover 2025-12-15 04:43:09 -08:00
Ladislau Szomoru
276db4812e Git - move commit/cancel actions from editor/title to editor/content (#283020) 2025-12-12 12:19:25 +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
ae77536e70 Git - cleanup delete worktree command implementation (#278018) 2025-11-18 00:17:55 -08: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
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
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
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
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 😺
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
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
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
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
7452464515 SCM - add secondary quick diff provider (#246707) 
* WIP - initial implementation

* Add stagedQuickDiffProvider API

* Reduce the usage of `isSCM`

* Make unstage feel snappier

* Deduplicate diffs between primary and secondary

* Fix unstage selected ranges to work from the editor

* WIP - saving my work

* Fixed deduplication and commands

* Add pattern colors

* Rework the colors, and fix deleted glyph

* Got unstage commands working

* Update provider name

* Some improvements

* Cleaned up CSS

* Tweak decoration colors

* Update proposed API naming

* Contributed decorations will use the primary colors for the time being

* More cleanup
 2025-04-16 12:52:36 +02:00
Ladislau Szomoru
03b5a51341 Git - fix commit hook setting name (#245307) 2025-04-02 09:16:21 +02: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
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
bd05fbbcb0 Git - disable untracked file soft-delete when connected to a remote (#240805) 2025-02-14 16:32:35 +01:00
Ladislau Szomoru
3d3806164c Git - remove the ignore sources setting as it is now merged into the sources setting (#240635) 2025-02-13 12:15:01 +01:00
Ladislau Szomoru
6618761449 Git - update settings descriptions (#240621) 2025-02-13 09:21:37 +01:00
Ladislau Szomoru
bd9c5acfd8 Git - polish the diagnostics information commit hook (#240590) 
* Rework the settings and implementation

* Add settings descriptions

* Update default enablement
 2025-02-13 00:33:16 +01:00
Ladislau Szomoru
6272008be1 Git - add setting for untracked changes soft delete (#240387) 2025-02-11 17:20:26 +01:00
Ladislau Szomoru
22c92fc911 Initial implementation (#240264) 2025-02-10 18:05:21 +01:00
Ladislau Szomoru
47b33dc58d Git - add command to delete remote branch (#239692) 2025-02-05 07:32:11 -08:00
Ladislau Szomoru
e5165663d9 Git - add commands to toggle git blame editor decoration/status bar item (#238302) 2025-01-20 17:58:45 +01:00
Ladislau Szomoru
eaa1502b23 Git - add more commands to the graph context menu (#237811) 
* Git - add "Delete Branch" and "Delete Tag" actions

* Git - update the graph cherry pick command
 2025-01-13 17:20:46 +01:00
Ladislau Szomoru
c636d93f53 Git - cleanup command names (#237790) 2025-01-13 11:47:18 +01:00
Ladislau Szomoru
496eb294d6 Git/SCM - update "view" to "open" in the command titles (#237645) 2025-01-10 14:45:09 +01:00
Parasaran
0c176cf4cf fix 227150: Added a recursive git clone button (#232497) 
* fix 227150: Added a recursive git clone button

* Git - update command for "Clone Repository" action

---------

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2025-01-09 11:24:05 +01:00
Ladislau Szomoru
fc4e78cbfe Git - remove commands that are not used (#237368) 
Git -  remove commands that are not used
 2025-01-06 22:17:09 +01:00
Ladislau Szomoru
3548eae0e1 Git - add git.commitShortHashLength setting (#237343) 2025-01-06 16:05:37 +00:00
Tyler James Leonhardt
37b1016c80 Lock some SCM strings (#236531) 
Fixes https://github.com/microsoft/vscode/issues/236530
 2024-12-18 15:04:42 -08:00
Ladislau Szomoru
5a2d782244 SCM - set the foundation for history item ref actions (#234784) 
* WIP - initial implementation

* Manually fix merge

* Figure out the correct way to pass action arguments

* Fix compilation error
 2024-11-27 22:07:16 +00:00
Ladislau Szomoru
f08b93ebb9 Git - add template support for editor decoration/status bar item (#234582) 
* Refactor property names

* Add template support

* Refactor template variable names

* Manually fix the merge
 2024-11-25 16:55:40 +00:00
Ladislau Szomoru
b61c0f18d9 Git - add git blame status bar item (#234302) 
* Git - improve enabliment of the editor decoration

* Git - add git blame status bar item
 2024-11-20 15:08:33 -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