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

cli: don't print "Working copy now at:" when it's unchanged

Browse source 
When I recently changed the working copy to not have a commit ID
(e098c01935), I lost the check in `update_working_copy()` in
`commands.rs` that made us not print "Working copy now at: " if the
commit was unchanged. Now we always print, which is unnecessary and
confusing (it makes it seem like the commit changed even if it
didn't). Let's restore the check.
This commit is contained in:
Martin von Zweigbergk 2022-02-19 23:44:53 -08:00 committed by Martin von Zweigbergk
parent 2a6ab8b6fc
commit 59eee7e918
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/commands.rs
View file

@ -33,7 +33,7 @@ use clap::{crate_version, Arg, ArgMatches, Command};
use criterion::Criterion; use criterion::Criterion;
use git2::{Oid, Repository}; use git2::{Oid, Repository};
use itertools::Itertools; use itertools::Itertools;
use jujutsu_lib::backend::{BackendError, CommitId, Timestamp, TreeId, TreeValue}; use jujutsu_lib::backend::{BackendError, CommitId, Timestamp, TreeValue};
use jujutsu_lib::commit::Commit; use jujutsu_lib::commit::Commit;
use jujutsu_lib::commit_builder::CommitBuilder; use jujutsu_lib::commit_builder::CommitBuilder;
use jujutsu_lib::dag_walk::topo_order_reverse; use jujutsu_lib::dag_walk::topo_order_reverse;
@ -631,11 +631,11 @@ impl WorkspaceCommandHelper {
if self.working_copy_shared_with_git { if self.working_copy_shared_with_git {
self.export_head_to_git(mut_repo)?; self.export_head_to_git(mut_repo)?;
} }
let maybe_old_tree_id = tx let maybe_old_commit = tx
.base_repo() .base_repo()
.view() .view()
.get_checkout(&self.workspace_id()) .get_checkout(&self.workspace_id())
.map(|commit_id| store.get_commit(commit_id).unwrap().tree_id().clone()); .map(|commit_id| store.get_commit(commit_id).unwrap());
self.repo = tx.commit(); self.repo = tx.commit();
if self.may_update_working_copy { if self.may_update_working_copy {
let stats = update_working_copy( let stats = update_working_copy(
@ -643,7 +643,7 @@ impl WorkspaceCommandHelper {
&self.repo, &self.repo,
&self.workspace_id(), &self.workspace_id(),
self.workspace.working_copy_mut(), self.workspace.working_copy_mut(),
maybe_old_tree_id.as_ref(), maybe_old_commit.as_ref(),
)?; )?;
if let Some(stats) = stats { if let Some(stats) = stats {
if stats.added_files > 0 || stats.updated_files > 0 || stats.removed_files > 0 { if stats.added_files > 0 || stats.updated_files > 0 || stats.removed_files > 0 {
@ -786,7 +786,7 @@ fn update_working_copy(
repo: &Arc<ReadonlyRepo>, repo: &Arc<ReadonlyRepo>,
workspace_id: &WorkspaceId, workspace_id: &WorkspaceId,
wc: &mut WorkingCopy, wc: &mut WorkingCopy,
old_tree_id: Option<&TreeId>, old_commit: Option<&Commit>,
) -> Result<Option<CheckoutStats>, CommandError> { ) -> Result<Option<CheckoutStats>, CommandError> {
let new_commit_id = match repo.view().get_checkout(workspace_id) { let new_commit_id = match repo.view().get_checkout(workspace_id) {
Some(new_commit_id) => new_commit_id, Some(new_commit_id) => new_commit_id,
@ -796,11 +796,16 @@ fn update_working_copy(
} }
}; };
let new_commit = repo.store().get_commit(new_commit_id).unwrap(); let new_commit = repo.store().get_commit(new_commit_id).unwrap();
let stats = if Some(new_commit.tree_id()) != old_tree_id { let old_tree_id = old_commit.map(|commit| commit.tree_id().clone());
let stats = if Some(new_commit.tree_id()) != old_tree_id.as_ref() {
// TODO: CheckoutError::ConcurrentCheckout should probably just result in a // TODO: CheckoutError::ConcurrentCheckout should probably just result in a
// warning for most commands (but be an error for the checkout command) // warning for most commands (but be an error for the checkout command)
let stats = wc let stats = wc
.check_out(repo.op_id().clone(), old_tree_id, &new_commit.tree()) .check_out(
repo.op_id().clone(),
old_tree_id.as_ref(),
&new_commit.tree(),
)
.map_err(|err| { .map_err(|err| {
CommandError::InternalError(format!( CommandError::InternalError(format!(
"Failed to check out commit {}: {}", "Failed to check out commit {}: {}",
@ -812,9 +817,11 @@ fn update_working_copy(
} else { } else {
None None
}; };
ui.write("Working copy now at: ")?; if Some(&new_commit) != old_commit {
ui.write_commit_summary(repo.as_repo_ref(), workspace_id, &new_commit)?; ui.write("Working copy now at: ")?;
ui.write("\n")?; ui.write_commit_summary(repo.as_repo_ref(), workspace_id, &new_commit)?;
ui.write("\n")?;
}
Ok(stats) Ok(stats)
} }