Remove open commits (see discussion #321) #390
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
`DescendantRebaser::update_checkouts()` only cares about the first element in `new_commit_ids`, so let's just pass in a single commit ID instead.
Since we're thinking of removing the concept of open and closed commits, we can't use that open/closed distinction to decide to not push some commits.
I'm about to change how `jj checkout` works w.r.t. open/closed commits (and in particular by moving some logic from the library crate to the CLI), so let's make sure we have some test coverage.
This is a little refactoring to prepare for removing the `open` flag off of commits.
I think it's conceptually simpler to create a new commit and set that commit to be the checkout in each workspace than to check out the commit in one workspace and edit in the others.
When a commit gets rewritten, we update any workspaces pointing to the old commit to check out the rewritten commit. If the rewritten commit is closed, we create a new working-copy commit on top of it. Since we're thinking about removing the open/closed concept, we need to make `jj close` manually create the new working-copy commit.
When rebasing commits after rewrites, we also update all workspaces' checkouts. If the new commit is closed, we create a new commit on top. Since we're hoping to remove the open/closed concept, we need a new condition. I considered creating a new commit on top if the change ID was different from before the rewrite. However, that would make at least `jj split` more complicated because it makes the first commit keep the change ID but it wants the second commit to be checked out. This patch instead creates the new commit on top only when the original commit was abandoned.
spectral54
reviewed
Jul 1, 2022
By adding `ui.open-commits=false` in your config, you can now make `jj checkout` always create a new working-copy commit on top of the specified commit. If the config is set, open commits will also appear in the same color as closed commits in `jj log` etc. This will let some of us experiment with the new UX before we decide if it's a good idea or not. I left `jj close` in place because it's useful for setting a description and creating a new commit in one step. I didn't mention the new config in the release notes because I hope we can reach a decision and remove the config before the next release.
spectral54
approved these changes
Jul 1, 2022
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