Add separate stream item type with copy info #4300
Merged
Conversation
This file contains 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
martinvonz
force-pushed
the
push-kprmmrplmxwn
branch
from
064ad20 to
65ffd55
Compare
fowles
approved these changes
Aug 18, 2024
martinvonz
force-pushed
the
push-kprmmrplmxwn
branch
from
65ffd55 to
0655231
Compare
Copy/rename handling is complicated. It seems worth having a module for it. I'm going to add more content to it next.
The support for copy tracing is already simply added to the stream just before yielding the item, so we can easily implement it as a stream adapter. That ensures that we use the same logic for the iterator- and stream-based versions. More importantly, it enables further cleanups and a simpler interface.
We now have only one caller, and it's in a different module, so it makes more sense to move it there.
I plan to provide a richer version of `TreeDiffEntry` with copy info (and to make `TreeDiffEntry` itself "poorer"). Most callers want to know about copies/renames, but at least working copy implementations probably don't. This patch adds separate `diff_stream()` and `diff_stream_with_copies()` so we can provide the simpler interface for callers that don't need copy info.
The goal is to have the new item type know if it represent a copy, a rename, a deleted rename source, or a regular copy-unrelated item.
martinvonz
force-pushed
the
push-kprmmrplmxwn
branch
from
0655231 to
d1720cb
Compare
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.
@fowles, I think this is a step on the way to making the behavior around deleted rename sources more consistent.
Checklist
If applicable:
CHANGELOG.md