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
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
Ladislau Szomoru
ce7e388ef1 Git - Checkout command aria label now includes the branch name (#161385) 
* Checkout command aria label now includes the branch name

* Pull request feedback
 2022-09-21 07:10:52 -07:00
Henning Dieterichs
40a262dc13 merge editor temp model (#161315) 
Introduces hidden mergeEditor.useWorkingCopy setting,
implements reset when the merge editor opens
 2022-09-21 16:02:50 +02:00
Johannes Rieken
21a2eca3b7 The openMergeEditor command should check the active tab when it is called without an URI (#161072) 
https://github.com/microsoft/vscode/issues/160924
 2022-09-16 11:55:06 +02:00
Joyce Er
6835a98d4a Fix branch checkout after git clone (#160922) 
* Fix branch checkout after git clone

* Add progress notification while checking out ref

* Remove promise chain
 2022-09-15 18:11:29 +02: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
fd2b0d888f Git - Do not override SSH_ASKPASS for the terminal (#160935) 
Do not override SSH_ASKPASS for the terminal
 2022-09-15 13:48:05 +02:00
Isidor Nikolic
65cbb9324b change git.mergeEditor setting to be false (#160923) 2022-09-14 11:41:41 -07:00
Ladislau Szomoru
e97b478d06 Commit dropdown button uses text-overflow (#160834) 2022-09-14 20:40:06 +02:00
Joyce Er
51ab74bc88 Don't register git protocol handler till after git commands are registered (#160857) 2022-09-14 19:23:38 +02:00
Ladislau Szomoru
60fa7bc579 Git - Improve git fetch command for repositories with multiple remotes (#159644) 
* Improve git fetch command for repositories with multiple remotes

* Refactored and cleaned up the implementation

* Pull request feedback
 2022-09-14 11:06:27 +02:00
Ladislau Szomoru
d2c241ffc0 Git - Disable git.init command, and a welcome view that uses the git.init command in codespaces (#160597) 
Disable git.init command, and a welcome view that uses the git.init command in codespaces
 2022-09-10 10:38:41 +02:00
Ladislau Szomoru
df51f5af27 GitHub - Disable command & view in codespaces (#160546) 
Disable command & view in codespaces
 2022-09-09 11:22:39 -07: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
Joyce Er
6d08356a85 Show modal error when git protocol clone fails (#160350) 2022-09-07 15:12:49 -07:00
Ladislau Szomoru
a6272c9416 Git - implement SSH_ASKPASS handler (#159573) 2022-09-07 15:59:40 +02:00
Ladislau Szomoru
eff6fa7696 Git - discover nested git repositories (#159291) 2022-09-07 15:35:46 +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
Ladislau Szomoru
4542a16b0b Git - fix telemetry comment (#160117) 
Fix telemetry comment
 2022-09-05 21:09:24 +02:00
Ladislau Szomoru
bb2c77dea1 Git - Initial repository scan telemetry (#160102) 
Initial repository scan telemetry
 2022-09-05 08:12:25 -07:00
Henning Dieterichs
9b381c5cd9 Merge pull request #159654 from microsoft/hediet/september 
Hediet/september
 2022-09-05 13:00:40 +02:00
Henning Dieterichs
226be69989 Adresses feedback from PR 2022-09-05 09:59:56 +02:00
Joyce Er
d337885984 Route user to download missing git (#159505) 
* Factor out captured variables that are not reused outside findGit callback

* Always register git protocol handler

* Notify the user when cloning without git installed

* Actually notify the user when cloning without git installed

Errors when invoking a command don't seem to get thrown in the extension host

* Add output channel logging

* Revert "Factor out captured variables that are not reused outside findGit callback"

This reverts commit df005bdda5.
 2022-09-02 16:31:17 +02:00
Henning Dieterichs
6a853ed3f3 Introduces mergeEditorMenus proposal & fixes issues from PR. 2022-09-02 09:06:24 +02:00
Joyce Er
8d28ffac6d Allow ref checkout after protocol handler clone (#159481) 2022-08-31 11:06:44 +02:00
Ladislau Szomoru
933c22a53f Git - Handle repository paths with a trailing \ character (#159461) 
* Fix another edge case with Windows path that contains a trailing \ character

* Pull request feedback
 2022-08-30 02:58:45 -07:00
Matt Bierner
5e92794be6 Re-enable running our eslint rules using ts-node (#159495) 
Resubmission of #157532 with the following changes:

- Use `eslint-plugin-local` instead of `yarn` link to run our plugins
- Move our plugins to a top level `.eslintplugin` dir (as required by `eslint-plugin-local`)
- Update all names to `local/`
 2022-08-30 08:40:04 +02:00
Matt Bierner
9e5248072a Fix ts-node for eslint (#159483) 
Bumps the cachesalt to make sure ts-node is installed
 2022-08-29 20:51:12 +02:00
Matt Bierner
5b21c7f28b Run our custom eslint rules using ts-node (#157532) 
* Run our custom eslint rules using ts-node

Use `ts-node` to run our custom eslint rules.  This lets us delete the pre-compiled js. It also means you can don't have to compile the rules while editing them

As part of this change, I've also switched us to using an eslint plugin instead of a rulesDir. This is now the preferred way to ship custom rules

* Fix two more disables

* Move ts-node to project root

* Enable transpileOnly
 2022-08-29 09:39:09 -07:00
Henning Dieterichs
7688a40249 Implements commands to recompute merge with git merge-file 2022-08-28 16:41:13 +02:00
Matt Bierner
b5a1bb34e9 Pick up latest TS for building VS Code (#158420) 2022-08-26 23:00:38 +02:00