Add cron task to update the wrong commits counts

Author: lunny

models/git/branch.go

@@ -109,6 +109,7 @@ type Branch struct {
 	Repo          *repo_model.Repository `xorm:"-"`
 	Name          string                 `xorm:"UNIQUE(s) NOT NULL"` // git's ref-name is case-sensitive internally, however, in some databases (mssql, mysql, by default), it's case-insensitive at the moment
 	CommitID      string
+	CommitCountID string // the commit id of the commit count
 	CommitCount   int64  // the number of commits in this branch
 	CommitMessage string `xorm:"TEXT"` // it only stores the message summary (the first line)
 	PusherID      int64
@@ -252,11 +253,12 @@ func UpdateBranch(ctx context.Context, repoID, pusherID int64, branchName string
 		})
 }
 
-func UpdateBranchCommitCount(ctx context.Context, repoID int64, branchName string, commitCount int64) error {
+func UpdateBranchCommitCount(ctx context.Context, repoID int64, branchName, commitID string, commitCount int64) error {
 	_, err := db.GetEngine(ctx).Where("repo_id=? AND name=?", repoID, branchName).
 		Cols("commit_count").
 		Update(&Branch{
-			CommitCount: commitCount,
+			CommitCount:   commitCount,
+			CommitCountID: commitID,
 		})
 	return err
 }

models/migrations/v1_24/v318.go

@@ -9,7 +9,8 @@ import (
 
 func AddBranchCommitsCount(x *xorm.Engine) error {
 	type Branch struct {
-		CommitCount int64 // the number of commits in this branch
+		CommitCountID string // the commit id of the commit count
+		CommitCount   int64  // the number of commits in this branch
 	}
 	return x.Sync(new(Branch))
 }

services/cron/tasks_basic.go

@@ -166,6 +166,16 @@ func registerSyncRepoLicenses() {
 	})
 }
 
+func registerSyncBranchCommitsCount() {
+	RegisterTaskFatal("sync_branch_commits_count", &BaseConfig{
+		Enabled:    true,
+		RunAtStart: true,
+		Schedule:   "@midnight",
+	}, func(ctx context.Context, _ *user_model.User, _ Config) error {
+		return repo_service.SyncBranchCommitsCount(ctx)
+	})
+}
+
 func initBasicTasks() {
 	if setting.Mirror.Enabled {
 		registerUpdateMirrorTask()
@@ -183,4 +193,5 @@ func initBasicTasks() {
 		registerCleanupPackages()
 	}
 	registerSyncRepoLicenses()
+	registerSyncBranchCommitsCount()
 }

services/repository/branch.go

@@ -736,3 +736,47 @@ func GetBranchDivergingInfo(ctx reqctx.RequestContext, baseRepo *repo_model.Repo
 	info.BaseHasNewCommits = info.HeadCommitsBehind > 0
 	return info, nil
 }
+
+func SyncBranchCommitsCount(ctx context.Context) error {
+	for {
+		select {
+		case <-ctx.Done():
+			return nil
+		default:
+		}
+
+		// search all branches commits count are not synced
+
+		for _, branch := range branches {
+			if err := syncBranchCommitsCount(ctx, branch); err != nil {
+				log.Error("syncBranchCommitsCount: %v", err)
+			}
+		}
+	}
+}
+
+func syncBranchCommitsCount(ctx context.Context, branch *git_model.Branch) error {
+	if err := branch.LoadRepo(ctx); err != nil {
+		return err
+	}
+	commitID, err := gitrepo.GetBranchCommitID(ctx, branch.Repo, branch.Name)
+	if err != nil {
+		return err
+	}
+
+	var cols []string
+	if commitID != branch.CommitID {
+		branch.CommitID = commitID
+		cols = append(cols, "commit_id")
+	}
+
+	commit, err := gitrepo.GetCommit(ctx, branch.Repo, commitID)
+
+	commitsCount, err := commit.CommitsCount()
+	if err != nil {
+		return err
+	}
+
+	git_model.UpdateBranchCommitCount(ctx, branch.RepoID, branch.Name, commit.ID, commitsCount)
+	return nil
+}