Skip to content

Commit c2f51a9

Browse files
committed
feat: vcs: support Jujutsu as a diff-provider
1 parent f41da1a commit c2f51a9

File tree

6 files changed

+558
-20
lines changed

6 files changed

+558
-20
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

helix-term/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@ assets = [
3131
]
3232

3333
[features]
34-
default = ["git"]
34+
default = ["git", "jj"]
3535
unicode-lines = ["helix-core/unicode-lines", "helix-view/unicode-lines"]
3636
integration = ["helix-event/integration_test"]
37+
# VCS features
3738
git = ["helix-vcs/git"]
39+
jj = ["helix-vcs/jj"]
3840

3941
[[bin]]
4042
name = "hx"

helix-vcs/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@ gix = { version = "0.73.0", features = ["attributes", "parallel", "status"], def
2121
imara-diff = "0.2.0"
2222
anyhow = "1"
2323
log = "0.4"
24+
memchr = { version = "2.7", optional = true }
25+
tempfile = { version = "3.13", optional = true }
2426

2527
[features]
2628
git = ["gix"]
29+
jj = ["memchr", "tempfile"]
2730

2831
[dev-dependencies]
2932
tempfile.workspace = true

0 commit comments

Comments
 (0)