dependabot[bot]
b9f2f634be
cargo: bump git2 from 0.17.1 to 0.17.2
...
Bumps [git2](https://github.com/rust-lang/git2-rs ) from 0.17.1 to 0.17.2.
- [Changelog](https://github.com/rust-lang/git2-rs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rust-lang/git2-rs/compare/0.17.1...0.17.2 )
---
updated-dependencies:
- dependency-name: git2
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-05-29 20:25:04 +02:00
Yuya Nishihara
f27ac22ba4
index: unify evaluate_revset() implementations
...
The lifetime is a bit tricky since CompositeIndex is a reference wrapper
whereas Index trait has no notion about ownership.
2023-05-29 08:15:40 +09:00
Yuya Nishihara
b7b9b8c88e
index: pass only CompositeIndex to default_revset_engine::evaluate()
2023-05-29 08:15:40 +09:00
Yuya Nishihara
cf5cb380bb
index: implement Index for CompositeIndex
...
We can't get rid of the other "impl Index"es because .as_composite() must
return a real reference type. Maybe we could turn CompositeIndex into an
owned wrapper, but I don't know if that would be worth the effort.
2023-05-29 08:15:40 +09:00
Yuya Nishihara
5989bdf781
index: move Index::as_any() to MutableIndex, obtain CompositeIndex from there
...
It might sound scary to add public .mutable_index() accessor, but I think
it's okay because immutable MutableIndex reference has no more power than
Index.
This allows us to implement Index for lifetime-bound type such as
CompositeIndex<'_>.
2023-05-29 08:15:40 +09:00
Yuya Nishihara
b9c8fd8ef3
index: make ReadonlyIndexImpl crate local
...
This ensure that callers will use ReadonlyIndexWrapper as the implementation
type.
2023-05-29 08:15:40 +09:00
Yuya Nishihara
93284a153f
index: obtain CompositeIndex from ReadonlyIndexWrapper
...
I'll remove Index::as_any() so that Index can be implemented for reference
wrapper.
2023-05-29 08:15:40 +09:00
Yuya Nishihara
fb77c55268
index: use as_composite() to access to index stats
...
The idea is that .as_composite() is equivalent to .as_index(), but for the
implementation type. I'm going to add "impl Index for CompositeIndex" to
clean up index references passed to revset engine.
2023-05-29 08:15:40 +09:00
Yuya Nishihara
92c1b7091b
index: make CompositeIndex copyable to clarify it is a cheap reference type
...
Well, I might change it to an owned wrapper later, but if I made such change,
the current CompositeIndex<'_> would be replaced with &CompositeIndex.
2023-05-29 08:15:40 +09:00
Martin von Zweigbergk
d047a8fbd4
tree: respect matcher.visit() when walking entries
...
This handles the basic case of where the matcher says that a whole
subtree is not matched. In the Linux repo, That's already enough to
speed up `jj --ignore-working-copy files samples` from 298 ms to 129
ms.
2023-05-28 07:28:16 -07:00
Martin von Zweigbergk
dbcecf7244
tree: rewrite recursive entries iterator to not use machine stack
...
In the same vein as c02c4168fe
2023-05-28 07:28:16 -07:00
Martin von Zweigbergk
a897b27770
revset: minor fixes to documentation of graph iterator
2023-05-26 15:55:29 -07:00
Martin von Zweigbergk
7bf1ab712a
progress: update progress only every 10 ms
...
In the Linux repo, this speeds up `jj diff` in a clean working copy
from 1.41 s to 881 ms.
2023-05-26 12:22:29 -07:00
dependabot[bot]
1fa88dbad0
github: bump github/codeql-action from 2.3.4 to 2.3.5
...
Bumps [github/codeql-action](https://github.com/github/codeql-action ) from 2.3.4 to 2.3.5.
- [Release notes](https://github.com/github/codeql-action/releases )
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md )
- [Commits](f0e3dfb303...0225834cc5
2023-05-26 17:09:56 +00:00
dependabot[bot]
fe90574b37
cargo: bump regex from 1.8.2 to 1.8.3
...
Bumps [regex](https://github.com/rust-lang/regex ) from 1.8.2 to 1.8.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.8.2...1.8.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-05-26 16:11:49 +00:00
dependabot[bot]
b2ecabe89a
github: bump github/codeql-action from 2.3.3 to 2.3.4
...
Bumps [github/codeql-action](https://github.com/github/codeql-action ) from 2.3.3 to 2.3.4.
- [Release notes](https://github.com/github/codeql-action/releases )
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md )
- [Commits](29b1f65c5e...f0e3dfb303
2023-05-25 16:12:55 +00:00
Aaron Bull Schaefer
d10af403a5
cleanup: fix minor typos in function names
...
> error: `mutliple` should be `multiple`
> error: `visble` should be `visible`
Found via typos:
- https://github.com/crate-ci/typos
2023-05-25 08:43:06 -07:00
Martin von Zweigbergk
d087e64abf
cleanup: consistently (?) put removed conflict terms before added ones
2023-05-25 04:24:26 -07:00
Martin von Zweigbergk
97c64d8071
tree: leverage trivial_merge() for file executable bit
2023-05-24 22:00:38 -07:00
Martin von Zweigbergk
f838d083d3
tree: add test of merge of executable bit
...
We didn't seem to have any tests of this, so let's add one before I
change the implementation.
2023-05-24 22:00:38 -07:00
Martin von Zweigbergk
28d3ad6f1d
files: add more multi-hunk tests
...
We seemed to have poor coverage of merges affecting multiple hunks, so
I added a few. Thanks to @quark-zju for providing the last of them.
2023-05-24 22:00:38 -07:00
Martin von Zweigbergk
1c284322b3
files: leverage trivial_merge() in merge()
...
Note that one test changed because the new `trivial_merge()` is more
strict than the old algorithm. I don't think that's a problem because
5-way conflicts are not very common, and I prefer to be strict now and
possibly relax it later if we decide that we would prefer that.
2023-05-24 22:00:38 -07:00
Martin von Zweigbergk
61c1b9f4eb
files: add another test of a 5-way merge
...
Just to show that this case doesn't change in the next commit.
2023-05-24 22:00:38 -07:00
Martin von Zweigbergk
1ec906b114
files: make merge() require one more adds than removes
...
All call paths already check before calling the function that the
condition is true. One caller - `tree::try_resolve_file_conflict()` -
checks it itself. The other caller -
`conflicts::materialize_merge_result()` - doesn't, but its callers
have checked it via `extract_file_conflict_as_single_hunk()`.
The deleted comment about empty strings seems to be obsolete since
e48ace56d1
2023-05-24 22:00:38 -07:00
Martin von Zweigbergk
3069718c0f
refs: leverage trivial_merge() in merge_ref_targets()
2023-05-24 22:00:38 -07:00
Martin von Zweigbergk
451af92912
tree: leverage trivial_merge() in merge_trees()
2023-05-24 22:00:38 -07:00
Martin von Zweigbergk
ef7b831411
merge: optimize 3-way merge case
...
I haven't done any profiling to see if this is actually useful, but
it's also pretty simple to do.
2023-05-24 22:00:38 -07:00
Martin von Zweigbergk
aa2792c5e5
merge: add a generic function for resolving trivial N-way merges
...
We already resolve merge conflicts between hunks, trees, and refs, and
maybe more. They each have their own code for the handling trivial
merges (where the output is equal to one of the inputs). They look
surprisingly different. This commit adds a generic function for doing
that. Curiously, this new implementation uses implements it in yet
another way (basically using a multi-set).
2023-05-24 22:00:38 -07:00
dependabot[bot]
69a7df1715
github: bump cachix/install-nix-action from 20 to 21
...
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action ) from 20 to 21.
- [Release notes](https://github.com/cachix/install-nix-action/releases )
- [Commits](29bd9290ef...4b933aa7eb
2023-05-24 16:13:59 +00:00
dependabot[bot]
6e09e47129
cargo: bump toml_edit from 0.19.9 to 0.19.10
...
Bumps [toml_edit](https://github.com/toml-rs/toml ) from 0.19.9 to 0.19.10.
- [Commits](https://github.com/toml-rs/toml/compare/v0.19.9...v0.19.10 )
---
updated-dependencies:
- dependency-name: toml_edit
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-05-24 16:11:45 +00:00
dependabot[bot]
3c1183fb38
cargo: bump regex from 1.8.1 to 1.8.2
...
Bumps [regex](https://github.com/rust-lang/regex ) from 1.8.1 to 1.8.2.
- [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.8.1...1.8.2 )
---
updated-dependencies:
- dependency-name: regex
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-05-23 16:13:49 +00:00
Yuya Nishihara
8157c4a926
index: remove walk_revs() from trait API
...
It only makes sense for the DefaultIndexStore.
2023-05-24 01:02:37 +09:00
Yuya Nishihara
e24fe817c9
tests: invoke .walk_revs() through CompositeIndex
...
Prepares for removal of the index trait method.
2023-05-24 01:02:37 +09:00
Yuya Nishihara
6ba684a395
index: replace use of walk_revs() with revset API
...
I've added a helper function because the construction of the range expression
is a bit noisy. It could be a Repo method, but I don't want to make it a
default implementation of the trait method.
revset::walk_revs() let the caller handle RevsetEvaluationError since the
evaluation engine may error out even with such a trivial query. For now, most
callers just .unwrap() the error as before.
2023-05-24 01:02:37 +09:00
Yuya Nishihara
0b2f0eca05
revset: add Revset::count() API
...
The default-engine implementation is pretty much the same as iter().count(),
but custom engine may have an optimal path.
2023-05-24 01:02:37 +09:00
Yuya Nishihara
5b568cabcc
revset: add iterator of (CommitId, ChangeId) pairs, use it in id_index
...
There are a few more places where we need these pairs.
2023-05-24 01:02:37 +09:00
Yuya Nishihara
4d39fdf614
id_prefix: remove redundant CommidId field from disambiguation index
2023-05-24 01:02:37 +09:00
Yuya Nishihara
44927be7c9
id_prefix: add IdIndex method that looks up unambiguous key
...
resolve_prefix_with() is changed to return both key and values.
2023-05-24 01:02:37 +09:00
Yuya Nishihara
e93ff5815c
id_prefix: rename IdIndex::resolve_prefix() to resolve_prefix_to_values()
...
I'll add a key resolution method.
2023-05-24 01:02:37 +09:00
Yuya Nishihara
e7f83e7681
index: add PrefixResolution::map() helper
...
I'm going to make IdIndex::resolve_prefix_with() return (key, values) pair,
and add convenient wrappers that .map() the pair to either key or values.
2023-05-24 01:02:37 +09:00
Yuya Nishihara
d6f1ab697a
cli: load revset/template aliases in order of config layers
...
Since we abuse TOML table syntax to define function aliases, an identical
function alias can be found more than once in the merged config. The merged
config doesn't preserve the definition order, so we need to load aliases
table per layer.
2023-05-23 14:20:55 +09:00
Yuya Nishihara
97e2ee2868
cli: pass CommandHelper reference to WorkspaceCommandHelper constructor
...
I'll need to access LayeredConfigs there, and I don't think external callers
would want to specify each argument separately.
2023-05-23 14:20:55 +09:00
Martin von Zweigbergk
f1e2849c23
cli: add some documentation for jj sparse, including examples
2023-05-22 09:49:38 -07:00
Martin von Zweigbergk
b6691a1d23
cli: make jj sparse --list a subcommand
...
`jj sparse` is a bit different from other commands in that its `jj
sparse --list` is practically a separate command. Let's make it an
actual subcommand for consistency, and so we can more cleanly add
additional flags for `jj sparse list` in the future. I moved all the
other arguments to `jj sparse set`. I'm not sure if `jj sparse set
--reset` would have been better as `jj sparse reset`, but it is
technically just updating the sparse patterns just like the other
arguments (`--clear`, `--add` , `--remove`).
2023-05-22 09:49:38 -07:00
dependabot[bot]
3575c1f499
cargo: bump digest from 0.10.6 to 0.10.7
...
Bumps [digest](https://github.com/RustCrypto/traits ) from 0.10.6 to 0.10.7.
- [Commits](https://github.com/RustCrypto/traits/compare/digest-v0.10.6...digest-v0.10.7 )
---
updated-dependencies:
- dependency-name: digest
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-05-22 16:16:04 +00:00
dependabot[bot]
d8d8fcff2f
cargo: bump clap_complete from 4.2.3 to 4.3.0
...
Bumps [clap_complete](https://github.com/clap-rs/clap ) from 4.2.3 to 4.3.0.
- [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.2.3...clap_complete-v4.3.0 )
---
updated-dependencies:
- dependency-name: clap_complete
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-05-22 16:13:55 +00:00
Martin von Zweigbergk
6a9b527987
tests: test lookup of prefixes from the log output just about
...
It's easier to follow the test if we try to resolve commits from the
`jj log` output just above. That's what we did until I changed it away
from that without thinking in fcda05c69b
2023-05-22 07:02:32 -07:00
Martin von Zweigbergk
5d2872d76f
tests: restore effectiveness of prefix among hidden commits
...
When I added `revsets.short-prefixes` in 20ef171d7a
2023-05-22 07:02:32 -07:00
Martin von Zweigbergk
a72898000f
tests: avoid hardcoding commit/operation ids when possible
...
Hardcoded ids cannot be updated with `insta`.
2023-05-22 07:02:32 -07:00
Martin von Zweigbergk
0e18757610
tests: include description in test_git_colocated log template
...
I think this makes the tests a little clearer.
2023-05-22 07:02:32 -07:00
