Commit Graph

2861 Commits

Author SHA1 Message Date
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
Ladislau Szomoru
faa9f0afcc SCM - proposed API to represent parent/child relationship (#256242)
* Add plumbing for parent/child relationship

* Fix selected and view height

* More clean-up

* More fixes related to view height

* Dispose submodules and worktrees

* Add onDidDisposeParent event
2025-07-17 14:54:32 +00: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
Ladislau Szomoru
d10e7bc100 Git - do not prompt for opening worktrees (#256059) 2025-07-15 08:41:26 -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
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
Ladislau Szomoru
6c8a25ae47 Git - distinguish between repository, submodule, and worktree (#255374) 2025-07-11 15:35:09 +02:00
Jérôme Lécuyer
d37ee81e3d Git - l10n discard changes dialogs (#254366) 2025-07-08 16:18:12 +00:00
Ladislau Szomoru
4d7c56ee82 Engineering - Add GitHub action for pull requests (#254056)
* Test - handle running tests as part of a GitHub action

* Add GitHub action files
2025-07-04 08:21:56 +00: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
973a531c70 Git - add logging for askpass (#250109) 2025-05-30 09:17:20 -04:00
Ladislau Szomoru
e8abd52cf7 Git - provideOriginalResource() should handle symbolic links (#249920) 2025-05-27 11:28:57 -07:00
Ladislau Szomoru
963bf2e2ad Git - handle the scenarion in which Recycle Bin/Trash are not supported (#249890) 2025-05-27 16:56:31 +02:00
Ladislau Szomoru
28af0e9aeb Git - include short commit hash in the ref picker details (#249874) 2025-05-27 11:51:40 +02:00
Ladislau Szomoru
804f18c995 Git - ref pickers should use commitShortHashLength setting (#249869) 2025-05-27 02:09:28 -07: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
84fb005bbd Git - do not add ellipsis to history item subject/timeline item label (#249086) 2025-05-16 02:54:40 -07: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
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 71f3ff6bf2

* chore: bump electron@35.1.4

* chore: bump electron@35.1.5

* ci: bump sysroot to glibc 2.28 and gcc 10.5.0

* ci: enable timeout for smoketests

* chore: bump min glibcxx to 3.4.26 for server

* Revert "ci: enable timeout for smoketests"

This reverts commit afb637e85d.

* chore: update debian dependencies

* fix: workaround npm.ps1 argument parsing with powershell

* chore: update rpm dependencies

* test: partially revert changes from 242535

* test: remove redudant keybinding dispatch for selectTab

* test: fix test failure from running configured tasks

* test: focus settings editor for preferences.test.ts

* node - adopt compile cache (#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
d667ffe026 Git - revert some changes that are not needed (#248215) 2025-05-06 19:30:36 +00: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
9e6c15d640 Git - add support for unstaging a subset of lines (#247853) 2025-04-30 16:50:49 +02:00
Ladislau Szomoru
6cdea9ec05 Git - fallback to relative() when computing relative paths (#247848) 2025-04-30 15:29:15 +02:00
Ladislau Szomoru
bf0fb34df4 Git - fix unstage selected ranges command (#247770) 2025-04-29 21:02:30 +02:00
Ladislau Szomoru
4231848899 Git - quick diff decoration label casing (#247717) 2025-04-29 11:06:23 +02:00
Alex Weininger
02378633c6 fix: handle cancellation errors inside edit session identity provider (#247450) 2025-04-27 19:45:48 -07:00
Tuan Tran Van
30d16b20a1 Replace single line break with double line break for commit description in git blame hover popup (#245779)
* Replace single line break with double line break for commit description in git blame hover popup

Fix issue #245773

* Remove unnecessary pattern `\n\n` when handling commit message

* Remove non-matching group, and fix the same issue for the gragh hover as well

---------

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
2025-04-23 21:03:48 +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
Joyce Er
516f9c731a fix: commit changes in empty git repo before Continue Working On (#246637) 2025-04-15 17:49:08 +02:00
hj
541ae30e0f git: make Letter/Text/Color semantically consistency (#245889) 2025-04-15 08:30:51 +00:00
Joyce Er
b7beb62a30 fix: handle Continue On in unpublished git repo with no working changes (#246561)
* fix: handle Continue On in unpublished git repo with no working changes

* fix: register leaked disposable

* fix: increase timeout
2025-04-15 02:34:17 +02:00
Ladislau Szomoru
d2fe294a96 Git - fix git blame status bar item (#246537) 2025-04-14 14:03:54 -07:00
Ladislau Szomoru
bdc1a35666 Git - cache editor decoration/status bar item templates (#246301) 2025-04-11 11:21:39 +02:00
Ladislau Szomoru
88c1f24373 Git - reduce the number of getConfiguration() calls (#246295)
* Git - reduce the number of `getConfiguration()` calls

* Missed one
2025-04-11 10:12:35 +02:00
Ladislau Szomoru
41ecdd700c Git - add more logging to provideOriginalResource() (#246242) 2025-04-10 14:20:04 -07: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
7160755930 Git - 💄 adopt truncate() in various places (#246219) 2025-04-10 18:01:28 +02:00
Ladislau Szomoru
7a274ae1cd Git - improve git commit diagnostics hook (#245519) 2025-04-03 17:21:47 +02:00
Ladislau Szomoru
03b5a51341 Git - fix commit hook setting name (#245307) 2025-04-02 09:16:21 +02:00
batsev
28b51a4dda Git - validate branch name before creation (#245029)
* Git - validate branch name before creation

* Git - tweak validation message

---------

Co-authored-by: Бацев Никита Александрович <NABatsev@sberbank.ru>
Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
2025-04-01 18:30:32 +00: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
Matt Bierner
526705b491 Merge pull request #244485 from mjbvz/tasty-lion
Pick up latest TS for building VSCode
2025-03-28 11:24:19 -07:00
Ladislau Szomoru
35a79740ae Git - integration tests should use workspace path and not the real path to avoid random failures (#244959) 2025-03-28 12:03:05 +01:00
Ladislau Szomoru
d9909effe9 Git - 💄 log repository real path as well (#244954) 2025-03-28 11:19:43 +01:00