From f98e882ef9b8f547feabbc52daa20d3aa41126a0 Mon Sep 17 00:00:00 2001 From: ltdk Date: Wed, 5 Oct 2022 21:12:06 -0400 Subject: [PATCH 1/5] Add HEAD fix to gitea doctor --- modules/doctor/heads.go | 97 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 modules/doctor/heads.go diff --git a/modules/doctor/heads.go b/modules/doctor/heads.go new file mode 100644 index 0000000000000..50080e41a7460 --- /dev/null +++ b/modules/doctor/heads.go @@ -0,0 +1,97 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package doctor + +import ( + "context" + + repo_model "code.gitea.io/gitea/models/repo" + "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/log" +) + +func synchronizeRepoHeads(ctx context.Context, logger log.Logger, autofix bool) error { + numRepos := 0 + numHeadsBroken := 0 + numDefaultBranchesBroken := 0 + numReposUpdated := 0 + err := iterateRepositories(ctx, func(repo *repo_model.Repository) error { + numRepos++ + runOpts := &git.RunOpts{Dir: repo.RepoPath()} + + head, _, headErr := git.NewCommand(ctx, "rev-parse", "HEAD").RunStdString(runOpts) + defaultBranch, _, defaultBranchErr := git.NewCommand(ctx, "rev-parse", repo.DefaultBranch).RunStdString(runOpts) + + // what we expect: both HEAD and default branch point to the same commit + if headErr == nil && defaultBranchErr == nil && head == defaultBranch { + return nil + } + + if headErr != nil { + numHeadsBroken++ + } + if defaultBranchErr != nil { + numDefaultBranchesBroken++ + } + + // absolute failure: both HEAD and default branch point to invalid commits + if headErr != nil && defaultBranchErr != nil { + logger.Critical("Neither HEAD nor the default branch for %s/%s point to a valid commit", repo.OwnerName, repo.Name) + return nil + } + + // if default branch is broken, let the user fix that in the UI + if defaultBranchErr != nil { + logger.Warn("Default branch for %s/%s doesn't point to a valid commit", repo.OwnerName, repo.Name) + return nil + } + + // if we're not autofixing, that's all we can do + if !autofix { + return nil + } + + // otherwise, let's try fixing HEAD + err := git.NewCommand(ctx, "switch", repo.DefaultBranch).Run(runOpts) + if err != nil { + logger.Warn("Failed to fix HEAD for %s/%s: %v", repo.OwnerName, repo.Name, err) + return nil + } + numReposUpdated++ + return nil + }) + + if err != nil { + logger.Critical("Error when fixing repo HEADs: %v", err) + } + + if autofix { + logger.Info("Out of %d repos, HEADs for %d are now fixed and HEADS for %d are still broken", numRepos, numReposUpdated, numDefaultBranchesBroken+numHeadsBroken-numReposUpdated) + } else { + if numHeadsBroken == 0 && numDefaultBranchesBroken == 0 { + logger.Info("All %d repos have their HEADs in the correct state") + } else { + if numHeadsBroken == 0 && numDefaultBranchesBroken != 0 { + logger.Critical("Default branches are broken for %d/%d repos", numDefaultBranchesBroken, numRepos) + } else if numHeadsBroken != 0 && numDefaultBranchesBroken == 0 { + logger.Warn("HEADs are broken for %d/%d repos", numHeadsBroken, numRepos) + } else { + logger.Critical("Out of %d repos, HEADS are broken for %d and default branches are broken for %d", numRepos, numHeadsBroken, numDefaultBranchesBroken) + } + } + } + + return err +} + +func init() { + Register(&Check{ + Title: "Synchronize repo HEADs", + Name: "synchronize-repo-heads", + IsDefault: true, + Run: synchronizeRepoHeads, + Priority: 7, + }) +} From a3bb8cf417d9d81d5e05afc9fa55ddd93264e8b7 Mon Sep 17 00:00:00 2001 From: ltdk Date: Mon, 10 Oct 2022 19:03:05 -0400 Subject: [PATCH 2/5] Use symbolic-ref to get/set HEAD --- modules/doctor/heads.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/modules/doctor/heads.go b/modules/doctor/heads.go index 50080e41a7460..4ebedb75952ff 100644 --- a/modules/doctor/heads.go +++ b/modules/doctor/heads.go @@ -21,11 +21,12 @@ func synchronizeRepoHeads(ctx context.Context, logger log.Logger, autofix bool) numRepos++ runOpts := &git.RunOpts{Dir: repo.RepoPath()} - head, _, headErr := git.NewCommand(ctx, "rev-parse", "HEAD").RunStdString(runOpts) - defaultBranch, _, defaultBranchErr := git.NewCommand(ctx, "rev-parse", repo.DefaultBranch).RunStdString(runOpts) + _, _, defaultBranchErr := git.NewCommand(ctx, "rev-parse", repo.DefaultBranch).RunStdString(runOpts) - // what we expect: both HEAD and default branch point to the same commit - if headErr == nil && defaultBranchErr == nil && head == defaultBranch { + head, _, headErr := git.NewCommand(ctx, "symbolic-ref", "--short", "HEAD").RunStdString(runOpts) + + // what we expect: default branch is valid, and HEAD points to it + if headErr == nil && defaultBranchErr == nil && head == repo.DefaultBranch { return nil } @@ -36,12 +37,6 @@ func synchronizeRepoHeads(ctx context.Context, logger log.Logger, autofix bool) numDefaultBranchesBroken++ } - // absolute failure: both HEAD and default branch point to invalid commits - if headErr != nil && defaultBranchErr != nil { - logger.Critical("Neither HEAD nor the default branch for %s/%s point to a valid commit", repo.OwnerName, repo.Name) - return nil - } - // if default branch is broken, let the user fix that in the UI if defaultBranchErr != nil { logger.Warn("Default branch for %s/%s doesn't point to a valid commit", repo.OwnerName, repo.Name) @@ -54,7 +49,7 @@ func synchronizeRepoHeads(ctx context.Context, logger log.Logger, autofix bool) } // otherwise, let's try fixing HEAD - err := git.NewCommand(ctx, "switch", repo.DefaultBranch).Run(runOpts) + err := git.NewCommand(ctx, "symbolic-ref", "HEAD", repo.DefaultBranch).Run(runOpts) if err != nil { logger.Warn("Failed to fix HEAD for %s/%s: %v", repo.OwnerName, repo.Name, err) return nil From 3bd700328ad4372be2c82b50386f017558162613 Mon Sep 17 00:00:00 2001 From: ltdk Date: Mon, 10 Oct 2022 20:53:16 -0400 Subject: [PATCH 3/5] gofumpt --- modules/doctor/heads.go | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/doctor/heads.go b/modules/doctor/heads.go index 4ebedb75952ff..f37e94618c26f 100644 --- a/modules/doctor/heads.go +++ b/modules/doctor/heads.go @@ -57,7 +57,6 @@ func synchronizeRepoHeads(ctx context.Context, logger log.Logger, autofix bool) numReposUpdated++ return nil }) - if err != nil { logger.Critical("Error when fixing repo HEADs: %v", err) } From d76b9d48ceecd330182c0ae90b7b2b32fb4b0f69 Mon Sep 17 00:00:00 2001 From: ltdk Date: Tue, 11 Oct 2022 19:41:46 -0400 Subject: [PATCH 4/5] Double-dashes --- modules/doctor/heads.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/doctor/heads.go b/modules/doctor/heads.go index f37e94618c26f..c03983bc3162d 100644 --- a/modules/doctor/heads.go +++ b/modules/doctor/heads.go @@ -21,7 +21,7 @@ func synchronizeRepoHeads(ctx context.Context, logger log.Logger, autofix bool) numRepos++ runOpts := &git.RunOpts{Dir: repo.RepoPath()} - _, _, defaultBranchErr := git.NewCommand(ctx, "rev-parse", repo.DefaultBranch).RunStdString(runOpts) + _, _, defaultBranchErr := git.NewCommand(ctx, "rev-parse", "--", repo.DefaultBranch).RunStdString(runOpts) head, _, headErr := git.NewCommand(ctx, "symbolic-ref", "--short", "HEAD").RunStdString(runOpts) @@ -49,7 +49,7 @@ func synchronizeRepoHeads(ctx context.Context, logger log.Logger, autofix bool) } // otherwise, let's try fixing HEAD - err := git.NewCommand(ctx, "symbolic-ref", "HEAD", repo.DefaultBranch).Run(runOpts) + err := git.NewCommand(ctx, "symbolic-ref", "--", "HEAD", repo.DefaultBranch).Run(runOpts) if err != nil { logger.Warn("Failed to fix HEAD for %s/%s: %v", repo.OwnerName, repo.Name, err) return nil From 49cfd554c179a12bd42b2fe7920a022819e4a8c2 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 12 Oct 2022 10:40:02 +0800 Subject: [PATCH 5/5] Update modules/doctor/heads.go --- modules/doctor/heads.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/doctor/heads.go b/modules/doctor/heads.go index c03983bc3162d..ec14aa4eadb1b 100644 --- a/modules/doctor/heads.go +++ b/modules/doctor/heads.go @@ -1,4 +1,4 @@ -// Copyright 2020 The Gitea Authors. All rights reserved. +// Copyright 2022 The Gitea Authors. All rights reserved. // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file.