fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-18 20:09:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set the default branch for repositories generated from templates (#19136)

Browse source 
* Set the default branch for repositories generated from templates
* Allows default branch to be set through the API for repos generated from templates
* Update swagger API template
* Only set default branch to the one from the template if not specified
* Use specified default branch if it exists while generating git commits

Fix #19082 

Co-authored-by: John Olheiser <john.olheiser@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
Abheek Dhawan 2022-03-26 21:56:28 -05:00 committed by GitHub
parent 71a5aaef32
commit f316582458
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
models/repo_generate.go
View file

@ -20,15 +20,16 @@ import (
// GenerateRepoOptions contains the template units to generate // GenerateRepoOptions contains the template units to generate
type GenerateRepoOptions struct { type GenerateRepoOptions struct {
Name string Name string
Description string DefaultBranch string
Private bool Description string
GitContent bool Private bool
Topics bool GitContent bool
GitHooks bool Topics bool
Webhooks bool GitHooks bool
Avatar bool Webhooks bool
IssueLabels bool Avatar bool
IssueLabels bool
} }
// IsValid checks whether at least one option is chosen for generation // IsValid checks whether at least one option is chosen for generation

15
modules/repository/generate.go
View file

@ -184,7 +184,13 @@ func generateRepoCommit(ctx context.Context, repo, templateRepo, generateRepo *r
return fmt.Errorf("git remote add: %v", err) return fmt.Errorf("git remote add: %v", err)
} }
return initRepoCommit(ctx, tmpDir, repo, repo.Owner, templateRepo.DefaultBranch) // set default branch based on whether it's specified in the newly generated repo or not
defaultBranch := repo.DefaultBranch
if strings.TrimSpace(defaultBranch) == "" {
defaultBranch = templateRepo.DefaultBranch
}
return initRepoCommit(ctx, tmpDir, repo, repo.Owner, defaultBranch)
} }
func generateGitContent(ctx context.Context, repo, templateRepo, generateRepo *repo_model.Repository) (err error) { func generateGitContent(ctx context.Context, repo, templateRepo, generateRepo *repo_model.Repository) (err error) {
@ -208,7 +214,11 @@ func generateGitContent(ctx context.Context, repo, templateRepo, generateRepo *r
return fmt.Errorf("getRepositoryByID: %v", err) return fmt.Errorf("getRepositoryByID: %v", err)
} }
repo.DefaultBranch = templateRepo.DefaultBranch // if there was no default branch supplied when generating the repo, use the default one from the template
if strings.TrimSpace(repo.DefaultBranch) == "" {
repo.DefaultBranch = templateRepo.DefaultBranch
}
gitRepo, err := git.OpenRepositoryCtx(ctx, repo.RepoPath()) gitRepo, err := git.OpenRepositoryCtx(ctx, repo.RepoPath())
if err != nil { if err != nil {
return fmt.Errorf("openRepository: %v", err) return fmt.Errorf("openRepository: %v", err)
@ -249,6 +259,7 @@ func GenerateRepository(ctx context.Context, doer, owner *user_model.User, templ
Name: opts.Name, Name: opts.Name,
LowerName: strings.ToLower(opts.Name), LowerName: strings.ToLower(opts.Name),
Description: opts.Description, Description: opts.Description,
DefaultBranch: opts.DefaultBranch,
IsPrivate: opts.Private, IsPrivate: opts.Private,
IsEmpty: !opts.GitContent || templateRepo.IsEmpty, IsEmpty: !opts.GitContent || templateRepo.IsEmpty,
IsFsckEnabled: templateRepo.IsFsckEnabled, IsFsckEnabled: templateRepo.IsFsckEnabled,

2
modules/structs/repo.go
View file

@ -201,6 +201,8 @@ type GenerateRepoOption struct {
// required: true // required: true
// unique: true // unique: true
Name string `json:"name" binding:"Required;AlphaDashDot;MaxSize(100)"` Name string `json:"name" binding:"Required;AlphaDashDot;MaxSize(100)"`
// Default branch of the new repository
DefaultBranch string `json:"default_branch"`
// Description of the repository to create // Description of the repository to create
Description string `json:"description" binding:"MaxSize(255)"` Description string `json:"description" binding:"MaxSize(255)"`
// Whether the repository is private // Whether the repository is private

19
routers/api/v1/repo/repo.go
View file

@ -359,15 +359,16 @@ func Generate(ctx *context.APIContext) {
} }
opts := models.GenerateRepoOptions{ opts := models.GenerateRepoOptions{
Name: form.Name, Name: form.Name,
Description: form.Description, DefaultBranch: form.DefaultBranch,
Private: form.Private, Description: form.Description,
GitContent: form.GitContent, Private: form.Private,
Topics: form.Topics, GitContent: form.GitContent,
GitHooks: form.GitHooks, Topics: form.Topics,
Webhooks: form.Webhooks, GitHooks: form.GitHooks,
Avatar: form.Avatar, Webhooks: form.Webhooks,
IssueLabels: form.Labels, Avatar: form.Avatar,
IssueLabels: form.Labels,
} }
if !opts.IsValid() { if !opts.IsValid() {

5
templates/swagger/v1_json.tmpl
View file

@ -15412,6 +15412,11 @@
"type": "boolean", "type": "boolean",
"x-go-name": "Avatar" "x-go-name": "Avatar"
}, },
"default_branch": {
"description": "Default branch of the new repository",
"type": "string",
"x-go-name": "DefaultBranch"
},
"description": { "description": {
"description": "Description of the repository to create", "description": "Description of the repository to create",
"type": "string", "type": "string",