Skip to content

Commit

Permalink
move code.gitea.io/git to code.gitea.io/gitea/modules/git (go-gitea#6364
Browse files Browse the repository at this point in the history 
)

* move code.gitea.io/git to code.gitea.io/gitea/modules/git

* fix imports

* fix fmt

* fix misspell

* remove wrong tests data

* fix unit tests

* fix tests

* fix tests

* fix tests

* fix tests

* fix tests

* enable Debug to trace the failure tests

* fix tests

* fix tests

* fix tests

* fix tests

* fix tests

* comment commit count tests since git clone depth is 50

* fix tests

* update from code.gitea.io/git

* revert change to makefile
  • Loading branch information
@lunny
lunny authored Mar 27, 2019
1 parent d056bf3 commit d578b71
Show file tree
Hide file tree
Showing 174 changed files with 3,044 additions and 145 deletions.
19 changes: 7 additions & 12 deletions Gopkg.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/admin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"os"
"text/tabwriter"

"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/auth/oauth2"
"code.gitea.io/gitea/modules/generate"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"

Expand Down
2 changes: 1 addition & 1 deletion cmd/hook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"strconv"
"strings"

"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/private"
"code.gitea.io/gitea/modules/setting"
Expand Down
2 changes: 1 addition & 1 deletion cmd/serv.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"strings"
"time"

"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/pprof"
"code.gitea.io/gitea/modules/private"
Expand Down
2 changes: 1 addition & 1 deletion integrations/api_releases_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"net/http"
"testing"

"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git"
api "code.gitea.io/sdk/gitea"

"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion integrations/git_helper_for_declarative_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"testing"
"time"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/ssh"
"github.com/Unknwon/com"
Expand Down
2 changes: 1 addition & 1 deletion integrations/git_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"testing"
"time"

"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git"

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion integrations/ssh_key_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"testing"
"time"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
api "code.gitea.io/sdk/gitea"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion models/action.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"time"
"unicode"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
Expand Down
2 changes: 1 addition & 1 deletion models/action_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"testing"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"

"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion models/git_diff.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"strconv"
"strings"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/highlight"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
Expand Down
2 changes: 1 addition & 1 deletion models/gpg_key.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"strings"
"time"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/util"

Expand Down
2 changes: 1 addition & 1 deletion models/graph.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"strings"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
)

Expand Down
2 changes: 1 addition & 1 deletion models/graph_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"testing"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
)

func BenchmarkGetCommitGraph(b *testing.B) {
Expand Down
2 changes: 1 addition & 1 deletion models/issue_comment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"fmt"
"strings"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/markup/markdown"
"code.gitea.io/gitea/modules/setting"
"github.com/Unknwon/com"
Expand Down
2 changes: 1 addition & 1 deletion models/migrations/v28.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"path/filepath"
"strings"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"

Expand Down
2 changes: 1 addition & 1 deletion models/migrations/v39.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package migrations
import (
"fmt"

"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"

"github.com/go-xorm/xorm"
Expand Down
2 changes: 1 addition & 1 deletion models/migrations/v82.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package migrations
import (
"fmt"

"code.gitea.io/git"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/git"

"github.com/go-xorm/xorm"
)
Expand Down
2 changes: 1 addition & 1 deletion models/pull.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"strings"
"time"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/cache"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
Expand Down
4 changes: 2 additions & 2 deletions models/release.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
"sort"
"strings"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"

api "code.gitea.io/sdk/gitea"

"github.com/go-xorm/builder"
)

Expand Down
2 changes: 1 addition & 1 deletion models/release_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package models
import (
"testing"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion models/repo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"strings"
"time"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/options"
Expand Down
2 changes: 1 addition & 1 deletion models/repo_branch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"time"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"

"github.com/Unknwon/com"
Expand Down
2 changes: 1 addition & 1 deletion models/repo_indexer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"strconv"
"strings"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/indexer"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
Expand Down
2 changes: 1 addition & 1 deletion models/repo_mirror.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"
"time"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/cache"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
Expand Down
2 changes: 1 addition & 1 deletion models/repo_tag.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package models

import (
"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
)

// GetTagsByPath returns repo tags by it's path
Expand Down
2 changes: 1 addition & 1 deletion models/status.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"fmt"
"strings"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
Expand Down
2 changes: 1 addition & 1 deletion models/update.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strings"
"time"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/cache"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/util"
)
Expand Down
2 changes: 1 addition & 1 deletion models/update_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion models/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"time"
"unicode/utf8"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/avatar"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/generate"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"
Expand Down
3 changes: 2 additions & 1 deletion models/webhook_dingtalk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ import (
"fmt"
"strings"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
api "code.gitea.io/sdk/gitea"

dingtalk "github.com/lunny/dingtalk_webhook"
)

Expand Down
2 changes: 1 addition & 1 deletion models/webhook_discord.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strconv"
"strings"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/sdk/gitea"
)
Expand Down
2 changes: 1 addition & 1 deletion models/webhook_slack.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"fmt"
"strings"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/sdk/gitea"
)
Expand Down
7 changes: 3 additions & 4 deletions models/wiki.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ import (
"path/filepath"
"strings"

"github.com/Unknwon/com"

"code.gitea.io/git"

"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/sync"

"github.com/Unknwon/com"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion modules/base/tool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@ import (
"unicode"
"unicode/utf8"

"code.gitea.io/git"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"

"github.com/Unknwon/com"
"github.com/Unknwon/i18n"
"github.com/gogits/chardet"
Expand Down
Loading

0 comments on commit d578b71

Please sign in to comment.