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

cli: use right workspace when checking if working copy has changed (#13)

Browse source 
Before committing the working copy, we check if the working copy is
checked out to the commit we expect based on the repo's view. We
always use the default workspace's checkout, so we need to fix that.
This commit is contained in:
Martin von Zweigbergk 2022-01-30 22:26:52 -08:00
parent 9cabb7eb35
commit 48bbb3abc0
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/commands.rs
View file

@ -472,12 +472,20 @@ impl WorkspaceCommandHelper {
}
let repo = self.repo.clone();
let workspace_id = self.workspace_id();
let checkout_id = match repo.view().get_checkout(&self.workspace_id()) {
Some(checkout_id) => checkout_id.clone(),
None => {
// If the workspace has been deleted, it's unclear what to do, so we just skip
// committing the working copy.
return Ok(());
}
};
let mut locked_wc = self.workspace.working_copy_mut().start_mutation();
// Check if the working copy commit matches the repo's view. It's fine if it
// doesn't, but we'll need to reload the repo so the new commit is
// in the index and view, and so we don't cause unnecessary
// divergence.
let checkout_commit = repo.store().get_commit(repo.view().checkout()).unwrap();
let checkout_commit = repo.store().get_commit(&checkout_id).unwrap();
let wc_commit_id = locked_wc.old_commit_id().clone();
if *checkout_commit.id() != wc_commit_id {
let wc_operation_data = self