Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-03-01 06:06:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
104,433 Commits 3,084 Branches 347 Tags
c4cfcf781b60decac080c05f2fd0b2f855fddbb7
Commit Graph

445 Commits

Author SHA1 Message Date
Ladislau Szomoru
47fe934057 Git - Fix ref sorting regression (#171058) 2023-01-11 13:22:57 +01:00
Ladislau Szomoru
827636e106 Git - Add getRefs() extension API (#170903) 
* Add `getRefs()` extension API

* Cleanup
 2023-01-11 11:21:23 +01:00
Ladislau Szomoru
74f046bfa9 💄 Git - delete tag does not use repository.refs (#170565) 2023-01-04 17:40:35 +01:00
Ladislau Szomoru
1542e90126 Git - Add command to delete remote tags (#170415) 
Add command to delete remote tags
 2023-01-03 06:08:48 -08:00
Ladislau Szomoru
1d18dfc209 Git - detect when HEAD is a tag (#170271) 
* HEAD set when checking out a tag

* Remove more calls

* Remove tag references when in detached mode
 2023-01-03 06:07:46 -08:00
Ladislau Szomoru
77fc799cf3 Git - fix issue with optimistic ui updates (#169824) 2022-12-22 13:33:59 +01:00
Ladislau Szomoru
9e195507a2 Git - Define Operations as types (#169518) 
Define Operations as types
 2022-12-21 06:53:29 -08:00
Ladislau Szomoru
2c8b54bbbf Git - Add support for git stash --staged (#169539) 
Add support for git stash --staged
 2022-12-19 15:04:55 +01:00
Ladislau Szomoru
c180a08350 Git - fix discard changes when the repository does not have an initial commit (#169397) 2022-12-16 14:47:25 +01:00
Ladislau Szomoru
cbf23d1500 Git - better handling for failed stash creation (#169394) 
Git - show notification when stash creation fails due to the repository not having any commits
 2022-12-16 14:11:07 +01:00
Ladislau Szomoru
a56c38c075 Git - Do not pull before checkout when checking out detached (#169387) 
Do not pull before checkout when checking out detached
 2022-12-16 13:29:32 +01:00
Ladislau Szomoru
4dea68b946 Git - Add the capability to "attach" state to operations (#169371) 2022-12-16 11:08:38 +01:00
Ladislau Szomoru
000ce1a7e5 Git - status bar item improvements (#169233) 
* More polish on the git status bar items

* Update status bar icon based on ref type

* Update status bar item label at the beginning of checkout
 2022-12-15 12:07:49 +01:00
Ladislau Szomoru
0f8bf1b66b Git - Fix error handling regression (#168284) 
Fix error handling regression
 2022-12-07 10:36:02 +01:00
Mikl Wolfe
1d7f930246 Remove repository.ts default parameter types (#155908) 
* Remove closeDiffEditors inferred parameter type

* Remove pushTo inferred parameter type

* Remove _push inferred parameter type

* Remove isBranchProtected inferred parameter type
 2022-12-06 20:30:26 +01:00
Ladislau Szomoru
d4a299631a Git - Handle tag conflict during pull operation (#167278) 
Handle tag conflict during pull operation
 2022-11-25 17:05:22 +00:00
Ladislau Szomoru
f57d336cfc Git - Move log change event handler to main (#166965) 
Move log change event handler to main
 2022-11-22 06:51:33 -08:00
Ladislau Szomoru
687514b9f4 Git - Fix optimistic UI update for untracked changes (#166277) 2022-11-14 06:24:14 -08:00
Ladislau Szomoru
b3eaceaf90 Git - 💄 Remove code duplication (#166263) 
💄 Remove code duplication
 2022-11-14 11:53:46 +01:00
Ladislau Szomoru
b4fbff3218 Git - Don't show progress for commands that support optimistic UI updates (#166124) 
Don't show progress for commands that support optimistic UI updates
 2022-11-11 08:11:41 -08:00
Ladislau Szomoru
9984da1a19 Git - Optimistic UI update for discarding changes (#166099) 
Optimistic UI update for discarding changes
 2022-11-11 02:25:01 -08:00
Ladislau Szomoru
8fd500ed74 Git - Add calcellation support for getRefs (#165938) 2022-11-10 12:25:53 -08:00
Ladislau Szomoru
57a5507e0b Git - Tweak optimistic update (#165815) 
Tweak optimistic update
 2022-11-08 15:44:24 +01:00
Ladislau Szomoru
4130136c25 Git - Stage/Unstage optimistic UI updates (#165716) 2022-11-08 14:29:54 +01:00
Ladislau Szomoru
d3611df987 Git - Optimistic UI updates for rebase continue (#165699) 
Optimistic UI updates for rebase continue
 2022-11-07 15:15:56 +01:00
Ladislau Szomoru
b208b8794d Git - Optimistic UI plumbing (#165237) 2022-11-04 04:52:28 -07:00
Ladislau Szomoru
67b8c25157 Commit Action button polish (#164746) 2022-10-28 15:23:19 +02:00
Ladislau Szomoru
f09c4124a2 Engineering - adopt l10n for git-base/git/github extesions (#164566) 
Co-authored-by: Tyler James Leonhardt <me@tylerleonhardt.com>
 2022-10-28 11:27:08 +02:00
Ladislau Szomoru
d1c8746455 Git - Add operation start/end trace log (#164242) 
Add operation start/end trace log
 2022-10-21 14:29:54 +02:00
Ladislau Szomoru
9c76d66e69 Git - implement cancellation for updating the model (#163926) 
* Initial implementation

* Polish implementation

* Add cancelled label in the output

* Revert change that is not needed

* Pull request feedback

* Dispose listener

* Port changes manually
 2022-10-20 06:26:22 -07:00
Ladislau Szomoru
2fa61a14b8 Git - Extract querying for status so that it can run in parallel with the other operations (#163990) 2022-10-20 04:37:04 -07:00
Ladislau Szomoru
d4773517f1 Git - Get HEAD details in parallel (#163756) 2022-10-18 09:42:07 +02:00
Ladislau Szomoru
e1e7ce5d17 Git - adopt log output channel api (#163695) 2022-10-17 02:49:12 -07:00
Ladislau Szomoru
3992d5b9ab Git - Show progress indicator while running fetch (#163425) 
Show progress indicator while running fetch
 2022-10-12 04:31:31 -07:00
Ladislau Szomoru
3e4df23350 Git- get commit input template in parallel with other operations (#163423) 2022-10-12 13:31:08 +02:00
Ladislau Szomoru
d904014287 Git - fix commitInProgress context key (#162562) 
Fix #154628
 2022-10-03 15:02:24 +02:00
Johannes Rieken
a2fe848791 set git.mergeChanges context key for all repos, not just one (#162339) 
fixes https://github.com/microsoft/vscode/issues/162224
 2022-09-29 05:50:07 -07:00
Ladislau Szomoru
e1c7285ab5 Git - Add the ability to fetch a branch before it is checked out (#160181) 2022-09-15 16:04:37 +02:00
Ladislau Szomoru
52223728f8 Git - Add the ability to commit and not execute a post-commit command (#160527) 
Add the ability to commit and not execute a post-commit command
 2022-09-09 14:58:38 +02:00
Johannes Rieken
ac5591282f send uris for git.mergeChanges context as objects (#160390) 
That way they undergo uri transformation and the setContext-command will stringify them so that everything works, fixes https://github.com/microsoft/vscode/issues/159837
 2022-09-08 02:33:19 -07:00
João Moreno
9e6e1312fb avoid calling setContext when not necessary (#160297) 
* avoid calling setContext when not necessary

* Update extensions/git/src/repository.ts
 2022-09-08 09:54:35 +02:00
Ladislau Szomoru
1e99736c27 Git - Add merge abort command (#159753) 
* Add merge abort command

* Pull request feedback
 2022-09-07 06:06:20 -07:00
Harald Kirschner
bb70d7ab19 Instrument slow git status updates (#158325) 
* Instrument slow git status updates

* Add expiration
 2022-08-22 22:01:51 +02:00
Ladislau Szomoru
3cfc74c52e Git - Add setting to remember post commit command (#158449) 2022-08-22 12:34:47 +02:00
João Moreno
6dbddd8b91 fix: freeze Resource#command (#158579) 
Fixes: #157904
 2022-08-19 14:24:36 +02:00
Johannes Rieken
c0ade8bc81 joh/unknown lemming (#158460) 
* make git's `openMergeEditor` user-facing command and show it for editors that have conflicts

also includes a workaround for an issue with untyped editor inputs... fyi @lramos15

* Patch matches

* Remove TODO

* set nowrap for white-space

fixes https://github.com/microsoft/vscode/issues/156402

Co-authored-by: Logan Ramos <lramos15@gmail.com>
 2022-08-18 06:58:30 -04:00
Johannes Rieken
9759525167 push workaround for https://github.com/microsoft/vscode/issues/157904 (#158368) 2022-08-17 14:40:36 +01:00
Ladislau Szomoru
b2212a1090 Git - Fix more scenarios where the post commit command setting is not honoured. (#157804) 
* Revert "Commit keyboard shortcut to honor the post commit command setting (#157617)"

This reverts commit fe946068ba.

* Fix more scenarios where the post commit command setting is not honoured.
 2022-08-10 16:12:26 -07:00
Ladislau Szomoru
fe946068ba Commit keyboard shortcut to honor the post commit command setting (#157617) 2022-08-09 11:14:56 +02:00
Johannes Rieken
bbbae594da show "Accept Merge" only for files currently under conflict. (#155822) 
While the merge editor shows users can handle merge conflicts outside of it, e.g on the console via `git add <FILE>`. The merge editor should have this graceful and step one is to hide the "Accept Merge" command when the file isn't conflicting anymore

* Adds a git-context key that contains all resource-uri-strings under conflict
* Enable/placement of the Accept Merge command is driven by that
* some merge editor context key sugar
 2022-07-21 13:25:23 +02:00