dependabot[bot]
47bdffed34
cargo: bump clap from 3.1.6 to 3.1.8
...
Bumps [clap](https://github.com/clap-rs/clap ) from 3.1.6 to 3.1.8.
- [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/v3.1.6...v3.1.8 )
---
updated-dependencies:
- dependency-name: clap
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-04-01 09:06:37 -07:00
dependabot[bot]
e7767002b6
cargo: bump insta from 1.13.0 to 1.14.0
...
Bumps [insta](https://github.com/mitsuhiko/insta ) from 1.13.0 to 1.14.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.13.0...1.14.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-03-28 08:54:08 -07:00
dependabot[bot]
d8b7d2269d
cargo: bump test-case from 2.0.1 to 2.0.2
...
Bumps [test-case](https://github.com/frondeus/test-case ) from 2.0.1 to 2.0.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.0.1...v2.0.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-03-28 08:53:04 -07:00
Martin von Zweigbergk
66fe23b4e9
cli: switch from clap
's Builder API to its Derive API
...
The Derive API is easier to work with, less error-prone, and less
verbose, so it seems like a good improvement.
It was quite a bit of work to make the switch, and I'll be surprised
if I didn't make any mistakes in the translation. We unfortunately
don't have enough e2e tests to be very confident, so we'll have to fix
any problems as we discover them.
I've at least verified that the output of `jj debug completion --fish`
is unchanged, except for a few help texts I changed for different
reasons (consistency, clarity, avoiding redundancy).
2022-03-23 15:17:21 -07:00
Martin von Zweigbergk
bf62e1789f
cargo: update lock file
...
With the current dependencies in the lock file, we cannot use `clap`'s
"derive" feature, which I'd like to do.
2022-03-23 15:17:21 -07:00
Martin von Zweigbergk
1d3f909a3b
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-23 09:57:42 -07:00
dependabot[bot]
302b4025d5
cargo: bump test-case from 2.0.0 to 2.0.1
...
Bumps [test-case](https://github.com/frondeus/test-case ) from 2.0.0 to 2.0.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.0.0...v2.0.1 )
---
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-03-22 09:33:22 -07:00
Martin von Zweigbergk
3f24411bbf
cargo: upgrade the config
crate from 0.11.0 to 0.12.0
...
This required a bit of work.
2022-03-18 22:33:04 -07:00
dependabot[bot]
30e3685f5e
cargo: bump regex from 1.5.4 to 1.5.5
...
Bumps [regex](https://github.com/rust-lang/regex ) from 1.5.4 to 1.5.5.
- [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.4...1.5.5 )
---
updated-dependencies:
- dependency-name: regex
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-16 22:57:09 -07:00
dependabot[bot]
f14b1260e5
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-16 22:27:45 -07:00
dependabot[bot]
85d4ac7d47
cargo: bump clap from 3.1.2 to 3.1.6
...
Bumps [clap](https://github.com/clap-rs/clap ) from 3.1.2 to 3.1.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/v3.1.2...v3.1.6 )
---
updated-dependencies:
- dependency-name: clap
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-16 22:12:52 -07:00
dependabot[bot]
a8f881b84c
cargo: bump test-case from 1.2.3 to 2.0.0
...
Bumps [test-case](https://github.com/frondeus/test-case ) from 1.2.3 to 2.0.0.
- [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/v1.2.3...v2.0.0 )
---
updated-dependencies:
- dependency-name: test-case
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-16 22:07:44 -07:00
dependabot[bot]
c8b32238f9
cargo: bump zstd from 0.10.0+zstd.1.5.2 to 0.11.1+zstd.1.5.2
...
Bumps [zstd](https://github.com/gyscos/zstd-rs ) from 0.10.0+zstd.1.5.2 to 0.11.1+zstd.1.5.2.
- [Release notes](https://github.com/gyscos/zstd-rs/releases )
- [Commits](https://github.com/gyscos/zstd-rs/commits )
---
updated-dependencies:
- dependency-name: zstd
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-16 21:52:29 -07:00
dependabot[bot]
65bc87f57d
cargo: bump serde_json from 1.0.78 to 1.0.79
...
Bumps [serde_json](https://github.com/serde-rs/json ) from 1.0.78 to 1.0.79.
- [Release notes](https://github.com/serde-rs/json/releases )
- [Commits](https://github.com/serde-rs/json/compare/v1.0.78...v1.0.79 )
---
updated-dependencies:
- dependency-name: serde_json
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-16 21:52:06 -07:00
dependabot[bot]
b56435d609
cargo: bump indoc from 1.0.3 to 1.0.4
...
Bumps [indoc](https://github.com/dtolnay/indoc ) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/dtolnay/indoc/releases )
- [Commits](https://github.com/dtolnay/indoc/compare/1.0.3...1.0.4 )
---
updated-dependencies:
- dependency-name: indoc
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-16 21:51:53 -07:00
dependabot[bot]
fae61bad79
cargo: bump blake2 from 0.10.2 to 0.10.4
...
Bumps [blake2](https://github.com/RustCrypto/hashes ) from 0.10.2 to 0.10.4.
- [Release notes](https://github.com/RustCrypto/hashes/releases )
- [Commits](https://github.com/RustCrypto/hashes/commits )
---
updated-dependencies:
- dependency-name: blake2
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-03-16 21:51:29 -07:00
dependabot[bot]
2fdd8bc60b
cargo: bump clap_complete from 3.1.0 to 3.1.1
...
Bumps [clap_complete](https://github.com/clap-rs/clap ) from 3.1.0 to 3.1.1.
- [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.1.0...clap_complete-v3.1.1 )
---
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-03-16 21:37:27 -07:00
dependabot[bot]
0ea6f47dc5
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-16 21:31:22 -07:00
Martin von Zweigbergk
168d986827
release: bump version to 0.3.3 (skipping 0.3.2)
...
I forgot to bump the version to 0.3.2 before tagging and releasing it,
so the released 0.3.2 has version number 0.3.1 in the source code and
(therefore) reported from `jj --version`. I'm therefore bumping it
from 0.3.1 to 0.3.3 now, so there can be a matching 0.3.3 release.
2022-03-16 12:20:52 -07:00
Martin von Zweigbergk
794e956a84
release: bump version to 0.3.1
...
This release is just to get #131 out and to see if the automated
release builds work now that we use a vendored OpenSSL from libgit2.
2022-03-13 21:49:09 -07:00
Martin von Zweigbergk
cac93e2793
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 21:34:07 -07:00
Martin von Zweigbergk
8f4949d2e4
release: bump version to 0.3.0
...
There's been *a lot* of changes since 0.2.0 almost a year ago. With
the attention the project has gotten recently, I feel like I should
cut a new release and start keeping a changelog. So let's start by
bumping the version to 0.3.0.
2022-03-12 23:03:01 -08:00
Martin von Zweigbergk
5721436558
tests: use insta
crate where appropriate
...
Thanks to @arxanas for the suggestion.
2022-03-07 20:23:55 -08:00
Martin von Zweigbergk
711f65303c
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-03-02 22:00:24 -08:00
Cole Mickens
e5043c2ace
cargo: add clap_mangen
2022-03-02 08:46:54 -08:00
Martin von Zweigbergk
c59dcd76a4
cargo: upgrade clap to 3.1.0
...
This avoids some deprecation warnings from `cargo install` (which
picks the latest version instead of the locked version by default).
2022-02-27 13:16:02 -08:00
Waleed Khan
9202aae8b1
build: conditionally use map_first_last
feature if available
2022-02-20 22:21:14 -08:00
Waleed Khan
dd3272fe90
build: use assert_matches
crate
...
The `assert_matches` feature is nightly-only, so use this crate as a shim.
2022-02-20 22:21:14 -08:00
Waleed Khan
75480c2bdc
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-20 22:21:14 -08:00
Martin von Zweigbergk
be7b0e6839
cargo: upgrade dependencies
2022-02-09 22:21:39 -08:00
Martin von Zweigbergk
117bf13708
cargo: upgrade backoff
2022-02-09 22:21:39 -08:00
Martin von Zweigbergk
33cc6b1253
cargo: upgrade blake2
2022-02-09 22:19:04 -08:00
Martin von Zweigbergk
de6e77dcdf
cargo: remove unused dependencies from CLI crate
2022-02-09 22:14:53 -08:00
Martin von Zweigbergk
9ce56f6cb7
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.
2022-01-16 17:37:14 -08:00
Martin von Zweigbergk
504148a81f
cli: upgrade to clap 3.0 now that it's released
2022-01-05 12:43:14 -08:00
Martin von Zweigbergk
1143b1ab6c
cargo: run cargo upgrade
...
For no particular reason other than to stay up to date.
2021-12-01 08:13:20 -08:00
Martin von Zweigbergk
905c45ddd7
cargo: upgrade to backoff
0.3
...
For no particular reason other than to stay up to date.
2021-12-01 08:13:20 -08:00
Martin von Zweigbergk
ca114d6d7e
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 22:13:40 -07:00
Martin von Zweigbergk
fa73b17c66
cli: add jj concepts
subcommand for concept help, starting with "branches"
...
With this commit, you can run `jj concepts branches` to get help about
the "branches" concept. We don't have much help for other commands and
their arguments yet, but I'm starting with concept guides so we can
point to them as we add help for commands and their arguments.
I initially tried to make the command to get help be `jj help
--concept branches`. That would require replacing clap's
implementation of the help command with our own. clap-rs/clap#1350
prevented me from doing that. But I'm pretty happy with having it
under `jj concepts` anyway. It's probably more discoverable that way.
I tried to mimic clap's styling with yellow headings.
2021-09-02 23:06:46 -07:00
Martin von Zweigbergk
720677c7f3
cargo: update test-case
to 1.2.0 now that frondeus/test-case#66 is fixed
2021-06-28 12:13:14 -07:00
Martin von Zweigbergk
f2100ed533
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 17:07:51 -07:00
Martin von Zweigbergk
40a25d4f59
cargo: update dependencies
...
We need (at least) a new version of `quote` (1.0.9) to be compatible
with a newer version of `test-case` that I want to upgrade to.
2021-06-23 17:05:00 -07:00
Martin von Zweigbergk
b593e552b8
cleanup: remove some Vec<_> annotations, mostly by using collect_vec()
2021-06-09 14:21:57 -07:00
Martin von Zweigbergk
798a6f7a74
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 17:01:28 -07:00
Martin von Zweigbergk
afe754a4e0
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 10:50:26 -07:00
Martin von Zweigbergk
d42e6c77b2
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 10:28:40 -07:00
Martin von Zweigbergk
88f7f4732b
gitignores: add own implementation and stop using libgit2's
...
This is to address issue #8 . I haven't added the optimization to avoid
walking all the files in `target/` yet. Even so, this patch still
speeds up `jj st` in this repo, with ~13k files in `target/`, from
~320 ms to ~100 ms (-5.1dB). The time actually checking if paths match
gitignores seems to go down from 116 ms to 6 ms. I think that's mostly
because libgit2 has to look for `.gitignore` files in every parent
directory every time we ask it about a file, while the rewritten code
looks for a `.gitignore` file only when visiting a new directory.
2021-05-13 22:23:59 -07:00
Martin von Zweigbergk
419002fab4
tests: use one thread per core in concurrency tests
...
The tests have been failing in GitHub's CI quite frequently. It's
about time I try to do something about it. Let's see if this helps.
2021-04-29 00:01:04 -07:00
Martin von Zweigbergk
2d6325b0f4
revsets: define grammar in pest
2021-04-18 21:25:58 -07:00
Martin von Zweigbergk
c071d412af
diff: use new diff algorithm for content diff
...
The previous patch switched over the content-merge code to use the new
histogram diff code. This patch switches over the content-diff code to
use the histogram diff code. As before, the immediate goal is to speed
it up. `jj diff -r c28ded83fc` in the git.git repo is a good example
of a diff that's extremely slow to calculate with our current
LCS-based diff. With this patch, that drops from 35 s to 0.12 s.
The diff was slightly better before. I think that's mostly because of
our different definition of a "word" in the data. We can improve that
later. The speedup we get now is easily worth the slightly worse diff.
2021-03-31 22:22:59 -07:00