mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-11-24 15:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
jj/Cargo.toml

49 lines
1.2 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"
project: bump version to 0.2.0 for release under new name We need to release on crates.io before the new name gets taken. Besides, a *lot* has improved since the previous release.
2021-05-15 17:28:40 +00:00
version = "0.2.0"
import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo
2020-12-12 08:00:42 +00:00
authors = ["Martin von Zweigbergk <martinvonz@google.com>"]
edition = "2018"
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"]
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"
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: update blake2 For no reason other than to stay up to date.
2020-12-24 09:15:38 +00:00
blake2 = "0.9.1"
cargo: update dependencies For no reason other than to stay up to date.
2020-12-24 04:55:12 +00:00
bytes = "1.0.0"
chrono = "0.4.19"
clap = "2.33.3"
config = "0.10.1"
criterion = "0.3.3"
dirs = "3.0.1"
git2 = "0.13.14"
hex = "0.4.2"
indoc = "1.0.3"
cleanup: remove some Vec<_> annotations, mostly by using collect_vec()
2021-06-09 20:57:48 +00:00
itertools = "0.10.1"
project: bump version to 0.2.0 for release under new name We need to release on crates.io before the new name gets taken. Besides, a *lot* has improved since the previous release.
2021-05-15 17:28:40 +00:00
jujutsu-lib = { version = "=0.2.0", path = "lib"}
cargo: update dependencies For no reason other than to stay up to date.
2020-12-24 04:55:12 +00:00
pest = "2.1.3"
pest_derive = "2.1.0"
cargo: upgrade to protobuf 2.22.1 to avoid workaround for rustfmt::skip
2021-03-18 20:04:30 +00:00
protobuf = { version = "2.22.1", features = ["with-bytes"] }
protobuf-codegen-pure = "2.22.1"
cli: make concurrent description-editing not use the same file If you ran two concurrent `jj describe` (for example) before this patch, they'd both try to open an editor on the same file. This patch fixes that by randomizing the filename. It also deletes the file at the end so the `.jj/` directory is not cluttered by these files.
2021-05-15 21:05:56 +00:00
rand = "0.8.0"
cargo: update dependencies For no reason other than to stay up to date.
2020-12-24 04:55:12 +00:00
serde_json = "1.0.60"
tempfile = "3.1.0"
commands: add an interactive mode for `jj restore` This adds an interactive mode for `jj restore`. It works by first creating two temporary directories with the contents of the subset of files that differ between the two trees, and then letting the user edit the directory representing the right/after side. This has some advantages compared to the interactive modes in Git and Mercurial: * It lets the user edit the final state as opposed to the diff itself (depending on the diff tool, of course). I think most users find it easier to edit the file contents than to edit the patch format. * It delegates the hard work to a tool that is already written (this is a big advantage for an immature tool like Jujube, but it is not an advantage from the user's point of view). Almost all of the work in this commit went into adding a function that takes two trees, lets the user edit the diff, and returns a new tree id. I plan to reuse that function for other interactive commands. One planned command is `jj edit`, which will let the user edit the changes in a commit. `jj edit -r abc123` will be mostly about providing a more intuitive name for `jj restore --source abc123^ --destination abc123`, plus it will be different for merge commits (it will edit only the changes in the merge commit). I also plan to add `jj split` by letting the user edit the full diff, leaving only the parts that should go into the first commit. Perhaps there will also be commands for moving part of a commit out of or into a parent commit.
2020-12-26 03:13:01 +00:00
thiserror = "1.0.22"
cargo: update dependencies For no reason other than to stay up to date.
2020-12-24 04:55:12 +00:00
uuid = { version = "0.8.1", features = ["v4"] }
zstd = "0.6.0"
import commit 0f15be02bf4012c116636913562691a0aaa7aed2 from my hg repo
2020-12-12 08:00:42 +00:00
[dev-dependencies]
cargo: point `test-case` dependency to my fork This is work around frondeus/test-case#66 until my pull request (or other fix) gets accepted.
2021-06-23 23:37:59 +00:00
test-case = { git= "https://github.com/martinvonz/test-case", branch="remove-unneeded-unit-expression" }
cargo: update dependencies For no reason other than to stay up to date.
2020-12-24 04:55:12 +00:00
regex = "1.4.2"
Reference in a new issue Copy permalink