Skip to content

Commit a828151

Browse files
committed
fix bug when migrate from API
1 parent 05e7715 commit a828151

File tree

3 files changed

+47
-5
lines changed

3 files changed

+47
-5
lines changed

models/repo.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2826,3 +2826,9 @@ func (repo *Repository) GetTreePathLock(treePath string) (*LFSLock, error) {
28262826
}
28272827
return nil, nil
28282828
}
2829+
2830+
// UpdateRepositoryCols updates repository's columns
2831+
func UpdateRepositoryCols(repo *Repository, cols ...string) error {
2832+
_, err := x.ID(repo.ID).Cols(cols...).Update(repo)
2833+
return err
2834+
}

modules/task/migrate.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ func runMigrateTask(t *models.Task) (err error) {
9797
opts.MigrateToRepoID = t.RepoID
9898
repo, err := migrations.MigrateRepository(t.Doer, t.Owner.Name, *opts)
9999
if err == nil {
100-
notification.NotifyMigrateRepository(t.Doer, t.Owner, repo)
101-
102100
log.Trace("Repository migrated [%d]: %s/%s", repo.ID, t.Owner.Name, repo.Name)
103101
return nil
104102
}

routers/api/v1/repo/repo.go

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
package repo
77

88
import (
9+
"bytes"
10+
"errors"
911
"fmt"
1012
"net/http"
1113
"net/url"
@@ -425,10 +427,46 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) {
425427
opts.Releases = false
426428
}
427429

428-
repo, err := migrations.MigrateRepository(ctx.User, ctxUser.Name, opts)
429-
if err == nil {
430-
notification.NotifyMigrateRepository(ctx.User, ctxUser, repo)
430+
repo, err := models.CreateRepository(ctx.User, ctxUser, models.CreateRepoOptions{
431+
Name: opts.RepoName,
432+
Description: opts.Description,
433+
OriginalURL: opts.CloneAddr,
434+
IsPrivate: opts.Private,
435+
IsMirror: opts.Mirror,
436+
Status: models.RepositoryBeingMigrated,
437+
})
438+
if err != nil {
439+
ctx.Error(500, "CreateRepository", err)
440+
return
441+
}
442+
443+
opts.MigrateToRepoID = repo.ID
444+
445+
defer func() {
446+
if e := recover(); e != nil {
447+
var buf bytes.Buffer
448+
fmt.Fprintf(&buf, "Handler crashed with error: %v", log.Stack(2))
449+
450+
err = errors.New(buf.String())
451+
}
431452

453+
if err == nil {
454+
repo.Status = models.RepositoryReady
455+
if err := models.UpdateRepositoryCols(repo, "status"); err == nil {
456+
notification.NotifyMigrateRepository(ctx.User, ctxUser, repo)
457+
return
458+
}
459+
}
460+
461+
if repo != nil {
462+
if errDelete := models.DeleteRepository(ctx.User, ctxUser.ID, repo.ID); errDelete != nil {
463+
log.Error("DeleteRepository: %v", errDelete)
464+
}
465+
}
466+
}()
467+
468+
_, err = migrations.MigrateRepository(ctx.User, ctxUser.Name, opts)
469+
if err == nil {
432470
log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName)
433471
ctx.JSON(201, repo.APIFormat(models.AccessModeAdmin))
434472
return

0 commit comments

Comments
 (0)