Commit Graph

2155 Commits

Author SHA1 Message Date
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
Joyce Er
f9a0fdeff2 Tolerate minor edit session identity differences (#163804)
Also add basic support for partial edit session identity matches
2022-10-16 23:51:51 -07:00
Ladislau Szomoru
b43c281df2 Git - Attempt to parse HEAD file before invoking git.exe (#162572)
* Attempt to parse HEAD file before invoking git.exe

* Pull request feedback

* Pull request feedback

* More pull request feedback
2022-10-12 15:56:36 +02: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
8c946e23f4 Git - Fix typo in setting description (#163400)
Fix typo in setting description
2022-10-12 09:12:39 +02:00
Ladislau Szomoru
d53074babf Git - Fix Commit action button enablement regression (#163159)
Fix Commit action button enablement regression
2022-10-10 14:06:20 +02:00
Johannes Rieken
03f98efb75 fix Extract Telemetry step (#162832) 2022-10-06 06:17:12 -07:00
Johannes Rieken
b2b7e0be6e send telemetry about git-exec duration (#162731)
* send telemetry about git-exec duration

* measure spawn and exec
2022-10-06 04:04:35 -07:00
Ladislau Szomoru
d904014287 Git - fix commitInProgress context key (#162562)
Fix #154628
2022-10-03 15:02:24 +02:00
Ladislau Szomoru
9bc43c7f8a Git - Rename git.fetchBeforeCheckout to git.pullBeforeCheckout (#162303)
Rename git.fetchBeforeCheckout to git.pullBeforeCheckout
2022-09-30 00:42:20 -07:00
Henning Dieterichs
46afa5b108 Fixes #162043 by renaming "Accept Merge" to "Complete Merge" (#162361) 2022-09-29 08:19:06 -07: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
Henning Dieterichs
6cba93633d Merge pull request #162318 from microsoft/hediet/amused-whale
Fixes #162027
2022-09-29 12:21:52 +02:00
Henning Dieterichs
c4359c2dab Addresses #162112 (#162321) 2022-09-29 12:18:18 +02:00
Henning Dieterichs
b29b217e36 Fixes #162027 2022-09-29 10:50:48 +02:00
Ladislau Szomoru
197bfd9088 Git - Use modal dialog after cloning a repository (#162306)
Use modal dialog after cloning a repository
2022-09-29 01:01:29 -07:00
Ladislau Szomoru
7559012a34 Git protocol handler improvements (#162144) 2022-09-28 02:58:10 -07:00
Tyler James Leonhardt
29e985eca0 rev vscode-nls to version that doesn't ask for vscode-nls-web-data (#161819)
ref #161297
2022-09-26 11:10:54 -07:00