cli: op diff: use predecessors information to pair old/new commits #6754 #6757
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fa7708b to
52d0bc7
Compare
This was referenced Jun 23, 2025
…se_lazy() This will be the initial step of operation range iterator. I think it can also be a building block of various filtered operation iterators (such as operations filtered by bookmark changes.) topo_order_reverse_chunked() returns Result<[T], E> instead of [Result<T, E>] because the former was easier to implement. I'm not sure which one would be generally useful, but I think the caller would do some post processing, so getting [T] might be handy.
At merge point, ancestor operations are visited in order of the parents list, so I don't think head_ops should be sorted either. walk_ancestors([op]) should be identical to [op] + walk_ancestors(op.parents()).
There are a couple of hand-rolled implementations of roots..heads query, and I'm going to add one more. It's wasteful to test these one by one. The added iterator will have to scan roots::heads range eagerly instead of ::roots. I think this is good for typical use cases where roots are closer to heads than the root().
This should produce better results at squash/split operations. Since "op diff" targets can be flipped, this patch implements basic handling of reversed predecessors graph. It should also work for sibling operations so long as there are no multiple greatest common ancestors. resolve_transitive_edges() takes additional "start" parameter. It might be useful in order to omit transitive edges in evolution log. Since walk_predecessors() usually tracks a single commit, it would be wasteful to build a fully-resolved predecessors graph.
martinvonz
approved these changes
Jun 26, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#6754 (recreated)
Checklist
If applicable:
CHANGELOG.mdREADME.md,docs/,demos/)cli/src/config-schema.json)