fix: create git graph log to after doing a fetch
This commit is contained in:
parent
4f6669548c
commit
6efe82d5b6
3 changed files with 67 additions and 103 deletions
|
@ -1,7 +1,7 @@
|
|||
//
|
||||
use actix::prelude::*;
|
||||
|
||||
use tracing::{debug, info, instrument, Instrument as _};
|
||||
use tracing::{debug, instrument, Instrument as _};
|
||||
|
||||
use crate::{
|
||||
repo::{
|
||||
|
@ -13,8 +13,8 @@ use crate::{
|
|||
};
|
||||
|
||||
use git_next_core::git::{
|
||||
self,
|
||||
validation::positions::{validate, Error, Positions},
|
||||
UserNotification,
|
||||
};
|
||||
|
||||
impl Handler<ValidateRepo> for RepoActor {
|
||||
|
@ -63,26 +63,19 @@ impl Handler<ValidateRepo> for RepoActor {
|
|||
};
|
||||
logger(self.log.as_ref(), "have repo config");
|
||||
|
||||
info!("collecting git graph log");
|
||||
let git_log = git::graph::log(&self.repo_details);
|
||||
info!(?git_log, "collected git graph log");
|
||||
self.update_tui_log(git_log.clone());
|
||||
info!("sent to ui git graph log");
|
||||
|
||||
match validate(
|
||||
&**open_repository,
|
||||
&self.repo_details,
|
||||
&repo_config,
|
||||
git_log,
|
||||
) {
|
||||
Ok(Positions {
|
||||
main,
|
||||
next,
|
||||
dev,
|
||||
dev_commit_history,
|
||||
next_is_valid,
|
||||
}) => {
|
||||
match validate(&**open_repository, &self.repo_details, &repo_config) {
|
||||
Ok((
|
||||
Positions {
|
||||
main,
|
||||
next,
|
||||
dev,
|
||||
dev_commit_history,
|
||||
next_is_valid,
|
||||
},
|
||||
git_log,
|
||||
)) => {
|
||||
debug!(%main, %next, %dev, "positions");
|
||||
self.update_tui_log(git_log);
|
||||
if next_is_valid && next != main {
|
||||
do_send(&ctx.address(), CheckCIStatus::new(next), self.log.as_ref());
|
||||
} else if next != dev {
|
||||
|
@ -118,7 +111,13 @@ impl Handler<ValidateRepo> for RepoActor {
|
|||
.wait(ctx);
|
||||
}
|
||||
Err(Error::UserIntervention(user_notification)) => {
|
||||
// FIXME: end up here when doing git force push to leave this situation
|
||||
self.alert_tui(format!("[USER INTERVENTION: {user_notification}]"));
|
||||
if let UserNotification::CICheckFailed { log, .. }
|
||||
| UserNotification::DevNotBasedOnMain { log, .. } = &user_notification
|
||||
{
|
||||
self.update_tui_log(log.clone());
|
||||
}
|
||||
notify_user(
|
||||
self.notify_user_recipient.as_ref(),
|
||||
user_notification,
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
use tracing::{debug, instrument};
|
||||
|
||||
//
|
||||
use crate::{
|
||||
git::{self, repository::open::OpenRepositoryLike, RepoDetails, UserNotification},
|
||||
BranchName, RepoConfig,
|
||||
};
|
||||
use tracing::{debug, instrument};
|
||||
|
||||
pub type Result<T> = core::result::Result<T, Error>;
|
||||
|
||||
|
@ -29,13 +28,14 @@ pub fn validate(
|
|||
open_repository: &dyn OpenRepositoryLike,
|
||||
repo_details: &git::RepoDetails,
|
||||
repo_config: &RepoConfig,
|
||||
log: git::graph::Log,
|
||||
) -> Result<Positions> {
|
||||
) -> Result<(Positions, git::graph::Log)> {
|
||||
let main_branch = repo_config.branches().main();
|
||||
let next_branch = repo_config.branches().next();
|
||||
let dev_branch = repo_config.branches().dev();
|
||||
// Collect Commit Histories for `main`, `next` and `dev` branches
|
||||
open_repository.fetch()?;
|
||||
let git_log = git::graph::log(repo_details);
|
||||
|
||||
let commit_histories = get_commit_histories(open_repository, repo_config)?;
|
||||
// branch tips
|
||||
let main = commit_histories
|
||||
|
@ -64,7 +64,7 @@ pub fn validate(
|
|||
main_branch,
|
||||
dev_commit: dev,
|
||||
main_commit: main,
|
||||
log,
|
||||
log: git_log,
|
||||
},
|
||||
));
|
||||
}
|
||||
|
@ -80,23 +80,38 @@ pub fn validate(
|
|||
&main,
|
||||
) {
|
||||
tracing::info!("Main not on same commit as next, or it's parent - resetting next to main",);
|
||||
return reset_next_to_main(open_repository, repo_details, &main, &next, &next_branch);
|
||||
return Err(reset_next_to_main(
|
||||
open_repository,
|
||||
repo_details,
|
||||
&main,
|
||||
&next,
|
||||
&next_branch,
|
||||
));
|
||||
}
|
||||
// verify that next is an ancestor of dev, else reset it back to main if dev not ahead of main
|
||||
if is_not_based_on(&commit_histories.dev, &next)
|
||||
&& commit_histories.main.first() == commit_histories.dev.first()
|
||||
{
|
||||
tracing::info!("Next is not an ancestor of dev - resetting next to main");
|
||||
return reset_next_to_main(open_repository, repo_details, &main, &next, &next_branch);
|
||||
return Err(reset_next_to_main(
|
||||
open_repository,
|
||||
repo_details,
|
||||
&main,
|
||||
&next,
|
||||
&next_branch,
|
||||
));
|
||||
}
|
||||
let next_is_valid = is_based_on(&commit_histories.dev, &next);
|
||||
Ok(git::validation::positions::Positions {
|
||||
main,
|
||||
next,
|
||||
dev,
|
||||
dev_commit_history: commit_histories.dev,
|
||||
next_is_valid,
|
||||
})
|
||||
Ok((
|
||||
git::validation::positions::Positions {
|
||||
main,
|
||||
next,
|
||||
dev,
|
||||
dev_commit_history: commit_histories.dev,
|
||||
next_is_valid,
|
||||
},
|
||||
git_log,
|
||||
))
|
||||
}
|
||||
|
||||
#[allow(clippy::result_large_err)]
|
||||
|
@ -106,22 +121,20 @@ fn reset_next_to_main(
|
|||
main: &git::Commit,
|
||||
next: &git::Commit,
|
||||
next_branch: &BranchName,
|
||||
) -> Result<Positions> {
|
||||
git::push::reset(
|
||||
) -> Error {
|
||||
if let Err(err) = git::push::reset(
|
||||
open_repository,
|
||||
repo_details,
|
||||
next_branch,
|
||||
&main.clone().into(),
|
||||
&git::push::Force::From(next.clone().into()),
|
||||
)
|
||||
.map_err(|err| {
|
||||
) {
|
||||
Error::NonRetryable(format!(
|
||||
"Failed to reset branch '{next_branch}' to commit '{next}': {err}"
|
||||
))
|
||||
})?;
|
||||
Err(Error::Retryable(format!(
|
||||
"Branch {next_branch} has been reset"
|
||||
)))
|
||||
} else {
|
||||
Error::Retryable(format!("Branch {next_branch} has been reset"))
|
||||
}
|
||||
}
|
||||
|
||||
fn is_not_based_on(commits: &[git::commit::Commit], needle: &git::Commit) -> bool {
|
||||
|
|
|
@ -75,12 +75,7 @@ mod positions {
|
|||
);
|
||||
let repo_config = given::a_repo_config();
|
||||
|
||||
let result = validate(
|
||||
&*repository,
|
||||
&repo_details,
|
||||
&repo_config,
|
||||
git::graph::Log::default(),
|
||||
);
|
||||
let result = validate(&*repository, &repo_details, &repo_config);
|
||||
println!("{result:?}");
|
||||
let_assert!(Err(err) = result, "validate");
|
||||
|
||||
|
@ -120,12 +115,7 @@ mod positions {
|
|||
"open repo"
|
||||
);
|
||||
|
||||
let result = validate(
|
||||
&*open_repository,
|
||||
&repo_details,
|
||||
&repo_config,
|
||||
git::graph::Log::default(),
|
||||
);
|
||||
let result = validate(&*open_repository, &repo_details, &repo_config);
|
||||
println!("{result:?}");
|
||||
|
||||
assert!(matches!(
|
||||
|
@ -164,12 +154,7 @@ mod positions {
|
|||
"open repo"
|
||||
);
|
||||
|
||||
let result = validate(
|
||||
&*open_repository,
|
||||
&repo_details,
|
||||
&repo_config,
|
||||
git::graph::Log::default(),
|
||||
);
|
||||
let result = validate(&*open_repository, &repo_details, &repo_config);
|
||||
println!("{result:?}");
|
||||
|
||||
assert!(matches!(
|
||||
|
@ -208,12 +193,7 @@ mod positions {
|
|||
"open repo"
|
||||
);
|
||||
|
||||
let result = validate(
|
||||
&*open_repository,
|
||||
&repo_details,
|
||||
&repo_config,
|
||||
git::graph::Log::default(),
|
||||
);
|
||||
let result = validate(&*open_repository, &repo_details, &repo_config);
|
||||
println!("{result:?}");
|
||||
|
||||
assert!(matches!(
|
||||
|
@ -260,12 +240,7 @@ mod positions {
|
|||
|
||||
//when
|
||||
let_assert!(
|
||||
Err(err) = validate(
|
||||
&*open_repository,
|
||||
&repo_details,
|
||||
&repo_config,
|
||||
git::graph::Log::default()
|
||||
),
|
||||
Err(err) = validate(&*open_repository, &repo_details, &repo_config),
|
||||
"validate"
|
||||
);
|
||||
|
||||
|
@ -350,12 +325,7 @@ mod positions {
|
|||
|
||||
//when
|
||||
let_assert!(
|
||||
Err(err) = validate(
|
||||
&*open_repository,
|
||||
&repo_details,
|
||||
&repo_config,
|
||||
git::graph::Log::default()
|
||||
),
|
||||
Err(err) = validate(&*open_repository, &repo_details, &repo_config),
|
||||
"validate"
|
||||
);
|
||||
|
||||
|
@ -424,12 +394,7 @@ mod positions {
|
|||
|
||||
//when
|
||||
let_assert!(
|
||||
Err(err) = validate(
|
||||
&*open_repository,
|
||||
&repo_details,
|
||||
&repo_config,
|
||||
git::graph::Log::default()
|
||||
),
|
||||
Err(err) = validate(&*open_repository, &repo_details, &repo_config),
|
||||
"validate"
|
||||
);
|
||||
|
||||
|
@ -516,12 +481,7 @@ mod positions {
|
|||
|
||||
//when
|
||||
let_assert!(
|
||||
Err(err) = validate(
|
||||
&*open_repository,
|
||||
&repo_details,
|
||||
&repo_config,
|
||||
git::graph::Log::default()
|
||||
),
|
||||
Err(err) = validate(&*open_repository, &repo_details, &repo_config),
|
||||
"validate"
|
||||
);
|
||||
|
||||
|
@ -607,12 +567,8 @@ mod positions {
|
|||
|
||||
//when
|
||||
let_assert!(
|
||||
Ok(positions) = validate(
|
||||
&*open_repository,
|
||||
&repo_details,
|
||||
&repo_config,
|
||||
git::graph::Log::default()
|
||||
),
|
||||
Ok((positions, _git_log)) =
|
||||
validate(&*open_repository, &repo_details, &repo_config),
|
||||
"validate"
|
||||
);
|
||||
|
||||
|
@ -671,12 +627,8 @@ mod positions {
|
|||
|
||||
//when
|
||||
let_assert!(
|
||||
Ok(positions) = validate(
|
||||
&*open_repository,
|
||||
&repo_details,
|
||||
&repo_config,
|
||||
git::graph::Log::default()
|
||||
),
|
||||
Ok((positions, _git_log)) =
|
||||
validate(&*open_repository, &repo_details, &repo_config),
|
||||
"validate"
|
||||
);
|
||||
|
||||
|
|
Loading…
Reference in a new issue