git: export git ref to parent branch when possible #6546
Conversation
This is helpful for - editors with git integration that show a warning when on an detached head (intellij etc.) - using git and jj together on a repository It is only done if there is a single parent with a single bookmark, otherwise it wouldn't be obvious which one to pick.
| mut_repo | ||
| .view() | ||
| .bookmarks() | ||
| .filter(|(_, bookmark)| bookmark.local_target == &new_head_target) |
There was a problem hiding this comment.
This is a scan over all bookmarks. The commit template uses an CommitRefsIndex to accelerate this, but as far as I can tell there's nothing to improve this available here.
There was a problem hiding this comment.
Maybe you can use local_bookmarks_for_commit()? It's not optimized in any sense, though.
| to_git_ref_name( | ||
| GitRefKind::Bookmark, | ||
| name.to_remote_symbol(REMOTE_NAME_FOR_LOCAL_GIT_REPO), | ||
| ) | ||
| .and_then(|name| { | ||
| gix::refs::FullName::try_from(BString::from(name.into_string())).ok() | ||
| }) | ||
| .map(gix::refs::Target::Symbolic) |
There was a problem hiding this comment.
I'm not sure if this is the best way to go from bookmark to gix target.
Also I don't think it it guaranteed that the bookmarks have been exported to git, so the code would have to check if the bookmark exists in git as well?
Alternatively, instead of checking if the parent jj commit has a jj bookmark, we could check if the parent git commit has a branch and check that out using gix, regardless of the jj state.
There was a problem hiding this comment.
Perhaps, we can check if <name> bookmark is in sync with <name>@git. If they point to the same commit, the bookmark would exist in Git (ignoring TOCTOU issue.) A stricter option might be to issue RefEdit to update the HEAD ref, plus noop RefEdit to update the target bookmark (to the same value.0
| @@ -1259,7 +1259,7 @@ pub fn reset_head(mut_repo: &mut MutableRepo, wc_commit: &Commit) -> Result<(), | |||
|
|
|||
| // If the first parent of the working copy has changed, reset the Git HEAD. | |||
| let old_head_target = mut_repo.git_head(); | |||
| if old_head_target != new_head_target { | |||
| if old_head_target != new_head_target || true { | |||
There was a problem hiding this comment.
Did you intend to leave the || true there? If so, what is accomplishing?
There was a problem hiding this comment.
Oh, that was just for testing. I'll remove it
| mut_repo | ||
| .view() | ||
| .bookmarks() | ||
| .filter(|(_, bookmark)| bookmark.local_target == &new_head_target) |
There was a problem hiding this comment.
Maybe you can use local_bookmarks_for_commit()? It's not optimized in any sense, though.
| to_git_ref_name( | ||
| GitRefKind::Bookmark, | ||
| name.to_remote_symbol(REMOTE_NAME_FOR_LOCAL_GIT_REPO), | ||
| ) | ||
| .and_then(|name| { | ||
| gix::refs::FullName::try_from(BString::from(name.into_string())).ok() | ||
| }) | ||
| .map(gix::refs::Target::Symbolic) |
There was a problem hiding this comment.
Perhaps, we can check if <name> bookmark is in sync with <name>@git. If they point to the same commit, the bookmark would exist in Git (ignoring TOCTOU issue.) A stricter option might be to issue RefEdit to update the HEAD ref, plus noop RefEdit to update the target bookmark (to the same value.0
| if self.data.parents.len() == 1 { | ||
| Some(&self.data.parents[0]) | ||
| } else { | ||
| None | ||
| } |
There was a problem hiding this comment.
nit: .as_slice() then pattern match?
This is helpful for
It is only done if there is a single parent with a single bookmark, otherwise it wouldn't be obvious which one to pick.
Checklist
CHANGELOG.md