mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-24 07:32:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

rewrite: pass a single new commit into update_checkouts()

Browse source 
`DescendantRebaser::update_checkouts()` only cares about the first
element in `new_commit_ids`, so let's just pass in a single commit ID
instead.
This commit is contained in:
Martin von Zweigbergk 2022-06-21 19:18:19 -07:00 committed by Martin von Zweigbergk
parent 73729e4517
commit 8667e374b8
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/src/rewrite.rs
View file

@ -295,7 +295,8 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
old_commit_id: CommitId,
new_commit_ids: Vec<CommitId>,
) -> Result<(), BackendError> {
self.update_checkouts(&old_commit_id, &new_commit_ids)?;
// We arbitrarily pick a new checkout among the candidates.
self.update_checkouts(&old_commit_id, &new_commit_ids[0])?;
if let Some(branch_names) = self.branches.get(&old_commit_id).cloned() {
let mut branch_updates = vec![];
@ -334,7 +335,7 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
fn update_checkouts(
&mut self,
old_commit_id: &CommitId,
new_commit_ids: &[CommitId],
new_commit_id: &CommitId,
) -> Result<(), BackendError> {
let mut workspaces_to_update = vec![];
for (workspace_id, checkout_id) in self.mut_repo.view().checkouts() {
@ -351,9 +352,7 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
// to have the same commit checked out afterwards as well, so we avoid
// calling MutableRepo::check_out() multiple times, since that might
// otherwise create a separate new commit for each workspace.
// We arbitrarily pick a new checkout among the candidates.
let new_commit_id = new_commit_ids[0].clone();
let new_commit = self.mut_repo.store().get_commit(&new_commit_id)?;
let new_commit = self.mut_repo.store().get_commit(new_commit_id)?;
let new_checkout_commit =
self.mut_repo
.check_out(workspaces_to_update[0].clone(), self.settings, &new_commit);