mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-11-29 02:54:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
jj/Cargo.toml

79 lines
2.3 KiB
TOML
Raw Normal View History

import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo
2020-12-12 08:00:42 +00:00
[package]
project: rename project from Jujube to Jujutsu "Jujutsu" is probably much more familiar and relatable to most people. Also, I'm still not sure how "jujube" is supposed to be pronounced :P
2021-05-15 16:16:31 +00:00
name = "jujutsu"
release: release version 0.7.0 It's been about 10 weeks and 730 commits since 0.6.0, compared to about 7 weeks and 350 commits between 0.5.0 and 0.6.0, so it's time for a new release. There's been significant user-visible changes and code-quality improvements. Thanks, everyone!
2023-02-16 17:26:40 +00:00
version = "0.7.0"
import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo
2020-12-12 08:00:42 +00:00
authors = ["Martin von Zweigbergk <martinvonz@google.com>"]
cargo: upgrade to Rust 2021 (just to stay up to date)
2021-12-14 05:38:10 +00:00
edition = "2021"
cargo: update MSRV to 1.64 We need 1.64 to bump `clap` to `4.1`. We don't really need to upgrade to that, but being on an older version causes minor confusions like #1393. Rust 1.64 is very close to 6 months old at this point.
2023-03-17 22:42:55 +00:00
rust-version = "1.64" # Remember to update CI, contributing.md, and flake.nix
cargo: fill in crates.io metadata
2021-01-03 16:45:07 +00:00
license = "Apache-2.0"
project: rename project from Jujube to Jujutsu "Jujutsu" is probably much more familiar and relatable to most people. Also, I'm still not sure how "jujube" is supposed to be pronounced :P
2021-05-15 16:16:31 +00:00
description = "Jujutsu (an experimental VCS)"
cargo: fill in crates.io metadata
2021-01-03 16:45:07 +00:00
homepage = "https://github.com/martinvonz/jj"
repository = "https://github.com/martinvonz/jj"
project: rename project from Jujube to Jujutsu "Jujutsu" is probably much more familiar and relatable to most people. Also, I'm still not sure how "jujube" is supposed to be pronounced :P
2021-05-15 16:16:31 +00:00
documentation = "https://docs.rs/jujutsu"
cargo: fill in crates.io metadata
2021-01-03 16:45:07 +00:00
readme = "README.md"
keywords = ["VCS", "DVCS", "SCM", "Git", "Mercurial"]
categories = ["command-line-utilities", "development-tools"]
build: set `default-run` to `jj` If not set, then `cargo run` produces this error: ``` error: `cargo run` could not determine which binary to run. Use the `--bin` option to specify a binary, or the `default-run` manifest key. available binaries: fake-diff-editor, fake-editor, jj ```
2022-04-26 17:50:29 +00:00
default-run = "jj"
import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo
2020-12-12 08:00:42 +00:00
cargo: set binary name to `jj`, not new crate name `jujube` I recently renamed the crate from `jj` to `jujube` because `jj` was taken on crates.io. I didn't realize that that would change the name of the binary.
2021-01-03 18:37:47 +00:00
[[bin]]
name = "jj"
path = "src/main.rs"
tests: add tests for `jj describe`
2022-04-09 22:53:32 +00:00
[[bin]]
name = "fake-editor"
path = "testing/fake-editor.rs"
tests: add tests for `jj restore -i`
2022-04-01 06:44:28 +00:00
[[bin]]
name = "fake-diff-editor"
path = "testing/fake-diff-editor.rs"
cargo: rename crates to names available on crates.io I'm preparing to publish an early version before someone takes the name(s) on crates.io. "jj" has been taken by a seemingly useless project, but "jujube" and "jujube-lib" are still available, so let's use those.
2021-01-03 16:45:07 +00:00
[workspace]
lib: replace protobuf crate with prost
2022-12-21 19:14:46 +00:00
members = ["lib", "lib/testutils", "lib/gen-protos"]
cargo: rename crates to names available on crates.io I'm preparing to publish an early version before someone takes the name(s) on crates.io. "jj" has been taken by a seemingly useless project, but "jujube" and "jujube-lib" are still available, so let's use those.
2021-01-03 16:45:07 +00:00
import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo
2020-12-12 08:00:42 +00:00
[dependencies]
cargo: bump chrono from 0.4.23 to 0.4.24 Bumps [chrono](https://github.com/chronotope/chrono) from 0.4.23 to 0.4.24. - [Release notes](https://github.com/chronotope/chrono/releases) - [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md) - [Commits](https://github.com/chronotope/chrono/compare/v0.4.23...v0.4.24) --- updated-dependencies: - dependency-name: chrono dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2023-03-13 16:03:13 +00:00
chrono = { version = "0.4.24", default-features = false, features = ["std", "clock"] }
cargo: upgrade to clap 4.1 This includes some changes to error messages. Also, the Zsh shell completion script is now simpler to source. Fixes #1393.
2023-03-17 23:14:20 +00:00
clap = { version = "4.1.9", features = ["derive", "deprecated"] }
clap_complete = "4.1.5"
clap_mangen = "0.2.10"
cargo: bump config from 0.13.2 to 0.13.3 Bumps [config](https://github.com/mehcode/config-rs) from 0.13.2 to 0.13.3. - [Release notes](https://github.com/mehcode/config-rs/releases) - [Changelog](https://github.com/mehcode/config-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mehcode/config-rs/compare/0.13.2...0.13.3) --- updated-dependencies: - dependency-name: config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-12-05 15:15:29 +00:00
config = { version = "0.13.3", default-features = false, features = ["toml"] }
cli: move `jj bench` commands to new module, hide behind feature flag The `jj bench` commands are mostly meant for developers, so lets hide the command from help and behind a `bench` feature flag. The feature flags avoids bloating the binary with the `criterion` dependencies, which was the reason I removed the command in 18c0b97d9d57.
2023-03-27 15:23:53 +00:00
criterion = {version = "0.4.0", optional = true }
cargo: bump crossterm from 0.25.0 to 0.26.0 Bumps [crossterm](https://github.com/crossterm-rs/crossterm) from 0.25.0 to 0.26.0. - [Release notes](https://github.com/crossterm-rs/crossterm/releases) - [Changelog](https://github.com/crossterm-rs/crossterm/blob/master/CHANGELOG.md) - [Commits](https://github.com/crossterm-rs/crossterm/compare/0.25...0.26) --- updated-dependencies: - dependency-name: crossterm dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2023-01-30 15:19:25 +00:00
crossterm = { version = "0.26", default-features = false }
config: move reading of config from lib crate to CLI crate The library crate should be usable by e.g. server processes, so it should not read from the current user's home directory.
2022-03-19 17:09:57 +00:00
dirs = "4.0.0"
graphlog: enable Sapling's graph styles by default I would also rename the feature, but I hope we can instead soon make it a non-optional dependency and delete the feature.
2023-01-27 06:33:24 +00:00
esl01-renderdag = "0.3.0"
cargo: sort dependencies in lexicographical order This should help future cargo add.
2023-03-27 08:18:20 +00:00
git2 = "0.16.1"
cargo: bump glob from 0.3.0 to 0.3.1 Bumps [glob](https://github.com/rust-lang/glob) from 0.3.0 to 0.3.1. - [Release notes](https://github.com/rust-lang/glob/releases) - [Commits](https://github.com/rust-lang/glob/compare/0.3.0...0.3.1) --- updated-dependencies: - dependency-name: glob dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2023-01-06 15:05:36 +00:00
glob = "0.3.1"
cargo: run `cargo upgrade` For no particular reason other than to stay up to date.
2021-11-30 17:14:21 +00:00
hex = "0.4.3"
cargo: bump indexmap from 1.9.2 to 1.9.3 Bumps [indexmap](https://github.com/bluss/indexmap) from 1.9.2 to 1.9.3. - [Release notes](https://github.com/bluss/indexmap/releases) - [Changelog](https://github.com/bluss/indexmap/blob/master/RELEASES.md) - [Commits](https://github.com/bluss/indexmap/compare/1.9.2...1.9.3) --- updated-dependencies: - dependency-name: indexmap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2023-03-27 16:04:45 +00:00
indexmap = "1.9.3"
cargo: bump itertools from 0.10.4 to 0.10.5 Bumps [itertools](https://github.com/rust-itertools/itertools) from 0.10.4 to 0.10.5. - [Release notes](https://github.com/rust-itertools/itertools/releases) - [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-itertools/itertools/commits) --- updated-dependencies: - dependency-name: itertools dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-09-20 16:55:05 +00:00
itertools = "0.10.5"
release: release version 0.7.0 It's been about 10 weeks and 730 commits since 0.6.0, compared to about 7 weeks and 350 commits between 0.5.0 and 0.6.0, so it's time for a new release. There's been significant user-visible changes and code-quality improvements. Thanks, everyone!
2023-02-16 17:26:40 +00:00
jujutsu-lib = { version = "=0.7.0", path = "lib", default-features = false }
rewrite: add support for rebasing descendants of multiple rewritten commits I plan to use this for rebasing descendants of rewritten remote branches (on fetch).
2021-09-15 15:54:55 +00:00
maplit = "1.0.2"
cargo: bump once_cell from 1.17.0 to 1.17.1 Bumps [once_cell](https://github.com/matklad/once_cell) from 1.17.0 to 1.17.1. - [Release notes](https://github.com/matklad/once_cell/releases) - [Changelog](https://github.com/matklad/once_cell/blob/master/CHANGELOG.md) - [Commits](https://github.com/matklad/once_cell/compare/v1.17.0...v1.17.1) --- updated-dependencies: - dependency-name: once_cell dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2023-02-14 16:12:18 +00:00
once_cell = "1.17.1"
cargo: bump pest from 2.5.5 to 2.5.6 Bumps [pest](https://github.com/pest-parser/pest) from 2.5.5 to 2.5.6. - [Release notes](https://github.com/pest-parser/pest/releases) - [Commits](https://github.com/pest-parser/pest/compare/v2.5.5...v2.5.6) --- updated-dependencies: - dependency-name: pest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2023-03-06 16:13:36 +00:00
pest = "2.5.6"
cargo: bump pest_derive from 2.4.1 to 2.5.0 Bumps [pest_derive](https://github.com/pest-parser/pest) from 2.4.1 to 2.5.0. - [Release notes](https://github.com/pest-parser/pest/releases) - [Commits](https://github.com/pest-parser/pest/compare/v2.4.1...v2.5.0) --- updated-dependencies: - dependency-name: pest_derive dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2022-11-25 15:07:08 +00:00
pest_derive = "2.5"
cargo: bump regex from 1.7.2 to 1.7.3 Bumps [regex](https://github.com/rust-lang/regex) from 1.7.2 to 1.7.3. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.7.2...1.7.3) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2023-03-27 16:04:57 +00:00
regex = "1.7.3"
cargo: bump rpassword from 7.1.0 to 7.2.0 Bumps [rpassword](https://github.com/conradkleinespel/rpassword) from 7.1.0 to 7.2.0. - [Release notes](https://github.com/conradkleinespel/rpassword/releases) - [Commits](https://github.com/conradkleinespel/rpassword/compare/v7.1.0...v7.2.0) --- updated-dependencies: - dependency-name: rpassword dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2022-11-28 15:09:27 +00:00
rpassword = "7.2.0"
diff_edit: load command arguments from merge-tools.<name> config Apparently, I need to pass `--merge` option to use kdiff3 as a diff editor. We could add `diff-editor-args` or extend `diff-editor` to a list of command arguments, but we'll eventually add stock merge tools and the configuration would look like: [merge-tools.<name>] program = ... diff-args = [...] edit-args = [...] merge-args = [...]
2022-05-01 01:45:22 +00:00
serde = { version = "1.0", features = ["derive"] }
cargo: bump slab from 0.4.7 to 0.4.8 Bumps [slab](https://github.com/tokio-rs/slab) from 0.4.7 to 0.4.8. - [Release notes](https://github.com/tokio-rs/slab/releases) - [Changelog](https://github.com/tokio-rs/slab/blob/master/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/slab/compare/v0.4.7...v0.4.8) --- updated-dependencies: - dependency-name: slab dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2023-02-20 16:09:14 +00:00
slab = "0.4.8"
cli: provide hint for typo of revset function name This is similar to what Mercurial does. The similarity threshold is copied from clap, but we might want to adjust it later.
2023-03-23 09:03:01 +00:00
strsim = "0.10.0"
cargo: bump tempfile from 3.3.0 to 3.4.0 Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/Stebalien/tempfile/releases) - [Changelog](https://github.com/Stebalien/tempfile/blob/master/NEWS) - [Commits](https://github.com/Stebalien/tempfile/commits) --- updated-dependencies: - dependency-name: tempfile dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2023-02-27 16:10:05 +00:00
tempfile = "3.4.0"
cargo: bump textwrap from 0.15.1 to 0.16.0 Bumps [textwrap](https://github.com/mgeisler/textwrap) from 0.15.1 to 0.16.0. - [Release notes](https://github.com/mgeisler/textwrap/releases) - [Changelog](https://github.com/mgeisler/textwrap/blob/master/CHANGELOG.md) - [Commits](https://github.com/mgeisler/textwrap/compare/0.15.1...0.16.0) --- updated-dependencies: - dependency-name: textwrap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2022-10-24 15:59:00 +00:00
textwrap = "0.16.0"
cargo: bump thiserror from 1.0.39 to 1.0.40 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.39 to 1.0.40. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.39...1.0.40) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2023-03-20 20:20:59 +00:00
thiserror = "1.0.40"
cargo: sort dependencies in lexicographical order This should help future cargo add.
2023-03-27 08:18:20 +00:00
timeago = { version = "0.4.1", default-features = false }
toml_edit = { version = "0.19.8", features = ["serde"] }
feature: add verbose flag and tracing library
2022-11-20 03:38:25 +00:00
tracing = "0.1.37"
tracing-subscriber = { version = "0.3.16", default-features = false, features = ["std", "ansi", "env-filter", "fmt"] }
import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo
2020-12-12 08:00:42 +00:00
cli: define drop+signal guard helper
2022-10-29 19:48:41 +00:00
[target.'cfg(unix)'.dependencies]
cargo: bump libc from 0.2.139 to 0.2.140 Bumps [libc](https://github.com/rust-lang/libc) from 0.2.139 to 0.2.140. - [Release notes](https://github.com/rust-lang/libc/releases) - [Commits](https://github.com/rust-lang/libc/compare/0.2.139...0.2.140) --- updated-dependencies: - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2023-03-09 15:12:26 +00:00
libc = { version = "0.2.140" }
cli: define drop+signal guard helper
2022-10-29 19:48:41 +00:00
import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo
2020-12-12 08:00:42 +00:00
[dev-dependencies]
cargo: bump assert_cmd from 2.0.7 to 2.0.8 Bumps [assert_cmd](https://github.com/assert-rs/assert_cmd) from 2.0.7 to 2.0.8. - [Release notes](https://github.com/assert-rs/assert_cmd/releases) - [Changelog](https://github.com/assert-rs/assert_cmd/blob/master/CHANGELOG.md) - [Commits](https://github.com/assert-rs/assert_cmd/compare/v2.0.7...v2.0.8) --- updated-dependencies: - dependency-name: assert_cmd dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2023-01-10 15:50:12 +00:00
assert_cmd = "2.0.8"
templater: rewrite syntax tests to not build evaluation object Now we have AST objects, so we don't need to evaluate integer literal to test parsing results.
2023-03-03 06:48:35 +00:00
assert_matches = "1.5.0"
cargo: bump insta from 1.28.0 to 1.29.0 Bumps [insta](https://github.com/mitsuhiko/insta) from 1.28.0 to 1.29.0. - [Release notes](https://github.com/mitsuhiko/insta/releases) - [Changelog](https://github.com/mitsuhiko/insta/blob/master/CHANGELOG.md) - [Commits](https://github.com/mitsuhiko/insta/compare/1.28.0...1.29.0) --- updated-dependencies: - dependency-name: insta dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2023-03-23 16:04:56 +00:00
insta = { version = "1.29.0", features = ["filters"] }
cargo: bump regex from 1.7.2 to 1.7.3 Bumps [regex](https://github.com/rust-lang/regex) from 1.7.2 to 1.7.3. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.7.2...1.7.3) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2023-03-27 16:04:57 +00:00
regex = "1.7.3"
tests: move `testutils` module into separate crate The `testutils` module should ideally not be part of the library dependencies. Since they're used by the integration tests (and the CLI tests), we need to move them to a separate crate to achieve that.
2022-11-08 12:35:16 +00:00
testutils = { path = "lib/testutils" }
cargo: use libgit2 with vendored OpenSSL (#73) I was able to build a working musl binary with this change, by running this command: ``` cargo build --release --target x86_64-unknown-linux-musl ``` Thanks to @arxanas for the tip.
2022-03-13 07:03:44 +00:00
[features]
build: don't use vendored OpenSSL by default I added support for using a vendored OpenSSL in dbadbd68c022. That was in order to get the musl binary to work. However, it shouldn't be needed on most platforms, and we've had a few reports of issues caused by it. Let's disable it by default and enable it specifically when building the musl binary instead.
2023-01-03 23:40:03 +00:00
default = ["jujutsu-lib/legacy-thrift"]
cli: move `jj bench` commands to new module, hide behind feature flag The `jj bench` commands are mostly meant for developers, so lets hide the command from help and behind a `bench` feature flag. The feature flags avoids bloating the binary with the `criterion` dependencies, which was the reason I removed the command in 18c0b97d9d57.
2023-03-27 15:23:53 +00:00
bench = ["criterion"]
cargo: use libgit2 with vendored OpenSSL (#73) I was able to build a working musl binary with this change, by running this command: ``` cargo build --release --target x86_64-unknown-linux-musl ``` Thanks to @arxanas for the tip.
2022-03-13 07:03:44 +00:00
vendored-openssl = ["git2/vendored-openssl", "jujutsu-lib/vendored-openssl"]
Reference in a new issue Copy permalink