Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-26 12:44:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
144,137 Commits 3,056 Branches 347 Tags
2b514ef2024945bee2e4e5163d30cb2cb2d71b63
Commit Graph

2896 Commits

Author SHA1 Message Date
Ladislau Szomoru
45e2e2072f Git - fix upstream state management check (#205078) 2024-02-13 11:53:50 +01:00
Ladislau Szomoru
2f6b7e163c Git - Update showProgress value in DiffOperation (#205012) 2024-02-12 17:40:02 +01:00
Ladislau Szomoru
c19383a66d Git - add file decoration provider for incoming changes (#204919) 
* Initial implementation of a file decoration provider and quick diff provider

* Refactor file decoration provider

* Add incomingChanges to history provider

* Move decoration provider

* Move things around

* Add separate color for renamed incoming change

* Remove include that is not needed
 2024-02-11 07:39:43 +01:00
Ladislau Szomoru
c9215c87ba Git - fix commit action button when detached/rebase (#204857) 2024-02-09 21:02:24 +01:00
Ladislau Szomoru
20c0f83f1b Git - experimental input validation using diagnostics (#204822) 
* Initial implementation

* Add setting + code actions
 2024-02-09 14:19:30 +01:00
Ladislau Szomoru
d25c50303e Git - Add more telemetry to history provider to investigate issue (#204689) 2024-02-08 09:02:47 +01:00
John Murray
6c7362fe4f Reinstate command items when filtering checkout quickpick (fix #202870) (#204107) 
---------

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2024-02-07 20:42:45 +00:00
Ladislau Szomoru
d96a8b66ce SCM - Use Publish action when the local branch does not have an upstream (#204617) 2024-02-07 15:54:49 +01:00
Ladislau Szomoru
0679fa72d5 Git - adjust branch base computation (#204585) 2024-02-07 12:43:16 +01:00
Ladislau Szomoru
63ebf06bb6 Git - add action to regenerate branch name (#204481) 2024-02-06 14:22:14 +01:00
Ladislau Szomoru
12904c651e Git - fix View Commit action from the timeline view (#204410) 2024-02-05 22:02:02 +01:00
Ladislau Szomoru
dd2038279d Git - fix repository deduplication logic (#203836) 2024-01-30 21:54:36 +01:00
Ladislau Szomoru
837b74c1b4 SCM - history item group context menu (#203712) 2024-01-29 17:27:24 +01:00
Ladislau Szomoru
2ba398845f Git - extract toMultiFileDiffEditorUris (#203688) 2024-01-29 13:53:28 +01:00
Ladislau Szomoru
0d22ba354b Git - 💄 remove duplicated code (#203609) 2024-01-27 17:16:16 +01:00
Ladislau Szomoru
fe0632cbb2 Git - handle stashes that contain untracked files (#203572) 2024-01-26 14:28:45 -08:00
Ladislau Szomoru
a10ecfaefd Git - fix issue related to a renamed resource (#203529) 2024-01-26 14:31:18 +01:00
Ladislau Szomoru
b26b05031e SCM - Add "Reopen Closed Repositories..." action to the "Source control Repositories" view title bar (#203512) 2024-01-26 10:50:25 +01:00
Ladislau Szomoru
adf93c270a Git - view stash should use the stash's parent commit for the left hand side (#203450) 2024-01-25 15:53:20 +01:00
Ladislau Szomoru
5b91204184 SCM - do not show "View Commit" or "View All Changes" action for empty commits (#203381) 2024-01-24 21:15:51 +01: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
5be6890cf5 Git - add onCommit event to vscode.git extension API (#202863) 2024-01-19 17:34:44 +01:00
Ladislau Szomoru
945bbd01aa Git - only show "Incoming changes" node for upstream (#202836) 
* Git - only show "Incoming changes" node for upstream

* 💄 Revert some of the changes now that base is limited to upstream

* Fixed a bug

* 💄 More clean-up
 2024-01-19 12:56:34 +01:00
Ladislau Szomoru
0287cb9fe7 Git - add fetch, pull, push commands to incoming/outgoing (#202809) 2024-01-19 11:25:59 +01:00
Ladislau Szomoru
9ed02ced92 SCM - 💄 polish incoming/outgoing proposed API (#202766) 2024-01-18 12:39:40 -08: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
Ladislau Szomoru
48bc94d646 Git - 💄 make stash picker async (#202573) 2024-01-16 11:02:32 +01:00
Ladislau Szomoru
61112949a6 Git - do not show checkout commands when searching (#202567) 2024-01-16 09:33:07 +01:00
Alex Ross
7109701918 Expose git merge as extension API (#202503) 
* Expose git merge as extension API
Part of microsoft/vscode-pull-request-github#200

* Respond to PR feedback
 2024-01-15 17:22:43 +01:00
Ladislau Szomoru
f42cf8d8a5 Git - 💄 show busy state while populating refs (#202513) 2024-01-15 16:05:24 +01:00
Ladislau Szomoru
b245a42ed0 Git - Improve "Close Repository" and "Close Other Repositories" commands (#202512) 2024-01-15 20:21:19 +05:30
Ladislau Szomoru
3ae8c8ea62 Git - polish view stash command (#202499) 
* Implement drop stash command

* Add apply and pop commands

* Rename "preview" command to "view"

* Fixed action order

* Add icons, update commands
 2024-01-15 14:49:01 +01:00
John Murray
2b06224582 Preserve sort order when filtering Git branch / tag quickpicks (fix #199471) (#199473) 
* Preserve sort order when filtering Git branch / tag quickpicks (fix #199471)

* Fix the merge

* Dispose quickpick listeners

* Changes arising from PR feedback

* Rework listener disposal
 2024-01-15 13:20:33 +00:00
Ladislau Szomoru
55af1bc7fb Git - checkout command improvements (#202495) 
Git - complete checkout command when checkout quick pick is cancelled
 2024-01-15 12:23:47 +01:00
Ladislau Szomoru
37b173d559 Add stage/unstage actions to the multi-diff editor (#202297) 2024-01-12 15:16:53 +01:00
Ladislau Szomoru
2434b7da03 Git - Add "View All Changes" action + polish (#202327) 
* Make allChanges a distinct historyItem element

* Add allChanges menu contribution

* Add View All Changes command

* Rename "Open Commit" to "View Commit"

* Pass the correct argument when getting "All Changes" node
 2024-01-12 10:46:52 +01:00
Ladislau Szomoru
273e4b0d7b SCM - Add scm.showChangesSummary setting (#202256) 
* SCM - make "All Changes" node part of the API and add setting

* Cleanup configuration change listeners

* More settings cleanup
 2024-01-11 17:21:05 +01:00
Ladislau Szomoru
8720ead44d Git - adopt _workbench.openMultiDiffEditor command (#202236) 2024-01-11 12:21:17 +01:00
Henning Dieterichs
05dfba857a Adopts #199291 for SCM view changes. (#202077) 2024-01-09 22:28:08 +01:00
Ladislau Szomoru
9808d4e655 SCM - rename incoming/outgoing menu contribution (#202068) 2024-01-09 17:04:27 +05:30
Ladislau Szomoru
b87ba01926 Git - swap file sides when previewing a stash (#202063) 2024-01-09 11:55:16 +01:00
Robo
fb76955440 chore: update electron@27.2.1 (#202053) 
* chore: bump electron@27.2.1

* chore: enable code cache support for custom standard schemes

Refs 267cbc841e

* chore: remove --ms-enable-electron-run-as-node

Removed in favor of f842ead6bc

* chore: update distro
 2024-01-09 08:33:34 +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
66023e11e6 Git - 💄 clean-up summary generation (#202036) 2024-01-08 11:50:42 -08:00
Ladislau Szomoru
322931b0fc Git - Only show "All Changes" node if there is more than one incoming/outgoing commit (#202021) 2024-01-08 17:45:44 +01:00
Ladislau Szomoru
51e490e8a2 Git - 💄 add historyItemParentId to provideHistoryItemChanges (#201991) 2024-01-08 14:00:57 +01:00
Ladislau Szomoru
03e191825d Git - fix context menu order (#201986) 2024-01-08 13:02:13 +01:00
Ladislau Szomoru
f8616b9a2b Git - rename "Open Stash" to "Preview Stash" (#201973) 
* Git - rename "Open Stash" to "Preview Stash"

* Add Preview Stash command to the "..." menu
 2024-01-08 10:59:49 +01:00