Skip to content

Commit acb0007

Browse files
wxiaoguangwxiaoguang
committed
re-format
1 parent 829f78e commit acb0007

Some content is hidden

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

59 files changed

+5
-67
lines changed

‎build/codeformat/formatimports.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func parseImportLine(line string) (*importLineParsed, error) {
4646
pDot := strings.IndexRune(il.pkg, '.')
4747
pSlash := strings.IndexRune(il.pkg, '/')
4848
if pDot != -1 && pDot < pSlash {
49-
il.group = il.pkg[:pSlash]
49+
il.group = "domain-package"
5050
}
5151
for groupName := range importPackageGroupOrders {
5252
if groupName == "" {

‎build/codeformat/formatimports_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,9 @@ import (
8686
"code.gitea.io/gitea/modules/util"
8787
8888
"code.gitea.io/other/package"
89-
9089
"github.com/issue9/identicon"
9190
"github.com/nfnt/resize"
9291
"github.com/oliamb/cutter"
93-
9492
"xorm.io/the/package"
9593
)
9694
`

‎cmd/doctor.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"code.gitea.io/gitea/modules/setting"
2020

2121
"github.com/urfave/cli"
22-
2322
"xorm.io/xorm"
2423
)
2524

‎cmd/dump.go

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

2323
"gitea.com/go-chi/session"
24-
2524
archiver "github.com/mholt/archiver/v3"
2625
"github.com/urfave/cli"
2726
)

‎cmd/web.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"code.gitea.io/gitea/routers/install"
2222

2323
"github.com/urfave/cli"
24-
2524
ini "gopkg.in/ini.v1"
2625
)
2726

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

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

1717
"github.com/urfave/cli"
18-
1918
ini "gopkg.in/ini.v1"
2019
)
2120

‎contrib/pr/checkout.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ 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-
4140
"xorm.io/xorm"
4241
)
4342

‎integrations/create_no_session_test.go

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

1919
"gitea.com/go-chi/session"
20-
2120
"github.com/stretchr/testify/assert"
2221
)
2322

‎integrations/gpg_git_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"code.gitea.io/gitea/modules/util"
2020

2121
"github.com/stretchr/testify/assert"
22-
2322
"golang.org/x/crypto/openpgp"
2423
"golang.org/x/crypto/openpgp/armor"
2524
)

‎models/db/engine.go

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

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

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-
2319
"xorm.io/xorm"
2420
"xorm.io/xorm/names"
2521
"xorm.io/xorm/schemas"
22+
23+
_ "github.com/denisenkom/go-mssqldb" // Needed for the MSSQL driver
24+
_ "github.com/go-sql-driver/mysql" // Needed for the MySQL driver
25+
_ "github.com/lib/pq" // Needed for the Postgresql driver
2626
)
2727

2828
var (

‎models/db/sql_postgres_with_schema.go

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

1414
"github.com/lib/pq"
15-
1615
"xorm.io/xorm/dialects"
1716
)
1817

‎models/external_login_user.go

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

1414
"github.com/markbates/goth"
15-
1615
"xorm.io/builder"
1716
)
1817

‎models/gpg_key.go

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

1717
"github.com/keybase/go-crypto/openpgp"
1818
"github.com/keybase/go-crypto/openpgp/packet"
19-
2019
"xorm.io/xorm"
2120
)
2221

‎models/issue_milestone_test.go

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

1717
"github.com/stretchr/testify/assert"
18-
1918
"xorm.io/builder"
2019
)
2120

‎models/login/oauth2_application.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ import (
1717
"code.gitea.io/gitea/modules/util"
1818

1919
uuid "github.com/google/uuid"
20-
2120
"golang.org/x/crypto/bcrypt"
22-
2321
"xorm.io/xorm"
2422
)
2523

‎models/login/source_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"code.gitea.io/gitea/modules/json"
1414

1515
"github.com/stretchr/testify/assert"
16-
1716
"xorm.io/xorm/schemas"
1817
)
1918

‎models/login/twofactor.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"code.gitea.io/gitea/modules/util"
1919

2020
"github.com/pquerna/otp/totp"
21-
2221
"golang.org/x/crypto/pbkdf2"
2322
)
2423

‎models/migrations/migrations_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424

2525
"github.com/stretchr/testify/assert"
2626
"github.com/unknwon/com"
27-
2827
"xorm.io/xorm"
2928
"xorm.io/xorm/names"
3029
)

‎models/migrations/v166.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"golang.org/x/crypto/bcrypt"
1313
"golang.org/x/crypto/pbkdf2"
1414
"golang.org/x/crypto/scrypt"
15-
1615
"xorm.io/builder"
1716
"xorm.io/xorm"
1817
)

‎models/migrations/v71.go

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

1414
"golang.org/x/crypto/pbkdf2"
15-
1615
"xorm.io/xorm"
1716
)
1817

‎models/ssh_key.go

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

1919
"golang.org/x/crypto/ssh"
20-
2120
"xorm.io/builder"
2221
)
2322

‎models/unittest/consistency.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"code.gitea.io/gitea/models/db"
1313

1414
"github.com/stretchr/testify/assert"
15-
1615
"xorm.io/builder"
1716
)
1817

‎models/unittest/fixtures.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"code.gitea.io/gitea/models/db"
1313

1414
"github.com/go-testfixtures/testfixtures/v3"
15-
1615
"xorm.io/xorm"
1716
"xorm.io/xorm/schemas"
1817
)

‎models/unittest/testdb.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"code.gitea.io/gitea/modules/util"
1919

2020
"github.com/stretchr/testify/assert"
21-
2221
"xorm.io/xorm"
2322
"xorm.io/xorm/names"
2423
)

‎models/unittest/unit_tests.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"code.gitea.io/gitea/models/db"
1111

1212
"github.com/stretchr/testify/assert"
13-
1413
"xorm.io/builder"
1514
)
1615

‎models/user.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import (
3939
"golang.org/x/crypto/bcrypt"
4040
"golang.org/x/crypto/pbkdf2"
4141
"golang.org/x/crypto/scrypt"
42-
4342
"xorm.io/builder"
4443
"xorm.io/xorm"
4544
)

‎modules/cache/cache_redis.go

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

1414
"gitea.com/go-chi/cache"
15-
1615
"github.com/go-redis/redis/v8"
1716
"github.com/unknwon/com"
1817
)

‎modules/cache/cache_twoqueue.go

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

1414
mc "gitea.com/go-chi/cache"
15-
1615
lru "github.com/hashicorp/golang-lru"
1716
)
1817

‎modules/charset/charset.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"code.gitea.io/gitea/modules/util"
1717

1818
"github.com/gogs/chardet"
19-
2019
"golang.org/x/net/html/charset"
2120
"golang.org/x/text/transform"
2221
)

‎modules/context/context.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,10 @@ import (
3434

3535
"gitea.com/go-chi/cache"
3636
"gitea.com/go-chi/session"
37-
3837
chi "github.com/go-chi/chi/v5"
3938
"github.com/unknwon/com"
4039
"github.com/unknwon/i18n"
4140
"github.com/unrolled/render"
42-
4341
"golang.org/x/crypto/pbkdf2"
4442
)
4543

‎modules/doctor/misc.go

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

2323
lru "github.com/hashicorp/golang-lru"
24-
2524
"xorm.io/builder"
2625
)
2726

‎modules/indexer/issues/indexer_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"code.gitea.io/gitea/modules/util"
1717

1818
"github.com/stretchr/testify/assert"
19-
2019
"gopkg.in/ini.v1"
2120
)
2221

‎modules/indexer/stats/indexer_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"code.gitea.io/gitea/modules/setting"
1515

1616
"github.com/stretchr/testify/assert"
17-
1817
"gopkg.in/ini.v1"
1918
)
2019

‎modules/log/console_windows.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"os"
99

1010
"github.com/mattn/go-isatty"
11-
1211
"golang.org/x/sys/windows"
1312
)
1413

‎modules/markup/html.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@ import (
2424
"code.gitea.io/gitea/modules/util"
2525

2626
"github.com/unknwon/com"
27-
2827
"golang.org/x/net/html"
2928
"golang.org/x/net/html/atom"
30-
3129
"mvdan.cc/xurls/v2"
3230
)
3331

‎modules/markup/markdown/renderconfig.go

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

1111
"github.com/yuin/goldmark/ast"
1212
east "github.com/yuin/goldmark/extension/ast"
13-
1413
"gopkg.in/yaml.v2"
1514
)
1615

‎modules/session/redis.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"code.gitea.io/gitea/modules/nosql"
2626

2727
"gitea.com/go-chi/session"
28-
2928
"github.com/go-redis/redis/v8"
3029
)
3130

‎modules/setting/cron_test.go

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

1010
"github.com/stretchr/testify/assert"
11-
1211
ini "gopkg.in/ini.v1"
1312
)
1413

‎modules/setting/setting.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ import (
3030

3131
shellquote "github.com/kballard/go-shellquote"
3232
"github.com/unknwon/com"
33-
3433
gossh "golang.org/x/crypto/ssh"
35-
3634
ini "gopkg.in/ini.v1"
3735
)
3836

‎modules/setting/storage_test.go

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

1010
"github.com/stretchr/testify/assert"
11-
1211
ini "gopkg.in/ini.v1"
1312
)
1413

‎modules/ssh/ssh.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"code.gitea.io/gitea/modules/util"
2929

3030
"github.com/gliderlabs/ssh"
31-
3231
gossh "golang.org/x/crypto/ssh"
3332
)
3433

‎modules/translation/translation.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"code.gitea.io/gitea/modules/setting"
1111

1212
"github.com/unknwon/i18n"
13-
1413
"golang.org/x/text/language"
1514
)
1615

‎modules/validation/binding.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"strings"
1111

1212
"gitea.com/go-chi/binding"
13-
1413
"github.com/gobwas/glob"
1514
)
1615

‎modules/validation/binding_test.go

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

1212
"gitea.com/go-chi/binding"
13-
1413
chi "github.com/go-chi/chi/v5"
1514
"github.com/stretchr/testify/assert"
1615
)

‎modules/validation/glob_pattern_test.go

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

1010
"gitea.com/go-chi/binding"
11-
1211
"github.com/gobwas/glob"
1312
)
1413

‎modules/web/middleware/binding.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"code.gitea.io/gitea/modules/validation"
1414

1515
"gitea.com/go-chi/binding"
16-
1716
"github.com/unknwon/com"
1817
)
1918

0 commit comments

Comments
 (0)