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

72 lines
1.7 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.4.0 This release is mostly about the fix for #177, which looks pretty bad even though I think it is actually harmless. It also has `jj log -p` contributed by @yuja!
2022-04-03 05:56:59 +00:00
version = "0.4.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: 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]
cli: use color only when stdout is a TTY This adds a `ui.color` config that can be set to "always", "never", or "auto". If set to "auto", we use color iff stdout is a TTY.
2021-06-03 05:02:06 +00:00
atty = "0.2.14"
cargo: run `cargo update` Our current version of `cpufeatures` was yanked so we needed to upgrade at least that. Note that I had to add "UNICODE-DFS-2016" as an allowed license for `cargo-deny`. I also had to upgrade `chrono` from 0.4.20 to 0.4.22 in the `Cargo.toml` files to prevent `cargo update` from *downgrading* it in the lock file.
2022-09-06 19:58:08 +00:00
chrono = { version = "0.4.22", default-features = false, features = ["std", "clock"] }
cargo: bump clap from 3.2.21 to 3.2.22 Bumps [clap](https://github.com/clap-rs/clap) from 3.2.21 to 3.2.22. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/v3.2.22/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v3.2.21...v3.2.22) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-09-16 15:28:25 +00:00
clap = { version = "3.2.22", features = ["derive"] }
cargo: bump clap_complete from 3.2.4 to 3.2.5 Bumps [clap_complete](https://github.com/clap-rs/clap) from 3.2.4 to 3.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_complete-v3.2.4...clap_complete-v3.2.5) --- 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-09-14 04:11:23 +00:00
clap_complete = "3.2.5"
cargo: add clap_mangen
2022-03-02 08:15:14 +00:00
clap_mangen = "0.1"
cargo: bump config from 0.13.1 to 0.13.2 Bumps [config](https://github.com/mehcode/config-rs) from 0.13.1 to 0.13.2. - [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.1...0.13.2) --- updated-dependencies: - dependency-name: config dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-08-02 15:35:49 +00:00
config = { version = "0.13.2", features = ["toml"] }
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"
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"
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.3 to 0.10.4 Bumps [itertools](https://github.com/rust-itertools/itertools) from 0.10.3 to 0.10.4. - [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/compare/v0.10.3...v0.10.4) --- 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-13 15:50:17 +00:00
itertools = "0.10.4"
release: release version 0.4.0 This release is mostly about the fix for #177, which looks pretty bad even though I think it is actually harmless. It also has `jj log -p` contributed by @yuja!
2022-04-03 05:56:59 +00:00
jujutsu-lib = { version = "=0.4.0", path = "lib"}
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 pest from 2.3.0 to 2.3.1 Bumps [pest](https://github.com/pest-parser/pest) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/pest-parser/pest/releases) - [Commits](https://github.com/pest-parser/pest/compare/v2.3.0...v2.3.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-09-12 15:45:13 +00:00
pest = "2.3.1"
pest: update to 2.3.x since 2.2.x has some yanked versions Detected with cargo-deny.
2022-08-22 18:23:26 +00:00
pest_derive = "2.3"
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.5.6 to 1.6.0 Bumps [regex](https://github.com/rust-lang/regex) from 1.5.6 to 1.6.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.5.6...1.6.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-07-06 15:33:53 +00:00
regex = "1.6.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: upgrade dependencies
2022-02-10 06:19:16 +00:00
tempfile = "3.3.0"
cargo: bump textwrap from 0.14.2 to 0.15.0 Bumps [textwrap](https://github.com/mgeisler/textwrap) from 0.14.2 to 0.15.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.14.2...0.15.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-03-17 04:09:53 +00:00
textwrap = "0.15.0"
cargo: bump thiserror from 1.0.34 to 1.0.35 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.34 to 1.0.35. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.34...1.0.35) --- 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-14 16:12:41 +00:00
thiserror = "1.0.35"
import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo
2020-12-12 08:00:42 +00:00
[dev-dependencies]
cargo: move some test deps to `[dev-dependencies]`
2022-04-29 21:06:23 +00:00
assert_cmd = "2.0.4"
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"
cargo: bump insta from 1.19.1 to 1.20.0 Bumps [insta](https://github.com/mitsuhiko/insta) from 1.19.1 to 1.20.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.19.1...1.20.0) --- updated-dependencies: - dependency-name: insta dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2022-09-19 15:46:22 +00:00
insta = "1.20.0"
tests: stop libgit2 from accessing config files libgit2 by default will respect config files present on a user's machine---in particular, when creating a new repo, it will read `init.defaultBranch` to determine what the name of the default branch should be. This makes the tests non-hermetic, so disable that feature. On my machine, `init.defaultBranch` is set in system config. Without this patch, `test_git_colocated` and `test_git_colocated_rebase_on_import` fail, but with this patch, they pass.
2022-08-30 17:37:12 +00:00
lazy_static = "1.4.0"
cargo: bump regex from 1.5.6 to 1.6.0 Bumps [regex](https://github.com/rust-lang/regex) from 1.5.6 to 1.6.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.5.6...1.6.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-07-06 15:33:53 +00:00
regex = "1.6.0"
tests: use `assert_cmd` for e2e tests I didn't know about `assert_cmd` when I wrote the few e2e tests we have. Let's switch to it and remove our own similar helpers.
2022-01-16 06:06:12 +00:00
predicates = "2.1.1"
cargo: bump test-case from 2.1.0 to 2.2.1 Bumps [test-case](https://github.com/frondeus/test-case) from 2.1.0 to 2.2.1. - [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.1.0...v2.2.1) --- updated-dependencies: - dependency-name: test-case dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2022-07-22 15:32:39 +00:00
test-case = "2.2.1"
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]
default = ["vendored-openssl"]
vendored-openssl = ["git2/vendored-openssl", "jujutsu-lib/vendored-openssl"]
Reference in a new issue Copy permalink