development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 21:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
107892 commits 1076 branches 296 tags 1.2 GiB
Commit graph

2165 commits

Author SHA1 Message Date
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
Ladislau Szomoru 1230b7c300
Git - "Commit & Push" command now publishes the branch if there is no tracking remote (#153749) 
"Commit & Push" command now publishes the branch if there is no tracking remote
 2022-06-30 02:12:31 -07:00
Ladislau Szomoru 6ca8db83e7
Git - Disable undo last commit command while commit is in progress (#153739) 
Disable undo last commit command while commit is in progress
 2022-06-29 18:45:21 +00:00
Ladislau Szomoru 8045df1b94
Git - Add commands to the editor title to accept/discard commit message (#153692) 
Add commands to the editor title to accept/discard commit message
 2022-06-29 14:00:09 +00:00
Johannes Rieken 7aec222831
joh/issue150862 (#153677) 
* execute `workbench.view.scm` to reval SCM view after accepting merge

fixes https://github.com/microsoft/vscode/issues/150862

* only reveal viewlet when stage/accept was done
 2022-06-29 12:20:49 +00:00
Johannes Rieken bd24f72d42
fix 153492 (#153667) 
* enable "accept merge" for merge editor only
* close merge editor before staging file, only stage file when editor has been closed

fixes https://github.com/microsoft/vscode/issues/153492
 2022-06-29 14:08:09 +02:00
Ladislau Szomoru a424998dfd
Git - Action button precedence (#153662) 2022-06-29 12:48:22 +02:00
Harald Kirschner 56cade24a3
Make the guided git.missing welcome view default (#149668) 2022-06-29 01:14:39 -07:00
Ladislau Szomoru e773c97507
Git - commit action button does not appear on the initial commit (#153605) 
Fix #153507
 2022-06-28 14:07:16 -07:00
Ladislau Szomoru adecb6b529
Git - fix secondary action localization (#153604) 
Fix #153503
 2022-06-28 20:46:03 +00:00
Ladislau Szomoru 75b3fd5253
Git - Remove icons from branch picker to address regression (#153433) 
* Remove icons from branch picker to address regression

* Fix create branch from issue

* Pull request feedback
 2022-06-28 14:12:08 +02:00
Johannes aae22c1605
rename setting to git.mergeEditor, no more experimental 2022-06-27 12:54:55 +02:00
Ladislau Szomoru 45427b2346
Git - Add icons to branch picker (#153149) 
Add icons to branch picker
 2022-06-24 15:46:51 -04:00
Ladislau Szomoru 367eefd5f1
Git - commit action button (#153031) 2022-06-24 16:07:24 +02:00
Johannes Rieken dfeb3e0050
joh/careful silverfish (#153089) 
* don't show `openChange` command for merge editor

https://github.com/microsoft/vscode/issues/151125

* disable and not-place the conflicting merge-conflict navigation commands for the merge editor

https://github.com/microsoft/vscode/issues/153087

* disable (configurable) merge-conflict featues (code lens, decorations) when git is configured to use merge editor

https://github.com/microsoft/vscode/issues/153087
 2022-06-24 09:33:06 +00:00
Ladislau Szomoru 4a72009c59
Git - Update git.terminalGitEditor default value (#153085) 
Update git.terminalGitEditor default value
 2022-06-24 10:54:24 +02:00
Logan Ramos 4a7a6a597a
Update extension telemetry modules (#153057) 2022-06-24 00:53:23 +00:00
Ladislau Szomoru 25cc6c0dd0
Git - Remove git.branchProtectionIndicator setting (#153020) 
Remove git.branchProtectionIndicator setting
 2022-06-23 21:56:54 +02:00
Henning Dieterichs a2eccb109e
Merge pull request #152865 from microsoft/3wm 2022-06-23 17:35:24 +02:00
Ladislau Szomoru 1513f91ac2
Git - fix regression with creating an empty commit (#152974) 2022-06-23 16:06:06 +02:00
Ladislau Szomoru b9484e8e16
SCM - Action button localization fix (#152903) 
* Localization fix

* Fix typo in key
 2022-06-22 19:27:27 +00:00
Ladislau Szomoru df0fc08407
Git - Fix configuration service warnings (#152867) 
Fix configuration service warnings
 2022-06-22 15:58:57 +02:00
Ladislau Szomoru 08a46984d6
SCM - Add capability to disable the SCM action button (#152849) 
Add capability to disable the SCM action button
 2022-06-22 13:01:20 +02:00
Henning Dieterichs b673b4274d
Some 3wm cleanup. 2022-06-22 11:49:09 +02:00
Ladislau Szomoru 75362a6268
Git - add settings to control the branch protection indicator (#152469) 
* Add settings to control the branch protection indicator

* Pull request feedback
 2022-06-22 01:02:13 -07:00
Henning Dieterichs 467eef9270
Sets titles to yours and theirs in the git extension & swaps order. Fixes #150853 2022-06-21 17:23:21 +02:00
Ladislau Szomoru 88731bf6d6
Git - enable using the editor as the git commit input (#152158) 2022-06-16 16:27:35 +02:00
Ladislau Szomoru 46d9d7acda
Git - branch protection (#152218) 
Co-authored-by: João Moreno <joao.moreno@microsoft.com>
 2022-06-16 16:25:03 +02:00
Matt Bierner f17b33faf2
Use .?method() in more places (#152112) 
Switches simple patterns like:

```ts
if (some.thing) {
    some.thing.method();
}
```

to:

```ts
some.thing?.method()
```

This is more concise and avoids having to repeat the `some.thing` part
 2022-06-15 16:28:31 +00:00
Ladislau Szomoru 03be93691c
SourceControlInputBox API finalization (#152171) 2022-06-15 15:14:28 +02:00
Ladislau Szomoru c5318659ec
Git - add support for SSH Uri (#152051) 
* Add support for SSH Uri

* Update extensions/git/src/protocolHandler.ts

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

Co-authored-by: João Moreno <joao.moreno@microsoft.com>
 2022-06-14 20:41:54 +02:00
Ladislau Szomoru 5bf63b6e37
Git - fix close all diff editors command (#152059) 
Fix #150315
 2022-06-14 13:21:43 +00:00
Sandeep Somavarapu 22fe16d3e5
adopt merge editor in settings sync 
- use merge editor for conflicts
- expose base resource in resource syncrhonziers
- add baseResourceScheme context to contribute Accept Merge button per feature
- support old way of handling conflicts behind an internal setting
 2022-06-12 15:49:45 +02:00
Johannes ed9ed45794
Merge branch 'main' into joh/voluminous-lobster 2022-06-10 09:07:30 +02:00
Matt Bierner f7e12a3a92
Use optional method calls in more places (#151634) 
This replaces code like:

```ts
if (foo.bar) {
    foo.bar(cat);
}
```

with:

```ts
foo.bar?.(cat)
```

Which is more concise but has the same meaning
 2022-06-09 15:04:28 -07:00
Johannes 43c31079ee
manual fixing of prefer-const violations 2022-06-09 10:19:56 +02:00
Johannes 3622010b64
Merge branch 'main' into joh/voluminous-lobster 2022-06-09 09:08:20 +02:00
Johannes 0656d21d11
auto-fixed prefer-const violation 2022-06-08 17:49:21 +02:00
Ladislau Szomoru 6f5fc17622
Git - use editor as commit message input (#151491) 2022-06-08 15:45:27 +02:00
Ladislau Szomoru d99d645c8d
Git - Switch to using the remoteName context key (#151212) 
Switch to using the remoteName context key
 2022-06-03 09:43:42 -07:00
Ladislau Szomoru 5f823f0deb
Git - Add minItems/maxItems for branch dictionary setting (#151132) 
Add minItems/maxItems for branch dictionary setting
 2022-06-02 16:48:25 +00:00
Ladislau Szomoru 59fa71999e
Git - branch name generation setting feedback (#151106) 2022-06-02 14:27:06 +00:00
Ladislau Szomoru 4bd12af7f6
Git log level polish (#151095) 2022-06-02 09:10:18 -04:00
Matt Bierner e44f4ba886
Add experimental tag to experimental extension settings (#151031) 
This makes a few more extension settings with the `experimental` tag so that show up if you search `@tag:experimental`
 2022-06-01 16:32:58 -07:00
Ladislau Szomoru 185d3ee2a1
Fix #150725 (#150956) 2022-06-01 11:36:22 +02:00
Solomon Kinard 3c6fdedd0e
Quick spelling update (#150759) 
https://github.com/Sertion/vscode-gitblame/pull/123
 2022-05-31 21:06:38 +00:00
David Dossett 903f9903f4
Fix #150595 (#150880) 2022-05-31 10:22:49 -07:00
Ladislau Szomoru 9bfd3c1d72
Revert "A full editor can be used as git commit message editor (#95266)" (#150487) 
This reverts commit 97f8e66d74.
 2022-05-26 14:06:23 -07:00
Ladislau Szomoru 149e2b7674
Fix #149831 (#150276) 2022-05-25 20:51:08 +02:00
Henning Dieterichs ac312975c6
Merge branch 'main' into 3wm 
# Conflicts:
#	build/lib/i18n.resources.json
 2022-05-25 18:12:25 +02:00
Johannes ce01702bbe
make git "accept from merge editor" command save the document and close the merge editor (uses heuristic to identify merge editor tab) 2022-05-25 17:43:02 +02:00
Jonas Dellinger 97f8e66d74
A full editor can be used as git commit message editor (#95266) 
Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2022-05-25 17:16:10 +02:00
Johannes 38931b6a3d
add git.experimental.mergeEditor setting to enable/disable merge editor for conflicting files 2022-05-25 17:08:15 +02:00
Logan Ramos 3a8b1fe03e
More telemetry comments (#150303) 
* Add owners to all telemetry events

* More comments

* Add comments to non typescript GDPR annotation

* Another comment
 2022-05-24 16:00:55 -07:00
Ladislau Szomoru 3e83fa95b0
Fix #150266 (#150267) 2022-05-24 15:06:34 +02:00
Johannes c87131372a
Merge branch 'main' into 3wm 2022-05-24 14:09:17 +02:00
Johannes 7a51178618
git should open merge editor with detail and description (tag and commit-hash) 2022-05-17 13:46:42 +02:00
Ladislau Szomoru 38de430140
Add scope for settings (#149696) 2022-05-17 12:41:45 +02:00
Johannes 3aac77dc5d
Merge branch 'main' into 3wm 2022-05-16 09:53:59 +02:00
Ladislau Szomoru 42ec698ec9
Git - Add trace level telemetry to repository discovery (#149469) 
* Add trace level telemetry to help investigate repository scan issues

* Remove empty line

* Switch back to the localized warning message
 2022-05-13 16:31:28 +02:00
Ladislau Szomoru a28eab6873
Git - branch protection (#149360) 
* Initial implementation of branch protection

* Pull request feedback

* Update extensions/git/src/commands.ts

Co-authored-by: João Moreno <joao.moreno@microsoft.com>
 2022-05-13 02:15:01 -07:00
John Murray 479abbf95e
Add "Open Containing Folder" etc to file context menu in Git SCM view (#149150) 
* Add "Open Containing Folder" etc to file context menu in Git SCM view

Caption is "Reveal in Finder" on macOS and "Reveal in File Explorer" on Windows.
This resolves #137828

* Use multiple decorators on a method to simplify code
 2022-05-13 09:48:36 +02:00
Johannes abd3e66bac
use git-fs to read base, ours, and theirs 2022-05-11 12:04:04 +02:00
Johannes 286333fffb
Merge branch 'main' into 3wm 2022-05-11 09:44:08 +02:00
Joyce Er c5da5332d5
git: validate URI for clone command (#149180) 
Co-authored-by: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com>
 2022-05-10 11:32:02 -07:00
Ladislau Szomoru b44e3caa96
Git - branch prefix + random name generation (#149069) 2022-05-10 15:14:52 +00:00
Johannes 983fc7a6b6
connect floating button to a menu and contribute to that from git 2022-05-10 16:14:28 +02:00
Johannes 5971d31881
(prototype) use _open.mergeEditor from git extension for files under conflict 2022-05-10 15:09:35 +02:00
Tyler James Leonhardt 73ccdb7675
Inform the user the actual branch name that will be used in the branchName inputbox (#148964) 2022-05-09 18:03:17 +02:00
Ladislau Szomoru ce88518440
Git - logging improvements (#148656) 2022-05-05 12:52:26 +00:00
Benjamin Pasero c6bd448948
debt - bring @types/mocha up to date with version 9.x 2022-05-02 08:30:27 +02:00
Harald Kirschner 781d0e4a94
Fixing #146093 2022-04-28 10:14:51 -07:00
Tyler Leonhardt 59cdc58ea0
update a few nls files with comments to ensure buttons don't get messed up 2022-04-27 14:26:48 -07:00
Benjamin Pasero fbdc6d0352
git - use different icon for uncomitted changes (#145781) 2022-04-23 09:44:45 +02:00
Ladislau Szomoru c2752e654f
Fix hygiene 2022-04-22 16:03:12 +02:00
Eric Amodio 1b8ca287a0
Fixes #140787 watches proper worktree dir (#140789) 2022-04-22 15:50:13 +02:00
João Moreno 2e2654c97f
address heuristic when stage ranges act on same line number diff (#145899) 
Co-authored-by: @lszomoru
Fixes: #126989
 2022-04-22 12:31:15 +02:00
Johannes 90a6367e2c
remove mentionings of tabs proposal, fyi@lramos15 2022-04-22 11:51:53 +02:00
Logan Ramos aa69f3d762
Fix #15178 Finalize tabs API 🎉 2022-04-21 11:08:12 -04:00
Benjamin Pasero 44b6695d4e
timeline - add setting to bring back "Uncommitted Changes" (#147372) 2022-04-13 17:10:28 +02:00
Ladislau Szomoru 0e5a8e4bc0
Git - Disable automatic repository scanning in the root of the HOMEDRIVE (#339) 
* Disable automatic repository scanning in the root of the HOMEDRIVE

* Fix condition

* Pull request feedback
 2022-04-12 11:03:24 -07:00
Ladislau Szomoru aa0cc06377
Adopt RelativePattern to watch the repository root 2022-04-11 12:13:47 +02:00
Ladislau Szomoru 404fe73c20
Enable more logging during repository discovery 2022-04-08 16:59:56 +02:00
Ladislau Szomoru a2f6254739
💄 Remove console.log 2022-04-07 16:39:20 +02:00
Ladislau Szomoru cb1851d2dc
Second attempt to fix #121914 2022-04-07 16:38:01 +02:00
Ladislau Szomoru ef6f0ec6ab
Manually porting change from PR #127702 2022-04-07 15:33:12 +02:00
Ladislau Szomoru 0b270f9e22
Fix #146909 2022-04-06 14:36:13 +02:00
Logan Ramos d52eeec75d
Update variable misname 2022-04-05 15:15:41 -04:00
heartacker 80f8b99e3c
add the git.fetch action to the frist header menu in scm in order to be easier to fetch the repo immediately (#137940) 2022-04-05 15:32:32 +02:00
Benjamin Pasero e8f26b998e
git - use same icon for comparing as core diff editor 
//cc @lszomoru
 2022-04-01 17:20:31 +02:00
Ladislau Szomoru 9f7eaad160
Additional logging for git commands 2022-03-30 12:15:20 +02:00
hello-smile6 45744133c3
Update package.json (#146278) 
Fixes #146093
 2022-03-30 09:35:56 +02:00
Ladislau Szomoru 29f9e51444
if 'git.untrackedChanges' is set to 'hidden' ignore untracked files when running 'git status' 
Co-authored-by: Markus Korn <markus.korn@gmail.com>
 2022-03-29 21:22:30 +02:00
SteVen Batten 88632df6c9 update git: reveal in side bar 
refs #145765
 2022-03-23 16:47:43 -07:00
Benjamin Pasero 7de40ebc0b
remove uncommited changes (#145853) 2022-03-23 09:26:17 +01:00
Johannes 0f648cd7db
add eslint rule to disallow look behind regex feature, ignore in git and markdown fyi @lszomoru, @mjbvz 2022-03-22 16:02:19 +01:00
Ladislau Szomoru c6a623c185
Fix #144671 2022-03-22 13:35:16 +01:00
Logan Ramos a2d8edb83d
Tabs API renaming 2022-03-21 13:35:34 -04:00
Ladislau Szomoru cfb685861a
Fix ESLint error 2022-03-21 16:45:56 +01:00
Backfighter b8a5e18171
Allow disabling integrated askpass (#115455) 
The GIT_ASKPASS variable is currently enforced by vscode and there is no way to overwrite it.
This commit adds an options to disable the integrated askpass and use
your own.

Fixes #111839
 2022-03-21 16:31:04 +01:00
Sebastian Bresin 7ed4699079
feat: also expose repository.revert() (#145029) 2022-03-21 13:11:43 +01:00
Logan Ramos 4d9393e9d3
Renamed NotebookEditorDiffTabInput 2022-03-18 12:53:55 -04:00
Logan Ramos 9b7268acf9
Update telemetry module 2022-03-18 11:34:33 -04:00
Johannes 86ed5ee8e4
simpler check for diff editors 2022-03-18 14:49:09 +01:00
Logan Ramos 85c3df0dde
Tie in tab input, remove cleanup .d.ts 2022-03-17 16:54:44 -04:00
Logan Ramos c56ff000d4
Move close and add array support 2022-03-17 10:59:28 -04:00
Martin Aeschlimann 02e8bd149c
Merge pull request #144759 from microsoft/aeschli/hcLightThemeKind 
Add high contrast light theme kind
 2022-03-16 16:41:22 +01:00
Jackson Kearl 2626c7f17c
Fix #145135 2022-03-15 12:25:31 -07:00
Benjamin Pasero 15d081c5d7
Merge pull request #145136 from microsoft/ben/history 
Add support for a local file history in timeline view
 2022-03-15 17:01:00 +01:00
Logan Ramos ed5a545047
Fix #145111 2022-03-15 09:55:57 -04:00
Martin Aeschlimann 596181cb26
Merge branch 'main' into aeschli/hcLightThemeKind 2022-03-15 14:20:31 +01:00
Benjamin Pasero c0b8e90b2e
Merge branch 'main' into ben/history 2022-03-14 20:02:35 +01:00
Ladislau Szomoru 43ebce7ce2
Use markdown for the timeline hover (#145038) 2022-03-14 19:53:24 +01:00
Logan Ramos 53aaa205e6
Fix #144605 2022-03-14 13:26:45 -04:00
Benjamin Pasero eda6a6090e
history - implement interop between git and local history 2022-03-11 13:44:43 +01:00
David Dossett f1bb9324d7 Update git color contributions 2022-03-10 15:33:21 -08:00
Robo 32d40cf44e
chore: update to electron 17 (#143223) 
* chore: bump electron@17.0.0

* Revert "chore: revert to electron@13 (#143851)"

This reverts commit df645f1450.

* chore: bump electron@17.1.0

* Revert "ci: fix build with latest node-gyp"

This reverts commit c3e948aa30.

* chore: revert ci changes for node v16

* chore: update yarn.lock

* chore: bump electron@17.1.1
 2022-03-11 00:51:37 +09:00
Ladislau Szomoru fa5aa53695
Revert "Fix #121914" 
This reverts commit 6011bf7e7a.
 2022-03-09 20:28:36 +01:00
Quan Zhuo f57c9e5bf5
#144671, fix some non localized strings in git extension (#144712) 
Signed-off-by: Quan Zhuo <quanzhuo@kylinos.cn>
 2022-03-09 11:50:55 +01:00
Logan Ramos 0aa4642a59
Rename additionalResourcesAndViewIds 2022-03-04 08:52:36 -05:00
Robo df645f1450
chore: revert to electron@13 (#143851) 
* Revert "chore: update to electron 16 (#137241)"

This reverts commit 01df559c18.
This reverts commit 46301339b7

* ci: fix remote compiler for sdl-scan

* chore: fix remote/.yarnrc

* chore: fix build/npm/postinstall.js

* chore: rm crash reporter from shared process

* chore: rm crash reporter from ext host

* chore: fix build/lib/layersChecker.ts

* :chore: preserve some more changes

* fix tests

Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
 2022-02-24 17:49:49 +01:00
Logan Ramos 3b6d4a8772
Fix #143746 2022-02-23 10:21:01 -05:00
Ladislau Szomoru 7442bf8f3d
Handle the case in which the git command is not the first argument #132778 2022-02-22 13:27:59 +01:00
Ladislau Szomoru 6011bf7e7a
Fix #121914 2022-02-15 16:02:34 +01:00
Ladislau Szomoru ce46f445c0
Add command to close all diff editors 2022-02-15 11:59:39 +01:00
Ladislau Szomoru 888677ed95
Close stale diff editors while stashing changes 2022-02-14 10:32:59 +01:00
Logan Ramos ec9df1d972
Update tabs model to utilize the new API shape (#142668) 
* Change shape of the tabs API

* Disable tab tests for now

* Add an onDidChangeTabGroup event

* Optimize for group activate

* Update events to no longer be an array

* Further tab optimization
 2022-02-10 15:09:11 -05:00
Ladislau Szomoru 088f5b6a3e
Git - close diff editors on operation (#142513) 2022-02-09 11:04:06 +01:00
Robo 01df559c18
chore: update to electron 16 (#137241) 
* chore: bump electron@15.3.0

* chore: bump node@16.x

* chore: enable render process reuse

* Revert "watcher - use `type` property for crash reporter location"

This reverts commit bfa488dd8f.

* Revert "watcher - enable crash reports on linux (#136264)"

This reverts commit af261488f8.

* chore: enable crashpad on linux

* chore: bump electron@15.3.1

* chore: update api changes

* chore: bump @vscode/sqlite3@5.0.3

* spec: skip non-context aware module unittests

* chore: fix perf hook integration with node environment

* fix: adopt fs api changes

* chore: fix integration tests

* chore: bump electron@15.3.2

* chore: bump electron@16.0.0

* temp(macOS): kill test instances in OSS

* Revert "temp(macOS): kill test instances in OSS"

This reverts commit b0d796c8d64227a5ec012c060bbbee7d9da27568.

* chore: update chromium version for clang downloader

* some 💄 changes

* align with changes

* adopt more fs.rm

* 💄

* chore: bump @vscode/sqlite3@5.0.4

* fix layers check to account for duplicated types from node.js

* update todo for type casts

* smoke - fix compile issue

* chore: update module cache

* watcher - fix unhandled rejection (fix #137416)

* ci: update node version

* enable stack dumping

* update electron types to 16.x

* chore: bump @vscode/sqlite3@5.0.5

Refs https://github.com/microsoft/vscode/issues/137496

* fix layer issue

* add `AbortSignal` to core types

* chore: update linux compile flags

Refs 797723ec83

* ci: fix linux build

* ci: update github ci cache

* ci: fix remote build in github ci

* ci: better fix for remote build

* chore: bump azure cache

* chore: fix merge conflict

* :chore: update to electron@16.0.2

* chore: bump @vscode/sqlite3@5.0.7

* ci: update to gcc-4.9 for remote

Refs https://github.com/microsoft/vscode/issues/137659

* ci: switch to buster for linux arm

Refs https://github.com/microsoft/vscode/issues/137927

* ci: fix build on linux arm64

* ci: fix arm client compiler toolchain

Refs #137927

* chore: bump electron@16.0.3

* ci: fix compile flags for the c toolchain

* chore: bump electron@16.0.4

* Add experimental dark mode flag (#139109)

* Add experimental dark mode flag

* Apply PR feedback

* chore: bump electron@16.0.6

* chore: bump electron@16.0.7

Fixes https://github.com/microsoft/vscode/issues/138792
Fixes https://github.com/microsoft/vscode/issues/139300

* chore: experimental highlight API

* smoke - fix compile issue

* FIXME: custom ELECTRON_RUN_AS_NODE with node worker

* Revert "chore: bump electron@16.0.7"

This reverts commit 5fd01cf37c.

* Revert "Revert "chore: bump electron@16.0.7""

This reverts commit a7f1b73951.

* chore: fix github linux workflow

* chore: address review feedback

* chore: bump electron@16.0.8

* ci: revert to stretch distro for linux arm

Refs https://github.com/microsoft/vscode/issues/137927

* ci: force build

* chore: update yarn.lock

* address feedback

* Revert "FIXME: custom ELECTRON_RUN_AS_NODE with node worker"

This reverts commit 7b48fa3732.

* ci: fix remote folder build

* chore: fix github linux ci

* 🆙 `versionSpec`

Co-authored-by: Benjamin Pasero <benjamin.pasero@microsoft.com>
Co-authored-by: Raymond Zhao <raymondzhao@microsoft.com>
 2022-02-08 20:09:00 +01:00
Ladislau Szomoru cf040aa0db
Related to #140731 2022-02-04 21:04:59 +01:00
Ladislau Szomoru e4cce8c6e8
Add setting for git commands to be logged in the git output 2022-02-04 15:36:25 +01:00
Johannes Rieken 4a130c40ed
enable @typescript-eslint/member-delimiter-style, https://github.com/microsoft/vscode/issues/140391 2022-02-02 14:35:33 +01:00
Ladislau Szomoru c32b9a6114
Add setting to control repository scan 2022-01-26 20:07:25 +01:00
Harald Kirschner a9e136f1f4
New git welcome missing guide (#140293) 
New git welcome missing guide & shortening based on feedback
 2022-01-24 09:36:55 -08:00
Ladislau Szomoru a10dccc76a
Replace path.relative with a helper function that factors in case sensitivity but preserve the casing of the resource path 2022-01-24 12:58:24 +01:00
Ladislau Szomoru ab914793d5
SCMActionButton overflow improvements 2022-01-21 16:16:08 +01:00
Ladislau Szomoru 23664355e6
Revert "Replace path.relative with a helper function that factors in case sensitivity" 
This reverts commit c3bd29b3d0.
 2022-01-21 13:35:08 +01:00
Ladislau Szomoru c3bd29b3d0
Replace path.relative with a helper function that factors in case sensitivity 2022-01-20 11:44:11 +01:00
Logan Ramos c047af40b2
Fix compilation 2022-01-19 16:18:14 -05:00
Logan Ramos b22ee20028
Move to @vscode/extension-telemetry 2022-01-19 15:57:17 -05:00
Ladislau Szomoru 41a1de64ed
Handle Mac file system as case insensitive when comparing paths in the git extension. #138090 2022-01-18 21:45:25 +01:00
Ladislau Szomoru 28910095e7
Add statusLimit telemetry 2022-01-18 11:17:50 +01:00
Ladislau Szomoru 23ac679d4f
Tweak git commands visiblity in the command palette 2022-01-16 20:56:39 +01:00
Ladislau Szomoru fbbfb6c22a
Disable Git Rename command if the resource is not under source control 2022-01-16 17:53:34 +01:00
Benjamin Pasero 044092db55
git - adopt new out of workspace watching support (#140691) (#140695) 
* git - adopt new out of workspace watching support (#140691)

* dispose emitter too

* 💄

Co-authored-by: Joao Moreno <joao.moreno@microsoft.com>
 2022-01-14 16:29:15 +01:00
Benjamin Pasero eecbd962ef
debt - rename iconv-lite-umd package (#140650) 2022-01-14 07:28:41 +01:00
Ladislau Szomoru f62bfae001
Switch to using aka.ms links 2022-01-11 09:51:51 +01:00
Ladislau Szomoru 942f56efa1
Use consistent git status limit 2022-01-10 21:23:16 +01:00
Ladislau Szomoru a4aae00a0a
Use scmActiveResourceHasChanges in the when clause to show/hide command in the editor title 2022-01-10 15:32:37 +01:00
Ladislau Szomoru ff75a30d9f
Revert "SCM - Introduce another open changes command got editor/command palette (#138293)" 
This reverts commit af8b6ad9f0.
 2022-01-10 15:32:37 +01:00
Ladislau Szomoru 302c41cf4e
Add command to drop all stashes 2022-01-07 11:11:16 +01:00
Ladislau Szomoru a4d7014d7a
Git - add setting to control repository scan depth (#140260) 2022-01-07 10:18:53 +01:00
John Murray faf4de0d7a
fix #118617 use term 'remote' when referring to lack of upstream branch (#120467) 2022-01-06 13:55:48 +01:00
Ladislau Szomoru 76f34266d5
Replace RegEx with trim() 2022-01-04 11:34:42 +01:00
Logan Ramos 932ab8e485
Update vscode extension telemetry modules 2021-12-28 11:06:48 -05:00
Matt Bierner e7b3724e0c
Enable no-case-declarations in codebase (#139243) 
Fixes #139236

This can catch tricky programming mistakes that cause a runtime error. See 7e266b2c42 as an example of the type of bug this can prevent
 2021-12-15 17:15:35 -08:00
Ladislau Szomoru 67d6356a25
Do not enable the git extension in restricted mode (#139124) 2021-12-14 20:46:06 +01:00
Ladislau Szomoru f0f5baffb9
Fix #124066 2021-12-13 15:44:20 +01:00
Christopher M Kline b0d7083e79
Expose 'tag' and 'deleteTag' in git extension API (#123815) 2021-12-13 14:37:47 +01:00
Ladislau Szomoru 47de42baa9
Only probe directories during repository discovery 2021-12-10 09:53:48 +01:00
Ladislau Szomoru b70174e85b
Revert "Filter out file paths when discovering git repositories" 
This reverts commit 81551acb51.
 2021-12-09 17:32:53 +01:00
Ladislau Szomoru 81551acb51
Filter out file paths when discovering git repositories 2021-12-09 17:29:40 +01:00
Ladislau Szomoru 452e2c5303
Add timestamp and execution time to Git log 2021-12-09 15:18:38 +01:00
Logan Ramos b395575f00
Address comments about ? operator 2021-12-02 09:55:53 -05:00
João Moreno 1af9ac1b8f
fixes #138274 2021-12-02 11:51:15 +01:00
Ladislau Szomoru af8b6ad9f0
SCM - Introduce another open changes command got editor/command palette (#138293) 
* Introduce another command got editor/command palette
 2021-12-02 11:40:08 +01:00
Logan Ramos 29ea2755e8
Fix #137974 2021-12-01 12:06:39 -05:00
Ladislau Szomoru d6f24e10d5
Fix regression related to git.scanRepositories 2021-12-01 09:20:41 +01:00
Ladislau Szomoru bfad20be9d
Extract remote source provider registry into the vscode.git-base extension (#137656) 2021-11-24 20:48:44 +01:00
Ladislau Szomoru 01d105b4a6
Add SCM contribution to manage context key for active resource changes (#137297) 2021-11-22 16:13:22 +01:00
Benjamin Pasero aa21039c3c
🆙 iconv-lite 2021-11-22 11:51:08 +01:00
Alex Dima cae6e662ce
Reduce usage of allow-any-unicode-next-line 2021-11-20 21:01:29 +01:00
Ladislau Szomoru 56681eda57
Update Publish Branch label 2021-11-16 14:43:47 +01:00
Ladislau Szomoru cd8f11af58
Remove cgmanifest.json from git extension 2021-11-12 16:22:08 +01:00
Ladislau Szomoru 93a6105179
Extract git syntaxes/grammars into a separate extension 2021-11-12 16:19:54 +01:00
Johannes Rieken d775c7346c
create stand-in declaration for contribViewsWelcome and adopt for git-extension, https://github.com/microsoft/vscode/issues/131165 2021-11-12 12:31:56 +01:00
Ladislau Szomoru e95c74c4c7
Extract git static contributions into a separate extension 2021-11-12 11:35:35 +01:00
Johannes Rieken 09c9d4c293
use enabledApiProposals instead of wildcard property, also update compilation units to only include d.ts-files that are needed, https://github.com/microsoft/vscode/issues/131165 2021-11-12 11:05:57 +01:00
Ladislau Szomoru 4549bd26c7
Extract diff language into its own extension (#136967) 2021-11-12 10:59:52 +01:00
Johannes Rieken a4d426a1c2
split vscode.proposed.d.ts into a file per proposal, https://github.com/microsoft/vscode/issues/131165 2021-11-12 09:48:17 +01:00
Johannes Rieken edb91ace89
Merge branch 'main' into joh/vscode-dts 2021-11-11 09:30:36 +01:00
Benjamin Pasero fb48ad43fb
git - make integration tests agnostic to file watcher issues (#136933) 2021-11-11 07:50:07 +01:00
Matt Bierner b911788593
Mark a few more arrays in vscode.d.ts readonly 
This makes it clear that you can't modify these arrays to add items, such as calling `breakpoints.push(...)` to add a breakpoint
 2021-11-10 17:53:27 -08:00
Johannes Rieken b9a2b0df1d
Merge branch 'main' into joh/vscode-dts 2021-11-10 17:57:11 +01:00
deepak1556 2b25c6730d fix: parsing of --ms-enable-electron-run-as-node flag 
Fixes https://github.com/microsoft/vscode/issues/136837
 2021-11-10 23:42:33 +09:00
Johannes Rieken d90dd1355b
Merge branch 'main' into joh/vscode-dts 2021-11-10 08:40:26 +01:00
Alexandru Dima e08e4d3fe1
Move --ms-enable-electron-run-as-node to a later location (#136786) 
* Move `--ms-enable-electron-run-as-node` to a later location, which is not fatal in Electron builds that don't know it

* undo bad change
 2021-11-09 15:11:12 -08:00
deepak1556 ac29daaf3b
Fixes #136771: update to Electron v13.5.2 and pass --ms-enable-run-as-node together with ELECTRON_RUN_AS_NODE 2021-11-09 19:09:26 +01:00
Johannes Rieken 68e819043c
use tsconfig.json#include for vscode.d.ts and vscode.proposed.d.ts, enables to remove most ref.d.ts-files 2021-11-09 15:53:35 +01:00
João Moreno f18b29e132
fix(scm): 🐛 do not await git repo status, just give the repo straight up to scm 
on repo discovery, the git extension would run `git status` and wait for that to finish before handing out the repository to scm. this was problematic since the scm default repo selection depends on repos being discovered in a timely fashion. there's no reason not to just hand out the repo to scm and let `git status` finish afterwards

Closes: #120089
Closes: #113803
 2021-11-09 15:11:16 +01:00
Johannes Rieken 9254a8cd27
move vscode.d.ts and vscode.proposed.d.ts into src/vscode-dts-folder, https://github.com/microsoft/vscode/issues/131165 2021-11-09 15:00:03 +01:00
João Moreno 5dfa71a9e8
fix(git): 🐛 git api commands should be registered as contributions 
Closes: #111658
 2021-11-09 13:24:28 +01:00
Logan Ramos 00de6a5f2f
Update telemetry module 2021-11-08 10:00:44 -05:00
Ladislau Szomoru 4297ff8195
Revert fix for #26425 2021-11-05 15:53:32 +01:00
Joyce Er 05a2f2809e
Don't show 'Sync Changes' button if auto sync or auto push are enabled (#134408) 2021-11-05 09:18:08 +01:00
Alex Dima a704a69394
Enforce that source code uses a small subset of Unicode 2021-11-03 23:34:41 +01:00
Ladislau Szomoru 827639c994
Fix #136275 2021-11-02 12:01:05 +01:00
Logan Ramos 286606327d
Fix #135692 2021-10-25 10:28:51 -04:00
Logan Ramos 514ad0acf0
Fix #135422 2021-10-20 15:18:46 -04:00
Logan Ramos a4342f3add
Bump telemetry module 2021-10-01 16:52:56 -04:00
Eric Amodio 051a07a0c9 Forgot to bump limit to 10K 2021-09-30 01:12:28 -04:00
Eric Amodio 2306ad1ef4 Fixes #129669: new setting to control status limit 
Also bumps the default from 5000 to 10,000
 2021-09-30 01:04:30 -04:00
Eric Amodio 6fe68a2b0c Fixes #133974: SCM - sync changes button 2021-09-28 15:10:57 -04:00
Eric Amodio 214ac689ca Fixes type 2021-09-28 00:48:28 -04:00
Eric Amodio 51bd88d8f2 Adds git.showUnpublishedCommitsButton setting 2021-09-28 00:13:51 -04:00
Eric Amodio 55c726b53e Adds scm action button 
Refs: #110882
 2021-09-27 01:16:09 -04:00
Logan Ramos 282f499c22
Update extension telemetry module 2021-09-23 11:26:57 -04:00
Benjamin Pasero adee8fa29a
editors - shorten diff labels (#110694) 2021-09-19 17:29:44 +02:00
Logan Ramos 8dbad73de5
Update built in extensions telemetry 2021-08-27 15:45:42 -04:00
Logan Ramos ecc7fdac90
Bump extension telemetry module 2021-08-27 11:29:48 -04:00
Ladislau Szomoru f29238c5f4
Update jschardet package 2021-08-23 10:47:41 +02:00
Logan Ramos da7d76d2ec
Update extension telemetry module 2021-08-10 12:43:41 -04:00
Logan Ramos 6aa5b9226b
Update extension telemetry module 2021-08-09 13:16:08 -04:00