Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-03-01 06:06:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
102,642 Commits 3,084 Branches 347 Tags
ea34e747c8e4cd4aa78f31f09ae2acfa2dad9596
Commit Graph

388 Commits

Author SHA1 Message Date
Ladislau Szomoru
8fd500ed74 Git - Add calcellation support for getRefs (#165938) 2022-11-10 12:25:53 -08:00
Ladislau Szomoru
624f4ac076 Git - Tweak git config parser (#166022) 
Tweak git config parser
 2022-11-10 18:04:35 +01:00
Ladislau Szomoru
b4eaea6bc6 Git - get remotes from the config file (#165909) 2022-11-10 14:35:43 +01:00
Ladislau Szomoru
08baa8abb4 Git - Only use this.dotGit when resolving HEAD (#165497) 
Fix #164363
 2022-11-04 23:15:42 -07:00
Logan Ramos
eafc1e0fe1 Remove overzealous telemetry (#165524) 2022-11-04 10:47:35 -07:00
Joyce Er
812c9bedf2 Fix cloning with specific branch (#164619) 2022-10-25 15:27:41 -07:00
Ladislau Szomoru
566e71b346 Revert "Git - parse config file for remotes (#164151)" (#164433) 
This reverts commit 798cd3bcac.
 2022-10-24 13:28:06 +02:00
Joyce Er
7318c90996 Checkout specific branch during clone operation (#163705) 2022-10-23 20:23:35 +02:00
Ladislau Szomoru
798cd3bcac Git - parse config file for remotes (#164151) 2022-10-21 06:57:22 -07:00
Ladislau Szomoru
9c76d66e69 Git - implement cancellation for updating the model (#163926) 
* Initial implementation

* Polish implementation

* Add cancelled label in the output

* Revert change that is not needed

* Pull request feedback

* Dispose listener

* Port changes manually
 2022-10-20 06:26:22 -07:00
Ladislau Szomoru
2fa61a14b8 Git - Extract querying for status so that it can run in parallel with the other operations (#163990) 2022-10-20 04:37:04 -07:00
Ladislau Szomoru
d4773517f1 Git - Get HEAD details in parallel (#163756) 2022-10-18 09:42:07 +02:00
Ladislau Szomoru
e1e7ce5d17 Git - adopt log output channel api (#163695) 2022-10-17 02:49:12 -07:00
Ladislau Szomoru
b43c281df2 Git - Attempt to parse HEAD file before invoking git.exe (#162572) 
* Attempt to parse HEAD file before invoking git.exe

* Pull request feedback

* Pull request feedback

* More pull request feedback
 2022-10-12 15:56:36 +02:00
Johannes Rieken
03f98efb75 fix Extract Telemetry step (#162832) 2022-10-06 06:17:12 -07:00
Johannes Rieken
b2b7e0be6e send telemetry about git-exec duration (#162731) 
* send telemetry about git-exec duration

* measure spawn and exec
 2022-10-06 04:04:35 -07:00
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