summaryrefslogtreecommitdiffstats
path: root/modules/migrations
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2019-10-13 21:23:14 +0800
committerGitHub <noreply@github.com>2019-10-13 21:23:14 +0800
commitf2a3abc683ad4b2177b7c7c6160a2c0b4316120a (patch)
tree3b92f34b9bb9a015072f511dc5cf6340af18eda5 /modules/migrations
parent0a96e59884ca5c4fedc8c3d166d97f35b245ad6e (diff)
downloadgitea-f2a3abc683ad4b2177b7c7c6160a2c0b4316120a.tar.gz
gitea-f2a3abc683ad4b2177b7c7c6160a2c0b4316120a.zip
Move migrating repository from frontend to backend (#6200)
* move migrating to backend * add loading image when migrating and fix tests * fix format * fix lint * add redis task queue support and improve docs * add redis vendor * fix vet * add database migrations and fix app.ini sample * add comments for task section on app.ini.sample * Update models/migrations/v84.go Co-Authored-By: lunny <xiaolunwen@gmail.com> * Update models/repo.go Co-Authored-By: lunny <xiaolunwen@gmail.com> * move migrating to backend * add loading image when migrating and fix tests * fix fmt * add redis task queue support and improve docs * fix fixtures * fix fixtures * fix duplicate function on index.js * fix tests * rename repository statuses * check if repository is being create when SSH request * fix lint * fix template * some improvements * fix template * unified migrate options * fix lint * fix loading page * refactor * When gitea restart, don't restart the running tasks because we may have servel gitea instances, that may break the migration * fix js * Update models/repo.go Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com> * Update docs/content/doc/advanced/config-cheat-sheet.en-us.md Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com> * fix tests * rename ErrTaskIsNotExist to ErrTaskDoesNotExist * delete release after add one on tests to make it run happy * fix tests * fix tests * improve codes * fix lint * fix lint * fix migrations
Diffstat (limited to 'modules/migrations')
-rw-r--r--modules/migrations/base/options.go21
-rw-r--r--modules/migrations/gitea.go36
-rw-r--r--modules/migrations/gitea_test.go7
-rw-r--r--modules/migrations/github.go4
-rw-r--r--modules/migrations/migrate.go12
5 files changed, 45 insertions, 35 deletions
diff --git a/modules/migrations/base/options.go b/modules/migrations/base/options.go
index ba7fdc6815..2d180b61d9 100644
--- a/modules/migrations/base/options.go
+++ b/modules/migrations/base/options.go
@@ -5,22 +5,7 @@
package base
-// MigrateOptions defines the way a repository gets migrated
-type MigrateOptions struct {
- RemoteURL string
- AuthUsername string
- AuthPassword string
- Name string
- Description string
- OriginalURL string
+import "code.gitea.io/gitea/modules/structs"
- Wiki bool
- Issues bool
- Milestones bool
- Labels bool
- Releases bool
- Comments bool
- PullRequests bool
- Private bool
- Mirror bool
-}
+// MigrateOptions defines the way a repository gets migrated
+type MigrateOptions = structs.MigrateRepoOption
diff --git a/modules/migrations/gitea.go b/modules/migrations/gitea.go
index 1edac47a6e..ab3b0b9f69 100644
--- a/modules/migrations/gitea.go
+++ b/modules/migrations/gitea.go
@@ -22,6 +22,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations/base"
"code.gitea.io/gitea/modules/setting"
+ "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/timeutil"
gouuid "github.com/satori/go.uuid"
@@ -90,16 +91,33 @@ func (g *GiteaLocalUploader) CreateRepo(repo *base.Repository, opts base.Migrate
remoteAddr = u.String()
}
- r, err := models.MigrateRepository(g.doer, owner, models.MigrateRepoOptions{
- Name: g.repoName,
- Description: repo.Description,
- OriginalURL: repo.OriginalURL,
- IsMirror: repo.IsMirror,
- RemoteAddr: remoteAddr,
- IsPrivate: repo.IsPrivate,
- Wiki: opts.Wiki,
- SyncReleasesWithTags: !opts.Releases, // if didn't get releases, then sync them from tags
+ var r *models.Repository
+ if opts.MigrateToRepoID <= 0 {
+ r, err = models.CreateRepository(g.doer, owner, models.CreateRepoOptions{
+ Name: g.repoName,
+ Description: repo.Description,
+ OriginalURL: repo.OriginalURL,
+ IsPrivate: opts.Private,
+ IsMirror: opts.Mirror,
+ Status: models.RepositoryBeingMigrated,
+ })
+ } else {
+ r, err = models.GetRepositoryByID(opts.MigrateToRepoID)
+ }
+ if err != nil {
+ return err
+ }
+
+ r, err = models.MigrateRepositoryGitData(g.doer, owner, r, structs.MigrateRepoOption{
+ RepoName: g.repoName,
+ Description: repo.Description,
+ Mirror: repo.IsMirror,
+ CloneAddr: remoteAddr,
+ Private: repo.IsPrivate,
+ Wiki: opts.Wiki,
+ Releases: opts.Releases, // if didn't get releases, then sync them from tags
})
+
g.repo = r
if err != nil {
return err
diff --git a/modules/migrations/gitea_test.go b/modules/migrations/gitea_test.go
index 88a3a6d218..73c119a15d 100644
--- a/modules/migrations/gitea_test.go
+++ b/modules/migrations/gitea_test.go
@@ -10,6 +10,7 @@ import (
"time"
"code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/util"
"github.com/stretchr/testify/assert"
@@ -29,9 +30,9 @@ func TestGiteaUploadRepo(t *testing.T) {
uploader = NewGiteaLocalUploader(user, user.Name, repoName)
)
- err := migrateRepository(downloader, uploader, MigrateOptions{
- RemoteURL: "https://github.com/go-xorm/builder",
- Name: repoName,
+ err := migrateRepository(downloader, uploader, structs.MigrateRepoOption{
+ CloneAddr: "https://github.com/go-xorm/builder",
+ RepoName: repoName,
AuthUsername: "",
Wiki: true,
diff --git a/modules/migrations/github.go b/modules/migrations/github.go
index 754f98941c..1c5d96c03d 100644
--- a/modules/migrations/github.go
+++ b/modules/migrations/github.go
@@ -34,7 +34,7 @@ type GithubDownloaderV3Factory struct {
// Match returns ture if the migration remote URL matched this downloader factory
func (f *GithubDownloaderV3Factory) Match(opts base.MigrateOptions) (bool, error) {
- u, err := url.Parse(opts.RemoteURL)
+ u, err := url.Parse(opts.CloneAddr)
if err != nil {
return false, err
}
@@ -44,7 +44,7 @@ func (f *GithubDownloaderV3Factory) Match(opts base.MigrateOptions) (bool, error
// New returns a Downloader related to this factory according MigrateOptions
func (f *GithubDownloaderV3Factory) New(opts base.MigrateOptions) (base.Downloader, error) {
- u, err := url.Parse(opts.RemoteURL)
+ u, err := url.Parse(opts.CloneAddr)
if err != nil {
return nil, err
}
diff --git a/modules/migrations/migrate.go b/modules/migrations/migrate.go
index 27782cb940..3f5c0d1118 100644
--- a/modules/migrations/migrate.go
+++ b/modules/migrations/migrate.go
@@ -6,6 +6,8 @@
package migrations
import (
+ "fmt"
+
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations/base"
@@ -27,7 +29,7 @@ func RegisterDownloaderFactory(factory base.DownloaderFactory) {
func MigrateRepository(doer *models.User, ownerName string, opts base.MigrateOptions) (*models.Repository, error) {
var (
downloader base.Downloader
- uploader = NewGiteaLocalUploader(doer, ownerName, opts.Name)
+ uploader = NewGiteaLocalUploader(doer, ownerName, opts.RepoName)
)
for _, factory := range factories {
@@ -50,14 +52,18 @@ func MigrateRepository(doer *models.User, ownerName string, opts base.MigrateOpt
opts.Comments = false
opts.Issues = false
opts.PullRequests = false
- downloader = NewPlainGitDownloader(ownerName, opts.Name, opts.RemoteURL)
- log.Trace("Will migrate from git: %s", opts.RemoteURL)
+ downloader = NewPlainGitDownloader(ownerName, opts.RepoName, opts.CloneAddr)
+ log.Trace("Will migrate from git: %s", opts.CloneAddr)
}
if err := migrateRepository(downloader, uploader, opts); err != nil {
if err1 := uploader.Rollback(); err1 != nil {
log.Error("rollback failed: %v", err1)
}
+
+ if err2 := models.CreateRepositoryNotice(fmt.Sprintf("Migrate repository from %s failed: %v", opts.CloneAddr, err)); err2 != nil {
+ log.Error("create respotiry notice failed: ", err2)
+ }
return nil, err
}