Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 04:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
108,846 Commits 2,498 Branches 340 Tags
7a7d45793b76351a2783d266a381ae5ef450c08a
Commit Graph

2173 Commits

Author SHA1 Message Date
Ladislau Szomoru
5c41d2b0fc Git - fix unsafe repository path to use \ as path separator (#167711) 
Fix #167515
 2022-11-30 11:46:12 +01:00
Ladislau Szomoru
4934caaf88 Git - improve unsafe repository message based on feedback (#167701) 
Fix #167595
 2022-11-30 10:15:44 +01:00
Ladislau Szomoru
075f04bf39 Git - Fix GitConfigParser regression (#167309) 
Fix #166264
 2022-11-28 17:01:40 +11: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
Johannes Rieken
e7edf6e9b8 Give an option to show changes (SCM view) when encountering a merge conflict (#167265) 
fixes https://github.com/microsoft/vscode/issues/162037
 2022-11-25 17:54:01 +01:00
Ladislau Szomoru
3a52e79cea Git - handle unsafe repositories (#167248) 2022-11-25 14:40:23 +01:00
Ladislau Szomoru
a13757c4ae Git - Additional tracing for opening git submodules (#167036) 
Additional tracing for opening git submodules
 2022-11-23 10:35:46 +01: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
Alex Ross
328ed10651 Git drop stash commands should use modal dialog (#166573) 
Since the warning is initiated through user action, and the user is required to interact with the warning to finish their intended action we should use a modal dialog here.
 2022-11-17 12:49:56 +01:00
Greg Van Liew
27a550f451 Settings description edits (#166315) 
* Settings description edits

* Remove unnecessary trailing line returns
 2022-11-14 13:47:54 -08:00
Logan Ramos
73d882bcf7 Update telemetry package (#166292) 2022-11-14 09:30: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
624f4ac076 Git - Tweak git config parser (#166022) 
Tweak git config parser
 2022-11-10 18:04:35 +01:00
Ladislau Szomoru
b149a6de63 Git - Improve branch publish prompt (#165949) 2022-11-10 15:20:27 +01:00
Ladislau Szomoru
b4eaea6bc6 Git - get remotes from the config file (#165909) 2022-11-10 14:35:43 +01:00
Sandeep Somavarapu
2cd8ea24f2 #159892 Finalize (#165925) 2022-11-09 10:28:27 -05:00
Logan Ramos
bf1697d98c Consume proposed telemetry API (#165862) 
* Consume proposed telemetry API

* Update webpack
 2022-11-08 21:58:28 -05: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
348a6585c7 Git - Show progress while doing the initial repository discovery (#165695) 
Show progress while doing the initial repository discovery
 2022-11-08 14:29:37 +01:00
Joyce Er
2282be522a Fix edit session partial matches (#165782) 2022-11-07 20:56:53 -08: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
08baa8abb4 Git - Only use this.dotGit when resolving HEAD (#165497) 
Fix #164363
 2022-11-04 23:15:42 -07:00
Logan Ramos
eafc1e0fe1 Remove overzealous telemetry (#165524) 2022-11-04 10:47:35 -07:00
Ladislau Szomoru
b208b8794d Git - Optimistic UI plumbing (#165237) 2022-11-04 04:52:28 -07:00
Ladislau Szomoru
f60ff405f4 Git - Add "OK, Don't Ask Again" button to the publish branch prompt (#165487) 
Add "OK, Don't Ask Again" button to the publish branch prompt
 2022-11-04 12:41:17 +01:00
Joyce Er
6199d0e9df Improve file dialog action button (#165417) 
* Improve file dialog action button

* `Location` -> `Destination`
 2022-11-03 13:34:43 -07:00
Ladislau Szomoru
e3d7e621f2 Git - Remove localization from askpass-main (#165129) 
Remove localization from askpass as it runs in a separate process
 2022-11-03 09:35:45 -07:00
David Dossett
2da60fd58b Update quick pick placeholders and/or remove titles (#165267) 2022-11-02 15:43:18 -07:00
Henning Dieterichs
d27d0c28e2 Implements #164686 2022-10-31 14:54:57 +01:00
João Moreno
53ef06a2dc bump unique names generator (#165015) 2022-10-31 08:25:51 +01: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
Joyce Er
812c9bedf2 Fix cloning with specific branch (#164619) 2022-10-25 15:27:41 -07:00
Ladislau Szomoru
7bd27b4287 Git - getSCMResource() should also look at the merge group (#164450) 
getSCMResource() should also look at the merge group
 2022-10-24 06:27:56 -07:00
Ladislau Szomoru
566e71b346 Revert "Git - parse config file for remotes (#164151)" (#164433) 
This reverts commit 798cd3bcac.
 2022-10-24 13:28:06 +02:00
Joyce Er
7318c90996 Checkout specific branch during clone operation (#163705) 2022-10-23 20:23:35 +02:00
Ladislau Szomoru
798cd3bcac Git - parse config file for remotes (#164151) 2022-10-21 06:57:22 -07: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
c139361a3c Git - catch exceptions while fast-forwarding a branch (#164128) 
Fixes #163685
 2022-10-20 04:30:10 -07:00
Logan Ramos
256aaf296b Don't use @microsoft.com in source code (#163933) 2022-10-18 07:38:15 -07:00
Ladislau Szomoru
d4773517f1 Git - Get HEAD details in parallel (#163756) 2022-10-18 09:42:07 +02:00
Henning Dieterichs
f1a27d7b8b Recognize stash merge conflicts (#163680) 2022-10-17 07:42:07 -07:00
Ladislau Szomoru
e1e7ce5d17 Git - adopt log output channel api (#163695) 2022-10-17 02:49:12 -07:00