Ladislau Szomoru
c6d8b3ab0b
Git - only show "Resolve in Merge Editor" editor action when conflict markers are present ( #269300 )
2025-10-01 11:28:30 +02: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 😺
6518fe6990
separate open and delete worktree action ( #262175 )
2025-08-18 11:30:03 -07:00
Christy 😺
e14542e646
add delete worktree command to context menu ( #261711 )
2025-08-14 22:07:40 +00:00
Christy 😺
860defc712
allow delete worktrees if worktrees are closed ( #258696 )
2025-07-29 16:21:38 -07:00
Christy 😺
44bc33cc68
detect worktrees on by default ( #257282 )
2025-07-22 08:15:09 -07:00
Ladislau Szomoru
5fa87f9356
SCM - worktree context menu improvements ( #257242 )
2025-07-22 12:23:39 +02: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
10abf5a6f6
SCM - Add contextValue proposed API for SourceControl object ( #255338 )
...
* Add contextValue proposed API
* Update names
* Fix documentation
2025-07-14 16:43:24 +02:00
Robo
12326f9906
chore: update to Electron 35 ( #245423 )
...
* chore: bump electron@35.0.1
* chore: update types/node@22.x
* chore: update web types for node v22.x
* chore: bump electron@35.1.2
* chore: update node.js build
* chore: update app.dock usage
Refs 71f3ff6bf2afb637e85d#246835 )
* node - adopt compile cache
* adopt for utility process
* tweaks
* log state of compilation cache
* Revert "log state of compilation cache"
This reverts commit f3840387a583013834762e2c44f6e8424929297f.
* Revert "node - adopt compile cache (#246835 )"
This reverts commit 673a00cab66c9bac87f3cd27b80efa41c80150f1.
* chore: update builds
* chore: bump electron@35.2.0
* chore: bump electron@35.2.1
* chore: bump electron@35.2.2
---------
Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com >
2025-05-09 19:03:36 +09:00
Ladislau Szomoru
a4f6aadf82
Git - disable "unstage selected ranges" and "unstage changes" commands in the editor/peek view ( #248202 )
...
* Git - disable "unstage selected ranges" command in the editor
* Disable the "Unstage Changes" command
2025-05-06 12:12:53 +00: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
Benjamin Pasero
f0ee501c7f
API: Finalise text document encoding ( fix #241449 ) ( #246016 )
...
* API: Finalise text document encoding (fix #241449 )
* address feedback
2025-04-10 18:28:21 +00:00
Ladislau Szomoru
03b5a51341
Git - fix commit hook setting name ( #245307 )
2025-04-02 09:16:21 +02:00
Ladislau Szomoru
6770e77230
Git - add the missing Api proposal ( #243959 )
2025-03-19 09:39:18 +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
f37aabbb68
Git - enable reference details in pickers by default ( #243839 )
2025-03-18 09:17:17 +01: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
d234a62e39
Git - remove diffCommand proposal ( #242675 )
2025-03-05 11:44:12 +01:00
Ladislau Szomoru
9fbff868fd
Git - use editorInlayHint.foreground for the git blame editor decoration as it is lighter than editorCodeLens.foreground ( #242665 )
2025-03-05 10:08:45 +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
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
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
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
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
22c92fc911
Initial implementation ( #240264 )
2025-02-10 18:05:21 +01:00
Ladislau Szomoru
c0ec925f2d
Git - enable deleting remote branches from the graph ( #239728 )
...
* Git - enable deleting remote branches from the graph
* Add missing return
2025-02-05 21:40:03 +01:00
Ladislau Szomoru
47b33dc58d
Git - add command to delete remote branch ( #239692 )
2025-02-05 07:32:11 -08:00
Ladislau Szomoru
4a24ab7c7e
Revert "SCM - disable actions for resource groups that do not have any resources ( #236813 )" ( #239098 )
...
This reverts commit 151ef3514e
2025-01-29 15:33:23 +01:00
Ladislau Szomoru
23c4dc3f8e
Git - enable git blame status bar entry by default ( #238454 )
2025-01-22 12:18:09 +01:00
Ladislau Szomoru
ac97234e4b
Git - adopt async status bar item hover ( #238355 )
2025-01-21 12:51:00 +01: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
36a79b5ce6
Git - move stage/unstage commands to the ... menu ( #237966 )
2025-01-15 17:24:18 +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
d6fd2c075b
Git - Add "Checkout" action to graph ( #237734 )
2025-01-12 19:51:10 +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
Ladislau Szomoru
aa6a38114c
Git - add stage/unstage commands to editor title ( #237257 )
2025-01-04 10:15:35 -08:00
Ladislau Szomoru
92bae09f4d
Git - update git blame settings ( #237187 )
2025-01-02 07:45:45 -08:00
Ladislau Szomoru
151ef3514e
SCM - disable actions for resource groups that do not have any resources ( #236813 )
2024-12-22 08:09:59 -05:00
Ladislau Szomoru
77cec55e49
Git - git installation welcome view should use remoteName context key ( #236672 )
2024-12-20 08:53:35 +01:00
