Commit Graph

2155 Commits

Author SHA1 Message Date
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
Harald Kirschner
bb70d7ab19 Instrument slow git status updates (#158325)
* Instrument slow git status updates

* Add expiration
2022-08-22 22:01:51 +02:00
Johannes Rieken
337cd4b1cf Expose editor "blue button" as menu (#158740)
* Expose editor "blue button" as menu

* rename proposed `MergeToolbar` to `EditorContent` menu
* adopt GIT and sync conflicts usage
* use content menu for "open in 3wm" command
* add new `ctxIsMergeResultEditor` context key

Better fix for https://github.com/microsoft/vscode/issues/153800

* fix typo
2022-08-22 15:24:56 +02:00
Ladislau Szomoru
052b1e4d1b Git - Clear global state if setting is not enabled (#158747)
Clear global state if setting is not enabled
2022-08-22 04:39:02 -07:00
Ladislau Szomoru
3cfc74c52e Git - Add setting to remember post commit command (#158449) 2022-08-22 12:34:47 +02:00
Joyce Er
fa4ff1519d Implement and adopt edit session identifier API proposal (#157733)
* Add canonical workspace identifier proposed API

* Use canonical id to store and resume edit sessions

* Add git extension workspace identity provider

* Fix warning incorrectly showing up

* Make auto resume behavior opt in

* * Create a separate service
* Accept WorkspaceFolder instead of URI
* Return string instead of object

* Make edit session restores resilient to provider registration races

* Introduce an activation event
* Activate contributing extension before using provider

* `CanonicalWorkspaceIdentity` -> `EditSessionIdentity`

* Show progress while resuming edit session

* Store edit session even if extension will take care of opening target workspace

* Address most of PR feedback

* `IEditSessionsWorkbenchService` -> `IEditSessionsStorageService`

* Unregister provider in renderer

* Split out proposal into new `editSessionIdentityProvider.d.ts`

* Fix bad merge

* Always show progress in window

* Convert URI schemes
2022-08-19 08:01:43 -07:00
João Moreno
6dbddd8b91 fix: freeze Resource#command (#158579)
Fixes: #157904
2022-08-19 14:24:36 +02:00
Johannes Rieken
c592ef8e18 use "Incoming" and "Current" everywhere (#158478)
fixes https://github.com/microsoft/vscode/issues/156229
2022-08-18 14:21:06 +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
Joyce Er
e1628628a8 Provide context on which repository is being cloned (#158324) 2022-08-17 00:11:28 +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
81e6a02c18 Git - Upgrade file-type package (#156411) 2022-08-09 11:30:49 -04:00
Ladislau Szomoru
fe946068ba Commit keyboard shortcut to honor the post commit command setting (#157617) 2022-08-09 11:14:56 +02:00
Tyler James Leonhardt
d8453c0440 Rev built-in versions of vscode-nls to 5.1.0 (#157530)
* rev version of vscode-nls to 5.1.0

* and yarn lock
2022-08-08 18:43:45 +02:00
Ladislau Szomoru
d01945923c Git - Fix regression with Commit action button icon (#156417)
Fix regression with Commit action button icon
2022-07-27 13:11:07 +02:00
Ladislau Szomoru
e210bbfea4 Git - fix edge case during rebase (#156410)
Fix blocking issue while resolving conflicts during rebase
2022-07-27 12:03:47 +03:00
易良
fbdc848c29 fix: typos (#155310)
* fix: typos

* chore: revert formatting changes

* fix: Remove redundant blank lines
2022-07-25 15:41:30 -07:00
Johannes Rieken
b8876a2d60 enable merge editor by default (#155937) 2022-07-22 11:28:49 +02:00