ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

git: import new head commits all at once

Browse source
This commit is contained in:
Yuya Nishihara 2023-09-08 11:05:54 +09:00
parent f744e5920b
commit 0c4e667e48
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/src/git.rs
View file

@ -219,10 +219,19 @@ pub fn import_some_refs(
// TODO: It might be better to obtain both git_repo and git_backend from // TODO: It might be better to obtain both git_repo and git_backend from
// mut_repo, and return error if the repo isn't backed by Git. // mut_repo, and return error if the repo isn't backed by Git.
let git_backend = store.backend_impl().downcast_ref::<GitBackend>().unwrap(); let git_backend = store.backend_impl().downcast_ref::<GitBackend>().unwrap();
// Bulk-import all reachable commits to reduce overhead of table merging.
let head_ids = itertools::chain(
&changed_git_head,
changed_git_refs.values().map(|(_, new_target)| new_target),
)
.flat_map(|target| target.added_ids());
let heads_imported = git_backend.import_head_commits(head_ids).is_ok();
let mut head_commits = Vec::new(); let mut head_commits = Vec::new();
// TODO: Import commits in bulk (but we'll need to adjust error handling.)
let get_commit = |id| { let get_commit = |id| {
// If bulk-import failed, try again to find bad head or ref.
if !heads_imported {
git_backend.import_head_commits([id])?; git_backend.import_head_commits([id])?;
}
store.get_commit(id) store.get_commit(id)
}; };
if let Some(new_head_target) = &changed_git_head { if let Some(new_head_target) = &changed_git_head {