kemitix/git-next
1
1
Fork 1
Code Issues 17 Pull requests 1 Projects 1 Releases 41 Packages 2 Wiki Activity Actions

feat(repo/branch): update next branch when not based on main
All checks were successful
ci/woodpecker/push/push-next Pipeline was successful
Details
ci/woodpecker/push/tag-created Pipeline was successful
Details
ci/woodpecker/push/cron-docker-builder Pipeline was successful
Details

Browse source 
Closes kemitix/git-next#41
This commit is contained in:
Paul Campbell 2024-04-13 15:26:45 +01:00
parent 2055421067
commit 0622e6092b
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/server/actors/repo/branch.rs
View file

@ -47,15 +47,7 @@ pub async fn validate_positions(
let next_is_ancestor_of_dev = commit_histories.dev.iter().any(|dev| dev == &next); let next_is_ancestor_of_dev = commit_histories.dev.iter().any(|dev| dev == &next);
if !next_is_ancestor_of_dev { if !next_is_ancestor_of_dev {
info!("Next is not an ancestor of dev - resetting next to main"); info!("Next is not an ancestor of dev - resetting next to main");
let reset = git.reset( reset_next_to_main(next, main, &repo_details, &config, &git);
&config.branches().next(),
main.into(),
ResetForce::Force(next.into()),
&repo_details,
);
if let Err(err) = reset {
warn!(?err, "Failed");
}
revalidate_positions(addr).await; revalidate_positions(addr).await;
return; return;
} }
@ -67,10 +59,11 @@ pub async fn validate_positions(
.collect::<Vec<_>>(); .collect::<Vec<_>>();
if !next_commits.contains(&main) { if !next_commits.contains(&main) {
warn!( warn!(
"Main branch '{}' is not on the same commit as next branch '{}', or it's parent", "Main branch '{}' is not on the same commit as next branch '{}', or it's parent - resetting next to main",
config.branches().main(), config.branches().main(),
config.branches().next() config.branches().next()
); );
reset_next_to_main(next, main, &repo_details, &config, &git);
revalidate_positions(addr).await; revalidate_positions(addr).await;
return; return;
} }
@ -85,7 +78,7 @@ pub async fn validate_positions(
.any(|commit| commit == &next_commits[0]); .any(|commit| commit == &next_commits[0]);
if !dev_has_next { if !dev_has_next {
warn!( warn!(
"Dev branch '{}' is not based on next branch '{}'", "Dev branch '{}' is not based on next branch '{}' - next branch will be updated shortly",
config.branches().dev(), config.branches().dev(),
config.branches().next() config.branches().next()
); );
@ -95,9 +88,10 @@ pub async fn validate_positions(
let dev_has_main = commit_histories.dev.iter().any(|commit| commit == &main); let dev_has_main = commit_histories.dev.iter().any(|commit| commit == &main);
if !dev_has_main { if !dev_has_main {
warn!( warn!(
"Dev branch '{}' is not based on main branch '{}'", "Dev branch '{}' is not based on main branch '{}' - user should rebase onto main branch '{}'",
config.branches().dev(), config.branches().dev(),
config.branches().main() config.branches().main(),
config.branches().main(),
); );
revalidate_positions(addr).await; revalidate_positions(addr).await;
return; return;
@ -132,6 +126,24 @@ async fn get_commit_histories(
} }
} }
fn reset_next_to_main(
next: forge::Commit,
main: forge::Commit,
repo_details: &RepoDetails,
repo_config: &RepoConfig,
git: &Git,
) {
let reset = git.reset(
&repo_config.branches().next(),
main.into(),
ResetForce::Force(next.into()),
repo_details,
);
if let Err(err) = reset {
warn!(?err, "Failed");
}
}
async fn revalidate_positions(addr: Addr<RepoActor>) { async fn revalidate_positions(addr: Addr<RepoActor>) {
// TODO : (#18) sleep and restart while we don't have webhooks // TODO : (#18) sleep and restart while we don't have webhooks
tokio::time::sleep(std::time::Duration::from_secs(10)).await; tokio::time::sleep(std::time::Duration::from_secs(10)).await;