Skip to content

Commit d532bbf

Browse files
committed
refactor
Make sure blame is enabled of blame-experimental is.
1 parent 826effb commit d532bbf

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ lean = ["fast", "tracing", "pretty-cli", "http-client-curl", "gitoxide-core-tool
6363
## Optimized for size, no parallelism thus much slower, progress line rendering.
6464
small = ["pretty-cli", "prodash-render-line", "is-terminal"]
6565

66-
## An experimental use of the v0.2 branch of `imara-diff` in `gix-diff` and `gix-blame`, to allow trying the new diff algorithm.
67-
blame-experimental = ["gitoxide-core/blame-experimental"]
68-
6966
## Like lean, but uses Rusts async implementations for networking.
7067
##
7168
## This build is more of a demonstration showing how async can work with `gitoxide`, which generally is blocking. This also means that the selection of async transports
@@ -151,6 +148,11 @@ http-client-reqwest = ["gix/blocking-http-transport-reqwest-rust-tls"]
151148
## Use async client networking.
152149
gitoxide-core-async-client = ["gitoxide-core/async-client", "futures-lite"]
153150

151+
#! ### Experimental Features
152+
#!
153+
## An experimental use of the v0.2 branch of `imara-diff` in `gix-diff` and `gix-blame`, to allow trying the new diff algorithm.
154+
blame-experimental = ["gitoxide-core/blame-experimental"]
155+
154156
[dependencies]
155157
anyhow = "1.0.98"
156158

gitoxide-core/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ async-client = ["gix/async-network-client-async-std", "gix-transport-configurati
4646
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
4747
serde = ["gix/serde", "dep:serde_json", "dep:serde", "bytesize/serde"]
4848

49+
#! ### Experimental
4950
## An experimental use of the v0.2 branch of `imara-diff` in `gix-diff` and `gix-blame`, to allow trying the new diff algorithm.
5051
blame-experimental = ["gix/blame-experimental"]
5152

gix/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,6 @@ merge = ["tree-editor", "blob-diff", "dep:gix-merge", "attributes"]
147147
## Add blame command similar to `git blame`.
148148
blame = ["dep:gix-blame", "blob-diff"]
149149

150-
## Use the v0.2 branch of `imara-diff` in `gix-diff` and `gix-blame`, to allow trying the new diff algorithm.
151-
blame-experimental = ["dep:gix-blame", "gix-blame/blob-experimental"]
152-
153150
## Make it possible to turn a tree into a stream of bytes, which can be decoded to entries and turned into various other formats.
154151
worktree-stream = ["gix-worktree-stream", "attributes"]
155152

@@ -308,6 +305,10 @@ progress-tree = ["prodash/progress-tree"]
308305
## Print debugging information about usage of object database caches, useful for tuning cache sizes.
309306
cache-efficiency-debug = ["gix-features/cache-efficiency-debug"]
310307

308+
#! #### Experimental Features
309+
## Use the v0.2 branch of `imara-diff` in `gix-diff` and `gix-blame`, to allow trying the new diff algorithm.
310+
blame-experimental = ["blame", "gix-blame/blob-experimental"]
311+
311312

312313
[dependencies]
313314
gix-utils = { version = "^0.3.1", path = "../gix-utils" }

0 commit comments

Comments
 (0)