Skip to content

update git vendor to fix wrong release commit id and add migrations #6224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions models/migrations/migrations.go
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@ var migrations = []Migration{
NewMigration("add is locked to issues", addIsLockedToIssues),
// v81 -> v82
NewMigration("update U2F counter type", changeU2FCounterType),
// v82 -> v83
NewMigration("hot fix for wrong release sha1 on release table", fixReleaseSha1OnReleaseTable),
}

// Migrate database to current version
Expand Down
87 changes: 87 additions & 0 deletions models/migrations/v82.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
// Copyright 2019 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 migrations

import (
"code.gitea.io/git"
"code.gitea.io/gitea/models"
"github.com/go-xorm/xorm"
)

func fixReleaseSha1OnReleaseTable(x *xorm.Engine) error {
type Release struct {
ID int64
RepoID int64
Sha1 string
TagName string
}

// Update release sha1
const batchSize = 100
sess := x.NewSession()
defer sess.Close()

var (
err error
count int
gitRepoCache = make(map[int64]*git.Repository)
repoCache = make(map[int64]*models.Repository)
)

if err = sess.Begin(); err != nil {
return err
}

for start := 0; ; start += batchSize {
releases := make([]*Release, 0, batchSize)
if err = sess.Limit(batchSize, start).Asc("id").Where("is_tag=?", false).Find(&releases); err != nil {
return err
}
if len(releases) == 0 {
break
}

for _, release := range releases {
gitRepo, ok := gitRepoCache[release.RepoID]
if !ok {
repo, ok := repoCache[release.RepoID]
if !ok {
repo, err = models.GetRepositoryByID(release.RepoID)
if err != nil {
return err
}
repoCache[release.RepoID] = repo
}

gitRepo, err = git.OpenRepository(repo.RepoPath())
if err != nil {
return err
}
gitRepoCache[release.RepoID] = gitRepo
}

release.Sha1, err = gitRepo.GetTagCommitID(release.TagName)
if err != nil {
return err
}

if _, err = sess.ID(release.ID).Cols("sha1").Update(release); err != nil {
return err
}

count++
if count >= 1000 {
if err = sess.Commit(); err != nil {
return err
}
if err = sess.Begin(); err != nil {
return err
}
count = 0
}
}
}
return sess.Commit()
}
9 changes: 5 additions & 4 deletions models/repo_branch.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,6 @@ func (repo *Repository) CheckBranchName(name string) error {
return err
}

if _, err := gitRepo.GetTag(name); err == nil {
return ErrTagAlreadyExists{name}
}

branches, err := repo.GetBranches()
if err != nil {
return err
Expand All @@ -127,6 +123,11 @@ func (repo *Repository) CheckBranchName(name string) error {
return ErrBranchNameConflict{branch.Name}
}
}

if _, err := gitRepo.GetTag(name); err == nil {
return ErrTagAlreadyExists{name}
}

return nil
}

Expand Down
2 changes: 1 addition & 1 deletion routers/repo/view.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
}
entries.CustomSort(base.NaturalSortLess)

ctx.Data["Files"], err = entries.GetCommitsInfo(ctx.Repo.Commit, ctx.Repo.TreePath)
ctx.Data["Files"], err = entries.GetCommitsInfo(ctx.Repo.Commit, ctx.Repo.TreePath, nil)
if err != nil {
ctx.ServerError("GetCommitsInfo", err)
return
Expand Down
11 changes: 11 additions & 0 deletions vendor/code.gitea.io/git/cache.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 15 additions & 5 deletions vendor/code.gitea.io/git/commit_info.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion vendor/code.gitea.io/git/repo_commit.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/code.gitea.io/git/repo_tag.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.