From b76595993371822a452a94ff8f4bc3323bb57d05 Mon Sep 17 00:00:00 2001 From: kuddev Date: Mon, 24 Aug 2026 15:09:13 +0800 Subject: [PATCH] chore: use owned GPUI dependency sources Route Nebula and gpui-component's transitive Zed dependencies through the Kuddev forks at immutable v1.16.1 baseline revisions, while retaining the official commit as upstream provenance. Locked metadata and the inverse dependency tree resolve one GPUI source; the application check remains unchanged at 65 migration errors and 348 warnings. --- Cargo.lock | 50 ++++++++++++++++++------------------- Cargo.toml | 27 ++++++++++---------- nebula_gpui/ARCHITECTURE.md | 24 ++++++++++-------- 3 files changed, 52 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 58356f6..6f29c21 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1331,7 +1331,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "gpui_util", "indexmap", @@ -1912,7 +1912,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "proc-macro2", "quote", @@ -3036,7 +3036,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "accesskit", "anyhow", @@ -3120,7 +3120,7 @@ dependencies = [ [[package]] name = "gpui-component" version = "0.5.2" -source = "git+https://github.com/Kuddev/gpui-component?rev=4ee9f274e990d6228e4f276f0a1e48f62f6a2048#4ee9f274e990d6228e4f276f0a1e48f62f6a2048" +source = "git+https://github.com/Kuddev/gpui-component?rev=4eb3917678930561c7ea36742f432313cd30b275#4eb3917678930561c7ea36742f432313cd30b275" dependencies = [ "aho-corasick", "anyhow", @@ -3203,7 +3203,7 @@ dependencies = [ [[package]] name = "gpui-component-assets" version = "0.5.1" -source = "git+https://github.com/Kuddev/gpui-component?rev=4ee9f274e990d6228e4f276f0a1e48f62f6a2048#4ee9f274e990d6228e4f276f0a1e48f62f6a2048" +source = "git+https://github.com/Kuddev/gpui-component?rev=4eb3917678930561c7ea36742f432313cd30b275#4eb3917678930561c7ea36742f432313cd30b275" dependencies = [ "anyhow", "gpui", @@ -3217,7 +3217,7 @@ dependencies = [ [[package]] name = "gpui-component-macros" version = "0.5.1" -source = "git+https://github.com/Kuddev/gpui-component?rev=4ee9f274e990d6228e4f276f0a1e48f62f6a2048#4ee9f274e990d6228e4f276f0a1e48f62f6a2048" +source = "git+https://github.com/Kuddev/gpui-component?rev=4eb3917678930561c7ea36742f432313cd30b275#4eb3917678930561c7ea36742f432313cd30b275" dependencies = [ "proc-macro2", "quote", @@ -3227,7 +3227,7 @@ dependencies = [ [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "accesskit", "accesskit_unix", @@ -3261,7 +3261,7 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "accesskit", "accesskit_macos", @@ -3309,7 +3309,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3320,7 +3320,7 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "console_error_panic_hook", "gpui", @@ -3333,7 +3333,7 @@ dependencies = [ [[package]] name = "gpui_shared_string" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "schemars", "serde", @@ -3343,7 +3343,7 @@ dependencies = [ [[package]] name = "gpui_util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "anyhow", "log", @@ -3353,7 +3353,7 @@ dependencies = [ [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "anyhow", "console_error_panic_hook", @@ -3376,7 +3376,7 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "anyhow", "bytemuck", @@ -3405,7 +3405,7 @@ dependencies = [ [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "accesskit", "accesskit_windows", @@ -3701,7 +3701,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "anyhow", "async-compression", @@ -4644,7 +4644,7 @@ checksum = "7ebb8d8732c6a6df3d8f032a82911cfc747e00efb95cc46e8d0acd5b5b88570c" [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "anyhow", "bindgen", @@ -6097,7 +6097,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "collections", "serde", @@ -6951,7 +6951,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "derive_refineable", ] @@ -7534,7 +7534,7 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "async-task", "backtrace", @@ -8397,7 +8397,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "heapless", "log", @@ -9707,7 +9707,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "perf", "quote", @@ -11667,7 +11667,7 @@ dependencies = [ [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "anyhow", "chrono", @@ -11684,7 +11684,7 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" dependencies = [ "tracing", "tracing-subscriber", @@ -11695,7 +11695,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" +source = "git+https://github.com/Kuddev/zed?rev=eb8e1c8b5502b7007465fbbc465f4a736fa39210#eb8e1c8b5502b7007465fbbc465f4a736fa39210" [[package]] name = "zune-core" diff --git a/Cargo.toml b/Cargo.toml index d8e0edd..5b65a8c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,7 @@ toml = "0.9.11" toml_edit = "0.24.0" # GPUI v1.16.1 把平台启动入口拆到独立 crate。它必须与 `gpui` 使用完全相同 # 的 Git URL 和 rev，否则 Cargo 会把同名类型解析成两套互不兼容的 crate。 -gpui_platform = { git = "https://github.com/zed-industries/zed", rev = "eb8e1c8b5502b7007465fbbc465f4a736fa39210", version = "=0.1.0" } +gpui_platform = { git = "https://github.com/Kuddev/zed", rev = "eb8e1c8b5502b7007465fbbc465f4a736fa39210", version = "=0.1.0" } # TODO: Drop this pin and return to the crates.io release once the fix ships there. [patch.crates-io] @@ -86,16 +86,17 @@ winit = { path = "third_party/winit-0.30.13" } # 精确固定，禁止 main、通配版本或仅凭 branch 名解析。 # # GitHub 固定点（branch/tag 只用于审计，Cargo 始终使用下面的完整 SHA）： -# zed-industries/zed v1.16.1 @ eb8e1c8b5502b7007465fbbc465f4a736fa39210 -# Kuddev/zed nebula-v1.16.1-base @ 同一 SHA（纯上游镜像，应急锚点） -# Kuddev/gpui-component nebula-v1.16.1-base -# @ 4ee9f274e990d6228e4f276f0a1e48f62f6a2048 -# （官方 46576ae7 快照 + 仅 Cargo 依赖固定，不含 Nebula 产品补丁） +# 上游来源：zed-industries/zed v1.16.1 +# @ eb8e1c8b5502b7007465fbbc465f4a736fa39210 +# Kuddev/zed nebula-v1.16.1-owned-base @ 同一 SHA（纯上游镜像） +# Kuddev/gpui-component nebula-v1.16.1-owned-base +# @ 4eb3917678930561c7ea36742f432313cd30b275 +# （4ee9f274 基线 + Zed source 统一为 Kuddev/zed，不含 Nebula 产品补丁） # -# Zed 依赖继续使用官方 URL：component 基线内部也使用这个 URL，而 Cargo 的 -# source identity 包含 URL；若应用改用 Kuddev 镜像，即使 SHA 相同也会解析成 -# 两套 gpui 类型。新增 component 补丁必须从固定基线开独立分支、逐条提交并 -# 更新 exact rev，不能移动基线 branch/tag。 +# 所有 Zed 依赖统一使用 Kuddev URL：Cargo 的 source identity 包含 URL，应用 +# 与 component 内部若混用官方/自有 URL，即使 SHA 相同也会解析成两套 gpui +# 类型。新增 Zed/component 补丁必须从固定基线开独立分支、逐条提交并更新 +# exact rev，不能移动基线 branch/tag。 # # 升级基点到 gpui-component 0.5.2+ 时的回归检查单（0.5.1 上这些行为本来是对的， # 是 0.5.2 重构 button 颜色推导时弄丢的，届时把下面两个 fix 带上）： @@ -150,6 +151,6 @@ winit = { path = "third_party/winit-0.30.13" } # 这条修的是鼠标拖选，两者都要。上游 PR 候选，合并即撤。 # # 当前只落固定基线；数学、GFM、Input 与视觉补丁将在独立提交中逐项恢复。 -gpui = { git = "https://github.com/zed-industries/zed", rev = "eb8e1c8b5502b7007465fbbc465f4a736fa39210", version = "=0.2.2" } -gpui-component = { git = "https://github.com/Kuddev/gpui-component", rev = "4ee9f274e990d6228e4f276f0a1e48f62f6a2048", version = "=0.5.2" } -gpui-component-assets = { git = "https://github.com/Kuddev/gpui-component", rev = "4ee9f274e990d6228e4f276f0a1e48f62f6a2048", version = "=0.5.1" } +gpui = { git = "https://github.com/Kuddev/zed", rev = "eb8e1c8b5502b7007465fbbc465f4a736fa39210", version = "=0.2.2" } +gpui-component = { git = "https://github.com/Kuddev/gpui-component", rev = "4eb3917678930561c7ea36742f432313cd30b275", version = "=0.5.2" } +gpui-component-assets = { git = "https://github.com/Kuddev/gpui-component", rev = "4eb3917678930561c7ea36742f432313cd30b275", version = "=0.5.1" } diff --git a/nebula_gpui/ARCHITECTURE.md b/nebula_gpui/ARCHITECTURE.md index 2bcd0b7..3791b47 100644 --- a/nebula_gpui/ARCHITECTURE.md +++ b/nebula_gpui/ARCHITECTURE.md @@ -78,20 +78,22 @@ gpui-component = "=0.5.2" gpui-component-assets = "=0.5.1" ``` -- `gpui` and `gpui_platform` come from `zed-industries/zed` commit - `eb8e1c8b5502b7007465fbbc465f4a736fa39210` (the official `v1.16.1` tag). +- `gpui` and `gpui_platform` come from `Kuddev/zed` commit + `eb8e1c8b5502b7007465fbbc465f4a736fa39210`. The commit is byte-identical to + the official `zed-industries/zed` `v1.16.1` tag. - `gpui-component` and its assets come from `Kuddev/gpui-component` commit - `4ee9f274e990d6228e4f276f0a1e48f62f6a2048`. This baseline contains the - upstream snapshot plus the Zed revision pin; it intentionally excludes - Nebula product patches. -- The `nebula-v1.16.1-base` branch and tag in both Kuddev forks are audit and - recovery anchors. Cargo dependencies always use the full commit SHA, never - those movable names. + `4eb3917678930561c7ea36742f432313cd30b275`. This baseline contains the + upstream snapshot, the Zed revision pin, and the unified `Kuddev/zed` source; + it intentionally excludes Nebula product patches. +- The `nebula-v1.16.1-owned-base` branch and tag in both Kuddev forks are audit + and recovery anchors. Cargo dependencies always use the full commit SHA, + never those movable names. Earlier `nebula-v1.16.1-base` refs remain intact + as provenance records and are not active dependency targets. Cargo source identity includes the repository URL. All Zed crates therefore -use the official URL, including transitive dependencies from gpui-component; -using the Kuddev Zed mirror for only part of the graph would create two -incompatible copies of GPUI even when both URLs point to the same commit. +use the Kuddev URL, including transitive dependencies from gpui-component; +mixing the official and Kuddev URLs would create two incompatible copies of +GPUI even when both URLs point to the same commit. Do not use wildcard versions, Git `main`, or branch-only pins. Verify every dependency revision change with: