2 files changed, 63 insertions, 15 deletions
diff --git a/services/repository/generate.go b/services/repository/generate.go
new file mode 100644
index 0000000000..bd7fd0ce11
--- /dev/null
+++ b/services/repository/generate.go
@@ -0,0 +1,63 @@
+// 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 repository
+
+import (
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/notification"
+)
+
+// GenerateRepository generates a repository from a template
+func GenerateRepository(doer, owner *models.User, templateRepo *models.Repository, opts models.GenerateRepoOptions) (_ *models.Repository, err error) {
+	var generateRepo *models.Repository
+	if err = models.WithTx(func(ctx models.DBContext) error {
+		generateRepo, err = models.GenerateRepository(ctx, doer, owner, templateRepo, opts)
+		if err != nil {
+			return err
+		}
+
+		// Git Content
+		if opts.GitContent && !templateRepo.IsEmpty {
+			if err = models.GenerateGitContent(ctx, templateRepo, generateRepo); err != nil {
+				return err
+			}
+		}
+
+		// Topics
+		if opts.Topics {
+			if err = models.GenerateTopics(ctx, templateRepo, generateRepo); err != nil {
+				return err
+			}
+		}
+
+		// Git Hooks
+		if opts.GitHooks {
+			if err = models.GenerateGitHooks(ctx, templateRepo, generateRepo); err != nil {
+				return err
+			}
+		}
+
+		// Webhooks
+		if opts.Webhooks {
+			if err = models.GenerateWebhooks(ctx, templateRepo, generateRepo); err != nil {
+				return err
+			}
+		}
+
+		return nil
+	}); err != nil {
+		if generateRepo != nil {
+			if errDelete := models.DeleteRepository(doer, owner.ID, generateRepo.ID); errDelete != nil {
+				log.Error("Rollback deleteRepository: %v", errDelete)
+			}
+		}
+		return nil, err
+	}
+
+	notification.NotifyCreateRepository(doer, owner, generateRepo)
+
+	return generateRepo, nil
+}
diff --git a/services/repository/repository.go b/services/repository/repository.go
index b1156b41d5..5135435c78 100644
--- a/services/repository/repository.go
+++ b/services/repository/repository.go
@@ -44,21 +44,6 @@ func ForkRepository(doer, u *models.User, oldRepo *models.Repository, name, desc
 	return repo, nil
 }
 
-// GenerateRepository generates a repository from a template
-func GenerateRepository(doer, u *models.User, oldRepo *models.Repository, opts models.GenerateRepoOptions) (*models.Repository, error) {
-	repo, err := models.GenerateRepository(doer, u, oldRepo, opts)
-	if err != nil {
-		if repo != nil {
-			if errDelete := models.DeleteRepository(doer, u.ID, repo.ID); errDelete != nil {
-				log.Error("Rollback deleteRepository: %v", errDelete)
-			}
-		}
-		return nil, err
-	}
-
-	return repo, nil
-}
-
 // DeleteRepository deletes a repository for a user or organization.
 func DeleteRepository(doer *models.User, repo *models.Repository) error {
 	if err := models.DeleteRepository(doer, repo.OwnerID, repo.ID); err != nil {