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

Make a minor simplification to CommitBuilder::write

Browse source 
There's no need to have a block of code at the beginning of the function to
cache the rewrite source id. We can simply check the necessary condition before
calling record_rewritten_commit.

This tweak makes the function a little easier to read since we don't check the
condition until we're ready to do the work.
This commit is contained in:
Evan Mesterhazy 2024-03-01 18:34:16 -05:00 committed by Evan Mesterhazy
parent 276276ea01
commit b8aa9a1a2b
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/src/commit_builder.rs
View file

@ -178,13 +178,6 @@ impl CommitBuilder<'_> {
} }
pub fn write(mut self) -> BackendResult<Commit> { pub fn write(mut self) -> BackendResult<Commit> {
let mut rewrite_source_id = None;
if let Some(rewrite_source) = self.rewrite_source {
if *rewrite_source.change_id() == self.commit.change_id {
rewrite_source_id.replace(rewrite_source.id().clone());
}
}
let sign_settings = &self.sign_settings; let sign_settings = &self.sign_settings;
let store = self.mut_repo.store(); let store = self.mut_repo.store();
@ -202,9 +195,11 @@ impl CommitBuilder<'_> {
let commit = self let commit = self
.mut_repo .mut_repo
.write_commit(self.commit, signing_fn.as_deref_mut())?; .write_commit(self.commit, signing_fn.as_deref_mut())?;
if let Some(rewrite_source_id) = rewrite_source_id { if let Some(rewrite_source) = self.rewrite_source {
self.mut_repo if rewrite_source.change_id() == commit.change_id() {
.record_rewritten_commit(rewrite_source_id, commit.id().clone()) self.mut_repo
.record_rewritten_commit(rewrite_source.id().clone(), commit.id().clone());
}
} }
Ok(commit) Ok(commit)
} }