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

cli: on finish_transaction(), look up check-out commit by caller

Browse source 
So the caller can print a commit summary.

It's getting less clear why cli_util::update_working_copy() takes a repo
argument. It might be better to extract a helper struct that operates on
repo + workspace (minus CLI stuff), and move it to the lib crate.
This commit is contained in:
Yuya Nishihara 2023-02-22 19:24:05 +09:00
parent 3dd8b9a5f0
commit 1cb473ab2a
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/cli_util.rs
View file

@ -953,6 +953,13 @@ impl WorkspaceCommandHelper {
maybe_old_commit: Option<&Commit>, maybe_old_commit: Option<&Commit>,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
assert!(self.may_update_working_copy); assert!(self.may_update_working_copy);
let new_commit = match self.get_wc_commit_id() {
Some(commit_id) => self.repo.store().get_commit(commit_id)?,
None => {
// It seems the workspace was deleted, so we shouldn't try to update it.
return Ok(());
}
};
let workspace_id = self.workspace_id().to_owned(); let workspace_id = self.workspace_id().to_owned();
let summary_template = parse_commit_summary_template( let summary_template = parse_commit_summary_template(
&self.repo, &self.repo,
@ -964,9 +971,9 @@ impl WorkspaceCommandHelper {
let stats = update_working_copy( let stats = update_working_copy(
ui, ui,
&self.repo, &self.repo,
&workspace_id,
self.workspace.working_copy_mut(), self.workspace.working_copy_mut(),
maybe_old_commit, maybe_old_commit,
&new_commit,
&summary_template, &summary_template,
)?; )?;
if let Some(stats) = stats { if let Some(stats) = stats {
@ -1510,19 +1517,11 @@ fn append_large_revsets_hint_if_multiple_revisions(err: CommandError) -> Command
pub fn update_working_copy( pub fn update_working_copy(
ui: &mut Ui, ui: &mut Ui,
repo: &Arc<ReadonlyRepo>, repo: &Arc<ReadonlyRepo>,
workspace_id: &WorkspaceId,
wc: &mut WorkingCopy, wc: &mut WorkingCopy,
old_commit: Option<&Commit>, old_commit: Option<&Commit>,
new_commit: &Commit,
summary_template: &dyn Template<Commit>, summary_template: &dyn Template<Commit>,
) -> Result<Option<CheckoutStats>, CommandError> { ) -> Result<Option<CheckoutStats>, CommandError> {
let new_commit_id = match repo.view().get_wc_commit_id(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);
}
};
let new_commit = repo.store().get_commit(new_commit_id)?;
let old_tree_id = old_commit.map(|commit| commit.tree_id().clone()); 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() { 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
@ -1547,9 +1546,9 @@ pub fn update_working_copy(
locked_wc.finish(repo.op_id().clone()); locked_wc.finish(repo.op_id().clone());
None None
}; };
if Some(&new_commit) != old_commit { if Some(new_commit) != old_commit {
ui.write("Working copy now at: ")?; ui.write("Working copy now at: ")?;
summary_template.format(&new_commit, ui.stdout_formatter().as_mut())?; summary_template.format(new_commit, ui.stdout_formatter().as_mut())?;
ui.write("\n")?; ui.write("\n")?;
} }
Ok(stats) Ok(stats)