mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-27 23:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

rewrite: drop now-unnecessary updating of branches map

Browse source 
Since we update all branches at the end now, we never update them in
several steps, so there are no intermediate locations we need to
remember.
This commit is contained in:
Martin von Zweigbergk 2024-03-23 09:29:29 -07:00 committed by Martin von Zweigbergk
parent 5e8d7f8c6f
commit 0481e67dfd
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/src/rewrite.rs
View file

@ -476,12 +476,6 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
if let Some(branch_names) = self.branches.get(&old_commit_id).cloned() { if let Some(branch_names) = self.branches.get(&old_commit_id).cloned() {
let mut branch_updates = vec![]; let mut branch_updates = vec![];
for branch_name in &branch_names { for branch_name in &branch_names {
for new_commit_id in &new_commit_ids {
self.branches
.entry(new_commit_id.clone())
.or_default()
.insert(branch_name.clone());
}
let local_target = self.mut_repo.get_local_branch(branch_name); let local_target = self.mut_repo.get_local_branch(branch_name);
for old_add in local_target.added_ids() { for old_add in local_target.added_ids() {
if *old_add == old_commit_id { if *old_add == old_commit_id {