cli: abandon: delete bookmarks pointing to abandoned commits #5392
Conversation
This file contains hidden or 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
reviewed
Jan 19, 2025
c5256f9 to
078d0e5
Compare
I'll make "jj abandon" delete bookmarks by default. This could be handled by cmd_abandon(), but we'll need a repo API if we also want to change the behavior of "jj rebase --skip-emptied".
…tionally This will help implement "jj abandon --retain-bookmarks".
Based on the discussion in jj-vcs#3505, I think the sliding behavior isn't favored at least for "jj abandon". This patch changes the default to delete bookmarks. "jj rebase --skip-emptied" can also be updated if needed. It might be good for consistency. However, I'm skeptical about changing the default of the internal API. It's not easy to add generic reporting mechanism for deleted/abandoned bookmarks. If we added one in report_repo_changes(), redundant message would be printed on "jj git fetch". So I think callers should enable the deletion explicitly. Closes jj-vcs#3505
078d0e5 to
ff2040c
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.
Closes #3505
Checklist
If applicable:
CHANGELOG.md