Commit graph

2476 commits

Author SHA1 Message Date
Ladislau Szomoru 1d4130b8b3
Git - fix repository detection when rev-parse returns a UNC path on Windows (#230207) 2024-10-01 10:35:48 +02:00
Benjamin Pasero b591f33513
🆙 jschardet@3.1.4 (#230197) 2024-10-01 08:19:15 +02:00
Matt Bierner d3596df9eb
More type assertion fixes (#230181)
For #211878

Also adds a few suppressions
2024-09-30 16:21:12 -07:00
Matt Bierner 51fa4d0172
Fix more type assertions (#230156)
* Fix more type assertions

For #211878

* Fix type error
2024-09-30 14:17:06 -07:00
Ladislau Szomoru 6c94f0a703
SCM - 💄 ActionButton API cleanup (#229943) 2024-09-27 12:08:48 +02:00
Ladislau Szomoru 0dea65fe0d
Git - rework integration tests (#229926)
* Git - rework integration tests

* Fix test
2024-09-27 11:38:10 +02:00
Ladislau Szomoru 44d05b9dfa
Git - cheery-pick now handles the case where the changes are already present on the current branch (#229731) 2024-09-25 18:07:16 +02:00
Ladislau Szomoru bdc3e5e2f4
SCM Graph - only show one badge per color/type (#229716) 2024-09-25 16:18:56 +02:00
Ladislau Szomoru deea09a36f
Git - remove the usage of cp.execSync from git integration test. Add assertions. (#229395) 2024-09-23 18:00:23 +02:00
Ladislau Szomoru a90e2f4e0f
Git - attempt to improve test reliability (#229160) 2024-09-20 16:55:45 +02:00
Ladislau Szomoru 55ed7b6ebc
Git - error handling while computing merge base (#229134) 2024-09-20 11:05:59 +02:00
Ladislau Szomoru cf4bc01bfb
Git - correctly detect merge base when creating a branch from a remote branch (#228942) 2024-09-18 17:02:02 +02:00
Ladislau Szomoru 47a8de0b9f
SCM Graph - add option to return only a subset of history item references (#228932) 2024-09-18 12:36:57 +02:00
Ladislau Szomoru dfa3888fbd
Git - use --stdin when running git log (#228817)
* Revert "Git - truncate commit hashes before running git log (#228643)"

This reverts commit 26ae4519ca.

* Use the --stdin flag when running git log
2024-09-17 13:36:14 +02:00
Ladislau Szomoru 1d10fa2268
Git - terminal shell integration to handle missing sub command (#228809) 2024-09-17 11:54:11 +02:00
Ladislau Szomoru 26ae4519ca
Git - truncate commit hashes before running git log (#228643) 2024-09-14 19:50:20 -07:00
Ladislau Szomoru 31e597ccdd
Git - only compute incoming changes decorations when needed (#228611) 2024-09-14 00:49:13 +02:00
Ladislau Szomoru a8343f15fa
Git - retrieve references as part of updating the model (#228609)
* Git - retrieve references as part of updating the model

* Remove extra import
2024-09-13 15:31:26 -07:00
Ladislau Szomoru 056af29c9b
SCM Graph - Add "Go to Current History Item" action (#228600)
* Reveal current history item if it is already part of the tree

* Fetch current history item
2024-09-13 23:35:29 +02:00
Ladislau Szomoru 597b5e965b
SCM Graph - Add more commands to the context menu (#228480)
* SCM Graph - add "Checkout (Detached)" command

* Add "Cherry Pick" command
2024-09-13 15:36:52 +02:00
Ladislau Szomoru 4376d38fcd
SCM Graph - Add "Create Branch..." command to the history item context menu (#228438) 2024-09-13 12:15:16 +02:00
Ladislau Szomoru 8a9caf323a
SCM Graph - Add "Create Tag" action to history item context menu (#228428) 2024-09-13 10:17:44 +02:00
Ladislau Szomoru adc7335b1d
SCM Graph - fix action item title and order (#228380) 2024-09-12 21:23:31 +02:00
Ladislau Szomoru 1d3895d045
SCM Graph - better handling of graph refresh (#228329)
* Initial implementation

* Removed refs should be also removed from the filter
2024-09-12 12:06:25 +02:00
Ladislau Szomoru 0485695683
Git - fix remote reference id (#228164)
* Git - fix remote reference id

* Remove unnecessary code
2024-09-11 00:40:22 +02:00
Ladislau Szomoru ff86643196
Git - clean-up history provider (#228148) 2024-09-10 21:43:46 +02:00
Ladislau Szomoru 2a27ab1e48 Fix typo 2024-09-10 15:07:54 +02:00
Ladislau Szomoru c2c032e0da SCM - 💄 remove SourceControlHistoryItemGroup from the API proposal 2024-09-10 14:46:12 +02:00
Ladislau Szomoru fea0aa298b
Git - only calculate branch merge base on checkout (#228066) 2024-09-10 08:45:20 +02:00
Ladislau Szomoru d8af24e15d
SCM - wire-up the onDidChangeHistoryItemRefs event (#228042)
Wire-up the event
2024-09-09 16:51:31 -07:00
Ladislau Szomoru 3f0893b273
SCM - cleanup history provider proposed API (#227960) 2024-09-09 14:40:56 +02:00
hj 88d7b97c93
chore: rm unreached ignore items when build extensions. (#227906)
chore: rm unreached ignore items when compiling extensions.
2024-09-09 10:32:51 +00:00
Ladislau Szomoru 3ab41c2f69
SCM Graph - add branch picker (#227949)
* WIP - saving my work

* Extract HistoryItemRef picker

* Extract Repository picker

* Improve history item ref picker rendering

* Refactor color map

* Refresh the graph when the filter changes

* Push minor fix
2024-09-09 12:02:31 +02:00
Robo b5a6aa14a8
feat: switch to npm as default package manager (#226927)
* feat: move from yarn to npm

* chore: skip yarn.lock files

* fix: playwright download

* chore: fix compile and hygiene

* chore: bump vsce@2.17.0

Refs 8b49e9dfdf

* test: update results for bat and sh colorizer tests

* fix: add missing lock files for windows

* fix: switch to legacy-peer-deps

* chore: update markdown-it@14.1.0

Refs 737c95a129

esbuild step in extensions-ci-pr was previously using markdown-it
from root which had userland punycode and was able to compile successfully.

* ci: increase pr timeout for windows integration tests

* chore: fix product build

* build: ignore extension dev dependency for rcedit

* build: fix working directory inside container

* build: fix dependency generation

* npm: update dependencies

* ci: use global npmrc

* ci: update cache

* ci: setup global npmrc for private npm auth

* build: fix extension bundling

* chore: sync npm dependencies

* ci: debug env variables for container

* ci: fix win32 cli pipeline

* build: fix npmrc config usage for build/ and remote/ dirs

* fix: windows build

* fix: container builds

* fix: markdown-language-features tests and bundling

```
[03:58:22] Error: Command failed: /Users/demohan/.nvm/versions/node/v20.15.1/bin/node /Users/demohan/github/vscode/extensions/markdown-language-features/esbuild-notebook.js --outputRoot /Users/demohan/github/vscode/.build/extensions/markdown-language-features
✘ [ERROR] Could not resolve "punycode"

    extensions/markdown-language-features/node_modules/markdown-it/lib/index.js:14:27:
      14 │ var punycode     = require('punycode');
         ╵                            ~~~~~~~~~~

  The package "punycode" wasn't found on the file system but is built into node. Are you trying to bundle for node? You can use "platform: 'node'" to do that, which will remove this error.
```

Adds userland package based on beed9aee2c

* fix: container builds for distro

* chore: update yarn occurrences

* fixup! chore: bump vsce@2.17.0

Uses the closest version to `main` branch that does not
include d3cc84cdec
while still having the fix 8b49e9dfdf

* chore: sync npm dependencies

* chore: sync npm dependencies

* chore: sync npm dependencies

* chore: throw error when yarn is used for installation

* chore: add review feedback

* chore: switch exec => run where needed

* chore: npm sync dependencies

* fix: markdown-language-features bundling

```
✘ [ERROR] Could not resolve "punycode"

    extensions/markdown-language-features/node_modules/markdown-it/lib/index.js:14:27:
      14 │ var punycode     = require('punycode');
         ╵                            ~~~~~~~~~~

  The package "punycode" wasn't found on the file system but is built into node. Are you trying to bundle for node? You can use "platform: 'node'" to do that, which will remove this error.
```

Adds missing userland package based on markdown-it/markdown-it@beed9ae,
can be removed once we update markdown-it >= 14.1.0

* ci: rename no-yarn-lock-changes.yml

* chore: sync npm dependencies

* ci: restore no-yarn-lock-changes.yml

We can disable it in a separate PR to keep the required
checks happy and also need workflow edit perms.

* chore: sync npm dependencies

* ci: rebuild cache

* ci: fix no-package-lock-changes.yml

* chore: bump distro

* chore: rm yarn.lock files

* chore: rm yarn.lock files without dependencies

* chore: add vscode-selfhost-import-aid to postinstall dirs

* chore: bump distro
2024-09-06 22:18:02 +09:00
Ladislau Szomoru 5ae8ffb7e3
SCM Graph - set the groundwork to show all history item groups (#227780) 2024-09-06 15:12:48 +02:00
Joyce Er b4608c9394
fix: resolve remote source actions by remote url (#227647)
fix: resolve remote source actions by remote name
2024-09-04 16:02:13 -07:00
Ladislau Szomoru 65af7713d1
SCM - fix graph rendering when checking out a tag or detached commit (#227578) 2024-09-04 15:17:51 +02:00
Ladislau Szomoru 87f05e126a
SCM - show multi-line commit message in hover (#227538)
* SCM - show multi-line commit message in hover

* Fix tests
2024-09-04 11:09:17 +02:00
Matt Bierner 8649c9c18b Allow lookbehind regexps in core
I believe safari was the last browser to add these, but they have been supported in safari since 16.4
2024-09-03 16:03:04 -07:00
Ladislau Szomoru 27b83d5060
SCM - fix tag detection (#227440) 2024-09-03 15:40:49 +02:00
Ladislau Szomoru cd0427ad28
SCM - add color to history item labels (#227436)
* Initial implementation

* Cleanup colors

* Revert changes to define colors in the git extension

* Add colors to labels
2024-09-03 14:04:22 +02:00
Ladislau Szomoru a3aedeae3e
SCM - cleanup SourceControlHistoryProvider api (#227376)
* Remove provideHistoryItemSummary

* Remove resolveHistoryItemGroupCommonAncestor

* Remove provideHistoryItems

* Rename methods and remove unused code

* Remove duplicated code
2024-09-02 15:52:05 +02:00
Ladislau Szomoru a546f7613c
SCM - graph always scoped to one repository (#227302)
* Initial implementation of the view

* Extract things into SCMHistoryViewModel

* Add repository name in the title description

* Set the scmProvider context key
2024-09-01 07:50:16 -07:00
Ladislau Szomoru 96af81f067
SCM - introduce history item displayId (#227205)
* SCM - add `displayId` to `SourceControlHistoryItem`

* Add `displayId` into the history item hover
2024-08-30 14:51:11 +02:00
Ladislau Szomoru 72e9b7daff
SCM - remove old incoming/outgoing code (#227200)
* Delete SCMViewSeparatorElement

* Deleted all renderers

* Delete SCMHistoryItemGroupTreeElement

* More clean-up

* Cleanup old menus

* Fix compilation errors after ESM merge
2024-08-30 14:10:47 +02:00
Ladislau Szomoru 88810d83f6
SCM - graph progress indicator improvements (#226482) 2024-08-23 21:50:46 +02:00
Ladislau Szomoru 00082d111f
SCM - use fixed references when paging in more data (#226425) 2024-08-23 15:06:06 +02:00
Ladislau Szomoru 557228e262
SCM - Source Control Graph view (#226250)
* Added the new view

* Add support for getting N number of commits

* Added view title actions

* More work to enable view/repository actions

* Expand the view by default, and always show the last N commits

* Add context menu actions

* Improve actions

* Basic infinite scrolling implemented

* Better implementation using --skip instead of a cursor

* Do not refresh graph when pressing Refresh

* Refactor load more/caching

* Rename the view

* Add support for the find widget
2024-08-22 15:54:22 +02:00
Ladislau Szomoru cd360e0318
SCM - remove incoming/outgoing/history graph from the Source Control view (#226241) 2024-08-22 12:42:14 +02:00
Daniel Imms cf347edc08
Merge pull request #224744 from microsoft/tyriar/145234_2
Finalize shellIntegration API
2024-08-07 06:55:30 -07:00