ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity
jj/Cargo.toml

81 lines
2.1 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.6.1 The only changes is that we now depend on a released version of `thrift`.
2022-12-06 04:31:59 +00:00
version = "0.6.1"
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: upgrade protobuf crates to 3.0.1 The biggest difference in the API is that fields are now public. The exception from that is `oneof` fields, which still require setters and getters. I couldn't measure any difference in performance. I didn't expect any difference either, but it's good that it didn't seem to regress. I timed `jj debug operation <some hash prefix>`, which will read the whole operation log (to check that the prefix is unambiguous).
2022-05-02 15:53:50 +00:00
rust-version = "1.60" # Remember to update CI
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"
build: migrate `diff_bench` to `criterion` Benchmarking is currently nightly-only, so to get `jujutsu` to build on stable, we need to use a stable benchmarking library.
2022-02-21 06:21:14 +00:00
[[bench]]
name = "diff_bench"
harness = false
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]
members = ["lib"]
import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo
2020-12-12 08:00:42 +00:00
[dependencies]
cargo: upgrade chrono to version 0.4.23
2022-11-14 17:37:48 +00:00
chrono = { version = "0.4.23", default-features = false, features = ["std", "clock"] }
cargo: bump clap from 4.0.27 to 4.0.29 Bumps [clap](https://github.com/clap-rs/clap) from 4.0.27 to 4.0.29. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.0.27...v4.0.29) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-11-29 15:07:00 +00:00
clap = { version = "4.0.29", features = ["derive", "deprecated"] }
cargo: bump clap_complete from 4.0.5 to 4.0.6 Bumps [clap_complete](https://github.com/clap-rs/clap) from 4.0.5 to 4.0.6. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.0.5...clap_complete-v4.0.6) --- updated-dependencies: - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-11-25 16:14:27 +00:00
clap_complete = "4.0.6"
cargo: bump clap_mangen from 0.2.4 to 0.2.5 Bumps [clap_mangen](https://github.com/clap-rs/clap) from 0.2.4 to 0.2.5. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_mangen-v0.2.4...clap_mangen-v0.2.5) --- updated-dependencies: - dependency-name: clap_mangen dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-11-25 15:07:00 +00:00
clap_mangen = "0.2.5"
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: draw bar in progress report
2022-10-23 20:50:03 +00:00
crossterm = { version = "0.25", 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"
cargo: bump git2 from 0.14.4 to 0.15.0 Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.14.4 to 0.15.0. - [Release notes](https://github.com/rust-lang/git2-rs/releases) - [Commits](https://github.com/rust-lang/git2-rs/compare/0.14.4...git2-curl-0.15.0) --- updated-dependencies: - dependency-name: git2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2022-07-29 15:34:12 +00:00
git2 = "0.15.0"
feat(branch): support `jj branch forget --glob`
2022-11-22 23:58:04 +00:00
glob = "0.3.0"
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 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.6.1 The only changes is that we now depend on a released version of `thrift`.
2022-12-06 04:31:59 +00:00
jujutsu-lib = { version = "=0.6.1", 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"
cleanup: alphabetize Cargo.toml
2022-11-21 01:37:46 +00:00
once_cell = "1.15.0"
cargo: bump pest from 2.5.0 to 2.5.1 Bumps [pest](https://github.com/pest-parser/pest) from 2.5.0 to 2.5.1. - [Release notes](https://github.com/pest-parser/pest/releases) - [Commits](https://github.com/pest-parser/pest/compare/v2.5.0...v2.5.1) --- updated-dependencies: - dependency-name: pest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-12-05 15:15:00 +00:00
pest = "2.5.1"
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 rand from 0.8.4 to 0.8.5 Bumps [rand](https://github.com/rust-random/rand) from 0.8.4 to 0.8.5. - [Release notes](https://github.com/rust-random/rand/releases) - [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-random/rand/compare/0.8.4...0.8.5) --- updated-dependencies: - dependency-name: rand dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-03-17 04:53:28 +00:00
rand = "0.8.5"
cargo: bump regex from 1.6.0 to 1.7.0 Bumps [regex](https://github.com/rust-lang/regex) from 1.6.0 to 1.7.0. - [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.6.0...1.7.0) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2022-11-08 15:30:59 +00:00
regex = "1.7.0"
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"] }
cli: define drop+signal guard helper
2022-10-29 19:48:41 +00:00
slab = "0.4.7"
cargo: upgrade dependencies
2022-02-10 06:19:16 +00:00
tempfile = "3.3.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"
feature: support relative timestamps as a config option
2022-11-26 01:33:24 +00:00
timeago = { version = "0.3.1", default-features = false }
cargo: bump thiserror from 1.0.36 to 1.0.37 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.36 to 1.0.37. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.36...1.0.37) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-09-28 15:49:46 +00:00
thiserror = "1.0.37"
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.137 to 0.2.138 Bumps [libc](https://github.com/rust-lang/libc) from 0.2.137 to 0.2.138. - [Release notes](https://github.com/rust-lang/libc/releases) - [Commits](https://github.com/rust-lang/libc/compare/0.2.137...0.2.138) --- updated-dependencies: - dependency-name: libc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-12-05 15:15:45 +00:00
libc = { version = "0.2.138" }
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.6 to 2.0.7 Bumps [assert_cmd](https://github.com/assert-rs/assert_cmd) from 2.0.6 to 2.0.7. - [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.6...v2.0.7) --- updated-dependencies: - dependency-name: assert_cmd dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-12-05 17:36:54 +00:00
assert_cmd = "2.0.7"
cargo: bump criterion from 0.3.6 to 0.4.0 Bumps [criterion](https://github.com/bheisler/criterion.rs) from 0.3.6 to 0.4.0. - [Release notes](https://github.com/bheisler/criterion.rs/releases) - [Changelog](https://github.com/bheisler/criterion.rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/bheisler/criterion.rs/compare/0.3.6...0.4.0) --- updated-dependencies: - dependency-name: criterion dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2022-09-12 15:59:06 +00:00
criterion = "0.4.0"
cargo: bump criterion_bencher_compat from 0.3.4 to 0.4.0 Bumps [criterion_bencher_compat](https://github.com/bheisler/criterion.rs) from 0.3.4 to 0.4.0. - [Release notes](https://github.com/bheisler/criterion.rs/releases) - [Changelog](https://github.com/bheisler/criterion.rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/bheisler/criterion.rs/compare/0.3.4...0.4.0) --- updated-dependencies: - dependency-name: criterion_bencher_compat dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2022-09-12 15:45:21 +00:00
criterion_bencher_compat = "0.4.0"
Upgrade insta from 1.21.2 to 1.22.0
2022-12-06 05:39:05 +00:00
insta = "1.22.0"
cargo: bump predicates from 2.1.3 to 2.1.4 Bumps [predicates](https://github.com/assert-rs/predicates-rs) from 2.1.3 to 2.1.4. - [Release notes](https://github.com/assert-rs/predicates-rs/releases) - [Changelog](https://github.com/assert-rs/predicates-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/assert-rs/predicates-rs/compare/v2.1.3...v2.1.4) --- updated-dependencies: - dependency-name: predicates dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-12-05 15:15:08 +00:00
predicates = "2.1.4"
cleanup: alphabetize Cargo.toml
2022-11-21 01:37:46 +00:00
regex = "1.7.0"
cargo: bump test-case from 2.2.1 to 2.2.2 Bumps [test-case](https://github.com/frondeus/test-case) from 2.2.1 to 2.2.2. - [Release notes](https://github.com/frondeus/test-case/releases) - [Changelog](https://github.com/frondeus/test-case/blob/master/CHANGELOG.md) - [Commits](https://github.com/frondeus/test-case/compare/v2.2.1...v2.2.2) --- updated-dependencies: - dependency-name: test-case dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-10-03 15:37:43 +00:00
test-case = "2.2.2"
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]
thrift: add `legacy-thrift` Cargo feature This patch adds a `legacy-thrift` Cargo feature that's enabled by default. If it's disabled, the upgrade from Thrift-based operation log does not happen, and the `thrift` depdendency is not included.
2022-12-02 20:49:21 +00:00
default = ["vendored-openssl", "jujutsu-lib/legacy-thrift"]
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"]
Copy permalink