Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-28 21:55:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
98,194 Commits 3,085 Branches 347 Tags
fb97ffc1609dca6186eb6532095b39bde9938658
Commit Graph

1557 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
4bd12af7f6 Git log level polish (#151095) 2022-06-02 09:10:18 -04:00
Solomon Kinard
3c6fdedd0e Quick spelling update (#150759) 
https://github.com/Sertion/vscode-gitblame/pull/123
 2022-05-31 21:06:38 +00: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
7a51178618 git should open merge editor with detail and description (tag and commit-hash) 2022-05-17 13:46:42 +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