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