Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-27 21:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
144,137 Commits 3,081 Branches 347 Tags
2b514ef2024945bee2e4e5163d30cb2cb2d71b63
Commit Graph

836 Commits

Author SHA1 Message Date
Harald Kirschner
56cade24a3 Make the guided git.missing welcome view default (#149668) 2022-06-29 01:14:39 -07:00
Johannes
aae22c1605 rename setting to git.mergeEditor, no more experimental 2022-06-27 12:54:55 +02: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
Ladislau Szomoru
df0fc08407 Git - Fix configuration service warnings (#152867) 
Fix configuration service warnings
 2022-06-22 15:58:57 +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
Ladislau Szomoru
88731bf6d6 Git - enable using the editor as the git commit input (#152158) 2022-06-16 16:27:35 +02:00
Ladislau Szomoru
03be93691c SourceControlInputBox API finalization (#152171) 2022-06-15 15:14:28 +02: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
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
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
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
Henning Dieterichs
ac312975c6 Merge branch 'main' into 3wm 
# Conflicts:
#	build/lib/i18n.resources.json
 2022-05-25 18:12:25 +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
Johannes
c87131372a Merge branch 'main' into 3wm 2022-05-24 14:09:17 +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
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
286333fffb Merge branch 'main' into 3wm 2022-05-11 09:44:08 +02: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
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
Johannes
90a6367e2c remove mentionings of tabs proposal, fyi@lramos15 2022-04-22 11:51:53 +02:00
Benjamin Pasero
44b6695d4e timeline - add setting to bring back "Uncommitted Changes" (#147372) 2022-04-13 17:10:28 +02: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
hello-smile6
45744133c3 Update package.json (#146278) 
Fixes #146093
 2022-03-30 09:35:56 +02: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
Logan Ramos
9b7268acf9 Update telemetry module 2022-03-18 11:34:33 -04:00
Martin Aeschlimann
596181cb26 Merge branch 'main' into aeschli/hcLightThemeKind 2022-03-15 14:20:31 +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
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
Ladislau Szomoru
ce46f445c0 Add command to close all diff editors 2022-02-15 11:59:39 +01: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
e4cce8c6e8 Add setting for git commands to be logged in the git output 2022-02-04 15:36:25 +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