Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-22 01:22:01 +02:00
Code Issues Activity

Revert interface change

Browse Source
This commit is contained in:
Lunny Xiao 2025-03-28 19:07:37 -07:00
parent 2b4bddf837
commit eda63517dd
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
13 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
models/repo/repo.go
View File

@ -220,33 +220,19 @@ func RelativePath(ownerName, repoName string) string {
}
// RelativePath should be an unix style path like username/reponame.git
func (repo *Repository) GetRelativePath() string {
func (repo *Repository) RelativePath() string {
return RelativePath(repo.OwnerName, repo.Name)
}
func (repo *Repository) GetDefaultBranch() string {
return repo.DefaultBranch
}
type StorageRepo struct {
RelativePath string
DefaultBranch string
}
type StorageRepo string
// RelativePath should be an unix style path like username/reponame.git
func (sr StorageRepo) GetRelativePath() string {
return sr.RelativePath
}
func (sr StorageRepo) GetDefaultBranch() string {
return sr.DefaultBranch
func (sr StorageRepo) RelativePath() string {
return string(sr)
}
func (repo *Repository) WikiStorageRepo() StorageRepo {
return StorageRepo{
RelativePath: strings.ToLower(repo.OwnerName) + "/" + strings.ToLower(repo.Name) + ".wiki.git",
DefaultBranch: repo.DefaultWikiBranch,
}
return StorageRepo(strings.ToLower(repo.OwnerName) + "/" + strings.ToLower(repo.Name) + ".wiki.git")
}
// SanitizedOriginalURL returns a sanitized OriginalURL

4
modules/gitrepo/branch.go
View File

@ -32,9 +32,9 @@ func GetBranchCommitID(ctx context.Context, repo Repository, branch string) (str
}
// SetDefaultBranch sets default branch of repository.
func SetDefaultBranch(ctx context.Context, repo Repository) error {
func SetDefaultBranch(ctx context.Context, repo Repository, defaultBranch string) error {
_, _, err := git.NewCommand("symbolic-ref", "HEAD").
AddDynamicArguments(git.BranchPrefix+repo.GetDefaultBranch()).
AddDynamicArguments(git.BranchPrefix+defaultBranch).
RunStdString(ctx, &git.RunOpts{Dir: repoPath(repo)})
return err
}

5
modules/gitrepo/gitrepo.go
View File

@ -17,14 +17,13 @@ import (
// Repository represents a git repository which stored in a disk
type Repository interface {
GetRelativePath() string // We don't assume how the directory structure of the repository is, so we only need the relative path
GetDefaultBranch() string
RelativePath() string // We don't assume how the directory structure of the repository is, so we only need the relative path
}
// RelativePath should be an unix style path like username/reponame.git
// This method should change it according to the current OS.
func repoPath(repo Repository) string {
return filepath.Join(setting.RepoRootPath, filepath.FromSlash(repo.GetRelativePath()))
return filepath.Join(setting.RepoRootPath, filepath.FromSlash(repo.RelativePath()))
}
// OpenRepository opens the repository at the given relative path with the provided context.

2
routers/api/v1/repo/repo.go
View File

@ -737,7 +737,7 @@ func updateBasicProperties(ctx *context.APIContext, opts api.EditRepoOption) err
if opts.DefaultBranch != nil && repo.DefaultBranch != *opts.DefaultBranch && (repo.IsEmpty || gitrepo.IsBranchExist(ctx, ctx.Repo.Repository, *opts.DefaultBranch)) {
repo.DefaultBranch = *opts.DefaultBranch
if !repo.IsEmpty {
if err := gitrepo.SetDefaultBranch(ctx, repo); err != nil {
if err := gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
ctx.APIErrorInternal(err)
return err
}

2
routers/private/default_branch.go
View File

@ -21,7 +21,7 @@ func SetDefaultBranch(ctx *gitea_context.PrivateContext) {
branch := ctx.PathParam("branch")
ctx.Repo.Repository.DefaultBranch = branch
if err := gitrepo.SetDefaultBranch(ctx, ctx.Repo.Repository); err != nil {
if err := gitrepo.SetDefaultBranch(ctx, ctx.Repo.Repository, branch); err != nil {
ctx.JSON(http.StatusInternalServerError, private.Response{
Err: fmt.Sprintf("Unable to set default branch on repository: %s/%s Error: %v", ownerName, repoName, err),
})

2
services/mirror/mirror_pull.go
View File

@ -647,7 +647,7 @@ func checkAndUpdateEmptyRepository(ctx context.Context, m *repo_model.Mirror, re
m.Repo.DefaultBranch = firstName
}
// Update the git repository default branch
if err := gitrepo.SetDefaultBranch(ctx, m.Repo); err != nil {
if err := gitrepo.SetDefaultBranch(ctx, m.Repo, m.Repo.DefaultBranch); err != nil {
log.Error("Failed to update default branch of underlying git repository %-v. Error: %v", m.Repo, err)
return false
}

6
services/repository/adopt.go
View File

@ -124,14 +124,14 @@ func adoptRepository(ctx context.Context, repo *repo_model.Repository, defaultBr
if len(defaultBranch) > 0 {
repo.DefaultBranch = defaultBranch
if err = gitrepo.SetDefaultBranch(ctx, repo); err != nil {
if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
return fmt.Errorf("setDefaultBranch: %w", err)
}
} else {
repo.DefaultBranch, err = gitrepo.GetDefaultBranch(ctx, repo)
if err != nil {
repo.DefaultBranch = setting.Repository.DefaultBranch
if err = gitrepo.SetDefaultBranch(ctx, repo); err != nil {
if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
return fmt.Errorf("setDefaultBranch: %w", err)
}
}
@ -188,7 +188,7 @@ func adoptRepository(ctx context.Context, repo *repo_model.Repository, defaultBr
repo.DefaultBranch = setting.Repository.DefaultBranch
}
if err = gitrepo.SetDefaultBranch(ctx, repo); err != nil {
if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
return fmt.Errorf("setDefaultBranch: %w", err)
}
}

4
services/repository/branch.go
View File

@ -464,7 +464,7 @@ func RenameBranch(ctx context.Context, repo *repo_model.Repository, doer *user_m
}
// repo's default branch has been updated in git_model.RenameBranch
err2 = gitrepo.SetDefaultBranch(ctx, repo)
err2 = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch)
if err2 != nil {
return err2
}
@ -651,7 +651,7 @@ func SetRepoDefaultBranch(ctx context.Context, repo *repo_model.Repository, newB
log.Error("CancelPreviousJobs: %v", err)
}
return gitrepo.SetDefaultBranch(ctx, repo)
return gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch)
}); err != nil {
return err
}

2
services/repository/create.go
View File

@ -181,7 +181,7 @@ func initRepository(ctx context.Context, u *user_model.User, repo *repo_model.Re
if len(opts.DefaultBranch) > 0 {
repo.DefaultBranch = opts.DefaultBranch
if err = gitrepo.SetDefaultBranch(ctx, repo); err != nil {
if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
return fmt.Errorf("setDefaultBranch: %w", err)
}

2
services/repository/generate.go
View File

@ -281,7 +281,7 @@ func generateGitContent(ctx context.Context, repo, templateRepo, generateRepo *r
repo.DefaultBranch = templateRepo.DefaultBranch
}
if err = gitrepo.SetDefaultBranch(ctx, repo); err != nil {
if err = gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
return fmt.Errorf("setDefaultBranch: %w", err)
}
if err = UpdateRepository(ctx, repo, false); err != nil {

2
services/repository/push.go
View File

@ -278,7 +278,7 @@ func pushNewBranch(ctx context.Context, repo *repo_model.Repository, pusher *use
repo.DefaultBranch = opts.RefName()
repo.IsEmpty = false
if repo.DefaultBranch != setting.Repository.DefaultBranch {
if err := gitrepo.SetDefaultBranch(ctx, repo); err != nil {
if err := gitrepo.SetDefaultBranch(ctx, repo, repo.DefaultBranch); err != nil {
return nil, err
}
}

6
services/repository/transfer.go
View File

@ -337,10 +337,8 @@ func changeRepositoryName(ctx context.Context, repo *repo_model.Repository, newR
}
if err = gitrepo.RenameRepository(ctx, repo,
repo_model.StorageRepo{
RelativePath: repo_model.RelativePath(repo.OwnerName, newRepoName),
DefaultBranch: repo.DefaultBranch,
}); err != nil {
repo_model.StorageRepo(repo_model.RelativePath(repo.OwnerName, newRepoName)),
); err != nil {
return fmt.Errorf("rename repository directory: %w", err)
}

2
services/wiki/wiki.go
View File

@ -43,7 +43,7 @@ func InitWiki(ctx context.Context, repo *repo_model.Repository) error {
return fmt.Errorf("InitRepository: %w", err)
} else if err = gitrepo.CreateDelegateHooks(ctx, repo.WikiStorageRepo()); err != nil {
return fmt.Errorf("createDelegateHooks: %w", err)
} else if err = gitrepo.SetDefaultBranch(ctx, repo.WikiStorageRepo()); err != nil {
} else if err = gitrepo.SetDefaultBranch(ctx, repo.WikiStorageRepo(), repo.DefaultWikiBranch); err != nil {
return fmt.Errorf("unable to set default wiki branch to %q: %w", repo.DefaultWikiBranch, err)
}
return nil