Commit graph

2325 commits

Author SHA1 Message Date
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
Ladislau Szomoru cfebdd863a
Git - add open stash command (#201970)
* Initial implementation

* Add button to quick pick

* Improve stash picker

* Remove quick pick buttons
2024-01-08 09:48:51 +01:00
Ladislau Szomoru bff3ef7651
Git - improve code that gets commit count (#201907) 2024-01-05 12:55:05 -08:00
João Moreno e2eb6c042b
use sha256 in git (#201781) 2024-01-04 12:02:02 +01:00
Ladislau Szomoru 860d67064a
Git - refactor ref pickers (#201411)
* Refactored quick picks

* Another set of refactoring

* Moved over the remaining classes

* git.checkoutType setting should only be used by the Checkout quick pick

* Introduce RefProcessor and cleanup code

* Introduced multiple processor types

* Another round of refactoring
2023-12-22 22:59:54 +01:00
Ladislau Szomoru b21537c2ef
Git - enable commit signing using SSH key (#201298) 2023-12-20 14:14:39 +01:00
Ladislau Szomoru 9098f756e8
Git - add missing error handler (#201160) 2023-12-18 14:43:44 -08:00
Ladislau Szomoru 536dcced4e
Git - disable wrapping for git-commit language (#201135) 2023-12-18 17:11:08 +01:00
Ladislau Szomoru 4061a9a5e7
Git - log branch name in case the branch cannot be found (#201117) 2023-12-18 13:15:48 +01:00
Ladislau Szomoru 279872bd96
Git - improve git-commit language settings (#201091) 2023-12-17 23:43:05 +01:00
Ladislau Szomoru baab9bde4d
Git - timeline provider should handle repository with no commits (#200962) 2023-12-15 15:17:38 +01:00
Ladislau Szomoru e8e04769ec
Git - explicitly open repository after initialized (#200957) 2023-12-15 14:53:18 +01:00
Ladislau Szomoru 81546fb355
Git - only add --diff-merges if flag is supported (#200954) 2023-12-15 14:39:46 +01:00
Ladislau Szomoru 371a1579f2
Git - make close other repositories command available in the command palette (#200925) 2023-12-15 08:34:24 +01:00
Ladislau Szomoru 81207cddf5
Git - add command to close other repositories (#200893) 2023-12-14 23:36:20 +01:00
Malix 31f8f0dd17
Remove unused import in extensions/git/src/api/git.d.ts (#200797)
Remove unused import
2023-12-14 09:01:39 +00:00
Ladislau Szomoru b0b6913211
Git - gif config should not throw if key does not exist (#200358) 2023-12-08 15:10:52 +01:00
Francis Chartrand bef295a70b
timeline: use follow option so timeline follow file beyond renames (#187174)
feat(git): use follow option so timeline follow file beyond renames

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
2023-12-08 13:03:59 +00:00
Roberto Huertas 62a957135b
feat(stash): return the stash result (#177732)
re #177726
2023-12-08 12:29:19 +01:00
Ladislau Szomoru fe055af0a4
Git - improve branch picker when merging (#200331)
* Git - improve branch picker when merging

* 💄
2023-12-08 12:26:40 +01:00
Ladislau Szomoru 1466cbfcdf
SCM - delete scmInputBoxActionButton proposal (#200012) 2023-12-05 10:52:01 +01:00
Ladislau Szomoru c5874782c5
SCM - delete scmInputBoxValueProvider proposal (#199778) 2023-12-01 08:54:59 -08:00