ilyagr.bsky.social
just playing with tangled
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
+84
-82
+3
-82
Cargo.toml
+3
-82
Cargo.toml
···
1
-
[package]
2
-
name = "jj-cli"
3
-
version = "0.8.0"
4
-
authors = ["Martin von Zweigbergk <martinvonz@google.com>"]
5
-
edition = "2021"
6
-
rust-version = "1.71" # Remember to update CI, and contributing.md
7
-
license = "Apache-2.0"
8
-
description = "Jujutsu (an experimental VCS)"
9
-
homepage = "https://github.com/martinvonz/jj"
10
-
repository = "https://github.com/martinvonz/jj"
11
-
documentation = "https://docs.rs/jj-cli"
12
-
readme = "README.md"
13
-
keywords = ["VCS", "DVCS", "SCM", "Git", "Mercurial"]
14
-
categories = ["command-line-utilities", "development-tools"]
15
-
default-run = "jj"
16
-
17
-
[[bin]]
18
-
name = "jj"
19
-
path = "src/main.rs"
20
-
21
-
[[bin]]
22
-
name = "fake-editor"
23
-
path = "testing/fake-editor.rs"
24
-
25
-
[[bin]]
26
-
name = "fake-diff-editor"
27
-
path = "testing/fake-diff-editor.rs"
1
+
cargo-features = []
28
2
29
3
[workspace]
30
-
members = ["lib", "lib/testutils", "lib/gen-protos"]
31
-
32
-
[build-dependencies]
33
-
cargo_metadata = "0.17.0"
34
-
35
-
[dependencies]
36
-
chrono = { version = "0.4.26", default-features = false, features = ["std", "clock"] }
37
-
clap = { version = "4.3.19", features = ["derive", "deprecated"] }
38
-
clap_complete = "4.3.2"
39
-
clap_mangen = "0.2.10"
40
-
config = { version = "0.13.3", default-features = false, features = ["toml"] }
41
-
criterion = {version = "0.5.1", optional = true }
42
-
crossterm = { version = "0.26", default-features = false }
43
-
dirs = "5.0.1"
44
-
esl01-renderdag = "0.3.0"
45
-
git2 = "0.17.2"
46
-
glob = "0.3.1"
47
-
hex = "0.4.3"
48
-
indexmap = "2.0.0"
49
-
itertools = "0.11.0"
50
-
jj-lib = { version = "=0.8.0", path = "lib", default-features = false }
51
-
maplit = "1.0.2"
52
-
once_cell = "1.18.0"
53
-
pest = "2.7.2"
54
-
pest_derive = "2.7.2"
55
-
regex = "1.9.1"
56
-
rpassword = "7.2.0"
57
-
serde = { version = "1.0", features = ["derive"] }
58
-
slab = "0.4.8"
59
-
tempfile = "3.7.0"
60
-
textwrap = "0.16.0"
61
-
thiserror = "1.0.44"
62
-
timeago = { version = "0.4.1", default-features = false }
63
-
toml_edit = { version = "0.19.14", features = ["serde"] }
64
-
tracing = "0.1.37"
65
-
tracing-chrome = "0.7.1"
66
-
tracing-subscriber = { version = "0.3.17", default-features = false, features = ["std", "ansi", "env-filter", "fmt"] }
67
-
68
-
[target.'cfg(unix)'.dependencies]
69
-
libc = { version = "0.2.147" }
70
-
71
-
[dev-dependencies]
72
-
anyhow = "1.0.72"
73
-
assert_cmd = "2.0.8"
74
-
assert_matches = "1.5.0"
75
-
insta = { version = "1.31.0", features = ["filters"] }
76
-
test-case = "3.1.0"
77
-
testutils = { path = "lib/testutils" }
78
-
79
-
[features]
80
-
default = []
81
-
bench = ["criterion"]
82
-
packaging = ["watchman"]
83
-
vendored-openssl = ["git2/vendored-openssl", "jj-lib/vendored-openssl"]
84
-
watchman = ["jj-lib/watchman"]
4
+
resolver = "2"
5
+
members = ["cli", "lib", "lib/testutils", "lib/gen-protos"]
85
6
86
7
[profile.release]
87
8
strip = "debuginfo"
build.rs
cli/build.rs
build.rs
cli/build.rs
+81
cli/Cargo.toml
+81
cli/Cargo.toml
···
1
+
[package]
2
+
name = "jj-cli"
3
+
version = "0.8.0"
4
+
authors = ["Martin von Zweigbergk <martinvonz@google.com>"]
5
+
edition = "2021"
6
+
rust-version = "1.71" # Remember to update CI, and contributing.md
7
+
license = "Apache-2.0"
8
+
description = "Jujutsu (an experimental VCS)"
9
+
homepage = "https://github.com/martinvonz/jj"
10
+
repository = "https://github.com/martinvonz/jj"
11
+
documentation = "https://docs.rs/jj-cli"
12
+
readme = "README.md"
13
+
keywords = ["VCS", "DVCS", "SCM", "Git", "Mercurial"]
14
+
categories = ["command-line-utilities", "development-tools"]
15
+
default-run = "jj"
16
+
17
+
[[bin]]
18
+
name = "jj"
19
+
path = "src/main.rs"
20
+
21
+
[[bin]]
22
+
name = "fake-editor"
23
+
path = "testing/fake-editor.rs"
24
+
25
+
[[bin]]
26
+
name = "fake-diff-editor"
27
+
path = "testing/fake-diff-editor.rs"
28
+
29
+
[build-dependencies]
30
+
cargo_metadata = "0.17.0"
31
+
32
+
[dependencies]
33
+
chrono = { version = "0.4.26", default-features = false, features = ["std", "clock"] }
34
+
clap = { version = "4.3.19", features = ["derive", "deprecated"] }
35
+
clap_complete = "4.3.2"
36
+
clap_mangen = "0.2.10"
37
+
config = { version = "0.13.3", default-features = false, features = ["toml"] }
38
+
criterion = {version = "0.5.1", optional = true }
39
+
crossterm = { version = "0.26", default-features = false }
40
+
dirs = "5.0.1"
41
+
esl01-renderdag = "0.3.0"
42
+
git2 = "0.17.2"
43
+
glob = "0.3.1"
44
+
hex = "0.4.3"
45
+
indexmap = "2.0.0"
46
+
itertools = "0.11.0"
47
+
jj-lib = { version = "=0.8.0", path = "../lib", default-features = false }
48
+
maplit = "1.0.2"
49
+
once_cell = "1.18.0"
50
+
pest = "2.7.2"
51
+
pest_derive = "2.7.2"
52
+
regex = "1.9.1"
53
+
rpassword = "7.2.0"
54
+
serde = { version = "1.0", features = ["derive"] }
55
+
slab = "0.4.8"
56
+
tempfile = "3.7.0"
57
+
textwrap = "0.16.0"
58
+
thiserror = "1.0.44"
59
+
timeago = { version = "0.4.1", default-features = false }
60
+
toml_edit = { version = "0.19.14", features = ["serde"] }
61
+
tracing = "0.1.37"
62
+
tracing-chrome = "0.7.1"
63
+
tracing-subscriber = { version = "0.3.17", default-features = false, features = ["std", "ansi", "env-filter", "fmt"] }
64
+
65
+
[target.'cfg(unix)'.dependencies]
66
+
libc = { version = "0.2.147" }
67
+
68
+
[dev-dependencies]
69
+
anyhow = "1.0.72"
70
+
assert_cmd = "2.0.8"
71
+
assert_matches = "1.5.0"
72
+
insta = { version = "1.31.0", features = ["filters"] }
73
+
test-case = "3.1.0"
74
+
testutils = { path = "../lib/testutils" }
75
+
76
+
[features]
77
+
default = []
78
+
bench = ["criterion"]
79
+
packaging = ["watchman"]
80
+
vendored-openssl = ["git2/vendored-openssl", "jj-lib/vendored-openssl"]
81
+
watchman = ["jj-lib/watchman"]
src/cleanup_guard.rs
cli/src/cleanup_guard.rs
src/cleanup_guard.rs
cli/src/cleanup_guard.rs
src/cli_util.rs
cli/src/cli_util.rs
src/cli_util.rs
cli/src/cli_util.rs
src/commands/bench.rs
cli/src/commands/bench.rs
src/commands/bench.rs
cli/src/commands/bench.rs
src/commands/branch.rs
cli/src/commands/branch.rs
src/commands/branch.rs
cli/src/commands/branch.rs
src/commands/debug.rs
cli/src/commands/debug.rs
src/commands/debug.rs
cli/src/commands/debug.rs
src/commands/git.rs
cli/src/commands/git.rs
src/commands/git.rs
cli/src/commands/git.rs
src/commands/mod.rs
cli/src/commands/mod.rs
src/commands/mod.rs
cli/src/commands/mod.rs
src/commands/operation.rs
cli/src/commands/operation.rs
src/commands/operation.rs
cli/src/commands/operation.rs
src/commit_templater.rs
cli/src/commit_templater.rs
src/commit_templater.rs
cli/src/commit_templater.rs
src/config-schema.json
cli/src/config-schema.json
src/config-schema.json
cli/src/config-schema.json
src/config.rs
cli/src/config.rs
src/config.rs
cli/src/config.rs
src/config/README.md
cli/src/config/README.md
src/config/README.md
cli/src/config/README.md
src/config/colors.toml
cli/src/config/colors.toml
src/config/colors.toml
cli/src/config/colors.toml
src/config/merge_tools.toml
cli/src/config/merge_tools.toml
src/config/merge_tools.toml
cli/src/config/merge_tools.toml
src/config/misc.toml
cli/src/config/misc.toml
src/config/misc.toml
cli/src/config/misc.toml
src/config/templates.toml
cli/src/config/templates.toml
src/config/templates.toml
cli/src/config/templates.toml
src/diff_util.rs
cli/src/diff_util.rs
src/diff_util.rs
cli/src/diff_util.rs
src/formatter.rs
cli/src/formatter.rs
src/formatter.rs
cli/src/formatter.rs
src/graphlog.rs
cli/src/graphlog.rs
src/graphlog.rs
cli/src/graphlog.rs
src/lib.rs
cli/src/lib.rs
src/lib.rs
cli/src/lib.rs
src/main.rs
cli/src/main.rs
src/main.rs
cli/src/main.rs
src/merge_tools.rs
cli/src/merge_tools.rs
src/merge_tools.rs
cli/src/merge_tools.rs
src/operation_templater.rs
cli/src/operation_templater.rs
src/operation_templater.rs
cli/src/operation_templater.rs
src/progress.rs
cli/src/progress.rs
src/progress.rs
cli/src/progress.rs
src/template.pest
cli/src/template.pest
src/template.pest
cli/src/template.pest
src/template_builder.rs
cli/src/template_builder.rs
src/template_builder.rs
cli/src/template_builder.rs
src/template_parser.rs
cli/src/template_parser.rs
src/template_parser.rs
cli/src/template_parser.rs
src/templater.rs
cli/src/templater.rs
src/templater.rs
cli/src/templater.rs
src/text_util.rs
cli/src/text_util.rs
src/text_util.rs
cli/src/text_util.rs
src/time_util.rs
cli/src/time_util.rs
src/time_util.rs
cli/src/time_util.rs
src/ui.rs
cli/src/ui.rs
src/ui.rs
cli/src/ui.rs
testing/bench-revsets-git.txt
cli/testing/bench-revsets-git.txt
testing/bench-revsets-git.txt
cli/testing/bench-revsets-git.txt
testing/fake-diff-editor.rs
cli/testing/fake-diff-editor.rs
testing/fake-diff-editor.rs
cli/testing/fake-diff-editor.rs
testing/fake-editor.rs
cli/testing/fake-editor.rs
testing/fake-editor.rs
cli/testing/fake-editor.rs