prjgit manual merge check

2025-07-28 19:44:52 +02:00
3 changed files with 108 additions and 59 deletions
--- a/common/gitea_utils.go
+++ b/common/gitea_utils.go
@@ -610,7 +610,11 @@ func (gitea *GiteaTransport) CreatePullRequestIfNotExist(repo *models.Repository
 	}

 	if pr, err := gitea.client.Repository.RepoGetPullRequestByBaseHead(
-		repository.NewRepoGetPullRequestByBaseHeadParams().WithOwner(repo.Owner.UserName).WithRepo(repo.Name).WithBase(targetId).WithHead(srcId),
+		repository.NewRepoGetPullRequestByBaseHeadParams().
+			WithOwner(repo.Owner.UserName).
+			WithRepo(repo.Name).
+			WithBase(targetId).
+			WithHead(srcId),
 		gitea.transport.DefaultAuthentication,
 	); err == nil {
 		return pr.Payload, nil
--- a/workflow-pr/pr_processor.go
+++ b/workflow-pr/pr_processor.go
@@ -23,6 +23,9 @@ func PrjGitDescription(prset *common.PRSet) (title string, desc string) {
 	refs := make([]string, 0, len(prset.PRs)-1)

 	for _, pr := range prset.PRs {
+		if prset.IsPrjGitPR(pr.PR) {
+			continue
+		}
 		org, repo, idx := pr.PRComponents()

 		title_refs = append(title_refs, repo)
@@ -31,16 +34,16 @@ func PrjGitDescription(prset *common.PRSet) (title string, desc string) {
 	}

 	title = "Forwarded PRs: " + strings.Join(title_refs, ", ")
-	desc = fmt.Sprintf("This is a forwarded pull request by %s\nreferencing the following pull request(s):\n\n", GitAuthor) + strings.Join(refs, ",\n")
+	desc = fmt.Sprintf("This is a forwarded pull request by %s\nreferencing the following pull request(s):\n\n", GitAuthor) + strings.Join(refs, "\n") + "\n"

 	if prset.Config.ManualMergeOnly {
-		desc = desc + "\n\nManualMergeOnly enabled. To merge, 'merge ok' is required in either the project PR or every package PR."
+		desc = desc + "\n###  ManualMergeOnly enabled. To merge, 'merge ok' is required in either the project PR or every package PR."
 	}
 	if prset.Config.ManualMergeProject {
-		desc = desc + "\nManualMergeProject enabled. To merge, 'merge ok' is required by project maintainer in the project PR."
+		desc = desc + "\n###  ManualMergeProject enabled. To merge, 'merge ok' is required by project maintainer in the project PR."
 	}
 	if !prset.Config.ManualMergeOnly && !prset.Config.ManualMergeProject {
-		desc = desc + "\nAutomatic merge enabled. This will merge when all review requirements are satisfied."
+		desc = desc + "\n###  Automatic merge enabled. This will merge when all review requirements are satisfied."
 	}
 	return
 }
@@ -205,8 +208,11 @@ func (pr *PRProcessor) CreatePRjGitPR(prjGitPRbranch string, prset *common.PRSet
 		return err
 	}

-	if !common.IsDryRun && headCommit != newHeadCommit {
-		common.PanicOnError(git.GitExec(common.DefaultGitPrj, "push", RemoteName, "+HEAD:"+prjGitPRbranch))
+	if !common.IsDryRun {
+		if headCommit != newHeadCommit {
+			common.PanicOnError(git.GitExec(common.DefaultGitPrj, "push", RemoteName, "+HEAD:"+prjGitPRbranch))
+		}
+
 		title, desc := PrjGitDescription(prset)
 		pr, err := Gitea.CreatePullRequestIfNotExist(PrjGit, prjGitPRbranch, PrjGitBranch, title, desc)
 		if err != nil {
@@ -286,20 +292,24 @@ func (pr *PRProcessor) UpdatePrjGitPR(prset *common.PRSet) error {
 		return err
 	}

-	if !common.IsDryRun && headCommit != newHeadCommit {
-		params := []string{"push", PrjGitPR.RemoteName, "+HEAD:" + prjGitPRbranch}
-		if forcePush {
-			params = slices.Insert(params, 1, "-f")
+	if !common.IsDryRun {
+		if headCommit != newHeadCommit {
+			params := []string{"push", PrjGitPR.RemoteName, "+HEAD:" + prjGitPRbranch}
+			if forcePush {
+				params = slices.Insert(params, 1, "-f")
+			}
+			common.PanicOnError(git.GitExec(common.DefaultGitPrj, params...))
 		}
-		common.PanicOnError(git.GitExec(common.DefaultGitPrj, params...))

 		// update PR
 		PrjGitTitle, PrjGitBody := PrjGitDescription(prset)
-		Gitea.UpdatePullRequest(PrjGit.Owner.UserName, PrjGit.Name, PrjGitPR.PR.Index, &models.EditPullRequestOption{
-			RemoveDeadline: true,
-			Title:          PrjGitTitle,
-			Body:           PrjGitBody,
-		})
+		if PrjGitPR.PR.Body != PrjGitBody || PrjGitPR.PR.Title != PrjGitTitle {
+			Gitea.UpdatePullRequest(PrjGit.Owner.UserName, PrjGit.Name, PrjGitPR.PR.Index, &models.EditPullRequestOption{
+				RemoveDeadline: true,
+				Title:          PrjGitTitle,
+				Body:           PrjGitBody,
+			})
+		}
 	}
 	return nil
 }
@@ -336,7 +346,38 @@ func (pr *PRProcessor) Process(req *common.PullRequestWebhookEvent) error {
 		prjGitPRbranch = prjGitPR.PR.Head.Name

 		if prjGitPR.PR.State != "open" {
-			// close entire prset
+			if prjGitPR.PR.HasMerged {
+				// update branches in project
+				prjGitPR.RemoteName, err = git.GitClone(common.DefaultGitPrj, prjGitPRbranch, prjGitPR.PR.Base.Repo.SSHURL)
+				common.PanicOnError(err)
+
+				old_pkgs, err := git.GitSubmoduleList(common.DefaultGitPrj, prjGitPR.PR.MergeBase)
+				common.PanicOnError(err)
+				new_pkgs, err := git.GitSubmoduleList(common.DefaultGitPrj, prjGitPRbranch)
+				common.PanicOnError(err)
+
+				pkgs := make(map[string]string)
+				for pkg, old_commit := range old_pkgs {
+					if new_commit, found := new_pkgs[pkg]; found {
+						// pkg modified
+						if new_commit != old_commit {
+							pkgs[pkg] = new_commit
+						}
+					} else { // not found, pkg removed
+						pkgs[pkg] = ""
+					}
+				}
+				for pkg, commit := range new_pkgs {
+					if _, found := old_pkgs[pkg]; !found {
+						// pkg added
+						pkgs[pkg] = commit
+					}
+				}
+
+				PrjGitSubmoduleCheck(config, git, common.DefaultGitPrj, pkgs)
+			}
+
+			// close entire prset that is still open
 			common.LogInfo("PR State is closed:", prjGitPR.PR.State)
 			for _, pr := range prset.PRs {
 				if pr.PR.State == "open" {
--- a/workflow-pr/repo_check.go
+++ b/workflow-pr/repo_check.go
@@ -55,44 +55,7 @@ func (s *DefaultStateChecker) ProcessPR(pr *models.PullRequest, config *common.A
 	return ProcesPullRequest(&event, common.AutogitConfigs{config})
 }

-func (s *DefaultStateChecker) VerifyProjectState(config *common.AutogitConfig) ([]*interfaces.PRToProcess, error) {
-	defer func() {
-		if r := recover(); r != nil {
-			common.LogError("panic caught")
-			if err, ok := r.(error); !ok {
-				common.LogError(err)
-			}
-			common.LogError(string(debug.Stack()))
-		}
-	}()
-
-	prsToProcess := []*interfaces.PRToProcess{}
-
-	prjGitOrg, prjGitRepo, prjGitBranch := config.GetPrjGit()
-	common.LogInfo("  checking", prjGitOrg+"/"+prjGitRepo+"#"+prjGitBranch)
-
-	git, err := GitHandler.CreateGitHandler(config.Organization)
-	common.LogDebug("Git Path:", git.GetPath())
-	if err != nil {
-		return nil, fmt.Errorf("Cannot create git handler: %w", err)
-	}
-	defer git.Close()
-
-	repo, err := Gitea.CreateRepositoryIfNotExist(git, prjGitOrg, prjGitRepo)
-	if err != nil {
-		return nil, fmt.Errorf("Error fetching or creating '%s/%s#%s' -- aborting verifyProjectState(). Err: %w", prjGitBranch, prjGitRepo, prjGitBranch, err)
-	}
-
-	_, err = git.GitClone(prjGitRepo, prjGitBranch, repo.SSHURL)
-	common.PanicOnError(err)
-
-	prsToProcess = append(prsToProcess, &interfaces.PRToProcess{
-		Org:    prjGitOrg,
-		Repo:   prjGitRepo,
-		Branch: prjGitBranch,
-	})
-	submodules, err := git.GitSubmoduleList(prjGitRepo, "HEAD")
-
+func PrjGitSubmoduleCheck(config *common.AutogitConfig, git common.Git, repo string, submodules map[string]string) (prsToProcess []*interfaces.PRToProcess, err error) {
 nextSubmodule:
 	for sub, commitID := range submodules {
 		common.LogDebug("  + checking", sub, commitID)
@@ -135,8 +98,8 @@ nextSubmodule:
 		}

 		// not found in past, check if we should advance the branch label ... pull the submodule
-		git.GitExecOrPanic(prjGitRepo, "submodule", "update", "--init", "--filter", "blob:none", "--", sub)
-		subDir := path.Join(prjGitRepo, sub)
+		git.GitExecOrPanic(repo, "submodule", "update", "--init", "--filter", "blob:none", "--", sub)
+		subDir := path.Join(repo, sub)
 		newCommits := common.SplitStringNoEmpty(git.GitExecWithOutputOrPanic(subDir, "rev-list", "^origin/"+branch, commitID), "\n")

 		if len(newCommits) >= 1 {
@@ -152,10 +115,51 @@ nextSubmodule:
 		}
 	}

-	// forward any package-gits referred by the project git, but don't go back
 	return prsToProcess, nil
 }

+func (s *DefaultStateChecker) VerifyProjectState(config *common.AutogitConfig) ([]*interfaces.PRToProcess, error) {
+	defer func() {
+		if r := recover(); r != nil {
+			common.LogError("panic caught")
+			if err, ok := r.(error); !ok {
+				common.LogError(err)
+			}
+			common.LogError(string(debug.Stack()))
+		}
+	}()
+
+	prsToProcess := []*interfaces.PRToProcess{}
+
+	prjGitOrg, prjGitRepo, prjGitBranch := config.GetPrjGit()
+	common.LogInfo("  checking", prjGitOrg+"/"+prjGitRepo+"#"+prjGitBranch)
+
+	git, err := GitHandler.CreateGitHandler(config.Organization)
+	common.LogDebug("Git Path:", git.GetPath())
+	if err != nil {
+		return nil, fmt.Errorf("Cannot create git handler: %w", err)
+	}
+	defer git.Close()
+
+	repo, err := Gitea.CreateRepositoryIfNotExist(git, prjGitOrg, prjGitRepo)
+	if err != nil {
+		return nil, fmt.Errorf("Error fetching or creating '%s/%s#%s' -- aborting verifyProjectState(). Err: %w", prjGitBranch, prjGitRepo, prjGitBranch, err)
+	}
+
+	_, err = git.GitClone(prjGitRepo, prjGitBranch, repo.SSHURL)
+	common.PanicOnError(err)
+
+	prsToProcess = append(prsToProcess, &interfaces.PRToProcess{
+		Org:    prjGitOrg,
+		Repo:   prjGitRepo,
+		Branch: prjGitBranch,
+	})
+	submodules, err := git.GitSubmoduleList(prjGitRepo, "HEAD")
+
+	// forward any package-gits referred by the project git, but don't go back
+	return PrjGitSubmoduleCheck(config, git, prjGitRepo, submodules)
+}
+
 func (s *DefaultStateChecker) CheckRepos() error {
 	errorList := make([]error, 0, 10)