Fix mirror sync parser and fix mirror messages (#36504)

Fix #36474 

It also fixed a bug when sync deleted branches.

modules/repository/branch.go

@@ -17,6 +17,13 @@ import (
 	"code.gitea.io/gitea/modules/timeutil"
 )
 
+// SyncResult describes a reference update detected during sync.
+type SyncResult struct {
+	RefName     git.RefName
+	OldCommitID string
+	NewCommitID string
+}
+
 // SyncRepoBranches synchronizes branch table with repository branches
 func SyncRepoBranches(ctx context.Context, repoID, doerID int64) (int64, error) {
 	repo, err := repo_model.GetRepositoryByID(ctx, repoID)
@@ -33,18 +40,19 @@ func SyncRepoBranches(ctx context.Context, repoID, doerID int64) (int64, error)
 	}
 	defer gitRepo.Close()
 
-	return SyncRepoBranchesWithRepo(ctx, repo, gitRepo, doerID)
+	count, _, err := SyncRepoBranchesWithRepo(ctx, repo, gitRepo, doerID)
+	return count, err
 }
 
-func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, doerID int64) (int64, error) {
+func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, doerID int64) (int64, []*SyncResult, error) {
 	objFmt, err := gitRepo.GetObjectFormat()
 	if err != nil {
-		return 0, fmt.Errorf("GetObjectFormat: %w", err)
+		return 0, nil, fmt.Errorf("GetObjectFormat: %w", err)
 	}
 	if objFmt.Name() != repo.ObjectFormatName {
 		repo.ObjectFormatName = objFmt.Name()
 		if err = repo_model.UpdateRepositoryColsWithAutoTime(ctx, repo, "object_format_name"); err != nil {
-			return 0, fmt.Errorf("UpdateRepositoryColsWithAutoTime: %w", err)
+			return 0, nil, fmt.Errorf("UpdateRepositoryColsWithAutoTime: %w", err)
 		}
 	}
 
@@ -52,7 +60,7 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
 	{
 		branches, _, err := gitRepo.GetBranchNames(0, 0)
 		if err != nil {
-			return 0, err
+			return 0, nil, err
 		}
 		log.Trace("SyncRepoBranches[%s]: branches[%d]: %v", repo.FullName(), len(branches), branches)
 		for _, branch := range branches {
@@ -67,7 +75,7 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
 			RepoID:      repo.ID,
 		})
 		if err != nil {
-			return 0, err
+			return 0, nil, err
 		}
 		for _, branch := range branches {
 			dbBranches[branch.Name] = branch
@@ -77,11 +85,12 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
 	var toAdd []*git_model.Branch
 	var toUpdate []*git_model.Branch
 	var toRemove []int64
+	var syncResults []*SyncResult
 	for branch := range allBranches {
 		dbb := dbBranches[branch]
 		commit, err := gitRepo.GetBranchCommit(branch)
 		if err != nil {
-			return 0, err
+			return 0, nil, err
 		}
 		if dbb == nil {
 			toAdd = append(toAdd, &git_model.Branch{
@@ -92,7 +101,12 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
 				PusherID:      doerID,
 				CommitTime:    timeutil.TimeStamp(commit.Committer.When.Unix()),
 			})
-		} else if commit.ID.String() != dbb.CommitID {
+			syncResults = append(syncResults, &SyncResult{
+				RefName:     git.RefNameFromBranch(branch),
+				OldCommitID: "",
+				NewCommitID: commit.ID.String(),
+			})
+		} else if commit.ID.String() != dbb.CommitID || dbb.IsDeleted {
 			toUpdate = append(toUpdate, &git_model.Branch{
 				ID:            dbb.ID,
 				RepoID:        repo.ID,
@@ -102,19 +116,29 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
 				PusherID:      doerID,
 				CommitTime:    timeutil.TimeStamp(commit.Committer.When.Unix()),
 			})
+			syncResults = append(syncResults, &SyncResult{
+				RefName:     git.RefNameFromBranch(branch),
+				OldCommitID: dbb.CommitID,
+				NewCommitID: commit.ID.String(),
+			})
 		}
 	}
 
 	for _, dbBranch := range dbBranches {
 		if !allBranches.Contains(dbBranch.Name) && !dbBranch.IsDeleted {
 			toRemove = append(toRemove, dbBranch.ID)
+			syncResults = append(syncResults, &SyncResult{
+				RefName:     git.RefNameFromBranch(dbBranch.Name),
+				OldCommitID: dbBranch.CommitID,
+				NewCommitID: "",
+			})
 		}
 	}
 
 	log.Trace("SyncRepoBranches[%s]: toAdd: %v, toUpdate: %v, toRemove: %v", repo.FullName(), toAdd, toUpdate, toRemove)
 
 	if len(toAdd) == 0 && len(toRemove) == 0 && len(toUpdate) == 0 {
-		return int64(len(allBranches)), nil
+		return int64(len(allBranches)), syncResults, nil
 	}
 
 	if err := db.WithTx(ctx, func(ctx context.Context) error {
@@ -140,7 +164,7 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
 
 		return nil
 	}); err != nil {
-		return 0, err
+		return 0, nil, err
 	}
-	return int64(len(allBranches)), nil
+	return int64(len(allBranches)), syncResults, nil
 }