Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-27 21:52:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
100,847 Commits 2,497 Branches 340 Tags
ac12a2e9ebbcfdfc8a13bd399c46bb893f674431
Commit Graph

372 Commits

Author SHA1 Message Date
Ladislau Szomoru
e1c7285ab5 Git - Add the ability to fetch a branch before it is checked out (#160181) 2022-09-15 16:04:37 +02:00
Ladislau Szomoru
1e99736c27 Git - Add merge abort command (#159753) 
* Add merge abort command

* Pull request feedback
 2022-09-07 06:06:20 -07:00
Henning Dieterichs
9b381c5cd9 Merge pull request #159654 from microsoft/hediet/september 
Hediet/september
 2022-09-05 13:00:40 +02:00
Ladislau Szomoru
933c22a53f Git - Handle repository paths with a trailing \ character (#159461) 
* Fix another edge case with Windows path that contains a trailing \ character

* Pull request feedback
 2022-08-30 02:58:45 -07:00
Matt Bierner
5e92794be6 Re-enable running our eslint rules using ts-node (#159495) 
Resubmission of #157532 with the following changes:

- Use `eslint-plugin-local` instead of `yarn` link to run our plugins
- Move our plugins to a top level `.eslintplugin` dir (as required by `eslint-plugin-local`)
- Update all names to `local/`
 2022-08-30 08:40:04 +02:00
Matt Bierner
9e5248072a Fix ts-node for eslint (#159483) 
Bumps the cachesalt to make sure ts-node is installed
 2022-08-29 20:51:12 +02:00
Matt Bierner
5b21c7f28b Run our custom eslint rules using ts-node (#157532) 
* Run our custom eslint rules using ts-node

Use `ts-node` to run our custom eslint rules.  This lets us delete the pre-compiled js. It also means you can don't have to compile the rules while editing them

As part of this change, I've also switched us to using an eslint plugin instead of a rulesDir. This is now the preferred way to ship custom rules

* Fix two more disables

* Move ts-node to project root

* Enable transpileOnly
 2022-08-29 09:39:09 -07:00
Henning Dieterichs
7688a40249 Implements commands to recompute merge with git merge-file 2022-08-28 16:41:13 +02:00
Matt Bierner
b5a1bb34e9 Pick up latest TS for building VS Code (#158420) 2022-08-26 23:00:38 +02:00
Ladislau Szomoru
81e6a02c18 Git - Upgrade file-type package (#156411) 2022-08-09 11:30:49 -04: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
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
João Moreno
2fcd34a41b Fixes #148568 (#154008) 
fixes #148568
 2022-07-04 07:41:54 +02:00
Ladislau Szomoru
1513f91ac2 Git - fix regression with creating an empty commit (#152974) 2022-06-23 16:06:06 +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
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
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
7a51178618 git should open merge editor with detail and description (tag and commit-hash) 2022-05-17 13:46:42 +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
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
9f7eaad160 Additional logging for git commands 2022-03-30 12:15:20 +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
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
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
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
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
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
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
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
Benjamin Pasero
eecbd962ef debt - rename iconv-lite-umd package (#140650) 2022-01-14 07:28:41 +01:00
Ladislau Szomoru
942f56efa1 Use consistent git status limit 2022-01-10 21:23:16 +01:00
Ladislau Szomoru
302c41cf4e Add command to drop all stashes 2022-01-07 11:11:16 +01:00
Ladislau Szomoru
76f34266d5 Replace RegEx with trim() 2022-01-04 11:34:42 +01: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
452e2c5303 Add timestamp and execution time to Git log 2021-12-09 15:18:38 +01: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
5ef5837c58 Improves Git security with untrusted workspaces 2021-07-13 13:04:49 -04:00