Normalize files with gofmt

diff --git a/models/git_diff.go b/models/git_diff.go
index 7aff1f53e167c72e212e62a8925809f75810c7f7..7d4f5db7f5f4545a3a825da1b0ef20a6a121632d 100644 (file)
--- a/models/git_diff.go
+++ b/models/git_diff.go
@@ -16,13 +16,13 @@ import (
        "os/exec"
        "strings"
 
-       "github.com/Unknwon/com"
+       "code.gitea.io/git"
        "code.gitea.io/gitea/modules/base"
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/process"
        "code.gitea.io/gitea/modules/setting"
        "code.gitea.io/gitea/modules/template/highlight"
-       "code.gitea.io/git"
+       "github.com/Unknwon/com"
        "github.com/sergi/go-diff/diffmatchpatch"
        "golang.org/x/net/html/charset"
        "golang.org/x/text/transform"

diff --git a/models/issue.go b/models/issue.go
index 67ee14cb9328403b9bb55f171f8dcc560cde92c2..16766fc6c383d28d0a72a639d7c8345dc3551f91 100644 (file)
--- a/models/issue.go
+++ b/models/issue.go
@@ -14,9 +14,9 @@ import (
        "strings"
        "time"
 
+       api "code.gitea.io/sdk/gitea"
        "github.com/Unknwon/com"
        "github.com/go-xorm/xorm"
-       api "code.gitea.io/sdk/gitea"
        gouuid "github.com/satori/go.uuid"
 
        "code.gitea.io/gitea/modules/base"

diff --git a/models/pull.go b/models/pull.go
index 98b9c96059c23bc555cdefd1a3716faa2cd87014..4b7034ce4d04c62cda4425f360afc23d1a40cd31 100644 (file)
--- a/models/pull.go
+++ b/models/pull.go
@@ -11,14 +11,14 @@ import (
        "strings"
        "time"
 
-       "github.com/Unknwon/com"
+       "code.gitea.io/git"
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/process"
        "code.gitea.io/gitea/modules/setting"
        "code.gitea.io/gitea/modules/sync"
-       "github.com/go-xorm/xorm"
-       "code.gitea.io/git"
        api "code.gitea.io/sdk/gitea"
+       "github.com/Unknwon/com"
+       "github.com/go-xorm/xorm"
 )
 
 var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)

diff --git a/models/repo.go b/models/repo.go
index 7d976cfa7bfdd0757c2e78055e5565be450932e2..844fca9a3a1ccbb385d0538cd724632665917cb4 100644 (file)
--- a/models/repo.go
+++ b/models/repo.go
@@ -19,17 +19,17 @@ import (
        "strings"
        "time"
 
-       "github.com/Unknwon/cae/zip"
-       "github.com/Unknwon/com"
+       "code.gitea.io/git"
        "code.gitea.io/gitea/modules/bindata"
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/markdown"
        "code.gitea.io/gitea/modules/process"
        "code.gitea.io/gitea/modules/setting"
        "code.gitea.io/gitea/modules/sync"
-       "github.com/go-xorm/xorm"
-       "code.gitea.io/git"
        api "code.gitea.io/sdk/gitea"
+       "github.com/Unknwon/cae/zip"
+       "github.com/Unknwon/com"
+       "github.com/go-xorm/xorm"
        version "github.com/mcuadros/go-version"
        ini "gopkg.in/ini.v1"
 )

diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index a8fd06ae465119a69bf98ee018e1ecf4becb5061..1f5330d23ac5631087ac2ad5685fa899cee221ce 100644 (file)
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -8,8 +8,8 @@ import (
        "net/url"
        "strings"
 
-       "github.com/Unknwon/com"
        "code.gitea.io/gitea/models"
+       "github.com/Unknwon/com"
        "github.com/go-macaron/binding"
        macaron "gopkg.in/macaron.v1"
 )

diff --git a/modules/base/tool.go b/modules/base/tool.go
index 5b907a0fdd1e8286dd41b1c45420b6c48ba79a1f..bacdeb292401fd44cf7b5eb2be3eb96773b5740e 100644 (file)
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -22,10 +22,10 @@ import (
        "unicode"
        "unicode/utf8"
 
-       "github.com/Unknwon/com"
-       "github.com/Unknwon/i18n"
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/setting"
+       "github.com/Unknwon/com"
+       "github.com/Unknwon/i18n"
        "github.com/gogits/chardet"
 )
 

diff --git a/modules/context/api.go b/modules/context/api.go
index d5041a1ec3b36d924ea06c1a79c357eb5c30f3a2..197fbd6df12eb79e9da798599d9452697e2bfec3 100644 (file)
--- a/modules/context/api.go
+++ b/modules/context/api.go
@@ -8,10 +8,10 @@ import (
        "fmt"
        "strings"
 
-       "github.com/Unknwon/paginater"
        "code.gitea.io/gitea/modules/base"
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/setting"
+       "github.com/Unknwon/paginater"
        macaron "gopkg.in/macaron.v1"
 )
 

diff --git a/modules/context/repo.go b/modules/context/repo.go
index d9d97d7a93cbb6eb98c754eb89621e8c58534682..db808d743e2bb5ac8e8f61b4154369762b06c5f4 100644 (file)
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -10,11 +10,11 @@ import (
        "path"
        "strings"
 
-       "github.com/Unknwon/com"
+       "code.gitea.io/git"
        "code.gitea.io/gitea/models"
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/setting"
-       "code.gitea.io/git"
+       "github.com/Unknwon/com"
        editorconfig "gopkg.in/editorconfig/editorconfig-core-go.v1"
        macaron "gopkg.in/macaron.v1"
 )

diff --git a/routers/repo/commit.go b/routers/repo/commit.go
index 0f5145a7522ddcb82874e1e098e6821c76772f99..e3170b053df36247d69efa9f1e94cee74ab0e1d6 100644 (file)
--- a/routers/repo/commit.go
+++ b/routers/repo/commit.go
@@ -8,12 +8,12 @@ import (
        "container/list"
        "path"
 
-       "github.com/Unknwon/paginater"
        "code.gitea.io/git"
        "code.gitea.io/gitea/models"
        "code.gitea.io/gitea/modules/base"
        "code.gitea.io/gitea/modules/context"
        "code.gitea.io/gitea/modules/setting"
+       "github.com/Unknwon/paginater"
 )
 
 const (

diff --git a/routers/repo/editor.go b/routers/repo/editor.go
index ed5cbd44086542c3ff21654648c778a412200a96..fca5430173beb2c174ca8cd18914917bb13ae33e 100644 (file)
--- a/routers/repo/editor.go
+++ b/routers/repo/editor.go
@@ -11,6 +11,7 @@ import (
        "path"
        "strings"
 
+       "code.gitea.io/git"
        "code.gitea.io/gitea/models"
        "code.gitea.io/gitea/modules/auth"
        "code.gitea.io/gitea/modules/base"
@@ -18,7 +19,6 @@ import (
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/setting"
        "code.gitea.io/gitea/modules/template"
-       "code.gitea.io/git"
 )
 
 const (

diff --git a/routers/repo/middlewares.go b/routers/repo/middlewares.go
index 5ffa100bff6c2b1a569d1bb07b9d5526086caeb0..94e007cd208bbc6e6f0428ddcb65d6a933e9d4e6 100644 (file)
--- a/routers/repo/middlewares.go
+++ b/routers/repo/middlewares.go
@@ -3,9 +3,9 @@ package repo
 import (
        "fmt"
 
+       "code.gitea.io/git"
        "code.gitea.io/gitea/models"
        "code.gitea.io/gitea/modules/context"
-       "code.gitea.io/git"
 )
 
 func SetEditorconfigIfExists(ctx *context.Context) {

diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 117b5684ec97120157700c19dea998b2558b38bb..83352d7f3c3e1f7fc04987c4aca51e86f003a098 100644 (file)
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -10,14 +10,14 @@ import (
        "path"
        "strings"
 
-       "github.com/Unknwon/com"
+       "code.gitea.io/git"
        "code.gitea.io/gitea/models"
        "code.gitea.io/gitea/modules/auth"
        "code.gitea.io/gitea/modules/base"
        "code.gitea.io/gitea/modules/context"
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/setting"
-       "code.gitea.io/git"
+       "github.com/Unknwon/com"
 )
 
 const (

diff --git a/routers/repo/release.go b/routers/repo/release.go
index 7010c832a05d2a2e1bf12f759c273ea643c0b405..3c496638302ab2476c90f7cdd2166150a97526de 100644 (file)
--- a/routers/repo/release.go
+++ b/routers/repo/release.go
@@ -7,13 +7,13 @@ package repo
 import (
        "fmt"
 
-       "github.com/Unknwon/paginater"
        "code.gitea.io/gitea/models"
        "code.gitea.io/gitea/modules/auth"
        "code.gitea.io/gitea/modules/base"
        "code.gitea.io/gitea/modules/context"
        "code.gitea.io/gitea/modules/log"
        "code.gitea.io/gitea/modules/markdown"
+       "github.com/Unknwon/paginater"
 )
 
 const (

diff --git a/routers/repo/view.go b/routers/repo/view.go
index d67ee9540f41657a5e52f52220eca03cceb0485b..8f49a12c32d191a30195c9e6bed1cccfc8460a7b 100644 (file)
--- a/routers/repo/view.go
+++ b/routers/repo/view.go
@@ -12,7 +12,7 @@ import (
        "path"
        "strings"
 
-       "github.com/Unknwon/paginater"
+       "code.gitea.io/git"
        "code.gitea.io/gitea/models"
        "code.gitea.io/gitea/modules/base"
        "code.gitea.io/gitea/modules/context"
@@ -21,7 +21,7 @@ import (
        "code.gitea.io/gitea/modules/setting"
        "code.gitea.io/gitea/modules/template"
        "code.gitea.io/gitea/modules/template/highlight"
-       "code.gitea.io/git"
+       "github.com/Unknwon/paginater"
 )
 
 const (

diff --git a/routers/user/auth.go b/routers/user/auth.go
index 21c301321f242bca9146e6a6dad12028801a43fd..69f1db47b37e0d55a7e29bc415982fb4b1a68d54 100644 (file)
--- a/routers/user/auth.go
+++ b/routers/user/auth.go
@@ -130,8 +130,8 @@ func SignInPost(ctx *context.Context, form auth.SignInForm) {
        // Register last login
        u.SetLastLogin()
        if err := models.UpdateUser(u); err != nil {
-           ctx.Handle(500, "UpdateUser", err)
-           return
+               ctx.Handle(500, "UpdateUser", err)
+               return
        }
 
        if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 {