mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-26 05:57:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

rewrite: inline and rewrite ref_target_update()

Browse source 
I rewrote `old_target` and `new_target` to more accurately represent
the change; the old target should be a normal (singleton) ref.
This commit is contained in:
Martin von Zweigbergk 2024-04-11 06:35:03 -07:00 committed by Martin von Zweigbergk
parent f696f5b727
commit 750002594e
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/src/rewrite.rs
View file

@ -349,14 +349,6 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
self.rebased self.rebased
} }
fn ref_target_update(old_id: CommitId, new_ids: Vec<CommitId>) -> (RefTarget, RefTarget) {
let old_ids = std::iter::repeat(old_id).take(new_ids.len());
(
RefTarget::from_legacy_form([], old_ids),
RefTarget::from_legacy_form([], new_ids),
)
}
fn update_references( fn update_references(
&mut self, &mut self,
old_commit_id: CommitId, old_commit_id: CommitId,
@ -393,8 +385,13 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
} }
} }
} }
let (old_target, new_target) =
DescendantRebaser::ref_target_update(old_commit_id, new_commit_ids); let old_target = RefTarget::normal(old_commit_id.clone());
assert!(!new_commit_ids.is_empty());
let new_target = RefTarget::from_legacy_form(
std::iter::repeat(old_commit_id).take(new_commit_ids.len() - 1),
new_commit_ids,
);
for branch_name in &branch_updates { for branch_name in &branch_updates {
self.mut_repo self.mut_repo
.merge_local_branch(branch_name, &old_target, &new_target); .merge_local_branch(branch_name, &old_target, &new_target);