martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-21 18:58:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

rewrite: always use MutableRepo::edit() when updating checkouts

Browse Source 
I think it's conceptually simpler to create a new commit and set that
commit to be the checkout in each workspace than to check out the
commit in one workspace and edit in the others.
This commit is contained in:
Martin von Zweigbergk 2022-06-22 15:13:08 -07:00 committed by Martin von Zweigbergk
parent bd1a8bd930
commit 0e812220af
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/src/rewrite.rs
View File

@ -349,19 +349,18 @@ impl<'settings, 'repo> DescendantRebaser<'settings, 'repo> {
}
let new_commit = self.mut_repo.store().get_commit(new_commit_id)?;
// If several workspaces had the same old commit checked out, we want them all
// 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.
let new_checkout_commit = if new_commit.is_open() {
self.mut_repo
.edit(workspaces_to_update[0].clone(), &new_commit);
new_commit
} else {
self.mut_repo
.check_out(workspaces_to_update[0].clone(), self.settings, &new_commit)
CommitBuilder::for_open_commit(
self.settings,
self.mut_repo.store(),
new_commit.id().clone(),
new_commit.tree_id().clone(),
)
.write_to_repo(self.mut_repo)
};
for workspace_id in workspaces_to_update.into_iter().skip(1) {
for workspace_id in workspaces_to_update.into_iter() {
self.mut_repo.edit(workspace_id, &new_checkout_commit);
}
Ok(())