Skip to content

Commit 829f78e

Browse files
wxiaoguangwxiaoguang
committed
re-format imports
1 parent 2ecd0ec commit 829f78e

File tree

146 files changed

+162
-29
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+162
-29
lines changed

‎cmd/doctor.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
"code.gitea.io/gitea/modules/log"
1919
"code.gitea.io/gitea/modules/setting"
2020

21-
"xorm.io/xorm"
22-
2321
"github.com/urfave/cli"
22+
23+
"xorm.io/xorm"
2424
)
2525

2626
// CmdDoctor represents the available doctor sub-command.

‎cmd/dump.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"code.gitea.io/gitea/modules/util"
2222

2323
"gitea.com/go-chi/session"
24+
2425
archiver "github.com/mholt/archiver/v3"
2526
"github.com/urfave/cli"
2627
)

‎cmd/mailer.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
"code.gitea.io/gitea/modules/private"
1212
"code.gitea.io/gitea/modules/setting"
13+
1314
"github.com/urfave/cli"
1415
)
1516

‎cmd/web.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@ import (
99
"fmt"
1010
"net"
1111
"net/http"
12-
_ "net/http/pprof" // Used for debugging if enabled and a web server is running
1312
"os"
1413
"strings"
1514

15+
_ "net/http/pprof" // Used for debugging if enabled and a web server is running
16+
1617
"code.gitea.io/gitea/modules/graceful"
1718
"code.gitea.io/gitea/modules/log"
1819
"code.gitea.io/gitea/modules/setting"
1920
"code.gitea.io/gitea/routers"
2021
"code.gitea.io/gitea/routers/install"
2122

2223
"github.com/urfave/cli"
24+
2325
ini "gopkg.in/ini.v1"
2426
)
2527

‎contrib/environment-to-ini/environment-to-ini.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"code.gitea.io/gitea/modules/util"
1616

1717
"github.com/urfave/cli"
18+
1819
ini "gopkg.in/ini.v1"
1920
)
2021

‎contrib/pr/checkout.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import (
3737
"github.com/go-git/go-git/v5"
3838
"github.com/go-git/go-git/v5/config"
3939
"github.com/go-git/go-git/v5/plumbing"
40+
4041
"xorm.io/xorm"
4142
)
4243

‎integrations/api_issue_label_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ import (
1010
"strings"
1111
"testing"
1212

13-
"code.gitea.io/gitea/models/unittest"
14-
1513
"code.gitea.io/gitea/models"
14+
"code.gitea.io/gitea/models/unittest"
1615
api "code.gitea.io/gitea/modules/structs"
1716

1817
"github.com/stretchr/testify/assert"

‎integrations/api_private_serv_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
"code.gitea.io/gitea/models"
1313
"code.gitea.io/gitea/modules/private"
14+
1415
"github.com/stretchr/testify/assert"
1516
)
1617

‎integrations/api_pull_commits_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"code.gitea.io/gitea/models"
1212
"code.gitea.io/gitea/models/unittest"
1313
api "code.gitea.io/gitea/modules/structs"
14+
1415
"github.com/stretchr/testify/assert"
1516
)
1617

‎integrations/api_repo_git_notes_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"code.gitea.io/gitea/models"
1313
"code.gitea.io/gitea/models/unittest"
1414
api "code.gitea.io/gitea/modules/structs"
15+
1516
"github.com/stretchr/testify/assert"
1617
)
1718

‎integrations/api_team_user_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"code.gitea.io/gitea/models/unittest"
1414
"code.gitea.io/gitea/modules/convert"
1515
api "code.gitea.io/gitea/modules/structs"
16+
1617
"github.com/stretchr/testify/assert"
1718
)
1819

‎integrations/api_user_org_perm_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"testing"
1111

1212
api "code.gitea.io/gitea/modules/structs"
13+
1314
"github.com/stretchr/testify/assert"
1415
)
1516

‎integrations/create_no_session_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"code.gitea.io/gitea/routers"
1818

1919
"gitea.com/go-chi/session"
20+
2021
"github.com/stretchr/testify/assert"
2122
)
2223

‎integrations/download_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"testing"
1010

1111
"code.gitea.io/gitea/modules/setting"
12+
1213
"github.com/stretchr/testify/assert"
1314
)
1415

‎integrations/eventsource_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"code.gitea.io/gitea/models/unittest"
1515
"code.gitea.io/gitea/modules/eventsource"
1616
api "code.gitea.io/gitea/modules/structs"
17+
1718
"github.com/stretchr/testify/assert"
1819
)
1920

‎integrations/git_clone_wiki_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414

1515
"code.gitea.io/gitea/modules/git"
1616
"code.gitea.io/gitea/modules/util"
17+
1718
"github.com/stretchr/testify/assert"
1819
)
1920

‎integrations/goget_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"testing"
1111

1212
"code.gitea.io/gitea/modules/setting"
13+
1314
"github.com/stretchr/testify/assert"
1415
)
1516

‎integrations/gpg_git_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ import (
1717
"code.gitea.io/gitea/modules/setting"
1818
api "code.gitea.io/gitea/modules/structs"
1919
"code.gitea.io/gitea/modules/util"
20+
2021
"github.com/stretchr/testify/assert"
22+
2123
"golang.org/x/crypto/openpgp"
2224
"golang.org/x/crypto/openpgp/armor"
2325
)

‎integrations/org_count_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"code.gitea.io/gitea/models"
1313
"code.gitea.io/gitea/models/unittest"
1414
api "code.gitea.io/gitea/modules/structs"
15+
1516
"github.com/stretchr/testify/assert"
1617
)
1718

‎integrations/org_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"testing"
1212

1313
api "code.gitea.io/gitea/modules/structs"
14+
1415
"github.com/stretchr/testify/assert"
1516
)
1617

‎integrations/rename_branch_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
"code.gitea.io/gitea/models"
1212
"code.gitea.io/gitea/models/unittest"
13+
1314
"github.com/stretchr/testify/assert"
1415
)
1516

‎integrations/repo_migrate_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"testing"
1212

1313
"code.gitea.io/gitea/modules/structs"
14+
1415
"github.com/stretchr/testify/assert"
1516
)
1617

‎integrations/repofiles_delete_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ import (
88
"net/url"
99
"testing"
1010

11-
"code.gitea.io/gitea/models/unittest"
12-
1311
"code.gitea.io/gitea/models"
12+
"code.gitea.io/gitea/models/unittest"
1413
"code.gitea.io/gitea/modules/repofiles"
1514
api "code.gitea.io/gitea/modules/structs"
1615
"code.gitea.io/gitea/modules/test"

‎integrations/signup_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"code.gitea.io/gitea/models"
1414
"code.gitea.io/gitea/models/unittest"
1515
"code.gitea.io/gitea/modules/setting"
16+
1617
"github.com/stretchr/testify/assert"
1718
"github.com/unknwon/i18n"
1819
)

‎integrations/user_avatar_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"code.gitea.io/gitea/models"
1717
"code.gitea.io/gitea/models/unittest"
1818
"code.gitea.io/gitea/modules/avatar"
19+
1920
"github.com/stretchr/testify/assert"
2021
)
2122

‎models/access_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
"code.gitea.io/gitea/models/db"
1111
"code.gitea.io/gitea/models/unittest"
12+
1213
"github.com/stretchr/testify/assert"
1314
)
1415

‎models/admin_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11+
1112
"github.com/stretchr/testify/assert"
1213
)
1314

‎models/attachment_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"code.gitea.io/gitea/models/db"
1111
"code.gitea.io/gitea/models/unit"
1212
"code.gitea.io/gitea/models/unittest"
13+
1314
"github.com/stretchr/testify/assert"
1415
)
1516

‎models/branches_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11+
1112
"github.com/stretchr/testify/assert"
1213
)
1314

‎models/commit_status_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"code.gitea.io/gitea/models/db"
1111
"code.gitea.io/gitea/models/unittest"
1212
"code.gitea.io/gitea/modules/structs"
13+
1314
"github.com/stretchr/testify/assert"
1415
)
1516

‎models/consistency_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
"code.gitea.io/gitea/models/db"
1111
"code.gitea.io/gitea/models/unittest"
12+
1213
"github.com/stretchr/testify/assert"
1314
)
1415

‎models/db/engine.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@ import (
1616

1717
"code.gitea.io/gitea/modules/setting"
1818

19-
_ "github.com/go-sql-driver/mysql" // Needed for the MySQL driver
19+
_ "github.com/denisenkom/go-mssqldb" // Needed for the MSSQL driver
20+
_ "github.com/go-sql-driver/mysql" // Needed for the MySQL driver
21+
_ "github.com/lib/pq" // Needed for the Postgresql driver
22+
2023
"xorm.io/xorm"
2124
"xorm.io/xorm/names"
2225
"xorm.io/xorm/schemas"
23-
24-
_ "github.com/lib/pq" // Needed for the Postgresql driver
25-
26-
27-
_ "github.com/denisenkom/go-mssqldb" // Needed for the MSSQL driver
2826
)
2927

3028
var (

‎models/db/sql_postgres_with_schema.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"code.gitea.io/gitea/modules/setting"
1313

1414
"github.com/lib/pq"
15+
1516
"xorm.io/xorm/dialects"
1617
)
1718

‎models/external_login_user.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"code.gitea.io/gitea/modules/structs"
1313

1414
"github.com/markbates/goth"
15+
1516
"xorm.io/builder"
1617
)
1718

‎models/gpg_key.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616

1717
"github.com/keybase/go-crypto/openpgp"
1818
"github.com/keybase/go-crypto/openpgp/packet"
19+
1920
"xorm.io/xorm"
2021
)
2122

‎models/issue_assignees_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11+
1112
"github.com/stretchr/testify/assert"
1213
)
1314

‎models/issue_comment_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"time"
1010

1111
"code.gitea.io/gitea/models/unittest"
12+
1213
"github.com/stretchr/testify/assert"
1314
)
1415

‎models/issue_dependency_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99

1010
"code.gitea.io/gitea/models/unittest"
11+
1112
"github.com/stretchr/testify/assert"
1213
)
1314

‎models/issue_label_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
"code.gitea.io/gitea/models/db"
1212
"code.gitea.io/gitea/models/unittest"
13+
1314
"github.com/stretchr/testify/assert"
1415
)
1516

‎models/issue_list.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"fmt"
99

1010
"code.gitea.io/gitea/models/db"
11+
1112
"xorm.io/builder"
1213
)
1314

‎models/issue_milestone_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"code.gitea.io/gitea/modules/timeutil"
1616

1717
"github.com/stretchr/testify/assert"
18+
1819
"xorm.io/builder"
1920
)
2021

‎models/issue_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313

1414
"code.gitea.io/gitea/models/db"
1515
"code.gitea.io/gitea/models/unittest"
16+
1617
"github.com/stretchr/testify/assert"
1718
)
1819

‎models/issue_tracked_time_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"time"
1010

1111
"code.gitea.io/gitea/models/unittest"
12+
1213
"github.com/stretchr/testify/assert"
1314
)
1415

‎models/issue_user_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
"code.gitea.io/gitea/models/db"
1111
"code.gitea.io/gitea/models/unittest"
12+
1213
"github.com/stretchr/testify/assert"
1314
)
1415

‎models/issue_watch_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
"code.gitea.io/gitea/models/db"
1111
"code.gitea.io/gitea/models/unittest"
12+
1213
"github.com/stretchr/testify/assert"
1314
)
1415

0 commit comments

Comments
 (0)