Skip to content

Commit 25efbfb

Browse files
cruesslerByron
authored andcommitted
feat: Add blame plumbing crate to the top-level.
For now, it doesn't come with a simplified `gix` API though.
1 parent d27adf7 commit 25efbfb

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

Cargo.lock

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gix-blame/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ rust-version = "1.65"
1414
doctest = false
1515

1616
[dependencies]
17-
gix-diff = { version = "^0.48.0", path = "../gix-diff", default-features = false, features = ["blob"] }
17+
gix-diff = { version = "^0.49.0", path = "../gix-diff", default-features = false, features = ["blob"] }
1818
gix-object = { version = "^0.46.0", path = "../gix-object" }
1919
gix-hash = { version = "^0.15.0", path = "../gix-hash" }
2020
gix-worktree = { version = "^0.38.0", path = "../gix-worktree", default-features = false, features = ["attributes"] }
2121
gix-traverse = { version = "^0.43.0", path = "../gix-traverse" }
2222

2323
[dev-dependencies]
2424
gix-ref = { version = "^0.49.0", path = "../gix-ref" }
25-
gix-filter = { version = "^0.15.0", path = "../gix-filter" }
25+
gix-filter = { version = "^0.16.0", path = "../gix-filter" }
2626
gix-fs = { version = "^0.12.0", path = "../gix-fs" }
2727
gix-index = { version = "^0.37.0", path = "../gix-index" }
28-
gix-odb = { version = "^0.65.0", path = "../gix-odb" }
28+
gix-odb = { version = "^0.66.0", path = "../gix-odb" }
2929
gix-testtools = { path = "../tests/tools" }

gix/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ blob-diff = ["gix-diff/blob", "attributes"]
141141
## Add functions to specifically merge files, using the standard three-way merge that git offers.
142142
merge = ["tree-editor", "blob-diff", "dep:gix-merge", "attributes"]
143143

144+
## Add blame command similar to `git blame`.
145+
blame = ["dep:gix-blame"]
146+
144147
## Make it possible to turn a tree into a stream of bytes, which can be decoded to entries and turned into various other formats.
145148
worktree-stream = ["gix-worktree-stream", "attributes"]
146149

@@ -371,6 +374,7 @@ gix-command = { version = "^0.4.0", path = "../gix-command", optional = true }
371374

372375
gix-worktree-stream = { version = "^0.18.0", path = "../gix-worktree-stream", optional = true }
373376
gix-archive = { version = "^0.18.0", path = "../gix-archive", default-features = false, optional = true }
377+
gix-blame = { version= "^0.0.0", path ="../gix-blame", optional = true }
374378

375379
# For communication with remotes
376380
gix-protocol = { version = "^0.47.0", path = "../gix-protocol" }

gix/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@
9595
pub use gix_actor as actor;
9696
#[cfg(feature = "attributes")]
9797
pub use gix_attributes as attrs;
98+
#[cfg(feature = "blame")]
99+
pub use gix_blame as blame;
98100
#[cfg(feature = "command")]
99101
pub use gix_command as command;
100102
pub use gix_commitgraph as commitgraph;

0 commit comments

Comments
 (0)