Nemcio/Gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-11-03 20:36:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace gogits/git-module dependency with go-gitea/git (#94)

Browse Source 
* Replace gogits/git-module dependency with go-gitea/git

Fixes #92

* Remove git alias for git module import (not needed)
This commit is contained in:
Sandro Santilli
2016-11-06 14:18:34 +01:00
committed by Andrey Nering
parent 55a4d46f5d
commit 6e4252dad4
54 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/serve.go
View File

@@ -14,7 +14,7 @@ import (
"time" "time"
"github.com/Unknwon/com" "github.com/Unknwon/com"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
gouuid "github.com/satori/go.uuid" gouuid "github.com/satori/go.uuid"
"github.com/urfave/cli" "github.com/urfave/cli"

4
cmd/web.go
View File

@@ -38,7 +38,7 @@ import (
"github.com/go-macaron/session" "github.com/go-macaron/session"
"github.com/go-macaron/toolbox" "github.com/go-macaron/toolbox"
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
gogs "github.com/gogits/go-gogs-client" gogs "github.com/gogits/go-gogs-client"
version "github.com/mcuadros/go-version" version "github.com/mcuadros/go-version"
"github.com/urfave/cli" "github.com/urfave/cli"
@@ -93,7 +93,7 @@ func checkVersion() {
{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"}, {"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
{"gopkg.in/ini.v1", ini.Version, "1.8.4"}, {"gopkg.in/ini.v1", ini.Version, "1.8.4"},
{"gopkg.in/macaron.v1", macaron.Version, "1.1.7"}, {"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
{"github.com/gogits/git-module", git.Version, "0.4.1"}, {"github.com/go-gitea/git", git.Version, "0.4.1"},
{"github.com/gogits/go-gogs-client", gogs.Version, "0.12.1"}, {"github.com/gogits/go-gogs-client", gogs.Version, "0.12.1"},
} }
for _, c := range checkers { for _, c := range checkers {

2
models/action.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
"github.com/gogits/git-module" "github.com/go-gitea/git"
api "github.com/gogits/go-gogs-client" api "github.com/gogits/go-gogs-client"
"github.com/go-gitea/gitea/modules/base" "github.com/go-gitea/gitea/modules/base"

2
models/git_diff.go
View File

@@ -22,7 +22,7 @@ import (
"github.com/go-gitea/gitea/modules/process" "github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting" "github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/template/highlight" "github.com/go-gitea/gitea/modules/template/highlight"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
"github.com/sergi/go-diff/diffmatchpatch" "github.com/sergi/go-diff/diffmatchpatch"
"golang.org/x/net/html/charset" "golang.org/x/net/html/charset"
"golang.org/x/text/transform" "golang.org/x/text/transform"

2
models/pull.go
View File

@@ -17,7 +17,7 @@ import (
"github.com/go-gitea/gitea/modules/setting" "github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/sync" "github.com/go-gitea/gitea/modules/sync"
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
api "github.com/gogits/go-gogs-client" api "github.com/gogits/go-gogs-client"
) )

2
models/release.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
"github.com/gogits/git-module" "github.com/go-gitea/git"
"github.com/go-gitea/gitea/modules/process" "github.com/go-gitea/gitea/modules/process"
) )

2
models/repo.go
View File

@@ -28,7 +28,7 @@ import (
"github.com/go-gitea/gitea/modules/setting" "github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/sync" "github.com/go-gitea/gitea/modules/sync"
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
api "github.com/gogits/go-gogs-client" api "github.com/gogits/go-gogs-client"
version "github.com/mcuadros/go-version" version "github.com/mcuadros/go-version"
ini "gopkg.in/ini.v1" ini "gopkg.in/ini.v1"

2
models/repo_branch.go
View File

@@ -5,7 +5,7 @@
package models package models
import ( import (
"github.com/gogits/git-module" "github.com/go-gitea/git"
) )
type Branch struct { type Branch struct {

2
models/repo_editor.go
View File

@@ -18,7 +18,7 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
gouuid "github.com/satori/go.uuid" gouuid "github.com/satori/go.uuid"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
"github.com/go-gitea/gitea/modules/log" "github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/process" "github.com/go-gitea/gitea/modules/process"

2
models/update.go
View File

@@ -10,7 +10,7 @@ import (
"os/exec" "os/exec"
"strings" "strings"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
"github.com/go-gitea/gitea/modules/log" "github.com/go-gitea/gitea/modules/log"
) )

2
models/user.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
"github.com/nfnt/resize" "github.com/nfnt/resize"
"github.com/gogits/git-module" "github.com/go-gitea/git"
api "github.com/gogits/go-gogs-client" api "github.com/gogits/go-gogs-client"
"github.com/go-gitea/gitea/modules/avatar" "github.com/go-gitea/gitea/modules/avatar"

2
models/webhook_slack.go
View File

@@ -10,7 +10,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/gogits/git-module" "github.com/go-gitea/git"
api "github.com/gogits/go-gogs-client" api "github.com/gogits/go-gogs-client"
"github.com/go-gitea/gitea/modules/setting" "github.com/go-gitea/gitea/modules/setting"

2
models/wiki.go
View File

@@ -15,7 +15,7 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/gogits/git-module" "github.com/go-gitea/git"
"github.com/go-gitea/gitea/modules/setting" "github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/sync" "github.com/go-gitea/gitea/modules/sync"

2
modules/context/repo.go
View File

@@ -14,7 +14,7 @@ import (
"github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/log" "github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting" "github.com/go-gitea/gitea/modules/setting"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
editorconfig "gopkg.in/editorconfig/editorconfig-core-go.v1" editorconfig "gopkg.in/editorconfig/editorconfig-core-go.v1"
macaron "gopkg.in/macaron.v1" macaron "gopkg.in/macaron.v1"
) )

2
routers/api/v1/convert/convert.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/gogits/git-module" "github.com/go-gitea/git"
api "github.com/gogits/go-gogs-client" api "github.com/gogits/go-gogs-client"
"github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/models"

2
routers/api/v1/repo/file.go
View File

@@ -5,7 +5,7 @@
package repo package repo
import ( import (
"github.com/gogits/git-module" "github.com/go-gitea/git"
"github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context" "github.com/go-gitea/gitea/modules/context"

2
routers/install.go
View File

@@ -17,7 +17,7 @@ import (
"gopkg.in/ini.v1" "gopkg.in/ini.v1"
"gopkg.in/macaron.v1" "gopkg.in/macaron.v1"
"github.com/gogits/git-module" "github.com/go-gitea/git"
"github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/auth" "github.com/go-gitea/gitea/modules/auth"

2
routers/repo/commit.go
View File

@@ -13,7 +13,7 @@ import (
"github.com/go-gitea/gitea/modules/base" "github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/context" "github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/setting" "github.com/go-gitea/gitea/modules/setting"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
) )
const ( const (

2
routers/repo/download.go
View File

@@ -8,7 +8,7 @@ import (
"io" "io"
"path" "path"
"github.com/gogits/git-module" "github.com/go-gitea/git"
"github.com/go-gitea/gitea/modules/base" "github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/context" "github.com/go-gitea/gitea/modules/context"

2
routers/repo/editor.go
View File

@@ -18,7 +18,7 @@ import (
"github.com/go-gitea/gitea/modules/log" "github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting" "github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/template" "github.com/go-gitea/gitea/modules/template"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
) )
const ( const (

2
routers/repo/http.go
View File

@@ -20,7 +20,7 @@ import (
"strings" "strings"
"time" "time"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
"github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/base" "github.com/go-gitea/gitea/modules/base"

2
routers/repo/middlewares.go
View File

@@ -5,7 +5,7 @@ import (
"github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context" "github.com/go-gitea/gitea/modules/context"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
) )
func SetEditorconfigIfExists(ctx *context.Context) { func SetEditorconfigIfExists(ctx *context.Context) {

2
routers/repo/pull.go
View File

@@ -17,7 +17,7 @@ import (
"github.com/go-gitea/gitea/modules/context" "github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/log" "github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting" "github.com/go-gitea/gitea/modules/setting"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
) )
const ( const (

2
routers/repo/repo.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/gogits/git-module" "github.com/go-gitea/git"
"github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/auth" "github.com/go-gitea/gitea/modules/auth"

2
routers/repo/setting.go
View File

@@ -8,7 +8,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/gogits/git-module" "github.com/go-gitea/git"
"github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/auth" "github.com/go-gitea/gitea/modules/auth"

2
routers/repo/view.go
View File

@@ -21,7 +21,7 @@ import (
"github.com/go-gitea/gitea/modules/setting" "github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/template" "github.com/go-gitea/gitea/modules/template"
"github.com/go-gitea/gitea/modules/template/highlight" "github.com/go-gitea/gitea/modules/template/highlight"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
) )
const ( const (

2
routers/repo/webhook.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
git "github.com/gogits/git-module" "github.com/go-gitea/git"
api "github.com/gogits/go-gogs-client" api "github.com/gogits/go-gogs-client"
"github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/models"

2
routers/repo/wiki.go
View File

@@ -9,7 +9,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/gogits/git-module" "github.com/go-gitea/git"
"github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/auth" "github.com/go-gitea/gitea/modules/auth"

0
vendor/github.com/gogits/git-module/LICENSE → vendor/github.com/go-gitea/git/LICENSE generated vendored
View File

4
vendor/github.com/gogits/git-module/README.md → vendor/github.com/go-gitea/git/README.md generated vendored
View File

@@ -1,6 +1,6 @@
# Git Shell [![Build Status](https://travis-ci.org/gogits/git-module.svg?branch=master)](https://travis-ci.org/gogits/git-module) # Git Shell [![Build # Status](https://travis-ci.org/go-gitea/git.svg?branch=master)](https://travis-ci.org/go-gitea/git)
Package git-module is a Go module for Git access through shell commands. Package git is a Go module for Git access through shell commands.
## Limitations ## Limitations

0
vendor/github.com/gogits/git-module/blob.go → vendor/github.com/go-gitea/git/blob.go generated vendored
View File

0
vendor/github.com/gogits/git-module/command.go → vendor/github.com/go-gitea/git/command.go generated vendored
View File

0
vendor/github.com/gogits/git-module/commit.go → vendor/github.com/go-gitea/git/commit.go generated vendored
View File

0
vendor/github.com/gogits/git-module/commit_archive.go → vendor/github.com/go-gitea/git/commit_archive.go generated vendored
View File

0
vendor/github.com/gogits/git-module/error.go → vendor/github.com/go-gitea/git/error.go generated vendored
View File

0
vendor/github.com/gogits/git-module/git.go → vendor/github.com/go-gitea/git/git.go generated vendored
View File

0
vendor/github.com/gogits/git-module/hook.go → vendor/github.com/go-gitea/git/hook.go generated vendored
View File

0
vendor/github.com/gogits/git-module/repo.go → vendor/github.com/go-gitea/git/repo.go generated vendored
View File

0
vendor/github.com/gogits/git-module/repo_branch.go → vendor/github.com/go-gitea/git/repo_branch.go generated vendored
View File

0
vendor/github.com/gogits/git-module/repo_commit.go → vendor/github.com/go-gitea/git/repo_commit.go generated vendored
View File

0
vendor/github.com/gogits/git-module/repo_hook.go → vendor/github.com/go-gitea/git/repo_hook.go generated vendored
View File

0
vendor/github.com/gogits/git-module/repo_object.go → vendor/github.com/go-gitea/git/repo_object.go generated vendored
View File

0
vendor/github.com/gogits/git-module/repo_pull.go → vendor/github.com/go-gitea/git/repo_pull.go generated vendored
View File

0
vendor/github.com/gogits/git-module/repo_tag.go → vendor/github.com/go-gitea/git/repo_tag.go generated vendored
View File

0
vendor/github.com/gogits/git-module/repo_tree.go → vendor/github.com/go-gitea/git/repo_tree.go generated vendored
View File

0
vendor/github.com/gogits/git-module/sha1.go → vendor/github.com/go-gitea/git/sha1.go generated vendored
View File

0
vendor/github.com/gogits/git-module/signature.go → vendor/github.com/go-gitea/git/signature.go generated vendored
View File

0
vendor/github.com/gogits/git-module/submodule.go → vendor/github.com/go-gitea/git/submodule.go generated vendored
View File

0
vendor/github.com/gogits/git-module/tag.go → vendor/github.com/go-gitea/git/tag.go generated vendored
View File

0
vendor/github.com/gogits/git-module/tree.go → vendor/github.com/go-gitea/git/tree.go generated vendored
View File

0
vendor/github.com/gogits/git-module/tree_blob.go → vendor/github.com/go-gitea/git/tree_blob.go generated vendored
View File

0
vendor/github.com/gogits/git-module/tree_entry.go → vendor/github.com/go-gitea/git/tree_entry.go generated vendored
View File

0
vendor/github.com/gogits/git-module/utlis.go → vendor/github.com/go-gitea/git/utlis.go generated vendored
View File

12
vendor/vendor.json vendored
View File

@@ -38,6 +38,12 @@
"revision": "fb1f79c6b65acda83063cbc69f6bba1522558bfc", "revision": "fb1f79c6b65acda83063cbc69f6bba1522558bfc",
"revisionTime": "2016-01-17T19:21:50Z" "revisionTime": "2016-01-17T19:21:50Z"
}, },
{
"checksumSHA1": "K3Gp8Tv/B8otlbsOfQp3UpJGaaE=",
"path": "github.com/go-gitea/git",
"revision": "766747ef8b271a2b1142edd0a40735f556ec2c1d",
"revisionTime": "2016-11-06T09:52:37Z"
},
{ {
"checksumSHA1": "qM/kf31cT2cxjtHxdzbu8q8jPq0=", "checksumSHA1": "qM/kf31cT2cxjtHxdzbu8q8jPq0=",
"path": "github.com/go-macaron/binding", "path": "github.com/go-macaron/binding",
@@ -146,12 +152,6 @@
"revision": "7f3990acf1833faa5ebd0e86f0a4c72a4b5eba3c", "revision": "7f3990acf1833faa5ebd0e86f0a4c72a4b5eba3c",
"revisionTime": "2016-08-10T03:50:02Z" "revisionTime": "2016-08-10T03:50:02Z"
}, },
{
"checksumSHA1": "PIGpfND20BlypoaFJsy2cH6urxs=",
"path": "github.com/gogits/git-module",
"revision": "b3009dc4f5842cf9e2e80fef1e125e79c38e4949",
"revisionTime": "2016-08-31T20:58:24Z"
},
{ {
"checksumSHA1": "5P4i69584LOvCooguu2D/pNxU14=", "checksumSHA1": "5P4i69584LOvCooguu2D/pNxU14=",
"path": "github.com/gogits/go-gogs-client", "path": "github.com/gogits/go-gogs-client",