mirror of
https://github.com/go-gitea/gitea.git
synced 2025-04-15 05:37:46 +00:00
Merge 573a55d556
into aada0370e7
This commit is contained in:
commit
ee08a25c34
@ -16,6 +16,7 @@ import (
|
||||
repo_model "code.gitea.io/gitea/models/repo"
|
||||
system_model "code.gitea.io/gitea/models/system"
|
||||
user_model "code.gitea.io/gitea/models/user"
|
||||
"code.gitea.io/gitea/modules/container"
|
||||
"code.gitea.io/gitea/modules/git"
|
||||
"code.gitea.io/gitea/modules/hostmatcher"
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
@ -329,6 +330,9 @@ func migrateRepository(ctx context.Context, doer *user_model.User, downloader ba
|
||||
messenger("repo.migrate.migrating_issues")
|
||||
issueBatchSize := uploader.MaxBatchInsertSize("issue")
|
||||
|
||||
// because when the migrating is running, some issues maybe removed, so after the next page
|
||||
// some of issue maybe duplicated, so we need to record the inserted issue indexes
|
||||
mapInsertedIssueIndexes := container.Set[int64]{}
|
||||
for i := 1; ; i++ {
|
||||
issues, isEnd, err := downloader.GetIssues(ctx, i, issueBatchSize)
|
||||
if err != nil {
|
||||
@ -338,6 +342,14 @@ func migrateRepository(ctx context.Context, doer *user_model.User, downloader ba
|
||||
log.Warn("migrating issues is not supported, ignored")
|
||||
break
|
||||
}
|
||||
for i := 0; i < len(issues); i++ {
|
||||
if mapInsertedIssueIndexes.Contains(issues[i].Number) {
|
||||
issues = append(issues[:i], issues[i+1:]...)
|
||||
i--
|
||||
continue
|
||||
}
|
||||
mapInsertedIssueIndexes.Add(issues[i].Number)
|
||||
}
|
||||
|
||||
if err := uploader.CreateIssues(ctx, issues...); err != nil {
|
||||
return err
|
||||
@ -383,6 +395,7 @@ func migrateRepository(ctx context.Context, doer *user_model.User, downloader ba
|
||||
log.Trace("migrating pull requests and comments")
|
||||
messenger("repo.migrate.migrating_pulls")
|
||||
prBatchSize := uploader.MaxBatchInsertSize("pullrequest")
|
||||
mapInsertedIssueIndexes := container.Set[int64]{}
|
||||
for i := 1; ; i++ {
|
||||
prs, isEnd, err := downloader.GetPullRequests(ctx, i, prBatchSize)
|
||||
if err != nil {
|
||||
@ -392,6 +405,14 @@ func migrateRepository(ctx context.Context, doer *user_model.User, downloader ba
|
||||
log.Warn("migrating pull requests is not supported, ignored")
|
||||
break
|
||||
}
|
||||
for i := 0; i < len(prs); i++ {
|
||||
if mapInsertedIssueIndexes.Contains(prs[i].Number) {
|
||||
prs = append(prs[:i], prs[i+1:]...)
|
||||
i--
|
||||
continue
|
||||
}
|
||||
mapInsertedIssueIndexes.Add(prs[i].Number)
|
||||
}
|
||||
|
||||
if err := uploader.CreatePullRequests(ctx, prs...); err != nil {
|
||||
return err
|
||||
|
Loading…
Reference in New Issue
Block a user