ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity
jj/cli/Cargo.toml

95 lines
2.7 KiB
TOML
Raw Normal View History

cli: move src/ directory to new cli/ directory Summary: In preparation for unifying all workspace dependencies across all crates, let's go ahead and move the jj-cli crate into its own new directory. This will also be a nicer and more uniform layout as we add new `jj-*` crates. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Icf94e7ae5f290dc8e181215727b38ada
2023-08-04 22:59:19 +00:00
[package]
name = "jj-cli"
cargo: unify a lot of crate metadata in the workspace Summary: There's no need to go around specifying `rust-version` or `edition` or `version` several times, now that we have a global workspace. Instead, inherit workspace metadata from the top-level Cargo.toml file. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Iaf905445978ed2b3377239dcdb8a6c32
2023-08-05 22:14:11 +00:00
description = "Jujutsu - an experimental version control system"
cli: move src/ directory to new cli/ directory Summary: In preparation for unifying all workspace dependencies across all crates, let's go ahead and move the jj-cli crate into its own new directory. This will also be a nicer and more uniform layout as we add new `jj-*` crates. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Icf94e7ae5f290dc8e181215727b38ada
2023-08-04 22:59:19 +00:00
default-run = "jj"
Use `{ workspace = true }` to appease VS Code's `Cargo.toml` parser The VS Code "Better TOML" plugin (which I think most of our VS Code developers use?) doesn't support the `x.y = z` syntax at the top level, even though it's valid TOML. This is also useful if we ever want to add additional properties in different sub-crates (although unlikely for the near future).
2023-08-22 16:41:42 +00:00
version = { workspace = true }
edition = { workspace = true }
rust-version = { workspace = true }
license = { workspace = true }
homepage = { workspace = true }
repository = { workspace = true }
documentation = { workspace = true }
keywords = { workspace = true }
cargo: unify a lot of crate metadata in the workspace Summary: There's no need to go around specifying `rust-version` or `edition` or `version` several times, now that we have a global workspace. Instead, inherit workspace metadata from the top-level Cargo.toml file. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Iaf905445978ed2b3377239dcdb8a6c32
2023-08-05 22:14:11 +00:00
cli: move src/ directory to new cli/ directory Summary: In preparation for unifying all workspace dependencies across all crates, let's go ahead and move the jj-cli crate into its own new directory. This will also be a nicer and more uniform layout as we add new `jj-*` crates. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Icf94e7ae5f290dc8e181215727b38ada
2023-08-04 22:59:19 +00:00
[[bin]]
name = "jj"
path = "src/main.rs"
[[bin]]
name = "fake-editor"
path = "testing/fake-editor.rs"
cargo: stop `cargo install` from installing `fake-editor` & co. Among other things, this prevented `jj` from working with `cargo binstall`. The trick is taken from https://github.com/rust-lang/cargo/issues/2911#issuecomment-1483256987. We could now also remove `--bin jj` from the installation commands in `install-and-setup.md`, but I'm not sure we should. That argument makes it clear that the binary is `jj`, not `jj-cli`. Fixes #216.
2023-09-20 05:30:34 +00:00
required-features = ["test-fakes"]
cli: move src/ directory to new cli/ directory Summary: In preparation for unifying all workspace dependencies across all crates, let's go ahead and move the jj-cli crate into its own new directory. This will also be a nicer and more uniform layout as we add new `jj-*` crates. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Icf94e7ae5f290dc8e181215727b38ada
2023-08-04 22:59:19 +00:00
[[bin]]
name = "fake-diff-editor"
path = "testing/fake-diff-editor.rs"
cargo: stop `cargo install` from installing `fake-editor` & co. Among other things, this prevented `jj` from working with `cargo binstall`. The trick is taken from https://github.com/rust-lang/cargo/issues/2911#issuecomment-1483256987. We could now also remove `--bin jj` from the installation commands in `install-and-setup.md`, but I'm not sure we should. That argument makes it clear that the binary is `jj`, not `jj-cli`. Fixes #216.
2023-09-20 05:30:34 +00:00
required-features = ["test-fakes"]
cli: move src/ directory to new cli/ directory Summary: In preparation for unifying all workspace dependencies across all crates, let's go ahead and move the jj-cli crate into its own new directory. This will also be a nicer and more uniform layout as we add new `jj-*` crates. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Icf94e7ae5f290dc8e181215727b38ada
2023-08-04 22:59:19 +00:00
[build-dependencies]
Use `{ workspace = true }` to appease VS Code's `Cargo.toml` parser The VS Code "Better TOML" plugin (which I think most of our VS Code developers use?) doesn't support the `x.y = z` syntax at the top level, even though it's valid TOML. This is also useful if we ever want to add additional properties in different sub-crates (although unlikely for the near future).
2023-08-22 16:41:42 +00:00
cargo_metadata = { workspace = true }
cli: move src/ directory to new cli/ directory Summary: In preparation for unifying all workspace dependencies across all crates, let's go ahead and move the jj-cli crate into its own new directory. This will also be a nicer and more uniform layout as we add new `jj-*` crates. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Icf94e7ae5f290dc8e181215727b38ada
2023-08-04 22:59:19 +00:00
[dependencies]
Use `{ workspace = true }` to appease VS Code's `Cargo.toml` parser The VS Code "Better TOML" plugin (which I think most of our VS Code developers use?) doesn't support the `x.y = z` syntax at the top level, even though it's valid TOML. This is also useful if we ever want to add additional properties in different sub-crates (although unlikely for the near future).
2023-08-22 16:41:42 +00:00
chrono = { workspace = true }
clap = { workspace = true }
clap_complete = { workspace = true }
clap_mangen = { workspace = true }
config = { workspace = true }
cargo: unify dependency versions through workspace deps Summary: This moves all dependencies across the jj-lib and jj-cli crates into the top-level Cargo file; with that, we can change each crate instead to just inherit the workspace version, with the toggled features enabled, by setting a dependency such as: dep.workspace = true in the relevant Cargo.toml file. This doesn't actually change any of the build semantics (from what I can tell) nor the lockfile, and seems to respond normally. There are more cleanups that can follow. Two notes: - Dependabot seems to work fine, based on what I've seen in other repos. - `cargo add` doesn't seem to know how to add packages to a top-level `workspace.dependencies` field; instead you can `cargo add -p jj-cli` and move the entries, at least. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: I307827e5f15c0d8ea8e2a80ec793d3c7
2023-08-05 16:14:11 +00:00
criterion = { workspace = true, optional = true }
Use `{ workspace = true }` to appease VS Code's `Cargo.toml` parser The VS Code "Better TOML" plugin (which I think most of our VS Code developers use?) doesn't support the `x.y = z` syntax at the top level, even though it's valid TOML. This is also useful if we ever want to add additional properties in different sub-crates (although unlikely for the near future).
2023-08-22 16:41:42 +00:00
crossterm = { workspace = true }
dirs = { workspace = true }
esl01-renderdag = { workspace = true }
conflicts: make materialization async We need to let async-ness propagate up from the backend because `block_on()` doesn't like to be called recursively. The conflict materialization code is a good place to make async because it doesn't depends on anything that isn't already async-ready.
2023-10-18 23:57:19 +00:00
futures = { workspace = true }
Use `{ workspace = true }` to appease VS Code's `Cargo.toml` parser The VS Code "Better TOML" plugin (which I think most of our VS Code developers use?) doesn't support the `x.y = z` syntax at the top level, even though it's valid TOML. This is also useful if we ever want to add additional properties in different sub-crates (although unlikely for the near future).
2023-08-22 16:41:42 +00:00
git2 = { workspace = true }
cli: rewrite base GitIgnoreFile lookup to use gitoxide instead of libgit2 Since gix::Repository::config_snapshot() borrows the repo instance, it has to be allocated in caller's stack. That's why GitBackend::git_config() is removed.
2023-10-31 00:50:10 +00:00
gix = { workspace = true }
Use `{ workspace = true }` to appease VS Code's `Cargo.toml` parser The VS Code "Better TOML" plugin (which I think most of our VS Code developers use?) doesn't support the `x.y = z` syntax at the top level, even though it's valid TOML. This is also useful if we ever want to add additional properties in different sub-crates (although unlikely for the near future).
2023-08-22 16:41:42 +00:00
hex = { workspace = true }
indexmap = { workspace = true }
itertools = { workspace = true }
jj-lib = { workspace = true }
maplit = { workspace = true }
once_cell = { workspace = true }
pest = { workspace = true }
pest_derive = { workspace = true }
async: switch to `pollster`'s `block_on()` During the transition to using more async code, I keep running into https://github.com/rust-lang/futures-rs/issues/2090. Right now, I want to convert `MergedTree::diff()` into a `Stream`. I don't want to update all call sites at once, so instead I'm adding a `MergedTree::diff_stream()` method, which just wraps `MergedTree::diff()` in a `Stream. However, since the iterator is synchronous, it needs to block on the async `Backend::read_tree()` calls. If we then also block on the `Stream` in the CLI, we run into the panic.
2023-10-28 23:15:01 +00:00
pollster = { workspace = true }
Use `{ workspace = true }` to appease VS Code's `Cargo.toml` parser The VS Code "Better TOML" plugin (which I think most of our VS Code developers use?) doesn't support the `x.y = z` syntax at the top level, even though it's valid TOML. This is also useful if we ever want to add additional properties in different sub-crates (although unlikely for the near future).
2023-08-22 16:41:42 +00:00
regex = { workspace = true }
rpassword = { workspace = true }
merge_tools: create builtin diff editor
2023-08-29 21:13:35 +00:00
scm-record = { workspace = true }
Use `{ workspace = true }` to appease VS Code's `Cargo.toml` parser The VS Code "Better TOML" plugin (which I think most of our VS Code developers use?) doesn't support the `x.y = z` syntax at the top level, even though it's valid TOML. This is also useful if we ever want to add additional properties in different sub-crates (although unlikely for the near future).
2023-08-22 16:41:42 +00:00
serde = { workspace = true }
slab = { workspace = true }
tempfile = { workspace = true }
textwrap = { workspace = true }
thiserror = { workspace = true }
timeago = { workspace = true }
toml_edit = { workspace = true }
tracing = { workspace = true }
tracing-chrome = { workspace = true }
tracing-subscriber = { workspace = true }
cli: add helper to elide text from left I don't think this implements unicode layout stuff thoroughly, but it can at least handle Latin and unambiguous East-Asian characters.
2023-08-31 07:42:42 +00:00
unicode-width = { workspace = true }
cli: move src/ directory to new cli/ directory Summary: In preparation for unifying all workspace dependencies across all crates, let's go ahead and move the jj-cli crate into its own new directory. This will also be a nicer and more uniform layout as we add new `jj-*` crates. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Icf94e7ae5f290dc8e181215727b38ada
2023-08-04 22:59:19 +00:00
[target.'cfg(unix)'.dependencies]
Use `{ workspace = true }` to appease VS Code's `Cargo.toml` parser The VS Code "Better TOML" plugin (which I think most of our VS Code developers use?) doesn't support the `x.y = z` syntax at the top level, even though it's valid TOML. This is also useful if we ever want to add additional properties in different sub-crates (although unlikely for the near future).
2023-08-22 16:41:42 +00:00
libc = { workspace = true }
cli: move src/ directory to new cli/ directory Summary: In preparation for unifying all workspace dependencies across all crates, let's go ahead and move the jj-cli crate into its own new directory. This will also be a nicer and more uniform layout as we add new `jj-*` crates. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Icf94e7ae5f290dc8e181215727b38ada
2023-08-04 22:59:19 +00:00
[dev-dependencies]
Use `{ workspace = true }` to appease VS Code's `Cargo.toml` parser The VS Code "Better TOML" plugin (which I think most of our VS Code developers use?) doesn't support the `x.y = z` syntax at the top level, even though it's valid TOML. This is also useful if we ever want to add additional properties in different sub-crates (although unlikely for the near future).
2023-08-22 16:41:42 +00:00
anyhow = { workspace = true }
assert_cmd = { workspace = true }
assert_matches = { workspace = true }
cargo: sort dependencies list alphabetically
2023-11-07 07:15:31 +00:00
async-trait = { workspace = true }
Use `{ workspace = true }` to appease VS Code's `Cargo.toml` parser The VS Code "Better TOML" plugin (which I think most of our VS Code developers use?) doesn't support the `x.y = z` syntax at the top level, even though it's valid TOML. This is also useful if we ever want to add additional properties in different sub-crates (although unlikely for the near future).
2023-08-22 16:41:42 +00:00
insta = { workspace = true }
test-case = { workspace = true }
testutils = { workspace = true }
cargo: stop `cargo install` from installing `fake-editor` & co. Among other things, this prevented `jj` from working with `cargo binstall`. The trick is taken from https://github.com/rust-lang/cargo/issues/2911#issuecomment-1483256987. We could now also remove `--bin jj` from the installation commands in `install-and-setup.md`, but I'm not sure we should. That argument makes it clear that the binary is `jj`, not `jj-cli`. Fixes #216.
2023-09-20 05:30:34 +00:00
# https://github.com/rust-lang/cargo/issues/2911#issuecomment-1483256987
jj-cli = { path = ".", features = ["test-fakes"], default-features = false }
cli: move src/ directory to new cli/ directory Summary: In preparation for unifying all workspace dependencies across all crates, let's go ahead and move the jj-cli crate into its own new directory. This will also be a nicer and more uniform layout as we add new `jj-*` crates. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Icf94e7ae5f290dc8e181215727b38ada
2023-08-04 22:59:19 +00:00
[features]
cargo: enable the watchman feature by default I think the feature is requested by enough users that we should include it by default, also for people who install from source (we include it in the `packaging` feature already). It increases the size of the binary from 16.5 MiB to 17.8 MiB. I suspect we'd see some of that increase in size soon anyway, as I'm probably going to use Tokio for making async backend requests.
2023-09-07 16:09:59 +00:00
default = ["watchman"]
cargo: don't expose the `criterion` feature There should be no reason to include `criterion` without the `bench` feature. Adding the `dep:` prefix to any dependency makes cargo not expose the implicit `criterion` feature.
2023-09-07 16:19:33 +00:00
bench = ["dep:criterion"]
cargo: enable the watchman feature by default I think the feature is requested by enough users that we should include it by default, also for people who install from source (we include it in the `packaging` feature already). It increases the size of the binary from 16.5 MiB to 17.8 MiB. I suspect we'd see some of that increase in size soon anyway, as I'm probably going to use Tokio for making async backend requests.
2023-09-07 16:09:59 +00:00
packaging = []
cargo: stop `cargo install` from installing `fake-editor` & co. Among other things, this prevented `jj` from working with `cargo binstall`. The trick is taken from https://github.com/rust-lang/cargo/issues/2911#issuecomment-1483256987. We could now also remove `--bin jj` from the installation commands in `install-and-setup.md`, but I'm not sure we should. That argument makes it clear that the binary is `jj`, not `jj-cli`. Fixes #216.
2023-09-20 05:30:34 +00:00
test-fakes = []
cli: move src/ directory to new cli/ directory Summary: In preparation for unifying all workspace dependencies across all crates, let's go ahead and move the jj-cli crate into its own new directory. This will also be a nicer and more uniform layout as we add new `jj-*` crates. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Icf94e7ae5f290dc8e181215727b38ada
2023-08-04 22:59:19 +00:00
vendored-openssl = ["git2/vendored-openssl", "jj-lib/vendored-openssl"]
watchman = ["jj-lib/watchman"]
cargo: make `jj` installable with `cargo binstall` https://github.com/cargo-bins/cargo-binstall Note that `jj` will only become installable once the next release is published to crates.io. For this reason, I am planning to wait until then before documenting the fact that `jj` can be installed this way. At that point, `cargo binstall jj-cli` should be sufficient. Before then, it's possible to test that this will work by doing ``` cargo binstall jj-cli --force --strategies crate-meta-data --log-level debug --dry-run --manifest-path cli/Cargo.toml ``` Without --dry-run, this should install the 0.9 release if run on `cli/Cargo.toml` form this commit.
2023-09-20 05:54:42 +00:00
[package.metadata.binstall]
# The archive name is jj, not jj-cli. Also, `cargo binstall` gets
# confused by the `v` before versions in archive name.
conflicts: make materialization async We need to let async-ness propagate up from the backend because `block_on()` doesn't like to be called recursively. The conflict materialization code is a good place to make async because it doesn't depends on anything that isn't already async-ready.
2023-10-18 23:57:19 +00:00
pkg-url = "{ repo }/releases/download/v{ version }/jj-v{ version }-{ target }.{ archive-format }"
Copy permalink