Make jj squash <path> not rewrite unmatched commits
#3602
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
yuja
approved these changes
Apr 30, 2024
martinvonz
force-pushed
the
push-xpztonuknpkq
branch
from
8df02a8 to
8fb8de3
Compare
We didn't have any tests with `jj squash` with multiple source commits and no matching paths.
We already have two uses for this function and I think we're soon going to have more. The function record the old commit as abandoned with the new parents, which is typically what you want. We could record it as abandoned with the old parents instead but then we'd have to do an extra iteration to find the parents when rebasing any children. It would also be confusing if `rewriter.set_parents(new_parents).record_abandoned_commit()` didn't respect the new parents.
Before this patch, we would abandon the source commit if it became empty after applying the reverse diff. This changes that condition to the equivalent condition of the selected tree being the source commit's original tree. This will help us rewrite the code to use `transform_descendants()`.
This is just a little refactoring to prepare for using `transform_descendants()`.
martinvonz
force-pushed
the
push-xpztonuknpkq
branch
from
8fb8de3 to
eaafd7a
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