development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-04 10:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
121334 commits 1117 branches 297 tags 1.3 GiB
Commit graph

2377 commits

Author SHA1 Message Date
Joyce Er 9f081fd11a
Open branches on vscode.dev from ref picker (#181549) 2023-05-24 11:23:40 +02:00
Ladislau Szomoru edcad3ab53
GitHub - use GitHub default branch name when publishing to GitHub (#183207) 2023-05-24 11:15:17 +02:00
Joyce Er 0880f76765
Improvements to canonical URI API (#182667) 
* Improve API names

* Allow requesting a specific scheme

* Implement ile uri support
 2023-05-18 09:23:27 -07:00
Ladislau Szomoru 46c9471450
Git - fix git status regression for git versions older than 2.18 (#182739) 
* Git - fix git status regression for git versions older than 2.18

* 💄 - Tweak version number
 2023-05-17 11:17:53 +02:00
Ladislau Szomoru b7be44e639
GitHub - fix an issue with toggling branch protection setting (#182536) 
* GitHub - fix an issue with toggling branch protection setting

* 💄 Remove variable

* Pull request feedback
 2023-05-15 21:03:27 +02:00
Joyce Er 2c5dcb3b81
Allow Continue On between repos with HTTPS and SSH remotes (#182352) 
* Deduplicate HTTPS and SSH remote URLs

* Improve doc
 2023-05-15 11:37:38 -07:00
Ladislau Szomoru 4981453f79
Git - fix working tree file system watcher regex (#182310) 2023-05-15 16:07:15 +02:00
Ladislau Szomoru f47327fee9
Git - fix branch creation regression (#182504) 2023-05-15 06:57:12 -07:00
Ladislau Szomoru b0252732a7
Git - add similarity threshold setting (#182492) 2023-05-15 12:59:33 +02:00
Peng Lyu 19545fea33
Fix isEmbeddedDiffEditor context key. (#182112) 
Fix isInEmbeddedEditor context key.
 2023-05-10 14:47:31 -07:00
Ladislau Szomoru b4469cf109
Git - add setting to control default branch name (#181884) 
* Initial implementation

* Refactor based on discussions

* More pull request feedback
 2023-05-10 20:52:13 +02:00
Ladislau Szomoru 1fc3c56ed8
Git - do not show publish branch action button when a tag is checked out (#181402) 2023-05-03 14:43:15 +02:00
Ladislau Szomoru 5ea57c3b48
GitHub - leveral repository rules for branch protection (#180416) 
* WIP - switching to use repository ruleset information

* Handle includes

* Refactor to add support for exclusion

* Fix exclude condition

* Fix request string

* Add logging

* Update setting description
 2023-04-20 16:43:42 +02:00
Ladislau Szomoru 45a44d1786
Git/GitHub - Branch protection refactoring (#179848) 
Branch protection refactoring
 2023-04-13 10:14:33 +01:00
Ladislau Szomoru bb7570f4f8
GitHub - branch protection provider (#179789) 
* Initial implementation

* Update default setting state
 2023-04-12 17:42:51 +02:00
Ladislau Szomoru a1eb9e2b48
Git - implement branch protection provider (#179752) 
* Branch protection using settings is working

* Revert extension api changes

* Refactor code
 2023-04-12 08:48:29 +01:00
易良 e9baeb3608
fix: typos (#179581) 2023-04-11 09:20:38 -07:00
Ladislau Szomoru 20aee57124
Git - better validation for the branchProtection setting (#179183) 2023-04-04 23:10:17 +02:00
Ladislau Szomoru 9e6a369b13
Action button - disable button during checkout (#178488) 2023-03-28 21:42:18 +02:00
Ladislau Szomoru 4ad068a9c6
Git - fix quick diff edge case when the resource is inside a submodule (#177691) 2023-03-21 16:27:05 +01:00
João Moreno 8635a5effd
avoid using XDG_RUNTIME_DIR on darwin (#175241) 
fixes #168321
 2023-02-24 17:33:25 +01:00
Alex Ross 6da385b3a3
Multi quick diff polish (#174584) 
Part of https://github.com/microsoft/vscode/issues/169012
 2023-02-16 16:15:10 +01:00
Logan Ramos 8e6bcc9b9e
Bump module to new package (#173599) 2023-02-06 12:29:36 -08:00
Ladislau Szomoru 01f32e6a44
Git - do not try to resolve workspace folders that do not use the file scheme (#173546) 2023-02-06 03:33:06 -08:00
Ladislau Szomoru 43db9d2d06
Git - add trace message if workspace folder cannot be resolved (#173410) 2023-02-04 10:15:27 +01:00
Ladislau Szomoru 4b2a44d7ec
Git - fix regression caused by workspace folder that cannot be resolved using fs.realpath() (#173372) 2023-02-03 13:25:25 -08:00
Ladislau Szomoru f50790371b
Git - Add file decoration for a deleted file (#173020) 2023-02-01 14:06:31 +01:00
Ladislau Szomoru 629d643eff
Git - remove gitlens-git from timeline provider (#172844) 2023-01-30 12:25:19 -08:00
Ladislau Szomoru b309525a3b
Git - Limit the enablement "* selected ranges" command palette commands (#172843) 2023-01-30 12:15:33 -08:00
Ladislau Szomoru 2d4f8aeb53
Git - more conservative approach to refreshing the timeline (#172765) 2023-01-30 11:33:48 -08:00
Ladislau Szomoru 475c59b638
Git - Deprecate the refs property (#172772) 2023-01-30 11:33:37 -08:00
Ladislau Szomoru 907e888754
Git - remove the commitInProgress context for the commit message commands (#172761) 2023-01-30 14:25:54 +01:00
Ladislau Szomoru 3ec25a9fbb
Git - add separator to the checkout quick pick (#172762) 2023-01-30 01:55:15 -08:00
Ladislau Szomoru 1c2d4e6c6c
Git - mark a failed operation completed as soon as the error dialog is shown (#172509) 2023-01-30 09:57:09 +01:00
Ladislau Szomoru 73072937bc
Git - deduplicate annotated and lightweight tags when showing the quick pick for tags (#172527) 2023-01-26 15:47:38 +01:00
Joyce Er f63bfe3942
Fix auto publish before Continue On (#172324) 
* Fix auto publish before Continue On

* Fix provider implementation
 2023-01-25 12:12:18 -08:00
Ladislau Szomoru 82ed9fd51c
Git - fix wording for git repositories in parent folders (#172375) 
* Git - update wording based on feedback

* Git - update wording based on feedback
 2023-01-25 12:59:15 +01:00
Ladislau Szomoru 88df431511
Git - fix status bar icon for a detached commit (#172271) 2023-01-25 10:52:55 +01:00
Ladislau Szomoru c35bf3b340
Git - change parent folder notification severity (#172230) 2023-01-24 19:18:37 +01:00
Ladislau Szomoru 569f3d1104
Git - update model state if a git operation fails (#172122) 2023-01-24 10:55:05 +01:00
Joyce Er 0a6c277e4f
Ensure Continue in Web and Continue in Clone appear in remote indicator on desktop git and remote git windows respectively (#172086) 2023-01-24 02:29:20 +01:00
Logan Ramos 8cea434dec
Remove unused proposals (#172035) 2023-01-23 19:09:07 +01:00
Ladislau Szomoru b87234ddca
Git - disable one more commands while a git operation is running (#171989) 
* Git - disable 3 more commands while a git operation is running

* Do not disable the open change and open all changes commands
 2023-01-23 17:13:55 +01:00
Ladislau Szomoru 6ee8313061
Git - update command label so that it is consistent with the other commands (#171987) 
💄 Git - update command label so that it is consistent with the other commands
 2023-01-23 15:24:08 +01:00
Ladislau Szomoru 9b63d86d77
Git - Add back logging message that was removed during refactoring (#171831) 2023-01-20 15:35:55 +01:00
Ladislau Szomoru 9c3e0aedb1
Git - do not show progress for the LogFile operation (#171828) 2023-01-20 15:03:07 +01:00
Ladislau Szomoru 78f9b06101
Git - handling git repositories in parent folders (#171726) 2023-01-20 09:10:53 +01:00
Ladislau Szomoru be84f97b9a
Git - fix edge case when the repository is at the root of a mapped drive (#171749) 
* Git - Handle repository at the root of a mapped drive

* Update comment
 2023-01-19 20:46:21 +01:00
Joyce Er 00d12fcdb2
Prompt before auto publishing branch (#171748) 2023-01-19 20:34:54 +01:00
Ladislau Szomoru e37cad47f2
Revert "Git - Improvements to opening git repositories in parent folders (#171617)" (#171662) 
This reverts commit fe423bbdba.
 2023-01-18 20:57:55 +01:00
Ladislau Szomoru fe423bbdba
Git - Improvements to opening git repositories in parent folders (#171617) 
* Initial implementation for external repositories

* Added setting

* Add basic welcome views

* Replaced "Always Open" with "Configure"

* Remove code duplication

* Polish based on feedback

* Language consistency

* Update notification severity

* Move away from the "external repository" terminology

* Refactor notification logic

* Saving my changes

* Further improvements

* Refactor parent repository notification

* Update message and fix edge case when setting is set to `never`
 2023-01-18 15:27:58 +01:00
Ladislau Szomoru 9a9d7bfdde
Git - Update getRefs pattern when querying for branches and tags (#171605) 2023-01-18 12:41:32 +01:00
Joyce Er e7d34457a5
Auto publish branches before Continue On in git repositories (#171211) 
* Support syncing with remote before Continue On

* Auto publish before Continue On in git extension

* Add configuration description
 2023-01-18 11:25:47 +00:00
Ladislau Szomoru df6f1b8ac5
Git - only show unsafe repository notification if we cannot use a welcome view. (#171485) 2023-01-17 13:36:41 +01:00
Ladislau Szomoru f50eeb50b5
Git - Migrate post commit command storage (#171416) 
* Git - Migrate post commit command storage

* Make it explicit that migration is async
 2023-01-16 13:24:17 +00:00
Ladislau Szomoru 99ecdd4122
Git - Another attempt to fix an edge case for adding a safe directory (#171151) 
* Git - Another attempt to fix an edge case for adding a safe directory

* Pull request feedback
 2023-01-13 20:10:48 +01:00
SteVen Batten 9194231bb6
support workspace trust keyboard shortcut (#171131) 
* support workspace trust keyboard shortcut

* macos test/fix

* Add support for short labels to the Button

* Remove code that is not needed

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2023-01-13 09:42:14 -08:00
Joyce Er d61f46dcf7
Support continue in local clone from remote window (#171134) 2023-01-12 08:03:15 -08:00
Ladislau Szomoru 05baad392b
💄 Git - use double quotation mark in the action button tooltip (#171161) 2023-01-12 14:10:49 +01:00
Babak K. Shandiz ea85d0ce72
🖊 Include branch name in commit button popup (#167827) 
* 🖊 Include branch name in commit button popup

Signed-off-by: Babak K. Shandiz <babak.k.shandiz@gmail.com>

* 🖊 Include branch name in "Publish" button popup

Signed-off-by: Babak K. Shandiz <babak.k.shandiz@gmail.com>

Signed-off-by: Babak K. Shandiz <babak.k.shandiz@gmail.com>
 2023-01-12 13:52:34 +01:00
Ladislau Szomoru b2b0642c45
Git - Fix bug related to Stash & Checkout (#171099) 2023-01-11 12:07:17 -08:00
RezCoder 85e992bffa
issue 163803/ first pick a ref then pick a name in create-branch-from... (#170908) 
* pick a ref then a name in create-branch-from...
 2023-01-11 15:13:05 +01:00
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 65962c405e
Git - cleanup getRemotes() (#169839) 
* Git - cleanup getRemotes()

* Remove test for read-only remote as the code to determine that a remote is read-only has been moved out of the function that does the parsing
 2023-01-09 14:24:35 +01:00
Ladislau Szomoru 797f4caca1
Git - Remove dependency on the refs property (#170579) 
* Remove usage of repository.refs from merge, rebase, pullFrom

* Remove remaining dependencies
 2023-01-06 09:22:14 +01:00
Ladislau Szomoru 74f046bfa9
💄 Git - delete tag does not use repository.refs (#170565) 2023-01-04 17:40:35 +01:00
Logan Ramos 4acf2d9b46
Update the telemetry modules (#170512) 
Update the module
 2023-01-03 15:10:45 -05:00
Ladislau Szomoru 2377c7a4c5
💄 Git - Add icon to the message item (#170486) 2023-01-03 16:07:23 +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 d227bd7495
Git - disable publish branch action button when in detached mode (#170272) 2022-12-30 08:04:46 +01:00
Ladislau Szomoru 77fc799cf3
Git - fix issue with optimistic ui updates (#169824) 2022-12-22 13:33:59 +01:00
Ladislau Szomoru e1719c310d
Git - Add blocking property to operation types (#169781) 2022-12-21 21:29:30 +01:00
Ladislau Szomoru e8b107b85b
Git - Fix bug when we checkout a remote branch detached (#169274) 
* Fix bug when we checkout a remote branch detached

* Pull request feedback
 2022-12-21 06:54:31 -08:00
Ladislau Szomoru 9e195507a2
Git - Define Operations as types (#169518) 
Define Operations as types
 2022-12-21 06:53:29 -08:00
Ladislau Szomoru cfca4b0183
Git - Add notification for the stage/unstage/revert selected ranges commands (#169623) 
Add notification for the stage/unstage/revert selected ranges commands
 2022-12-20 13:52:40 +01:00
Ladislau Szomoru df3d2c350f
Git - Remove remote quick pick includes description and icon (#169571) 2022-12-19 12:09:34 -08:00
Ladislau Szomoru 7d7fa09ae5
Git - fix issue where change is on the first line of the editor (#169557) 2022-12-19 18:07:41 +01:00
Ladislau Szomoru a565017f12
Git - use application name in auto fetch notification (#169543) 2022-12-19 15:22:00 +01: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 7febede390
Git - more tweaks to command enablement (#169292) 
Use a new context for enablement
 2022-12-15 18:37:03 +01:00
Logan Ramos b1076b41f3
Bump telemetry packages (#169283) 2022-12-15 17:29:10 +01:00
Ladislau Szomoru 07b7ca6402
Git - Remove duplicate resources to have the correct resource count in the discard dialog (#169258) 
Remove duplicate resources to have the correct resource count in the discard dialog
 2022-12-15 15:29:25 +01:00
Ladislau Szomoru 6883cfe95e
Git - Add button to migrate changes during checkout (#169251) 
Add back button to migrate changes
 2022-12-15 14:24:01 +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
Matt Bierner 57dd298b47
Add typings for test runner scripts (#169196) 2022-12-15 02:19:24 +01:00
Ladislau Szomoru c78d585895
Git - Disable git status bar items while commit is running (#169133) 
Disable git status bar items while commit is running
 2022-12-14 15:35:47 +01:00
Ladislau Szomoru eb2e52b6f8
Git - Disable git commands while commit is in progress (#169124) 
Disable git commands while commit is in progress
 2022-12-14 13:30:08 +01:00
Ladislau Szomoru 5d8216787f
Git - Remove double quotation mark from the property value (#168981) 
Remove double quotation mark from the property value
 2022-12-13 14:08:10 +01:00
Ladislau Szomoru d97a30c701
Git - Improve unsafe repository handling (#168568) 
Improve unsafe repository handling by extracting the  repository path to be used when calling git config
 2022-12-09 20:23:35 +01:00
Ladislau Szomoru 4ccf2d729b
Git - fix untracked group commands (#168593) 2022-12-09 14:52:09 +01:00
Ilya Golovin 603019055e
Fix: make git commands work with keyboard (#159113) 
* Fix: make git commands work from keyboard

* refactor: improve code style
 2022-12-08 14:44:07 +01:00
Ladislau Szomoru 28832f37e2
Git - Do not pop the stash as part of the "Stash & Checkout" action (#168297) 2022-12-07 13:27:35 +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
Mikl Wolfe 73221ee046
Update git config.followTagsWhenSync definition (#155914) 2022-12-06 15:03:22 +01:00
Ladislau Szomoru 55d6b17e19
Git - Update unsafe repositories link (#167832) 
Update unsafe repositories link
 2022-12-01 13:40:05 +01:00
Ladislau Szomoru a1f2132aa8
Git - Fix command name (#167812) 
Fix command name
 2022-12-01 09:57:15 +01:00
Ladislau Szomoru d0b47f6c30
Git - Unsafe repositories flow polish (#167728) 2022-11-30 16:39:59 +01:00
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
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
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
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
Ladislau Szomoru ace330ba2c
SCM - Fixed a regression due to which post-commit commands were not being executed (#155824) 
Fixed a regression due to which post-commit commands were not being executed
 2022-07-21 12:25:15 +02:00
Ladislau Szomoru cd90b2b5ad
Git - Add telemetry comments (#155811) 
Add telemetry comments
 2022-07-21 09:34:19 +02:00
Ladislau Szomoru e0e7ad368e
Git - Enable action button while rebasing (#155744) 
Enable action button while rebasing
 2022-07-20 23:35:05 -07:00
Ladislau Szomoru f19251a4ca
Git - Use GIT_EDITOR environment variable to suppress the git commit editor during rebase (#155748) 
Use GIT_EDITOR environment variable to suppress the git commit editor during rebase
 2022-07-20 17:52:56 +02:00
Ping 0b2c56eb7b
Fix #114461 (#151824) 
suppress the editor during git rebase, fix #114461

Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2022-07-20 15:03:43 +02:00
Johannes Rieken ce5d92e998
use commit-icon for description, tweak codicon font-size (#155714) 
https://github.com/microsoft/vscode/issues/150863
 2022-07-20 13:49:24 +02:00
Johannes Rieken 7cdaa57928
also default to opening merge editor when conflict is about adding (#155711) 
fixes https://github.com/microsoft/vscode/issues/153737#issuecomment-1189357241
 2022-07-20 12:36:08 +02:00
Ladislau Szomoru 03c16c9c00
Git - The git.sync command should use the git.rebaseWhenSync setting (#155511) 
The git.sync command should use the git.rebaseWhenSync setting
 2022-07-18 18:38:58 +02:00
Ladislau Szomoru b3218963c4
Git - Do not show SmartCommit dialog when using "Commit All" (#155486) 
Do not show SmartCommit dialog when using "Commit All"
 2022-07-18 16:55:41 +02:00
Johannes Rieken 8bada27fdd
Merge pull request #155148 from microsoft/joh/double-barnacle 
joh/double barnacle
 2022-07-18 16:45:00 +02:00
Johannes Rieken 1878583319
read REBASE_HEAD when rebasing, swap yours/theirs (label, sides) as well (#155208) 
https://github.com/microsoft/vscode/issues/153737
 2022-07-14 09:23:44 -07:00
Ladislau Szomoru ee18db8144
Sync Changes button - only show when local branch is ahead/behind the remote branch (#155192) 
Only show Sync Changes button when local branch is ahead/behind the remote branch
 2022-07-14 13:51:47 +00:00
Ladislau Szomoru 70a1ebd595
Git - Add events to IPostCommitCommandsProviderRegistry (#155051) 
* Add events to IPostCommitCommandsProviderRegistry

* Pull request feedback
 2022-07-14 10:46:57 +02:00
Johannes 0f0101be5f
use TabInputTextMerge in git extensions 
For now only when checking for tabs, not yet for opening tabs
 2022-07-14 09:41:54 +02:00
Ladislau Szomoru f6332bd86d
Git - Use cloud icon for remote branches (#155140) 
Use cloud icon for remote branches
 2022-07-14 08:55:29 +02:00
Ladislau Szomoru bc51adde6f
git - Add localization comment for Publish Branch action button (#155053) 
* Add localization comment for Publish Branch action button

* Pull request feedback
 2022-07-13 14:39:18 +00:00
Ladislau Szomoru c7c0acd2ce
Git - Commit action button extension api (#154555) 2022-07-12 17:06:16 +02:00
Ladislau Szomoru acd1db24f2
Git - fix edge case with Windows mapped drives (#154342) 
* Fix an edge case with computing relative path on Windows

* Refactor the fix
 2022-07-12 12:20:41 +02:00
Ladislau Szomoru 5d18f94bb0
Git - Maintain spaces in the arguments (#154685) 
Maintain spaces in the arguments
 2022-07-11 02:28:57 -07:00
Ladislau Szomoru eb2e5d8558
Git - Commit action button should use smart commit settings (#154169) 
Consider smart commit settings when rendering the commit action button
 2022-07-07 21:31:10 +02:00
Logan Ramos a20329d291
Switch extensions to 1DS (#154299) 
* Move extensions to 1DS

* Switch extensions to 1DS
 2022-07-06 17:18:41 -07:00
Ladislau Szomoru 57609a19da
Git - Update commit button icon and tooltip based on branch protection (#154101) 
Update commit button icon and tooltip based on branch protection
 2022-07-04 20:18:16 +02:00
Ladislau Szomoru 32406a7157
Debt - Prevent icon translations (#154094) 
Prevent icon translations
 2022-07-04 14:37:52 +00:00
João Moreno 2fcd34a41b
Fixes #148568 (#154008) 
fixes #148568
 2022-07-04 07:41:54 +02:00
Ladislau Szomoru 53c752ac8a
Git - Disable commit button while merge is in progress (#153890) 
Disable commit button while merge is in progress
 2022-07-01 02:56:29 -07:00
Ladislau Szomoru b18f9e0630
Git - Do not show Sync Changes and Publish Branch action button when commit is in progress (#153821) 
Do not show Sync Changes and Publish Branch action button when commit is in progress
 2022-06-30 07:27:42 -07:00
Ladislau Szomoru cf532ac7db
Git - Tweak the git.useEditorAsCommitInput setting description (#153794) 
* Tweak the setting description

* Update extensions/git/package.nls.json

Co-authored-by: João Moreno <joao.moreno@microsoft.com>

Co-authored-by: João Moreno <joao.moreno@microsoft.com>
 2022-06-30 06:42:23 -07:00