mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-28 23:55:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
jj/cli/Cargo.toml

124 lines
3.3 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"
compile integration tests as a single binary this greatly speeds up the time to run all tests, at the cost of slightly larger recompile times for individual tests. this unfortunately adds the requirement that all tests are listed in `runner.rs` for the crate. to avoid forgetting, i've added a new test that ensures the directory is in sync with the file. ## benchmarks before this change, recompiling all tests took 32-50 seconds and running a single test took 3.5 seconds: ``` ; hyperfine 'touch lib/src/lib.rs && cargo t --test test_working_copy' Time (mean ± σ): 3.543 s ± 0.168 s [User: 2.597 s, System: 1.262 s] Range (min … max): 3.400 s … 3.847 s 10 runs ``` after this change, recompiling all tests take 4 seconds: ``` ; hyperfine 'touch lib/src/lib.rs ; cargo t --test runner --no-run' Time (mean ± σ): 4.055 s ± 0.123 s [User: 3.591 s, System: 1.593 s] Range (min … max): 3.804 s … 4.159 s 10 runs ``` and running a single test takes about the same: ``` ; hyperfine 'touch lib/src/lib.rs && cargo t --test runner -- test_working_copy' Time (mean ± σ): 4.129 s ± 0.120 s [User: 3.636 s, System: 1.593 s] Range (min … max): 3.933 s … 4.346 s 10 runs ``` about 1.4 seconds of that is the time for the runner, of which .4 is the time for the linker. so there may be room for further improving the times.
2024-02-02 07:55:24 +00:00
autotests = 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
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
cargo: explicitly indicate paths to publish Running `cargo publish` from a non-colocated repo (such as my usual repo) is currently quite scary because it uploads all non-hidden files, even if they're ignored by `.gitignore` (https://github.com/rust-lang/cargo/issues/2063). I noticed this a while ago and have always run the command from a fresh clone since then. To avoid the need for that, let's use the workaround mentioned on the bug, which is to explicitly list patterns we want to publish.
2024-04-14 22:27:23 +00:00
include = [
"/LICENSE",
"/build.rs",
"/examples/",
"/src/",
"/testing/",
"/tests/",
"!*.pending-snap",
"!*.snap*",
"/tests/cli-reference@.md.snap"
]
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
cli: add a fake code formatter tool for testing
2024-05-15 17:39:33 +00:00
[[bin]]
name = "fake-formatter"
path = "testing/fake-formatter.rs"
required-features = ["test-fakes"]
compile integration tests as a single binary this greatly speeds up the time to run all tests, at the cost of slightly larger recompile times for individual tests. this unfortunately adds the requirement that all tests are listed in `runner.rs` for the crate. to avoid forgetting, i've added a new test that ensures the directory is in sync with the file. ## benchmarks before this change, recompiling all tests took 32-50 seconds and running a single test took 3.5 seconds: ``` ; hyperfine 'touch lib/src/lib.rs && cargo t --test test_working_copy' Time (mean ± σ): 3.543 s ± 0.168 s [User: 2.597 s, System: 1.262 s] Range (min … max): 3.400 s … 3.847 s 10 runs ``` after this change, recompiling all tests take 4 seconds: ``` ; hyperfine 'touch lib/src/lib.rs ; cargo t --test runner --no-run' Time (mean ± σ): 4.055 s ± 0.123 s [User: 3.591 s, System: 1.593 s] Range (min … max): 3.804 s … 4.159 s 10 runs ``` and running a single test takes about the same: ``` ; hyperfine 'touch lib/src/lib.rs && cargo t --test runner -- test_working_copy' Time (mean ± σ): 4.129 s ± 0.120 s [User: 3.636 s, System: 1.593 s] Range (min … max): 3.933 s … 4.346 s 10 runs ``` about 1.4 seconds of that is the time for the runner, of which .4 is the time for the linker. so there may be room for further improving the times.
2024-02-02 07:55:24 +00:00
[[test]]
name = "runner"
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 }
cli: new `jj util markdown-help` outputs `jj help` for all commands This uses the [`clap-markdown`] library. It's not very flexible, but seems to work. Its implementation is not difficult. If needed, we could later reimplement the part that iterates over all subcommands and have a different output (e.g., the boring version of each help text inside its own code block, or a different file per subcommand, or some fancy template in handlebars or another rust-supported templating language). I don't want to do it right now, though. The library does turn out to have some annoying bugs, e.g. https://github.com/ConnorGray/clap-markdown/pull/18, but I think that's not a deal-braker. The fix seems to be 3 lines; if the fix doesn't get merged soon, we could vendor the library maybe? [`clap-markdown`]: https://docs.rs/clap-markdown/latest/clap_markdown/
2024-01-26 02:35:28 +00:00
clap-markdown = { 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
clap_complete = { workspace = true }
completion: Add support for Nushell completions
2024-02-16 20:23:41 +00:00
clap_complete_nushell = { 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
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 }
windows: avoid UNC paths in `run_ui_editor` See #3986 for more details. This is a no-op for non-Windows.
2024-06-30 10:02:21 +00:00
dunce = { 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
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 }
copy-tracking: cargo add gix-format and gix diff-blob feature
2024-06-25 16:00:51 +00:00
gix-filter = { 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 }
Use `minus` as a builtin pager
2024-02-11 02:55:02 +00:00
minus = { 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
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 }
cli: implement enough of `jj fix` to run a single tool on all files
2024-05-15 22:19:55 +00:00
rayon = { 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 }
templater: add similarity hint to no such method/keyword errors The translation from method error to keyword error can go wrong if the context object had n-ary methods (n > 0), which isn't the case as of now. For simplicity, arguments error is mapped to "self.<name>(..)" suggestion. Local variables and "self" could be merged without using extra method, but we'll need extend_*_candidates() to merge in symbol/function aliases anyway.
2024-02-26 05:49:46 +00:00
strsim = { 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
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 }
test_conflicts and test_resolve_command: use `indoc!` to indent conflict markers in tests 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`.
2024-03-23 02:34:28 +00:00
indoc = { 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 = []
revset: add count_estimate() to Revset trait The count() function in this trait is used by "jj branch" to determine (and then report) how many commits a certain branch is ahead/behind another branch. This is currently implemented by walking all commits in the revset, counting how many were encountered. But this could be improved: if the number is large, it is probably sufficient to report "at least N" (instead of walking all the way), and this does not scale well to jj backends that may not have all commits present locally (which may prefer to return an estimate, rather than access the network). Therefore, add a function that is explicitly documented to be O(1) and that can return a range of values if the backend so chooses. Also remove count(), as it is not immediately obvious that it is an expensive call, and callers that are willing to pay the cost can obtain the exact same functionality through iter().count() anyway. (In this commit, all users of count() are migrated to iter().count() to preserve all existing functionality; they will be migrated to count_estimate() in a subsequent commit.) "branch" needed to be updated due to this change. Although jj is currently only available in English, I have attempted to keep user-visible text from being assembled piece by piece, so that if we later decide to translate jj into other languages, things will be easier for translators.
2024-01-16 22:12:02 +00:00
test-fakes = ["jj-lib/testing"]
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 }"
Reference in a new issue Copy permalink