mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-23 15:00:17 +00:00
02a04d0d37
Apart from (IMO) looking nicer, this will also sidestep the potential problem that if the file contains actual jj conflict markers (`>>>>>>>` in the beginning of a line, for example), jj would currently have trouble materializing and subsequently parsing conflicts in the file if it actually became conflicted. I'll demo this bug in either this or a subsequent PR. It's the kind of bug that sounds serious in theory but might never cause a problem in practice. After this PR, only `docs/tutorial.md` has a conflict marker that's not indented. There's only one there, so hopefully it won't be too much of a pain to deal with. I also indented other strings in `test_conflicts.rs`. IMO, this looks nice and more consistent with the `insta::assert_snapshot` output. I didn't spend the time to do the same for `test_resolve_command`.
88 lines
2.3 KiB
TOML
88 lines
2.3 KiB
TOML
[package]
|
|
name = "jj-lib"
|
|
description = "Library for Jujutsu - an experimental version control system"
|
|
autotests = false
|
|
|
|
version = { workspace = true }
|
|
edition = { workspace = true }
|
|
rust-version = { workspace = true }
|
|
license = { workspace = true }
|
|
homepage = { workspace = true }
|
|
repository = { workspace = true }
|
|
documentation = { workspace = true }
|
|
readme = { workspace = true }
|
|
|
|
[[test]]
|
|
name = "runner"
|
|
|
|
[[bench]]
|
|
name = "diff_bench"
|
|
harness = false
|
|
|
|
[build-dependencies]
|
|
version_check = { workspace = true }
|
|
|
|
[dependencies]
|
|
async-trait = { workspace = true }
|
|
backoff = { workspace = true }
|
|
blake2 = { workspace = true }
|
|
bytes = { workspace = true }
|
|
chrono = { workspace = true }
|
|
config = { workspace = true }
|
|
digest = { workspace = true }
|
|
either = { workspace = true }
|
|
futures = { workspace = true }
|
|
git2 = { workspace = true }
|
|
gix = { workspace = true }
|
|
glob = { workspace = true }
|
|
hex = { workspace = true }
|
|
ignore = { workspace = true }
|
|
itertools = { workspace = true }
|
|
jj-lib-proc-macros = { workspace = true }
|
|
maplit = { workspace = true }
|
|
once_cell = { workspace = true }
|
|
pest = { workspace = true }
|
|
pest_derive = { workspace = true }
|
|
pollster = { workspace = true }
|
|
prost = { workspace = true }
|
|
rand = { workspace = true }
|
|
rand_chacha = { workspace = true }
|
|
rayon = { workspace = true }
|
|
ref-cast = { workspace = true }
|
|
regex = { workspace = true }
|
|
serde = { workspace = true }
|
|
serde_json = { workspace = true }
|
|
smallvec = { workspace = true }
|
|
strsim = { workspace = true }
|
|
tempfile = { workspace = true }
|
|
thiserror = { workspace = true }
|
|
tokio = { workspace = true, optional = true }
|
|
tracing = { workspace = true }
|
|
watchman_client = { workspace = true, optional = true }
|
|
whoami = { workspace = true }
|
|
zstd = { workspace = true }
|
|
|
|
[target.'cfg(unix)'.dependencies]
|
|
rustix = { workspace = true }
|
|
|
|
[target.'cfg(windows)'.dependencies]
|
|
winreg = { workspace = true }
|
|
|
|
[dev-dependencies]
|
|
assert_matches = { workspace = true }
|
|
criterion = { workspace = true }
|
|
esl01-renderdag = { workspace = true }
|
|
indoc = { workspace = true }
|
|
insta = { workspace = true }
|
|
num_cpus = { workspace = true }
|
|
pretty_assertions = { workspace = true }
|
|
test-case = { workspace = true }
|
|
testutils = { workspace = true }
|
|
tokio = { workspace = true, features = ["full"] }
|
|
|
|
[features]
|
|
default = []
|
|
vendored-openssl = ["git2/vendored-openssl"]
|
|
watchman = ["dep:tokio", "dep:watchman_client"]
|
|
testing = []
|