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

cli: avoid an unnecessary read of the working copy commit

Browse source
This commit is contained in:
Martin von Zweigbergk 2022-01-16 17:35:16 -08:00
parent 9ce56f6cb7
commit 6fcd3b3af6
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/commands.rs
View file

@ -690,12 +690,13 @@ fn update_working_copy(
wc: &mut WorkingCopy,
) -> Result<Option<CheckoutStats>, CommandError> {
let old_commit_id = wc.current_commit_id();
let new_commit = repo.store().get_commit(repo.view().checkout()).unwrap();
if *new_commit.id() == old_commit_id {
let new_commit_id = repo.view().checkout();
if *new_commit_id == old_commit_id {
return Ok(None);
}
// TODO: CheckoutError::ConcurrentCheckout should probably just result in a
// warning for most commands (but be an error for the checkout command)
let new_commit = repo.store().get_commit(new_commit_id).unwrap();
let stats = wc.check_out(new_commit.clone()).map_err(|err| {
CommandError::InternalError(format!(
"Failed to check out commit {}: {}",