From a31ca0cd664c547cf0635f5c17e2d9ffaf5b95ba Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Thu, 7 Nov 2024 23:09:38 +0100 Subject: [PATCH] bin: Improve brain loading / creating --- bin/commands/patch.rs | 13 +------------ bin/commands/patch/review/builder.rs | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/bin/commands/patch.rs b/bin/commands/patch.rs index c1e0c650..02a068c3 100644 --- a/bin/commands/patch.rs +++ b/bin/commands/patch.rs @@ -314,18 +314,7 @@ mod interface { None => patch.latest(), }; - let brain = if let Ok(b) = Brain::load(patch_id.into(), signer.public_key(), repo.raw()) { - log::info!( - "Loaded existing brain {} for patch {}", - b.head().id(), - &patch_id - ); - b - } else { - let base = repo.raw().find_commit((*revision.base()).into())?; - Brain::new(patch_id.into(), signer.public_key(), base, repo.raw())? - }; - + let brain = Brain::load_or_new(patch_id, &revision, repo.raw(), &signer)?; let builder = ReviewBuilder::new(patch_id.into(), &signer, &repo); let queue = builder.queue(&brain, &revision)?; diff --git a/bin/commands/patch/review/builder.rs b/bin/commands/patch/review/builder.rs index b45eab18..c4ececa6 100644 --- a/bin/commands/patch/review/builder.rs +++ b/bin/commands/patch/review/builder.rs @@ -362,6 +362,27 @@ impl<'a> Brain<'a> { }) } + pub fn load_or_new( + patch: PatchId, + revision: &Revision, + repo: &'a git::raw::Repository, + signer: &'a G, + ) -> Result { + let brain = if let Ok(b) = Brain::load(patch.into(), signer.public_key(), repo) { + log::info!( + "Loaded existing brain {} for patch {}", + b.head().id(), + &patch + ); + b + } else { + let base = repo.find_commit((*revision.base()).into())?; + Brain::new(patch.into(), signer.public_key(), base, repo)? + }; + + Ok(brain) + } + /// Accept changes to the brain. pub fn accept( &mut self,