Merge pull request #11253 from Byron/next2

intermezzo: finish but-api cleanup

Author: Byron

.github/copilot-instructions.md

@@ -225,7 +225,6 @@ The `crates/` directory contains ~65 Rust crates organized by functionality:
 **Note**: Some crates are marked for refactoring (see DEVELOPMENT.md). Be cautious when modifying:
 
 - gitbutler-reference
-- gitbutler-storage
 - gitbutler-branch-actions
 - gitbutler-repository
 - gitbutler-url

.github/workflows/push.yaml

@@ -119,6 +119,8 @@ jobs:
           cargo check -p but-meta
           cargo check -p but-graph
           cargo check -p but-workspace
+          cargo check -p but-github
+          cargo check -p but-api
         name: Special `cargo check` runs
         env:
           RUSTFLAGS: '--deny warnings'

Cargo.lock

@@ -36,6 +36,8 @@ but-feedback = { path = "crates/but-feedback" }
 but-forge-storage = { path = "crates/but-forge-storage" }
 but-settings = { path = "crates/but-settings" }
 but-oxidize = { path = "crates/but-oxidize" }
+but-fs = { path = "crates/but-fs" }
+but-forge = { path = "crates/but-forge" }
 
 gitbutler-git = { path = "crates/gitbutler-git" }
 gitbutler-watcher = { path = "crates/gitbutler-watcher" }
@@ -51,8 +53,6 @@ gitbutler-project = { path = "crates/gitbutler-project" }
 gitbutler-user = { path = "crates/gitbutler-user" }
 gitbutler-branch = { path = "crates/gitbutler-branch" }
 gitbutler-reference = { path = "crates/gitbutler-reference" }
-gitbutler-storage = { path = "crates/gitbutler-storage" }
-gitbutler-fs = { path = "crates/gitbutler-fs" }
 gitbutler-time = { path = "crates/gitbutler-time" }
 gitbutler-commit = { path = "crates/gitbutler-commit" }
 gitbutler-url = { path = "crates/gitbutler-url" }
@@ -61,7 +61,6 @@ gitbutler-operating-modes = { path = "crates/gitbutler-operating-modes" }
 gitbutler-edit-mode = { path = "crates/gitbutler-edit-mode" }
 gitbutler-cherry-pick = { path = "crates/gitbutler-cherry-pick" }
 gitbutler-stack = { path = "crates/gitbutler-stack" }
-gitbutler-forge = { path = "crates/gitbutler-forge" }
 gitbutler-hunk-dependency = { path = "crates/gitbutler-hunk-dependency" }
 gitbutler-workspace = { path = "crates/gitbutler-workspace" }
 

Cargo.toml

@@ -499,7 +499,6 @@ If you are interested in joining our small but tightly knit engineering team, we
 This is a list of crates/modules that we want to eliminate or split into smaller crates:
 
 - [gitbutler-reference](crates/gitbutler-reference/) (just bad)
-- [gitbutler-storage](crates/gitbutler-storage/) (legacy way of dealing with files)
 - [gitbutler-branch-actions](crates/gitbutler-branch-actions/) (contains functionality outside of the virtual branch domain (e.g. commit actions etc.))
 - [gitbutler-repository](crates/gitbutler-repository/)
 - [gitbutler-branch](crates/gitbutler-branch/) (contains `diff` and `branch` contexts due to a cyclic dependency)

DEVELOPMENT.md

@@ -20,10 +20,28 @@ tauri = ["dep:tauri"]
 ## When paths are turned into strings they are lossy. Also provide a `_bytes` variant of such fields with the original value
 ## for lossless use.
 path-bytes = ["dep:bstr"]
+## Make legacy functionality available.
+legacy = [
+    "dep:gitbutler-user",
+    "dep:gitbutler-project",
+    "dep:gitbutler-branch",
+    "dep:gitbutler-branch-actions",
+    "dep:gitbutler-commit",
+    "dep:gitbutler-command-context",
+    "dep:gitbutler-reference",
+    "dep:gitbutler-stack",
+    "dep:gitbutler-repo",
+    "dep:gitbutler-repo-actions",
+    "dep:gitbutler-edit-mode",
+    "dep:gitbutler-operating-modes",
+    "dep:gitbutler-sync",
+    "dep:gitbutler-oplog",
+]
+
 
 [dependencies]
 but-settings.workspace = true
-but-github.workspace = true
+but-github = { workspace = true, features = ["legacy"] }
 but-secret.workspace = true
 but-workspace = { workspace = true, features = ["legacy"] }
 but-worktrees.workspace = true
@@ -46,22 +64,22 @@ but-feedback.workspace = true
 but-error.workspace = true
 but-rules.workspace = true
 but-oxidize.workspace = true
+but-forge.workspace = true
 
-gitbutler-user.workspace = true
-gitbutler-project.workspace = true
-gitbutler-branch.workspace = true
-gitbutler-branch-actions.workspace = true
-gitbutler-commit.workspace = true
-gitbutler-command-context.workspace = true
-gitbutler-reference.workspace = true
-gitbutler-stack.workspace = true
-gitbutler-repo.workspace = true
-gitbutler-repo-actions.workspace = true
-gitbutler-edit-mode.workspace = true
-gitbutler-operating-modes.workspace = true
-gitbutler-sync.workspace = true
-gitbutler-oplog.workspace = true
-gitbutler-forge.workspace = true
+gitbutler-user = {workspace = true, optional = true}
+gitbutler-project = {workspace = true, optional = true}
+gitbutler-branch = {workspace = true, optional = true}
+gitbutler-branch-actions = {workspace = true, optional = true}
+gitbutler-commit = {workspace = true, optional = true}
+gitbutler-command-context = {workspace = true, optional = true}
+gitbutler-reference = {workspace = true, optional = true}
+gitbutler-stack = {workspace = true, optional = true}
+gitbutler-repo = {workspace = true, optional = true}
+gitbutler-repo-actions = {workspace = true, optional = true}
+gitbutler-edit-mode = {workspace = true, optional = true}
+gitbutler-operating-modes = {workspace = true, optional = true}
+gitbutler-sync = {workspace = true, optional = true}
+gitbutler-oplog = {workspace = true, optional = true}
 
 tauri = { version = "^2.9.2", features = ["unstable"], optional = true } # For the #[tauri::command(async)] macro only