Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-22 10:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
144,137 Commits 2,994 Branches 347 Tags
2b514ef2024945bee2e4e5163d30cb2cb2d71b63
Commit Graph

2896 Commits

Author SHA1 Message Date
Ladislau Szomoru
105d8dd583 SCM - 💄some follow-up cleanup (#274193) 2025-10-30 13:55:23 -07:00
Ladislau Szomoru
9e8f5336da SCM - plumbing to support artifacts in the repositories view (#274173) 
* WIP - ported changes from the old branch

* More work getting the changes ready

* Tweak things

* Git - wire-up checkout command
 2025-10-30 12:37:22 -07:00
Ladislau Szomoru
f46638bfc7 Git - improve reference comparison commands (#274143) 
* Git - improve compare commands

* Remove an extra check

* Fix bad manual merge
 2025-10-30 17:00:30 +00:00
Ladislau Szomoru
d2c16dbf3e Git - use git diff-tree only for the first commit in the repository (#274107) 2025-10-30 17:53:37 +01:00
Ladislau Szomoru
16f58dd3ac SCM - add incoming/outgoing nodes to graph (#274059) 2025-10-30 17:04:24 +01:00
Ladislau Szomoru
f8e2f71c2f Git - move compare with merge base action into the context menu (#273981) 2025-10-29 16:14:03 +00:00
Ladislau Szomoru
20ded57d68 Git - use diff instead of diff-tree for showing commit data and comparing branches (#273969) 2025-10-29 16:28:46 +01:00
Ladislau Szomoru
8fb6a9c257 Git - improve graph/timeline/blame hover rendering (#273932) 2025-10-29 08:14:58 -04:00
Ladislau Szomoru
5840155ace Git - add commands to easily compare a local branch with upstream and merge base (#273839) 2025-10-28 17:22:06 -07:00
Ladislau Szomoru
4c3d8cf64a Git - adopt the new icons for the statusbar command (#273789) 
* Git - adopt the new icons

* Attempt to fix tests
 2025-10-28 19:37:40 +00:00
Ladislau Szomoru
90627f0950 Git - unify compare commands for the graph (#273771) 
* Git - unify compare commands for the graph

* Update placeholder

* More changes
 2025-10-28 16:00:51 +00:00
Ladislau Szomoru
23894eb833 Git - fix theme icon (#273767) 2025-10-28 15:23:22 +00:00
Ladislau Szomoru
294b045d4b Git - fix bug with comparing with a remote branch (#273705) 
* Git - fix bug with comparing with a remote branch

* Update placeholder
 2025-10-28 11:10:07 +01:00
Ladislau Szomoru
124710c5ff Git - add command to compare a tag (#273694) 
* Git - update command label

* Git - add command to compare a tag
 2025-10-28 06:43:12 +00:00
Ladislau Szomoru
3fff78b18a Graph - add command to compare references (#273635) 2025-10-27 15:37:10 -07:00
Ladislau Szomoru
24dc95ef64 Git - add telemetry to track down stale diagnostics (#273565) 2025-10-27 07:42:35 -07:00
Ladislau Szomoru
aaa334f22a SCM - introduce new menu for the repositories view (#272946) 2025-10-23 20:40:45 +00:00
Alex Ross
edf4ea5879 Simplify git clone API (#272912) 
- Don't allow to skip the cache
- Only have "none" post commit action
- Consolidate post commit logic
- I ended up keeping the `Uri | null` return type for the `clone` API. It's just too useful, and there's no reason why we couldn't pass it back if the user didn't decide to open the clone and reload the window.
 2025-10-23 16:55:21 +02:00
Alex Ross
3cc447e709 Improve layering for git model (#272857) 
* Improve layering for git model
- Git clone doesn't belong in the model, removed it
- All the extra repo picking didn't seem to fit into `Git` though, as that is really about git operations
- Added a `CloneUtils` namespace for all the clone stuff to live.

* Update extensions/git/src/clone.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* CloneManager class

* public/private
 2025-10-23 16:04:35 +02:00
Alex Ross
dda6e09f62 Update git clone to use new repo cache (#272276) 2025-10-22 21:06:20 +02:00
Alex Ross
f93044c015 Maintain a cache of repo remotes that we know about (#271652) 
* Maintain a cache of repo remotes that we know about
Part of #271101

* Save workspace file or folder instead of repo root path

* PR feedback
- Rename to repositoryCache
- Remove timestamp
- Move logic into repo cache
- Fix tests

* Name changes

* Actually delete

* Fix change that got lost in the rename
 2025-10-20 18:16:04 +00:00
Ladislau Szomoru
bc01289e90 Git - limit the timeline/blame/graph hover commands (#271530) 2025-10-15 15:09:02 +00:00
Baptiste Girardeau
62ff0cceb4 fix: resolve renamed paths on merge editor (#254677) 2025-10-15 14:53:12 +00:00
Ladislau Szomoru
a1d4cfa3d8 SCM - graph hover provided by extension (#271519) 
* Git - 💄 consolidate git blame and timeline hover code

* Git - Delete code that was commented out

* SCM - graph hover provided by extension

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* More fixes

* More fixes

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-10-15 14:22:12 +00:00
Matt Bierner
162806006a Update a few package-locks for mocha 2025-10-13 11:13:12 -07:00
Matt Bierner
98b069c041 Work towards getting isolated built-in extension compiles 
For #271167

This makes it so our built-in extensions can mostly be built using `tsc` on the command line. Previously the extensions were picking up a lot of typing info from the root `node_modules` that meant they weren't truly independent
 2025-10-13 11:03:20 -07:00
Ladislau Szomoru
c244c79cd4 Git - remove the usages of any (#270179) 
* Git - remove the usages of `any`

* Remove debug message
 2025-10-07 08:14:52 -04:00
Ladislau Szomoru
bbe85db188 Git - remove usages of any (#270075) 
* Git - remove usages of `any`

* 💄 fix check
 2025-10-06 18:23:03 +00:00
Ladislau Szomoru
82d335bbbc Git - 💄 consolidate git blame and timeline hover code (#269689) 
* Git - 💄 consolidate git blame and timeline hover code

* Git - Delete code that was commented out
 2025-10-03 14:12:03 +02:00
Matt Bierner
360c9fd134 Add lint rule for as any and bulk ignore all existing breaks 
For #269213

This adds a new eslint rule for `as any` and `<any>({... })`. We'd like to remove almost all of these, however right now the first goal is to prevent them in new code. That's why with this first PR I simply add `eslint-disable` comments for all breaks

Trying to get this change in soon after branching off for release to hopefully minimize disruption during debt week work
 2025-10-02 23:38:33 -07:00
Ladislau Szomoru
d0cb4a16a5 Git - fix regression related to using path.sep (#269361) 2025-10-01 15:36:11 +00:00
Ladislau Szomoru
597148770d SCM - use subject as the title of the multi-file diff editor (#269347) 2025-10-01 16:55:05 +02:00
Ladislau Szomoru
c6d8b3ab0b Git - only show "Resolve in Merge Editor" editor action when conflict markers are present (#269300) 2025-10-01 11:28:30 +02:00
Ladislau Szomoru
1a72b133fd Git - add context key for merge conflict detection (#268183) 2025-09-24 15:33:01 +00:00
Ladislau Szomoru
b276d35cd6 Git - path comparison should better handle trailing/mixed separators (#267112) 2025-09-17 06:56:24 -07:00
Ladislau Szomoru
a1c9bc01e7 Chat - add support to attach a history item change range to chat (#266022) 
* Chat - add ISCMHistoryItemChangeRangeVariableEntry

* Chat - add content provider for ISCMHistoryItemChangeRangeVariableEntry
 2025-09-10 14:16:38 +00:00
Ladislau Szomoru
f3d0305959 SCM - add method to resolve a source control history item (#265844) 2025-09-09 15:40:52 +02:00
Christy 😺
8bdbcf0e32 compare with workspace use diff editor instead of merge editor (#265054) 
compare with workspace use diff editor instead of merge
 2025-09-03 20:33:10 -07:00
Christy 😺
901aa3b820 directly call simplified merge editor for worktree merges (#265024) 
directly call own simplified merge editor for worktree merges
 2025-09-03 14:45:41 -07:00
Christy 😺
f562c9d3e8 Enable users to view and apply changes from worktree to main repo, per file (#263927) 
* enable compare with workspace command

* add context to command

* clean up
 2025-09-02 15:28:07 +02:00
Christy 😺
211615d751 Git: Fix worktree checkout default actions (#262414) 
* fix worktree checkout default action

* remove comments

* clean up

* fix returns

* change action to 'cancel'
 2025-09-01 15:46:09 +02:00
Christy 😺
9c9a837573 clean up dialog and add additional warning (#263908) 
* restrict dialog to less than 5 files

* add warning dialog
 2025-08-28 15:34:27 -07:00
Christy 😺
79712fb87f migrate worktree changes (#262656) 
* migrate worktree changes

* detect LocalChangesOverwritten error before creating & applying stash

* error handle

* make error label clearer

* delete redundant stash length check

* clean up error handling
 2025-08-28 07:57:26 -07:00
Ladislau Szomoru
a63acf5e40 Git - accept working set changes when a resource is staged/committed (#262885) 2025-08-25 08:07:51 -07:00
Ladislau Szomoru
845601668b Git - fix commit signing regression (#262479) 
* Git - fix commit signing regression

* Extract file name when signing commit
 2025-08-20 10:55:44 +00:00
Ladislau Szomoru
792addc4a2 Git - reveal specific file in the multi-file diff editor (#262458) 
Git - reveal specific file in the multi-file diff ediotr
 2025-08-20 08:46:53 +00:00
Christy 😺
6518fe6990 separate open and delete worktree action (#262175) 2025-08-18 11:30:03 -07:00
Christy 😺
e14542e646 add delete worktree command to context menu (#261711) 2025-08-14 22:07:40 +00:00
Christy 😺
01d448dc0c fix worktree label (#260627) 
fix label
 2025-08-08 11:00:37 -07:00
Matt Bierner
ed71020bfc Convert extension webpack scripts to modules 2025-08-07 17:20:22 -07:00