Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move code.gitea.io/git to code.gitea.io/gitea/modules/git #6364

Merged
merged 21 commits into from
Mar 27, 2019
Merged

move code.gitea.io/git to code.gitea.io/gitea/modules/git #6364

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
3f12c75
move code.gitea.io/git to code.gitea.io/gitea/modules/git
lunny Mar 19, 2019
f22a9d3
fix imports
lunny Mar 19, 2019
a0f3655
fix fmt
lunny Mar 20, 2019
f79fd61
fix misspell
lunny Mar 20, 2019
c845653
remove wrong tests data
lunny Mar 20, 2019
9c7466a
fix unit tests
lunny Mar 21, 2019
80b25c4
fix tests
lunny Mar 22, 2019
fe694d0
fix tests
lunny Mar 25, 2019
0db2e30
fix tests
lunny Mar 25, 2019
109af59
fix tests
lunny Mar 26, 2019
6e9bc6f
fix tests
lunny Mar 26, 2019
9483b9d
enable Debug to trace the failure tests
lunny Mar 26, 2019
3e038cd
fix tests
lunny Mar 26, 2019
1abe8c2
fix tests
lunny Mar 26, 2019
aa01681
fix tests
lunny Mar 26, 2019
5b5db53
fix tests
lunny Mar 26, 2019
26b0dcc
fix tests
lunny Mar 26, 2019
e120e7f
comment commit count tests since git clone depth is 50
lunny Mar 26, 2019
c42efe0
fix tests
lunny Mar 27, 2019
bc5e46c
update from code.gitea.io/git
lunny Mar 27, 2019
707b69d
revert change to makefile
lunny Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions Gopkg.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ coverage:

.PHONY: unit-test-coverage
unit-test-coverage:
$(GO) test -tags='sqlite sqlite_unlock_notify' -cover -coverprofile coverage.out $(PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1
GITEA_ROOT=${CURDIR} $(GO) test -tags='sqlite sqlite_unlock_notify' -cover -coverprofile coverage.out $(PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1

.PHONY: vendor
vendor:
Expand Down
2 changes: 1 addition & 1 deletion cmd/admin.go
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading