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

cli: update working copy to current workspace's checkout (#13)

Browse source 
When updating the working copy after committing a transaction, we
should update it based on the right checkout.
This commit is contained in:
Martin von Zweigbergk 2022-01-30 22:51:09 -08:00
parent 5f38213e91
commit daaf735e4b
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

@ -615,6 +615,7 @@ impl WorkspaceCommandHelper {
let stats = update_working_copy(
ui,
&self.repo,
&self.workspace_id(),
self.workspace.working_copy_mut(),
maybe_old_commit_id.as_ref(),
)?;
@ -763,10 +764,17 @@ fn matcher_from_values(
fn update_working_copy(
ui: &mut Ui,
repo: &Arc<ReadonlyRepo>,
workspace_id: &WorkspaceId,
wc: &mut WorkingCopy,
old_commit_id: Option<&CommitId>,
) -> Result<Option<CheckoutStats>, CommandError> {
let new_commit_id = repo.view().checkout();
let new_commit_id = match repo.view().get_checkout(workspace_id) {
Some(new_commit_id) => new_commit_id,
None => {
// It seems the workspace was deleted, so we shouldn't try to update it.
return Ok(None);
}
};
if Some(new_commit_id) == old_commit_id {
return Ok(None);
}