13
3
Fork 0
Wiki Issues 89 resources competences Projects 8 Code Pull Requests Releases Activity
Browse Source

Move migrations into services and base into modules/migration (#17663) 

* Move migrtions into services and base into modules/migration

* Fix imports

* Fix lint
tags/v1.16.0-rc1
Lunny Xiao 3 years ago committed by GitHub
parent
48ccd325a1
commit
7e1ae38097
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 51 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      cmd/dump_repo.go
  2. 5
      integrations/migrate_test.go
  3. 2
      integrations/mirror_pull_test.go
  4. 2
      models/task.go
  5. 2
      modules/migration/comment.go
  6. 2
      modules/migration/downloader.go
  7. 2
      modules/migration/error.go
  8. 2
      modules/migration/issue.go
  9. 2
      modules/migration/label.go
  10. 2
      modules/migration/messenger.go
  11. 2
      modules/migration/milestone.go
  12. 2
      modules/migration/null_downloader.go
  13. 2
      modules/migration/options.go
  14. 2
      modules/migration/pullrequest.go
  15. 2
      modules/migration/reaction.go
  16. 2
      modules/migration/release.go
  17. 2
      modules/migration/repo.go
  18. 2
      modules/migration/retry_downloader.go
  19. 2
      modules/migration/review.go
  20. 2
      modules/migration/uploader.go
  21. 2
      modules/repository/repo.go
  22. 4
      modules/task/migrate.go
  23. 2
      modules/task/task.go
  24. 4
      routers/api/v1/repo/migrate.go
  25. 2
      routers/init.go
  26. 2
      routers/private/restore_repo.go
  27. 2
      routers/web/repo/migrate.go
  28. 2
      routers/web/repo/setting.go
  29. 2
      services/cron/tasks_basic.go
  30. 2
      services/migrations/dump.go
  31. 0
      services/migrations/error.go
  32. 2
      services/migrations/git.go
  33. 2
      services/migrations/gitbucket.go
  34. 2
      services/migrations/gitea_downloader.go
  35. 2
      services/migrations/gitea_downloader_test.go
  36. 2
      services/migrations/gitea_uploader.go
  37. 2
      services/migrations/gitea_uploader_test.go
  38. 2
      services/migrations/github.go
  39. 2
      services/migrations/github_test.go
  40. 2
      services/migrations/gitlab.go
  41. 2
      services/migrations/gitlab_test.go
  42. 2
      services/migrations/gogs.go
  43. 2
      services/migrations/gogs_test.go
  44. 2
      services/migrations/main_test.go
  45. 2
      services/migrations/migrate.go
  46. 0
      services/migrations/migrate_test.go
  47. 2
      services/migrations/onedev.go
  48. 2
      services/migrations/onedev_test.go
  49. 2
      services/migrations/restore.go
  50. 0
      services/migrations/update.go

4
cmd/dump_repo.go
Unescape View File

@ -11,10 +11,10 @@ import (
"code.gitea.io/gitea/modules/convert"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/services/migrations"
"github.com/urfave/cli"
)

5
integrations/migrate_test.go
Unescape View File

@ -8,11 +8,10 @@ import (
"os"
"testing"
"code.gitea.io/gitea/models/unittest"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/migrations"
"code.gitea.io/gitea/models/unittest"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/services/migrations"
"github.com/stretchr/testify/assert"
)

2
integrations/mirror_pull_test.go
Unescape View File

@ -11,7 +11,7 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/unittest"
"code.gitea.io/gitea/modules/git"
migration "code.gitea.io/gitea/modules/migrations/base"
"code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/repository"
mirror_service "code.gitea.io/gitea/services/mirror"
release_service "code.gitea.io/gitea/services/release"

2
models/task.go
Unescape View File

@ -9,7 +9,7 @@ import (
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/json"
migration "code.gitea.io/gitea/modules/migrations/base"
"code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/secret"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"

2
modules/migrations/base/comment.go → modules/migration/comment.go
Unescape View File

@ -3,7 +3,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
import "time"

2
modules/migrations/base/downloader.go → modules/migration/downloader.go
Unescape View File

@ -3,7 +3,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
import (
"context"

2
modules/migrations/base/error.go → modules/migration/error.go
Unescape View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
import "fmt"

2
modules/migrations/base/issue.go → modules/migration/issue.go
Unescape View File

@ -3,7 +3,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
import "time"

2
modules/migrations/base/label.go → modules/migration/label.go
Unescape View File

@ -3,7 +3,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
// Label defines a standard label information
type Label struct {

2
modules/migrations/base/messenger.go → modules/migration/messenger.go
Unescape View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
// Messenger is a formatting function similar to i18n.Tr
type Messenger func(key string, args ...interface{})

2
modules/migrations/base/milestone.go → modules/migration/milestone.go
Unescape View File

@ -3,7 +3,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
import "time"

2
modules/migrations/base/null_downloader.go → modules/migration/null_downloader.go
Unescape View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
import (
"context"

2
modules/migrations/base/options.go → modules/migration/options.go
Unescape View File

@ -3,7 +3,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
import "code.gitea.io/gitea/modules/structs"

2
modules/migrations/base/pullrequest.go → modules/migration/pullrequest.go
Unescape View File

@ -3,7 +3,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
import (
"fmt"

2
modules/migrations/base/reaction.go → modules/migration/reaction.go
Unescape View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
// Reaction represents a reaction to an issue/pr/comment.
type Reaction struct {

2
modules/migrations/base/release.go → modules/migration/release.go
Unescape View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
import (
"io"

2
modules/migrations/base/repo.go → modules/migration/repo.go
Unescape View File

@ -3,7 +3,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
// Repository defines a standard repository information
type Repository struct {

2
modules/migrations/base/retry_downloader.go → modules/migration/retry_downloader.go
Unescape View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
import (
"context"

2
modules/migrations/base/review.go → modules/migration/review.go
Unescape View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
import "time"

2
modules/migrations/base/uploader.go → modules/migration/uploader.go
Unescape View File

@ -3,7 +3,7 @@
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package base
package migration
// Uploader uploads all the information of one repository
type Uploader interface {

2
modules/repository/repo.go
Unescape View File

@ -18,7 +18,7 @@ import (
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/lfs"
"code.gitea.io/gitea/modules/log"
migration "code.gitea.io/gitea/modules/migrations/base"
"code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"

4
modules/task/migrate.go
Unescape View File

@ -14,13 +14,13 @@ import (
"code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations"
migration "code.gitea.io/gitea/modules/migrations/base"
"code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/notification"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/services/migrations"
)
func handleCreateError(owner *models.User, err error) error {

2
modules/task/task.go
Unescape View File

@ -11,7 +11,7 @@ import (
"code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/queue"
repo_module "code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/secret"

4
routers/api/v1/repo/migrate.go
Unescape View File

@ -17,8 +17,7 @@ import (
"code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/lfs"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/notification"
repo_module "code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/setting"
@ -26,6 +25,7 @@ import (
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/services/forms"
"code.gitea.io/gitea/services/migrations"
)
// Migrate migrate remote git repository to gitea

2
routers/init.go
Unescape View File

@ -24,7 +24,6 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/markup/external"
repo_migrations "code.gitea.io/gitea/modules/migrations"
"code.gitea.io/gitea/modules/notification"
repo_module "code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/setting"
@ -43,6 +42,7 @@ import (
"code.gitea.io/gitea/services/auth/source/oauth2"
"code.gitea.io/gitea/services/cron"
"code.gitea.io/gitea/services/mailer"
repo_migrations "code.gitea.io/gitea/services/migrations"
mirror_service "code.gitea.io/gitea/services/mirror"
pull_service "code.gitea.io/gitea/services/pull"
"code.gitea.io/gitea/services/repository"

2
routers/private/restore_repo.go
Unescape View File

@ -10,8 +10,8 @@ import (
myCtx "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/migrations"
"code.gitea.io/gitea/modules/private"
"code.gitea.io/gitea/services/migrations"
)
// RestoreRepo restore a repository from data

2
routers/web/repo/migrate.go
Unescape View File

@ -14,13 +14,13 @@ import (
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/lfs"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/task"
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/services/forms"
"code.gitea.io/gitea/services/migrations"
)
const (

2
routers/web/repo/setting.go
Unescape View File

@ -22,7 +22,6 @@ import (
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/lfs"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations"
"code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"
@ -34,6 +33,7 @@ import (
"code.gitea.io/gitea/routers/utils"
"code.gitea.io/gitea/services/forms"
"code.gitea.io/gitea/services/mailer"
"code.gitea.io/gitea/services/migrations"
mirror_service "code.gitea.io/gitea/services/mirror"
repo_service "code.gitea.io/gitea/services/repository"
wiki_service "code.gitea.io/gitea/services/wiki"

2
services/cron/tasks_basic.go
Unescape View File

@ -10,10 +10,10 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/webhook"
"code.gitea.io/gitea/modules/migrations"
repository_service "code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/services/auth"
"code.gitea.io/gitea/services/migrations"
mirror_service "code.gitea.io/gitea/services/mirror"
)

2
modules/migrations/dump.go → services/migrations/dump.go
Unescape View File

@ -20,7 +20,7 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/structs"

0
modules/migrations/error.go → services/migrations/error.go
Unescape View File

2
modules/migrations/git.go → services/migrations/git.go
Unescape View File

@ -7,7 +7,7 @@ package migrations
import (
"context"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
)
var (

2
modules/migrations/gitbucket.go → services/migrations/gitbucket.go
Unescape View File

@ -9,7 +9,7 @@ import (
"net/url"
"strings"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/structs"
)

2
modules/migrations/gitea_downloader.go → services/migrations/gitea_downloader.go
Unescape View File

@ -17,7 +17,7 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/proxy"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"

2
modules/migrations/gitea_downloader_test.go → services/migrations/gitea_downloader_test.go
Unescape View File

@ -12,7 +12,7 @@ import (
"testing"
"time"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"github.com/stretchr/testify/assert"
)

2
modules/migrations/gitea_uploader.go → services/migrations/gitea_uploader.go
Unescape View File

@ -19,7 +19,7 @@ import (
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
repo_module "code.gitea.io/gitea/modules/repository"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/storage"

2
modules/migrations/gitea_uploader_test.go → services/migrations/gitea_uploader_test.go
Unescape View File

@ -14,7 +14,7 @@ import (
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/unittest"
"code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/util"

2
modules/migrations/github.go → services/migrations/github.go
Unescape View File

@ -17,7 +17,7 @@ import (
"time"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/proxy"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"

2
modules/migrations/github_test.go → services/migrations/github_test.go
Unescape View File

@ -11,7 +11,7 @@ import (
"testing"
"time"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"github.com/stretchr/testify/assert"
)

2
modules/migrations/gitlab.go → services/migrations/gitlab.go
Unescape View File

@ -17,7 +17,7 @@ import (
"time"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/proxy"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"

2
modules/migrations/gitlab_test.go → services/migrations/gitlab_test.go
Unescape View File

@ -12,7 +12,7 @@ import (
"testing"
"time"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"github.com/stretchr/testify/assert"
)

2
modules/migrations/gogs.go → services/migrations/gogs.go
Unescape View File

@ -14,7 +14,7 @@ import (
"time"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/proxy"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"

2
modules/migrations/gogs_test.go → services/migrations/gogs_test.go
Unescape View File

@ -11,7 +11,7 @@ import (
"testing"
"time"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"github.com/stretchr/testify/assert"
)

2
modules/migrations/main_test.go → services/migrations/main_test.go
Unescape View File

@ -11,7 +11,7 @@ import (
"time"
"code.gitea.io/gitea/models/unittest"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"github.com/stretchr/testify/assert"
)

2
modules/migrations/migrate.go → services/migrations/migrate.go
Unescape View File

@ -16,7 +16,7 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/matchlist"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
)

0
modules/migrations/migrate_test.go → services/migrations/migrate_test.go
Unescape View File

2
modules/migrations/onedev.go → services/migrations/onedev.go
Unescape View File

@ -15,7 +15,7 @@ import (
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"code.gitea.io/gitea/modules/structs"
)

2
modules/migrations/onedev_test.go → services/migrations/onedev_test.go
Unescape View File

@ -12,7 +12,7 @@ import (
"testing"
"time"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"github.com/stretchr/testify/assert"
)

2
modules/migrations/restore.go → services/migrations/restore.go
Unescape View File

@ -11,7 +11,7 @@ import (
"path/filepath"
"strconv"
"code.gitea.io/gitea/modules/migrations/base"
base "code.gitea.io/gitea/modules/migration"
"gopkg.in/yaml.v2"
)

0
modules/migrations/update.go → services/migrations/update.go
Unescape View File

Write Preview
Loading…
Cancel
Save