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
sheremetyev · Aug 5, 2023 · 48fa821 · 48fa821
1 parent 56109bd
commit 48fa821
Show file tree

Hide file tree

Showing 37 changed files with 84 additions and 82 deletions.
diff --git a/Cargo.toml b/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"

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -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"]
diff --git a/build.rs → cli/build.rs b/build.rs → cli/build.rs
diff --git a/src/cleanup_guard.rs → cli/src/cleanup_guard.rs b/src/cleanup_guard.rs → cli/src/cleanup_guard.rs
diff --git a/src/cli_util.rs → cli/src/cli_util.rs b/src/cli_util.rs → cli/src/cli_util.rs
diff --git a/src/commands/bench.rs → cli/src/commands/bench.rs b/src/commands/bench.rs → cli/src/commands/bench.rs
diff --git a/src/commands/branch.rs → cli/src/commands/branch.rs b/src/commands/branch.rs → cli/src/commands/branch.rs
diff --git a/src/commands/debug.rs → cli/src/commands/debug.rs b/src/commands/debug.rs → cli/src/commands/debug.rs
diff --git a/src/commands/git.rs → cli/src/commands/git.rs b/src/commands/git.rs → cli/src/commands/git.rs
diff --git a/src/commands/mod.rs → cli/src/commands/mod.rs b/src/commands/mod.rs → cli/src/commands/mod.rs
diff --git a/src/commands/operation.rs → cli/src/commands/operation.rs b/src/commands/operation.rs → cli/src/commands/operation.rs
diff --git a/src/commit_templater.rs → cli/src/commit_templater.rs b/src/commit_templater.rs → cli/src/commit_templater.rs
diff --git a/src/config-schema.json → cli/src/config-schema.json b/src/config-schema.json → cli/src/config-schema.json
diff --git a/src/config.rs → cli/src/config.rs b/src/config.rs → cli/src/config.rs
diff --git a/src/config/README.md → cli/src/config/README.md b/src/config/README.md → cli/src/config/README.md
diff --git a/src/config/colors.toml → cli/src/config/colors.toml b/src/config/colors.toml → cli/src/config/colors.toml
diff --git a/src/config/merge_tools.toml → cli/src/config/merge_tools.toml b/src/config/merge_tools.toml → cli/src/config/merge_tools.toml
diff --git a/src/config/misc.toml → cli/src/config/misc.toml b/src/config/misc.toml → cli/src/config/misc.toml
diff --git a/src/config/templates.toml → cli/src/config/templates.toml b/src/config/templates.toml → cli/src/config/templates.toml
diff --git a/src/diff_util.rs → cli/src/diff_util.rs b/src/diff_util.rs → cli/src/diff_util.rs
diff --git a/src/formatter.rs → cli/src/formatter.rs b/src/formatter.rs → cli/src/formatter.rs
diff --git a/src/graphlog.rs → cli/src/graphlog.rs b/src/graphlog.rs → cli/src/graphlog.rs
diff --git a/src/lib.rs → cli/src/lib.rs b/src/lib.rs → cli/src/lib.rs
diff --git a/src/main.rs → cli/src/main.rs b/src/main.rs → cli/src/main.rs
diff --git a/src/merge_tools.rs → cli/src/merge_tools.rs b/src/merge_tools.rs → cli/src/merge_tools.rs
diff --git a/src/operation_templater.rs → cli/src/operation_templater.rs b/src/operation_templater.rs → cli/src/operation_templater.rs
diff --git a/src/progress.rs → cli/src/progress.rs b/src/progress.rs → cli/src/progress.rs
diff --git a/src/template.pest → cli/src/template.pest b/src/template.pest → cli/src/template.pest
diff --git a/src/template_builder.rs → cli/src/template_builder.rs b/src/template_builder.rs → cli/src/template_builder.rs
diff --git a/src/template_parser.rs → cli/src/template_parser.rs b/src/template_parser.rs → cli/src/template_parser.rs
diff --git a/src/templater.rs → cli/src/templater.rs b/src/templater.rs → cli/src/templater.rs
diff --git a/src/text_util.rs → cli/src/text_util.rs b/src/text_util.rs → cli/src/text_util.rs
diff --git a/src/time_util.rs → cli/src/time_util.rs b/src/time_util.rs → cli/src/time_util.rs
diff --git a/src/ui.rs → cli/src/ui.rs b/src/ui.rs → cli/src/ui.rs
diff --git a/testing/bench-revsets-git.txt → cli/testing/bench-revsets-git.txt b/testing/bench-revsets-git.txt → cli/testing/bench-revsets-git.txt
diff --git a/testing/fake-diff-editor.rs → cli/testing/fake-diff-editor.rs b/testing/fake-diff-editor.rs → cli/testing/fake-diff-editor.rs
diff --git a/testing/fake-editor.rs → cli/testing/fake-editor.rs b/testing/fake-editor.rs → cli/testing/fake-editor.rs