1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 12:54:53 -05:00

fix migrations 82 to ignore unsynced tags between database and git data and missing is_archived on repository table (#6387)

This commit is contained in:
Lunny Xiao 2019-03-21 00:37:50 +08:00 committed by zeripath
parent b78cbbcaa2
commit 3bb123e90e

View file

@ -5,8 +5,11 @@
package migrations package migrations
import ( import (
"fmt"
"code.gitea.io/git" "code.gitea.io/git"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
) )
@ -18,6 +21,17 @@ func fixReleaseSha1OnReleaseTable(x *xorm.Engine) error {
TagName string TagName string
} }
type Repository struct {
ID int64
OwnerID int64
Name string
}
type User struct {
ID int64
Name string
}
// Update release sha1 // Update release sha1
const batchSize = 100 const batchSize = 100
sess := x.NewSession() sess := x.NewSession()
@ -27,7 +41,8 @@ func fixReleaseSha1OnReleaseTable(x *xorm.Engine) error {
err error err error
count int count int
gitRepoCache = make(map[int64]*git.Repository) gitRepoCache = make(map[int64]*git.Repository)
repoCache = make(map[int64]*models.Repository) repoCache = make(map[int64]*Repository)
userCache = make(map[int64]*User)
) )
if err = sess.Begin(); err != nil { if err = sess.Begin(); err != nil {
@ -48,14 +63,31 @@ func fixReleaseSha1OnReleaseTable(x *xorm.Engine) error {
if !ok { if !ok {
repo, ok := repoCache[release.RepoID] repo, ok := repoCache[release.RepoID]
if !ok { if !ok {
repo, err = models.GetRepositoryByID(release.RepoID) repo = new(Repository)
has, err := sess.ID(release.RepoID).Get(repo)
if err != nil { if err != nil {
return err return err
} else if !has {
return fmt.Errorf("Repository %d is not exist", release.RepoID)
} }
repoCache[release.RepoID] = repo repoCache[release.RepoID] = repo
} }
gitRepo, err = git.OpenRepository(repo.RepoPath()) user, ok := userCache[repo.OwnerID]
if !ok {
user = new(User)
has, err := sess.ID(repo.OwnerID).Get(user)
if err != nil {
return err
} else if !has {
return fmt.Errorf("User %d is not exist", repo.OwnerID)
}
userCache[repo.OwnerID] = user
}
gitRepo, err = git.OpenRepository(models.RepoPath(user.Name, repo.Name))
if err != nil { if err != nil {
return err return err
} }
@ -63,12 +95,14 @@ func fixReleaseSha1OnReleaseTable(x *xorm.Engine) error {
} }
release.Sha1, err = gitRepo.GetTagCommitID(release.TagName) release.Sha1, err = gitRepo.GetTagCommitID(release.TagName)
if err != nil { if err != nil && !git.IsErrNotExist(err) {
return err return err
} }
if _, err = sess.ID(release.ID).Cols("sha1").Update(release); err != nil { if err == nil {
return err if _, err = sess.ID(release.ID).Cols("sha1").Update(release); err != nil {
return err
}
} }
count++ count++