mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-09 05:58:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

git: calculate refs to be imported first, then apply in later pass

Browse source 
This allows us to use mut_repo.view() reference during diff computation.
This commit is contained in:
Yuya Nishihara 2023-08-05 07:13:09 +09:00
parent feaddf6e51
commit a2b8d1cc3a
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/src/git.rs
View file

@ -206,6 +206,7 @@ pub fn import_some_refs(
mut_repo.set_git_head_target(RefTarget::absent());
}
// Calculate diff of old/new git refs
let mut changed_git_refs = BTreeMap::new();
let git_repo_refs = git_repo.references()?;
for git_repo_ref in git_repo_refs {
@ -232,10 +233,6 @@ pub fn import_some_refs(
let old_target = jj_view_git_refs.remove(full_name).flatten();
let new_target = RefTarget::normal(id.clone());
if new_target != old_target {
prevent_gc(git_repo, &id)?;
mut_repo.set_git_ref_target(full_name, RefTarget::normal(id.clone()));
let commit = store.get_commit(&id).unwrap();
mut_repo.add_head(&commit);
changed_git_refs.insert(ref_name, (old_target, new_target));
}
}
@ -245,11 +242,23 @@ pub fn import_some_refs(
if !git_ref_filter(&ref_name) {
continue;
}
mut_repo.set_git_ref_target(&full_name, RefTarget::absent());
changed_git_refs.insert(ref_name, (target, RefTarget::absent()));
}
// Import new heads
for id in changed_git_refs
.values()
.flat_map(|(_, new_git_target)| new_git_target.added_ids())
{
prevent_gc(git_repo, id)?;
let commit = store.get_commit(id).unwrap();
mut_repo.add_head(&commit);
}
for (ref_name, (old_git_target, new_git_target)) in &changed_git_refs {
// Apply the change that happened in git since last time we imported refs
let full_name = to_git_ref_name(ref_name).unwrap();
mut_repo.set_git_ref_target(&full_name, new_git_target.clone());
mut_repo.merge_single_ref(ref_name, old_git_target, new_git_target);
// If a git remote-tracking branch changed, apply the change to the local branch
// as well