Merge pull request #2937 from gitbutlerapp/Virtual-branch-2

rename gitbutler-diff to gitbutler-changeset

.github/workflows/push.yaml

@@ -15,7 +15,7 @@ jobs:
       gitbutler-app: ${{ steps.filter.outputs.gitbutler-app }}
       gitbutler-core: ${{ steps.filter.outputs.gitbutler-core }}
       gitbutler-git: ${{ steps.filter.outputs.gitbutler-git }}
-      gitbutler-diff: ${{ steps.filter.outputs.gitbutler-diff }}
+      gitbutler-changeset: ${{ steps.filter.outputs.gitbutler-changeset }}
     steps:
       - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v3
@@ -41,9 +41,9 @@ jobs:
             gitbutler-git:
               - *rust
               - 'gitbutler-git/**'
-            gitbutler-diff:
+            gitbutler-changeset:
               - *rust
-              - 'gitbutler-diff/**'
+              - 'gitbutler-changeset/**'
 
   lint-node:
     needs: changes
@@ -95,7 +95,7 @@ jobs:
       - uses: ./.github/actions/init-env-rust
       # TODO(qix-): we have to exclude the app here for now because for some
       # TODO(qix-): reason it doesn't build with the docs feature enabled.
-      - run: cargo doc --no-deps --all-features --document-private-items -p gitbutler-core -p gitbutler-git -p gitbutler-diff
+      - run: cargo doc --no-deps --all-features --document-private-items -p gitbutler-core -p gitbutler-git -p gitbutler-changeset
         env:
           RUSTDOCFLAGS: -Dwarnings
 
@@ -151,9 +151,9 @@ jobs:
           features: ${{ toJson(matrix.features) }}
           action: ${{ matrix.action }}
 
-  check-gitbutler-diff:
+  check-gitbutler-changeset:
     needs: [changes, rust-init]
-    if: ${{ needs.changes.outputs.gitbutler-diff == 'true' }}
+    if: ${{ needs.changes.outputs.gitbutler-changeset == 'true' }}
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/gitbutlerapp/ci-base-image:latest
@@ -173,7 +173,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/check-crate
         with:
-          crate: gitbutler-diff
+          crate: gitbutler-changeset
           features: ${{ toJson(matrix.features) }}
           action: ${{ matrix.action }}
 
@@ -209,7 +209,7 @@ jobs:
       - changes
       - check-gitbutler-app
       - check-gitbutler-git
-      - check-gitbutler-diff
+      - check-gitbutler-changeset
       - check-gitbutler-core
     runs-on: ubuntu-latest
     if: ${{ needs.changes.outputs.rust == 'true' }}

Cargo.lock

@@ -1989,16 +1989,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "gitbutler-core"
-version = "0.0.0"
-dependencies = [
- "rusqlite",
- "serde",
- "uuid",
-]
-
-[[package]]
-name = "gitbutler-diff"
+name = "gitbutler-changeset"
 version = "0.0.0"
 dependencies = [
  "git2",
@@ -2007,6 +1998,15 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "gitbutler-core"
+version = "0.0.0"
+dependencies = [
+ "rusqlite",
+ "serde",
+ "uuid",
+]
+
 [[package]]
 name = "gitbutler-git"
 version = "0.0.0"

Cargo.toml

@@ -2,7 +2,7 @@
 members = [
     "gitbutler-app",
     "gitbutler-core",
-    "gitbutler-diff",
+    "gitbutler-changeset",
     "gitbutler-git",
 ]
 resolver = "2"

gitbutler-changeset/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "gitbutler-diff"
+name = "gitbutler-changeset"
 version = "0.0.0"
 edition = "2021"