Make jj squash and jj move share more code
#3268
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-vuytzrxpnkqk
branch
3 times, most recently
from
986c315 to
a75399a
Compare
The `destination` variable we use when creating the operation log may have been replaced earlier in the code. I think this was a regression when I moved the setting of the description from `start_transaction()` to `finish_transaction()` a while ago.
This matches what we do for `jj squash`, whether it's a full or partial move. I didn't add a test since we're planning to deprecate `jj move`, and this will soon be tested via the `jj squash` tests.
I'm soon going to make `jj squash` accept either `-r` or `--from/--to`, which means `-r` will then be optional. This patch prepares for that already, since it also simplifies the code a little (and improves it so we warn if the user does `jj squash -r @ nonexistent`).
This is just a little step towards reusing the helper I just extracted from `jj move`. I had to update `test_immutable_commits.rs` because it would otherwise fail because of the merge rather than failing because of the immutable commit.
This patch makes `jj squash` us the helper I just extracted from `jj move`. I had a to add a few small features to it for that. The `test_squash_command.rs` test changed in a few cases where we do a partial squash. After this patch, we include the rebased child in the count of rebased descendants. That seems reasonable and consistent with partial squash/move further than 1 generation.
martinvonz
force-pushed
the
push-vuytzrxpnkqk
branch
from
a75399a to
df50aeb
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.
This is prep work for teaching
jj squash --from/--toand for making it support multiple--fromrevisions (and maybe multiple-rrevisions)Checklist
If applicable:
CHANGELOG.md