Enable Go modules

Author: unknwon

.travis.yml

@@ -6,7 +6,10 @@ go:
   - 1.6.x
   - 1.7.x
   - 1.8.x
-  - master
+  - 1.9.x
+  - 1.10.x
+  - 1.11.x
+  - 1.12.x
 
 script: 
   - go get golang.org/x/tools/cmd/cover

commit.go

@@ -14,7 +14,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mcuadros/go-version"
+	goversion "github.com/mcuadros/go-version"
 )
 
 // Commit represents a git commit.
@@ -141,7 +141,7 @@ func CommitChanges(repoPath string, opts CommitChangesOptions) error {
 func commitsCount(repoPath, revision, relpath string) (int64, error) {
 	var cmd *Command
 	isFallback := false
-	if version.Compare(gitVersion, "1.8.0", "<") {
+	if goversion.Compare(gitVersion, "1.8.0", "<") {
 		isFallback = true
 		cmd = NewCommand("log", "--pretty=format:''")
 	} else {

git.go

@@ -10,10 +10,10 @@ import (
 	"time"
 )
 
-const _VERSION = "0.7.1"
+const version = "0.8.0"
 
 func Version() string {
-	return _VERSION
+	return version
 }
 
 var (

go.mod

@@ -0,0 +1,10 @@
+module github.com/gogs/git-module
+
+go 1.12
+
+require (
+	github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
+	github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75
+	github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect
+	github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337
+)

go.sum

@@ -0,0 +1,17 @@
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
+github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75 h1:Pijfgr7ZuvX7QIQiEwLdRVr3RoMG+i0SbBO1Qu+7yVk=
+github.com/mcuadros/go-version v0.0.0-20190308113854-92cdf37c5b75/go.mod h1:76rfSfYPWj01Z85hUf/ituArm797mNKcvINh1OlsZKo=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY=
+github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 h1:WN9BUFbdyOsSH/XohnWpXOlq9NBD5sGAB2FciQMUEe8=
+github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=

repo.go

@@ -11,10 +11,9 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
-
-	"github.com/unknwon/com"
 )
 
 // Repository represents a Git repository.
@@ -251,6 +250,11 @@ const (
 	_STAT_SIZE_GARBAGE   = "size-garbage: "
 )
 
+func strToInt64(s string) int64 {
+	i, _ := strconv.ParseInt(s, 10, 64)
+	return i
+}
+
 // GetRepoSize returns disk usage report of repository in given path.
 func GetRepoSize(repoPath string) (*CountObject, error) {
 	cmd := NewCommand("count-objects", "-v")
@@ -263,21 +267,21 @@ func GetRepoSize(repoPath string) (*CountObject, error) {
 	for _, line := range strings.Split(stdout, "\n") {
 		switch {
 		case strings.HasPrefix(line, _STAT_COUNT):
-			countObject.Count = com.StrTo(line[7:]).MustInt64()
+			countObject.Count = strToInt64(line[7:])
 		case strings.HasPrefix(line, _STAT_SIZE):
-			countObject.Size = com.StrTo(line[6:]).MustInt64() * 1024
+			countObject.Size = strToInt64(line[6:]) * 1024
 		case strings.HasPrefix(line, _STAT_IN_PACK):
-			countObject.InPack = com.StrTo(line[9:]).MustInt64()
+			countObject.InPack = strToInt64(line[9:])
 		case strings.HasPrefix(line, _STAT_PACKS):
-			countObject.Packs = com.StrTo(line[7:]).MustInt64()
+			countObject.Packs = strToInt64(line[7:])
 		case strings.HasPrefix(line, _STAT_SIZE_PACK):
-			countObject.SizePack = com.StrTo(line[11:]).MustInt64() * 1024
+			countObject.SizePack = strToInt64(line[11:]) * 1024
 		case strings.HasPrefix(line, _STAT_PRUNE_PACKABLE):
-			countObject.PrunePackable = com.StrTo(line[16:]).MustInt64()
+			countObject.PrunePackable = strToInt64(line[16:])
 		case strings.HasPrefix(line, _STAT_GARBAGE):
-			countObject.Garbage = com.StrTo(line[9:]).MustInt64()
+			countObject.Garbage = strToInt64(line[9:])
 		case strings.HasPrefix(line, _STAT_SIZE_GARBAGE):
-			countObject.SizeGarbage = com.StrTo(line[14:]).MustInt64() * 1024
+			countObject.SizeGarbage = strToInt64(line[14:]) * 1024
 		}
 	}
 

repo_branch.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mcuadros/go-version"
+	goversion "github.com/mcuadros/go-version"
 )
 
 const BRANCH_PREFIX = "refs/heads/"
@@ -54,7 +54,7 @@ func (repo *Repository) GetHEADBranch() (*Branch, error) {
 
 // SetDefaultBranch sets default branch of repository.
 func (repo *Repository) SetDefaultBranch(name string) error {
-	if version.Compare(gitVersion, "1.7.10", "<") {
+	if goversion.Compare(gitVersion, "1.7.10", "<") {
 		return ErrUnsupportedVersion{"1.7.10"}
 	}
 

repo_commit.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mcuadros/go-version"
+	goversion "github.com/mcuadros/go-version"
 )
 
 const REMOTE_PREFIX = "refs/remotes/"
@@ -257,7 +257,7 @@ func (repo *Repository) FilesCountBetween(startCommitID, endCommitID string) (in
 
 // CommitsBetween returns a list that contains commits between [last, before).
 func (repo *Repository) CommitsBetween(last *Commit, before *Commit) (*list.List, error) {
-	if version.Compare(gitVersion, "1.8.0", ">=") {
+	if goversion.Compare(gitVersion, "1.8.0", ">=") {
 		stdout, err := NewCommand("rev-list", before.ID.String()+"..."+last.ID.String()).RunInDirBytes(repo.Path)
 		if err != nil {
 			return nil, err

repo_tag.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mcuadros/go-version"
+	goversion "github.com/mcuadros/go-version"
 )
 
 const TAG_PREFIX = "refs/tags/"
@@ -95,7 +95,7 @@ func (repo *Repository) GetTag(name string) (*Tag, error) {
 // GetTags returns all tags of the repository.
 func (repo *Repository) GetTags() ([]string, error) {
 	cmd := NewCommand("tag", "-l")
-	if version.Compare(gitVersion, "2.4.9", ">=") {
+	if goversion.Compare(gitVersion, "2.4.9", ">=") {
 		cmd.AddArguments("--sort=-creatordate")
 	}
 
@@ -107,8 +107,8 @@ func (repo *Repository) GetTags() ([]string, error) {
 	tags := strings.Split(stdout, "\n")
 	tags = tags[:len(tags)-1]
 
-	if version.Compare(gitVersion, "2.4.9", "<") {
-		version.Sort(tags)
+	if goversion.Compare(gitVersion, "2.4.9", "<") {
+		goversion.Sort(tags)
 
 		// Reverse order
 		for i := 0; i < len(tags)/2; i++ {