forked from mirrors/jj
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
This commit is contained in:
parent
56109bda38
commit
48fa821e60
37 changed files with 84 additions and 82 deletions
85
Cargo.toml
85
Cargo.toml
|
@ -1,87 +1,8 @@
|
|||
[package]
|
||||
name = "jj-cli"
|
||||
version = "0.8.0"
|
||||
authors = ["Martin von Zweigbergk <martinvonz@google.com>"]
|
||||
edition = "2021"
|
||||
rust-version = "1.71" # Remember to update CI, and contributing.md
|
||||
license = "Apache-2.0"
|
||||
description = "Jujutsu (an experimental VCS)"
|
||||
homepage = "https://github.com/martinvonz/jj"
|
||||
repository = "https://github.com/martinvonz/jj"
|
||||
documentation = "https://docs.rs/jj-cli"
|
||||
readme = "README.md"
|
||||
keywords = ["VCS", "DVCS", "SCM", "Git", "Mercurial"]
|
||||
categories = ["command-line-utilities", "development-tools"]
|
||||
default-run = "jj"
|
||||
|
||||
[[bin]]
|
||||
name = "jj"
|
||||
path = "src/main.rs"
|
||||
|
||||
[[bin]]
|
||||
name = "fake-editor"
|
||||
path = "testing/fake-editor.rs"
|
||||
|
||||
[[bin]]
|
||||
name = "fake-diff-editor"
|
||||
path = "testing/fake-diff-editor.rs"
|
||||
cargo-features = []
|
||||
|
||||
[workspace]
|
||||
members = ["lib", "lib/testutils", "lib/gen-protos"]
|
||||
|
||||
[build-dependencies]
|
||||
cargo_metadata = "0.17.0"
|
||||
|
||||
[dependencies]
|
||||
chrono = { version = "0.4.26", default-features = false, features = ["std", "clock"] }
|
||||
clap = { version = "4.3.19", features = ["derive", "deprecated"] }
|
||||
clap_complete = "4.3.2"
|
||||
clap_mangen = "0.2.10"
|
||||
config = { version = "0.13.3", default-features = false, features = ["toml"] }
|
||||
criterion = {version = "0.5.1", optional = true }
|
||||
crossterm = { version = "0.26", default-features = false }
|
||||
dirs = "5.0.1"
|
||||
esl01-renderdag = "0.3.0"
|
||||
git2 = "0.17.2"
|
||||
glob = "0.3.1"
|
||||
hex = "0.4.3"
|
||||
indexmap = "2.0.0"
|
||||
itertools = "0.11.0"
|
||||
jj-lib = { version = "=0.8.0", path = "lib", default-features = false }
|
||||
maplit = "1.0.2"
|
||||
once_cell = "1.18.0"
|
||||
pest = "2.7.2"
|
||||
pest_derive = "2.7.2"
|
||||
regex = "1.9.1"
|
||||
rpassword = "7.2.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
slab = "0.4.8"
|
||||
tempfile = "3.7.0"
|
||||
textwrap = "0.16.0"
|
||||
thiserror = "1.0.44"
|
||||
timeago = { version = "0.4.1", default-features = false }
|
||||
toml_edit = { version = "0.19.14", features = ["serde"] }
|
||||
tracing = "0.1.37"
|
||||
tracing-chrome = "0.7.1"
|
||||
tracing-subscriber = { version = "0.3.17", default-features = false, features = ["std", "ansi", "env-filter", "fmt"] }
|
||||
|
||||
[target.'cfg(unix)'.dependencies]
|
||||
libc = { version = "0.2.147" }
|
||||
|
||||
[dev-dependencies]
|
||||
anyhow = "1.0.72"
|
||||
assert_cmd = "2.0.8"
|
||||
assert_matches = "1.5.0"
|
||||
insta = { version = "1.31.0", features = ["filters"] }
|
||||
test-case = "3.1.0"
|
||||
testutils = { path = "lib/testutils" }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
bench = ["criterion"]
|
||||
packaging = ["watchman"]
|
||||
vendored-openssl = ["git2/vendored-openssl", "jj-lib/vendored-openssl"]
|
||||
watchman = ["jj-lib/watchman"]
|
||||
resolver = "2"
|
||||
members = ["cli", "lib", "lib/testutils", "lib/gen-protos"]
|
||||
|
||||
[profile.release]
|
||||
strip = "debuginfo"
|
||||
|
|
81
cli/Cargo.toml
Normal file
81
cli/Cargo.toml
Normal file
|
@ -0,0 +1,81 @@
|
|||
[package]
|
||||
name = "jj-cli"
|
||||
version = "0.8.0"
|
||||
authors = ["Martin von Zweigbergk <martinvonz@google.com>"]
|
||||
edition = "2021"
|
||||
rust-version = "1.71" # Remember to update CI, and contributing.md
|
||||
license = "Apache-2.0"
|
||||
description = "Jujutsu (an experimental VCS)"
|
||||
homepage = "https://github.com/martinvonz/jj"
|
||||
repository = "https://github.com/martinvonz/jj"
|
||||
documentation = "https://docs.rs/jj-cli"
|
||||
readme = "README.md"
|
||||
keywords = ["VCS", "DVCS", "SCM", "Git", "Mercurial"]
|
||||
categories = ["command-line-utilities", "development-tools"]
|
||||
default-run = "jj"
|
||||
|
||||
[[bin]]
|
||||
name = "jj"
|
||||
path = "src/main.rs"
|
||||
|
||||
[[bin]]
|
||||
name = "fake-editor"
|
||||
path = "testing/fake-editor.rs"
|
||||
|
||||
[[bin]]
|
||||
name = "fake-diff-editor"
|
||||
path = "testing/fake-diff-editor.rs"
|
||||
|
||||
[build-dependencies]
|
||||
cargo_metadata = "0.17.0"
|
||||
|
||||
[dependencies]
|
||||
chrono = { version = "0.4.26", default-features = false, features = ["std", "clock"] }
|
||||
clap = { version = "4.3.19", features = ["derive", "deprecated"] }
|
||||
clap_complete = "4.3.2"
|
||||
clap_mangen = "0.2.10"
|
||||
config = { version = "0.13.3", default-features = false, features = ["toml"] }
|
||||
criterion = {version = "0.5.1", optional = true }
|
||||
crossterm = { version = "0.26", default-features = false }
|
||||
dirs = "5.0.1"
|
||||
esl01-renderdag = "0.3.0"
|
||||
git2 = "0.17.2"
|
||||
glob = "0.3.1"
|
||||
hex = "0.4.3"
|
||||
indexmap = "2.0.0"
|
||||
itertools = "0.11.0"
|
||||
jj-lib = { version = "=0.8.0", path = "../lib", default-features = false }
|
||||
maplit = "1.0.2"
|
||||
once_cell = "1.18.0"
|
||||
pest = "2.7.2"
|
||||
pest_derive = "2.7.2"
|
||||
regex = "1.9.1"
|
||||
rpassword = "7.2.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
slab = "0.4.8"
|
||||
tempfile = "3.7.0"
|
||||
textwrap = "0.16.0"
|
||||
thiserror = "1.0.44"
|
||||
timeago = { version = "0.4.1", default-features = false }
|
||||
toml_edit = { version = "0.19.14", features = ["serde"] }
|
||||
tracing = "0.1.37"
|
||||
tracing-chrome = "0.7.1"
|
||||
tracing-subscriber = { version = "0.3.17", default-features = false, features = ["std", "ansi", "env-filter", "fmt"] }
|
||||
|
||||
[target.'cfg(unix)'.dependencies]
|
||||
libc = { version = "0.2.147" }
|
||||
|
||||
[dev-dependencies]
|
||||
anyhow = "1.0.72"
|
||||
assert_cmd = "2.0.8"
|
||||
assert_matches = "1.5.0"
|
||||
insta = { version = "1.31.0", features = ["filters"] }
|
||||
test-case = "3.1.0"
|
||||
testutils = { path = "../lib/testutils" }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
bench = ["criterion"]
|
||||
packaging = ["watchman"]
|
||||
vendored-openssl = ["git2/vendored-openssl", "jj-lib/vendored-openssl"]
|
||||
watchman = ["jj-lib/watchman"]
|
Loading…
Reference in a new issue