Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-27 13:40:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
124,157 Commits 2,497 Branches 340 Tags
e81aceaa07bab1ccdc94deae04168c8bd062f0de
Commit Graph

718 Commits

Author SHA1 Message Date
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
Logan Ramos
b22ee20028 Move to @vscode/extension-telemetry 2022-01-19 15:57:17 -05: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
eecbd962ef debt - rename iconv-lite-umd package (#140650) 2022-01-14 07:28:41 +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
Logan Ramos
932ab8e485 Update vscode extension telemetry modules 2021-12-28 11:06:48 -05:00
Ladislau Szomoru
67d6356a25 Do not enable the git extension in restricted mode (#139124) 2021-12-14 20:46:06 +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
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
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