Skip to content

Commit d578b71

Browse files
authored
move code.gitea.io/git to code.gitea.io/gitea/modules/git (#6364)
* 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
1 parent d056bf3 commit d578b71

File tree

174 files changed

+3044
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+3044
-145
lines changed

Gopkg.lock

+7-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/admin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import (
1111
"os"
1212
"text/tabwriter"
1313

14-
"code.gitea.io/git"
1514
"code.gitea.io/gitea/models"
1615
"code.gitea.io/gitea/modules/auth/oauth2"
1716
"code.gitea.io/gitea/modules/generate"
17+
"code.gitea.io/gitea/modules/git"
1818
"code.gitea.io/gitea/modules/log"
1919
"code.gitea.io/gitea/modules/setting"
2020

cmd/hook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"strconv"
1313
"strings"
1414

15-
"code.gitea.io/git"
1615
"code.gitea.io/gitea/models"
16+
"code.gitea.io/gitea/modules/git"
1717
"code.gitea.io/gitea/modules/log"
1818
"code.gitea.io/gitea/modules/private"
1919
"code.gitea.io/gitea/modules/setting"

cmd/serv.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"strings"
1515
"time"
1616

17-
"code.gitea.io/git"
1817
"code.gitea.io/gitea/models"
18+
"code.gitea.io/gitea/modules/git"
1919
"code.gitea.io/gitea/modules/log"
2020
"code.gitea.io/gitea/modules/pprof"
2121
"code.gitea.io/gitea/modules/private"

integrations/api_releases_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"net/http"
1010
"testing"
1111

12-
"code.gitea.io/git"
1312
"code.gitea.io/gitea/models"
13+
"code.gitea.io/gitea/modules/git"
1414
api "code.gitea.io/sdk/gitea"
1515

1616
"github.com/stretchr/testify/assert"

integrations/git_helper_for_declarative_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"testing"
1717
"time"
1818

19-
"code.gitea.io/git"
19+
"code.gitea.io/gitea/modules/git"
2020
"code.gitea.io/gitea/modules/setting"
2121
"code.gitea.io/gitea/modules/ssh"
2222
"github.com/Unknwon/com"

integrations/git_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"testing"
1717
"time"
1818

19-
"code.gitea.io/git"
2019
"code.gitea.io/gitea/models"
20+
"code.gitea.io/gitea/modules/git"
2121

2222
"github.com/stretchr/testify/assert"
2323
)

integrations/ssh_key_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"testing"
1515
"time"
1616

17-
"code.gitea.io/git"
17+
"code.gitea.io/gitea/modules/git"
1818
api "code.gitea.io/sdk/gitea"
1919
"github.com/stretchr/testify/assert"
2020
)

models/action.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"time"
1515
"unicode"
1616

17-
"code.gitea.io/git"
1817
"code.gitea.io/gitea/modules/base"
18+
"code.gitea.io/gitea/modules/git"
1919
"code.gitea.io/gitea/modules/log"
2020
"code.gitea.io/gitea/modules/setting"
2121
"code.gitea.io/gitea/modules/util"

models/action_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strings"
77
"testing"
88

9-
"code.gitea.io/git"
9+
"code.gitea.io/gitea/modules/git"
1010
"code.gitea.io/gitea/modules/setting"
1111

1212
"github.com/stretchr/testify/assert"

models/git_diff.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"strconv"
2020
"strings"
2121

22-
"code.gitea.io/git"
2322
"code.gitea.io/gitea/modules/base"
23+
"code.gitea.io/gitea/modules/git"
2424
"code.gitea.io/gitea/modules/highlight"
2525
"code.gitea.io/gitea/modules/log"
2626
"code.gitea.io/gitea/modules/process"

models/gpg_key.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"strings"
1616
"time"
1717

18-
"code.gitea.io/git"
18+
"code.gitea.io/gitea/modules/git"
1919
"code.gitea.io/gitea/modules/log"
2020
"code.gitea.io/gitea/modules/util"
2121

models/graph.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99
"strings"
1010

11-
"code.gitea.io/git"
11+
"code.gitea.io/gitea/modules/git"
1212
"code.gitea.io/gitea/modules/setting"
1313
)
1414

models/graph_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99
"testing"
1010

11-
"code.gitea.io/git"
11+
"code.gitea.io/gitea/modules/git"
1212
)
1313

1414
func BenchmarkGetCommitGraph(b *testing.B) {

models/issue_comment.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"fmt"
1212
"strings"
1313

14-
"code.gitea.io/git"
14+
"code.gitea.io/gitea/modules/git"
1515
"code.gitea.io/gitea/modules/markup/markdown"
1616
"code.gitea.io/gitea/modules/setting"
1717
"github.com/Unknwon/com"

models/migrations/v28.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"path/filepath"
1111
"strings"
1212

13-
"code.gitea.io/git"
13+
"code.gitea.io/gitea/modules/git"
1414
"code.gitea.io/gitea/modules/log"
1515
"code.gitea.io/gitea/modules/setting"
1616

models/migrations/v39.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package migrations
77
import (
88
"fmt"
99

10-
"code.gitea.io/git"
1110
"code.gitea.io/gitea/models"
11+
"code.gitea.io/gitea/modules/git"
1212
"code.gitea.io/gitea/modules/log"
1313

1414
"github.com/go-xorm/xorm"

models/migrations/v82.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package migrations
77
import (
88
"fmt"
99

10-
"code.gitea.io/git"
1110
"code.gitea.io/gitea/models"
11+
"code.gitea.io/gitea/modules/git"
1212

1313
"github.com/go-xorm/xorm"
1414
)

models/pull.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"strings"
1717
"time"
1818

19-
"code.gitea.io/git"
2019
"code.gitea.io/gitea/modules/base"
2120
"code.gitea.io/gitea/modules/cache"
21+
"code.gitea.io/gitea/modules/git"
2222
"code.gitea.io/gitea/modules/log"
2323
"code.gitea.io/gitea/modules/process"
2424
"code.gitea.io/gitea/modules/setting"

models/release.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"sort"
1010
"strings"
1111

12-
"code.gitea.io/git"
12+
"code.gitea.io/gitea/modules/git"
1313
"code.gitea.io/gitea/modules/log"
1414
"code.gitea.io/gitea/modules/process"
1515
"code.gitea.io/gitea/modules/setting"
1616
"code.gitea.io/gitea/modules/util"
17-
1817
api "code.gitea.io/sdk/gitea"
18+
1919
"github.com/go-xorm/builder"
2020
)
2121

models/release_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package models
77
import (
88
"testing"
99

10-
"code.gitea.io/git"
10+
"code.gitea.io/gitea/modules/git"
1111

1212
"github.com/stretchr/testify/assert"
1313
)

models/repo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222
"time"
2323

24-
"code.gitea.io/git"
24+
"code.gitea.io/gitea/modules/git"
2525
"code.gitea.io/gitea/modules/log"
2626
"code.gitea.io/gitea/modules/markup"
2727
"code.gitea.io/gitea/modules/options"

models/repo_branch.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99
"time"
1010

11-
"code.gitea.io/git"
11+
"code.gitea.io/gitea/modules/git"
1212
"code.gitea.io/gitea/modules/setting"
1313

1414
"github.com/Unknwon/com"

models/repo_indexer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"strconv"
1010
"strings"
1111

12-
"code.gitea.io/git"
1312
"code.gitea.io/gitea/modules/base"
13+
"code.gitea.io/gitea/modules/git"
1414
"code.gitea.io/gitea/modules/indexer"
1515
"code.gitea.io/gitea/modules/log"
1616
"code.gitea.io/gitea/modules/setting"

models/repo_mirror.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"strings"
1111
"time"
1212

13-
"code.gitea.io/git"
1413
"code.gitea.io/gitea/modules/cache"
14+
"code.gitea.io/gitea/modules/git"
1515
"code.gitea.io/gitea/modules/log"
1616
"code.gitea.io/gitea/modules/process"
1717
"code.gitea.io/gitea/modules/setting"

models/repo_tag.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package models
66

77
import (
8-
"code.gitea.io/git"
8+
"code.gitea.io/gitea/modules/git"
99
)
1010

1111
// GetTagsByPath returns repo tags by it's path

models/status.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"fmt"
1010
"strings"
1111

12-
"code.gitea.io/git"
12+
"code.gitea.io/gitea/modules/git"
1313
"code.gitea.io/gitea/modules/log"
1414
"code.gitea.io/gitea/modules/setting"
1515
"code.gitea.io/gitea/modules/util"

models/update.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"strings"
1212
"time"
1313

14-
"code.gitea.io/git"
1514
"code.gitea.io/gitea/modules/cache"
15+
"code.gitea.io/gitea/modules/git"
1616
"code.gitea.io/gitea/modules/log"
1717
"code.gitea.io/gitea/modules/util"
1818
)

models/update_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"testing"
1010
"time"
1111

12-
"code.gitea.io/git"
12+
"code.gitea.io/gitea/modules/git"
1313

1414
"github.com/stretchr/testify/assert"
1515
)

models/user.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"time"
2626
"unicode/utf8"
2727

28-
"code.gitea.io/git"
2928
"code.gitea.io/gitea/modules/avatar"
3029
"code.gitea.io/gitea/modules/base"
3130
"code.gitea.io/gitea/modules/generate"
31+
"code.gitea.io/gitea/modules/git"
3232
"code.gitea.io/gitea/modules/log"
3333
"code.gitea.io/gitea/modules/setting"
3434
"code.gitea.io/gitea/modules/structs"

models/webhook_dingtalk.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import (
99
"fmt"
1010
"strings"
1111

12-
"code.gitea.io/git"
12+
"code.gitea.io/gitea/modules/git"
1313
api "code.gitea.io/sdk/gitea"
14+
1415
dingtalk "github.com/lunny/dingtalk_webhook"
1516
)
1617

models/webhook_discord.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"strconv"
1212
"strings"
1313

14-
"code.gitea.io/git"
14+
"code.gitea.io/gitea/modules/git"
1515
"code.gitea.io/gitea/modules/setting"
1616
api "code.gitea.io/sdk/gitea"
1717
)

models/webhook_slack.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"fmt"
1111
"strings"
1212

13-
"code.gitea.io/git"
13+
"code.gitea.io/gitea/modules/git"
1414
"code.gitea.io/gitea/modules/setting"
1515
api "code.gitea.io/sdk/gitea"
1616
)

models/wiki.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ import (
1313
"path/filepath"
1414
"strings"
1515

16-
"github.com/Unknwon/com"
17-
18-
"code.gitea.io/git"
19-
16+
"code.gitea.io/gitea/modules/git"
2017
"code.gitea.io/gitea/modules/setting"
2118
"code.gitea.io/gitea/modules/sync"
19+
20+
"github.com/Unknwon/com"
2221
)
2322

2423
var (

modules/base/tool.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ import (
2323
"unicode"
2424
"unicode/utf8"
2525

26-
"code.gitea.io/git"
26+
"code.gitea.io/gitea/modules/git"
2727
"code.gitea.io/gitea/modules/log"
2828
"code.gitea.io/gitea/modules/setting"
2929
"code.gitea.io/gitea/modules/util"
30+
3031
"github.com/Unknwon/com"
3132
"github.com/Unknwon/i18n"
3233
"github.com/gogits/chardet"

0 commit comments

Comments
 (0)