Refactor MutRepo to make DescendantRebaser private (pt 2) #2738
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
4 tasks
ilyagr
force-pushed
the
rm-descreb-api-pt2
branch
18 times, most recently
from
ebc3d87 to
fdcd7cf
Compare
yuja
approved these changes
Dec 31, 2023
martinvonz
approved these changes
Dec 31, 2023
…ed APIs This removes uses of `DescendantRebaser::new` or `MutRepo::create_descendant_rebaser` from most tests. The exceptions are the tests having to do with abandoning empty commits on rebase, since adjusting those is a bit more elaborate (see follow-up commits).
A TODO left over from a previous PR
…mmits This commit is a little out of place in this sequence, but it seems to make more sense for MutRepo to own these maps. @yuja [pointed out] that any tests written using `create_descendant_rebaser` now need to do this cleanup, but there are no longer any such tests after the previous commits and a follow-up commit removes `create_descendant_rebaser` entirely. [pointed out]: jj-vcs#2737 (comment)
This completes the process of removing DescendantRebaser-related APIs from tests. It requires creating some new test utils and a new `rebase_descendants_with_option_return_map`.
Finally, there are no test uses of these APIs. `DescendantRebaser` is made `pub(crate)`, since it is used by `MutRepo`. Other functions are made private.
ilyagr
commented
Jan 2, 2024
Inline `create_descendant_commits`, move some functionality of `DescendantRebaser::rebase_next` to `rebase_all`, a seemingly more logical location.
ilyagr
force-pushed
the
rm-descreb-api-pt2
branch
from
fdcd7cf to
2624f18
Compare
ilyagr
added a commit
to ilyagr/jj
that referenced
this pull request
Jan 2, 2024
…sumes the rebaser This prevents a clone and does not affect the public API, as suggested in jj-vcs#2738 (comment).
ilyagr
added a commit
to ilyagr/jj
that referenced
this pull request
Jan 2, 2024
…sumes the rebaser This prevents a clone and does not affect the public API, as suggested in jj-vcs#2738 (comment).
This was referenced Jan 2, 2024
ilyagr
added a commit
that referenced
this pull request
Jan 2, 2024
…sumes the rebaser This prevents a clone and does not affect the public API, as suggested in #2738 (comment).
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 finishes up #2737, making DescendantRebaser private to the library crate, and removing the use of the newly internal APIs from all the tests.
Checklist
If applicable: