git init: add option to track local bookmarks #5279
Conversation
bryceberger
force-pushed
the
bryce/push-nykszoowpmuu
branch
from
767e203 to
2c74e80
Compare
bryceberger
force-pushed
the
bryce/push-nykszoowpmuu
branch
2 times, most recently
from
ebf10e9 to
9680ce3
Compare
cli/src/commands/git/init.rs
Outdated
| for (name, remote_name) in &pairs { | ||
| repo.track_remote_bookmark(name, remote_name); | ||
| } |
There was a problem hiding this comment.
Just fyi, this can move local bookmark if remote is ahead of (or diverged from) the local bookmark, as jj bookmark track would do. It might be better to document the behavior. See also #1862
There was a problem hiding this comment.
I think it would make more sense to only track if local and remote are the same, and print the current hint text if they're different.
There was a problem hiding this comment.
or if local is ahead of remote? local == remote might be too strict.
bryceberger
force-pushed
the
bryce/push-nykszoowpmuu
branch
from
9680ce3 to
874bf8f
Compare
Uses the same list of bookmarks that is otherwise printed to the user as local bookmarks not associated with their remote. Essentially, just automatically runs the hinted `jj bookmark track ...`. If a bookmark is not at the same position as a given remote, will skip tracking that remote.
bryceberger
force-pushed
the
bryce/push-nykszoowpmuu
branch
from
874bf8f to
cea7fe7
Compare
| let remote_added = remote_ref.target.added_ids().cloned().collect(); | ||
| let Ok(ahead_of_remote) = RevsetExpression::commits(remote_added) | ||
| .descendants() | ||
| .evaluate(repo) | ||
| .map(|r| r.containing_fn()) | ||
| else { | ||
| return Some(Err(format!("{name}@{remote_name}"))); | ||
| }; | ||
|
|
||
| if local_target | ||
| .added_ids() | ||
| .any(|add| ahead_of_remote(add).unwrap_or(false)) | ||
| { |
There was a problem hiding this comment.
@yuja would like you to look at this. My intent was:
- get descendants of remote ref
- check if local ref is contained in above set
Unsure if this is the best way to do that, or if that's exactly what's wanted.
Also, this triggers if any of the added_ids() are a descendant. Pretty sure this is what's wanted, as it will trigger even if local has merged in another branch.
There was a problem hiding this comment.
Perhaps, you can use repo.index().is_ancestor(). It's also good to use refs::merge_ref_targets() and check the merge result, something like:
let base_target = remote_ref.tracking_target();
let merged_target = merge_ref_targets(index, local_target, base_target, &remote_ref.target);
merged_target == local_target
Uses the same list of bookmarks that is otherwise printed to the user as local bookmarks not associated with their remote. Essentially, just automatically runs the hinted
jj bookmark track ....I use an external tool that is not jj-aware to manage my repositories (ghq). As such, I find myself running
jj git init --colocatefairly often. Almost always, I immediately follow the hint and copy and paste the givenjj bookmark track ...command. Would like to just skip that step.Checklist
If applicable:
CHANGELOG.md