improve

lunny · lunny · commit 437e90d8f773 · 2019-11-05T16:44:57.000+08:00
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
@@ -465,14 +465,13 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) {
 		}
 	}()
 
-	_, err = migrations.MigrateRepository(ctx.User, ctxUser.Name, opts)
-	if err == nil {
-		log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName)
-		ctx.JSON(201, repo.APIFormat(models.AccessModeAdmin))
+	if _, err = migrations.MigrateRepository(ctx.User, ctxUser.Name, opts); err != nil {
+		handleMigrateError(ctx, remoteAddr, err)
 		return
 	}
 
-	handleMigrateError(ctx, remoteAddr, err)
+	log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName)
+	ctx.JSON(201, repo.APIFormat(models.AccessModeAdmin))
 }
 
 func handleMigrateError(ctx *context.APIContext, remoteAddr string, err error) {

Original file line number	Diff line number	Diff line change
`@@ -465,14 +465,13 @@ func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) {`
`465`	`465`	`}`
`466`	`466`	`}()`
`467`	`467`
`468`		`- _, err = migrations.MigrateRepository(ctx.User, ctxUser.Name, opts)`
`469`		`- if err == nil {`
`470`		`- log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName)`
`471`		`- ctx.JSON(201, repo.APIFormat(models.AccessModeAdmin))`
	`468`	`+ if _, err = migrations.MigrateRepository(ctx.User, ctxUser.Name, opts); err != nil {`
	`469`	`+ handleMigrateError(ctx, remoteAddr, err)`
`472`	`470`	`return`
`473`	`471`	`}`
`474`	`472`
`475`		`- handleMigrateError(ctx, remoteAddr, err)`
	`473`	`+ log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName)`
	`474`	`+ ctx.JSON(201, repo.APIFormat(models.AccessModeAdmin))`
`476`	`475`	`}`
`477`	`476`
`478`	`477`	`func handleMigrateError(ctx *context.APIContext, remoteAddr string, err error) {`