mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 10:07:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

cli: extract update_working_copy() from finish_transaction()

Browse source 
I'll move some bits from the free update_working_copy() function to
deduplicate parse_commit_summary_template() call.
This commit is contained in:
Yuya Nishihara 2023-02-22 19:47:52 +09:00
parent 61d6604d3d
commit 3dd8b9a5f0
1 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/cli_util.rs
View file

@ -947,6 +947,34 @@ impl WorkspaceCommandHelper {
Ok(()) Ok(())
} }
fn update_working_copy(
&mut self,
ui: &mut Ui,
maybe_old_commit: Option<&Commit>,
) -> Result<(), CommandError> {
assert!(self.may_update_working_copy);
let workspace_id = self.workspace_id().to_owned();
let summary_template = parse_commit_summary_template(
&self.repo,
&workspace_id,
&self.template_aliases_map,
&self.settings,
)
.expect("parse error should be confined by WorkspaceCommandHelper::new()");
let stats = update_working_copy(
ui,
&self.repo,
&workspace_id,
self.workspace.working_copy_mut(),
maybe_old_commit,
&summary_template,
)?;
if let Some(stats) = stats {
print_checkout_stats(ui, stats)?;
}
Ok(())
}
pub fn start_transaction(&mut self, description: &str) -> WorkspaceCommandTransaction { pub fn start_transaction(&mut self, description: &str) -> WorkspaceCommandTransaction {
let tx = start_repo_transaction(&self.repo, &self.settings, &self.string_args, description); let tx = start_repo_transaction(&self.repo, &self.settings, &self.string_args, description);
WorkspaceCommandTransaction { helper: self, tx } WorkspaceCommandTransaction { helper: self, tx }
@ -977,25 +1005,7 @@ impl WorkspaceCommandHelper {
.transpose()?; .transpose()?;
self.repo = tx.commit(); self.repo = tx.commit();
if self.may_update_working_copy { if self.may_update_working_copy {
let workspace_id = self.workspace_id().to_owned(); self.update_working_copy(ui, maybe_old_commit.as_ref())?;
let summary_template = parse_commit_summary_template(
&self.repo,
&workspace_id,
&self.template_aliases_map,
&self.settings,
)
.expect("parse error should be confined by WorkspaceCommandHelper::new()");
let stats = update_working_copy(
ui,
&self.repo,
&workspace_id,
self.workspace.working_copy_mut(),
maybe_old_commit.as_ref(),
&summary_template,
)?;
if let Some(stats) = stats {
print_checkout_stats(ui, stats)?;
}
} }
let settings = &self.settings; let settings = &self.settings;
if settings.user_name() == UserSettings::user_name_placeholder() if settings.user_name() == UserSettings::user_name_placeholder()