From c9b185f7f46f4ade2011c66a868bf37fb6e55a43 Mon Sep 17 00:00:00 2001 From: Josh Junon Date: Mon, 26 Feb 2024 16:28:25 +0100 Subject: [PATCH] rename gitbutler-diff to gitbutler-changeset --- .github/workflows/push.yaml | 16 +++++++-------- Cargo.lock | 20 +++++++++---------- Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../fixture/code1.txt | 0 .../fixture/code2.txt | 0 .../fixture/code3.txt | 0 .../fixture/code4.txt | 0 .../fixture/large1.txt | 0 .../fixture/large2.txt | 0 .../fixture/text1.txt | 0 .../fixture/text2.txt | 0 .../fixture/text3.txt | 0 .../src/lib.rs | 0 .../src/linefile.rs | 0 .../src/linefile/memory.rs | 0 .../src/linefile/mmap.rs | 0 .../src/signature.rs | 0 .../src/span.rs | 0 19 files changed, 20 insertions(+), 20 deletions(-) rename {gitbutler-diff => gitbutler-changeset}/Cargo.toml (91%) rename {gitbutler-diff => gitbutler-changeset}/fixture/code1.txt (100%) rename {gitbutler-diff => gitbutler-changeset}/fixture/code2.txt (100%) rename {gitbutler-diff => gitbutler-changeset}/fixture/code3.txt (100%) rename {gitbutler-diff => gitbutler-changeset}/fixture/code4.txt (100%) rename {gitbutler-diff => gitbutler-changeset}/fixture/large1.txt (100%) rename {gitbutler-diff => gitbutler-changeset}/fixture/large2.txt (100%) rename {gitbutler-diff => gitbutler-changeset}/fixture/text1.txt (100%) rename {gitbutler-diff => gitbutler-changeset}/fixture/text2.txt (100%) rename {gitbutler-diff => gitbutler-changeset}/fixture/text3.txt (100%) rename {gitbutler-diff => gitbutler-changeset}/src/lib.rs (100%) rename {gitbutler-diff => gitbutler-changeset}/src/linefile.rs (100%) rename {gitbutler-diff => gitbutler-changeset}/src/linefile/memory.rs (100%) rename {gitbutler-diff => gitbutler-changeset}/src/linefile/mmap.rs (100%) rename {gitbutler-diff => gitbutler-changeset}/src/signature.rs (100%) rename {gitbutler-diff => gitbutler-changeset}/src/span.rs (100%) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 155b69124..765c56470 100644 --- a/.github/workflows/push.yaml +++ b/.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' }} diff --git a/Cargo.lock b/Cargo.lock index a0bcb6ede..b82c855e9 100644 --- a/Cargo.lock +++ b/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" diff --git a/Cargo.toml b/Cargo.toml index cd798c821..fd084fd20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ members = [ "gitbutler-app", "gitbutler-core", - "gitbutler-diff", + "gitbutler-changeset", "gitbutler-git", ] resolver = "2" diff --git a/gitbutler-diff/Cargo.toml b/gitbutler-changeset/Cargo.toml similarity index 91% rename from gitbutler-diff/Cargo.toml rename to gitbutler-changeset/Cargo.toml index d02a3b267..40f64a4cf 100644 --- a/gitbutler-diff/Cargo.toml +++ b/gitbutler-changeset/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "gitbutler-diff" +name = "gitbutler-changeset" version = "0.0.0" edition = "2021" diff --git a/gitbutler-diff/fixture/code1.txt b/gitbutler-changeset/fixture/code1.txt similarity index 100% rename from gitbutler-diff/fixture/code1.txt rename to gitbutler-changeset/fixture/code1.txt diff --git a/gitbutler-diff/fixture/code2.txt b/gitbutler-changeset/fixture/code2.txt similarity index 100% rename from gitbutler-diff/fixture/code2.txt rename to gitbutler-changeset/fixture/code2.txt diff --git a/gitbutler-diff/fixture/code3.txt b/gitbutler-changeset/fixture/code3.txt similarity index 100% rename from gitbutler-diff/fixture/code3.txt rename to gitbutler-changeset/fixture/code3.txt diff --git a/gitbutler-diff/fixture/code4.txt b/gitbutler-changeset/fixture/code4.txt similarity index 100% rename from gitbutler-diff/fixture/code4.txt rename to gitbutler-changeset/fixture/code4.txt diff --git a/gitbutler-diff/fixture/large1.txt b/gitbutler-changeset/fixture/large1.txt similarity index 100% rename from gitbutler-diff/fixture/large1.txt rename to gitbutler-changeset/fixture/large1.txt diff --git a/gitbutler-diff/fixture/large2.txt b/gitbutler-changeset/fixture/large2.txt similarity index 100% rename from gitbutler-diff/fixture/large2.txt rename to gitbutler-changeset/fixture/large2.txt diff --git a/gitbutler-diff/fixture/text1.txt b/gitbutler-changeset/fixture/text1.txt similarity index 100% rename from gitbutler-diff/fixture/text1.txt rename to gitbutler-changeset/fixture/text1.txt diff --git a/gitbutler-diff/fixture/text2.txt b/gitbutler-changeset/fixture/text2.txt similarity index 100% rename from gitbutler-diff/fixture/text2.txt rename to gitbutler-changeset/fixture/text2.txt diff --git a/gitbutler-diff/fixture/text3.txt b/gitbutler-changeset/fixture/text3.txt similarity index 100% rename from gitbutler-diff/fixture/text3.txt rename to gitbutler-changeset/fixture/text3.txt diff --git a/gitbutler-diff/src/lib.rs b/gitbutler-changeset/src/lib.rs similarity index 100% rename from gitbutler-diff/src/lib.rs rename to gitbutler-changeset/src/lib.rs diff --git a/gitbutler-diff/src/linefile.rs b/gitbutler-changeset/src/linefile.rs similarity index 100% rename from gitbutler-diff/src/linefile.rs rename to gitbutler-changeset/src/linefile.rs diff --git a/gitbutler-diff/src/linefile/memory.rs b/gitbutler-changeset/src/linefile/memory.rs similarity index 100% rename from gitbutler-diff/src/linefile/memory.rs rename to gitbutler-changeset/src/linefile/memory.rs diff --git a/gitbutler-diff/src/linefile/mmap.rs b/gitbutler-changeset/src/linefile/mmap.rs similarity index 100% rename from gitbutler-diff/src/linefile/mmap.rs rename to gitbutler-changeset/src/linefile/mmap.rs diff --git a/gitbutler-diff/src/signature.rs b/gitbutler-changeset/src/signature.rs similarity index 100% rename from gitbutler-diff/src/signature.rs rename to gitbutler-changeset/src/signature.rs diff --git a/gitbutler-diff/src/span.rs b/gitbutler-changeset/src/span.rs similarity index 100% rename from gitbutler-diff/src/span.rs rename to gitbutler-changeset/src/span.rs