mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-24 15:43:12 +00:00
c071d412af
The previous patch switched over the content-merge code to use the new histogram diff code. This patch switches over the content-diff code to use the histogram diff code. As before, the immediate goal is to speed it up. `jj diff -r c28ded83fc` in the git.git repo is a good example of a diff that's extremely slow to calculate with our current LCS-based diff. With this patch, that drops from 35 s to 0.12 s. The diff was slightly better before. I think that's mostly because of our different definition of a "word" in the data. We can improve that later. The speedup we get now is easily worth the slightly worse diff.
47 lines
1.1 KiB
TOML
47 lines
1.1 KiB
TOML
[package]
|
|
name = "jujube"
|
|
version = "0.1.1"
|
|
authors = ["Martin von Zweigbergk <martinvonz@google.com>"]
|
|
edition = "2018"
|
|
license = "Apache-2.0"
|
|
description = "Jujube (an experimental VCS)"
|
|
homepage = "https://github.com/martinvonz/jj"
|
|
repository = "https://github.com/martinvonz/jj"
|
|
documentation = "https://docs.rs/jujube"
|
|
readme = "README.md"
|
|
keywords = ["VCS", "DVCS", "SCM", "Git", "Mercurial"]
|
|
categories = ["command-line-utilities", "development-tools"]
|
|
|
|
[[bin]]
|
|
name = "jj"
|
|
path = "src/main.rs"
|
|
|
|
[workspace]
|
|
members = ["lib"]
|
|
|
|
[dependencies]
|
|
blake2 = "0.9.1"
|
|
bytes = "1.0.0"
|
|
chrono = "0.4.19"
|
|
clap = "2.33.3"
|
|
config = "0.10.1"
|
|
criterion = "0.3.3"
|
|
dirs = "3.0.1"
|
|
git2 = "0.13.14"
|
|
hex = "0.4.2"
|
|
indoc = "1.0.3"
|
|
jujube-lib = { version = "=0.1.1", path = "lib"}
|
|
pest = "2.1.3"
|
|
pest_derive = "2.1.0"
|
|
protobuf = { version = "2.22.1", features = ["with-bytes"] }
|
|
protobuf-codegen-pure = "2.22.1"
|
|
serde_json = "1.0.60"
|
|
tempfile = "3.1.0"
|
|
thiserror = "1.0.22"
|
|
uuid = { version = "0.8.1", features = ["v4"] }
|
|
zstd = "0.6.0"
|
|
|
|
[dev-dependencies]
|
|
test-case = "1.0.0"
|
|
regex = "1.4.2"
|