copies: filter rename source entries by CopiesTreeDiffStream #4313
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
…caller This is simpler, and I think it's generally better to not spawn executor in library code.
Git reports a rename source as deleted if the rename target is excluded. I think that's because Git restricts the search space to the specified paths. For example, Git doesn't also recognize a rename if the source path is excluded whereas jj does. I don't think we need to copy the exact behavior of Git, so this patch just moves matcher application to earlier stage. This change will help remove collect_copied_sources(). The added get_copy_records() helper could be moved to jj_lib, but we'll probably want a stream version of this function in library, and writing a stream adapter isn't as simple as iterator.
All for/has_source/target() combinations are added for API consistency.
Rename source entries will be handled by CopiesTreeDiffStream.
martinvonz
reviewed
Aug 21, 2024
martinvonz
approved these changes
Aug 22, 2024
So that it can be wrapped within a while loop + continue.
yuja
force-pushed
the
push-skskwqxzwyur
branch
from
9a39501 to
a29fcc0
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.
Checklist
If applicable:
CHANGELOG.md