Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit f25d088

Browse files
committed
Remove git.Commit referenced repo to let it portable
1 parent c7b99c8 commit f25d088

File tree

111 files changed

+660
-650
lines changed

Some content is hidden

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

111 files changed

+660
-650
lines changed

‎modules/actions/workflows.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ func IsWorkflow(path string) bool {
4444
return strings.HasPrefix(path, ".gitea/workflows") || strings.HasPrefix(path, ".github/workflows")
4545
}
4646

47-
func ListWorkflows(commit *git.Commit) (string, git.Entries, error) {
47+
func ListWorkflows(tree *git.Tree) (string, git.Entries, error) {
4848
rpath := ".gitea/workflows"
49-
tree, err := commit.SubTree(rpath)
49+
tree, err := tree.SubTree(rpath)
5050
if _, ok := err.(git.ErrNotExist); ok {
5151
rpath = ".github/workflows"
52-
tree, err = commit.SubTree(rpath)
52+
tree, err = tree.SubTree(rpath)
5353
}
5454
if _, ok := err.(git.ErrNotExist); ok {
5555
return "", nil, nil
@@ -105,7 +105,7 @@ func DetectWorkflows(
105105
payload api.Payloader,
106106
detectSchedule bool,
107107
) ([]*DetectedWorkflow, []*DetectedWorkflow, error) {
108-
_, entries, err := ListWorkflows(commit)
108+
_, entries, err := ListWorkflows(git.NewTree(gitRepo, commit.TreeID))
109109
if err != nil {
110110
return nil, nil, err
111111
}
@@ -150,7 +150,7 @@ func DetectWorkflows(
150150
}
151151

152152
func DetectScheduledWorkflows(gitRepo *git.Repository, commit *git.Commit) ([]*DetectedWorkflow, error) {
153-
_, entries, err := ListWorkflows(commit)
153+
_, entries, err := ListWorkflows(git.NewTree(gitRepo, commit.TreeID))
154154
if err != nil {
155155
return nil, err
156156
}
@@ -204,7 +204,7 @@ func detectMatched(gitRepo *git.Repository, commit *git.Commit, triggedEvent web
204204

205205
case // push
206206
webhook_module.HookEventPush:
207-
return matchPushEvent(commit, payload.(*api.PushPayload), evt)
207+
return matchPushEvent(gitRepo, commit, payload.(*api.PushPayload), evt)
208208

209209
case // issues
210210
webhook_module.HookEventIssues,
@@ -256,7 +256,7 @@ func detectMatched(gitRepo *git.Repository, commit *git.Commit, triggedEvent web
256256
}
257257
}
258258

259-
func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobparser.Event) bool {
259+
func matchPushEvent(gitRepo*git.Repository, commit *git.Commit, pushPayload *api.PushPayload, evt *jobparser.Event) bool {
260260
// with no special filter parameters
261261
if len(evt.Acts()) == 0 {
262262
return true
@@ -322,7 +322,7 @@ func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobpa
322322
matchTimes++
323323
break
324324
}
325-
filesChanged, err := commit.GetFilesChangedSinceCommit(pushPayload.Before)
325+
filesChanged, err := gitRepo.GetFilesChangedBetween(pushPayload.Before, commit.ID.String())
326326
if err != nil {
327327
log.Error("GetFilesChangedSinceCommit [commit_sha1: %s]: %v", commit.ID.String(), err)
328328
} else {
@@ -339,7 +339,7 @@ func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobpa
339339
matchTimes++
340340
break
341341
}
342-
filesChanged, err := commit.GetFilesChangedSinceCommit(pushPayload.Before)
342+
filesChanged, err := gitRepo.GetFilesChangedBetween(pushPayload.Before, commit.ID.String())
343343
if err != nil {
344344
log.Error("GetFilesChangedSinceCommit [commit_sha1: %s]: %v", commit.ID.String(), err)
345345
} else {
@@ -478,7 +478,7 @@ func matchPullRequestEvent(gitRepo *git.Repository, commit *git.Commit, prPayloa
478478
matchTimes++
479479
}
480480
case "paths":
481-
filesChanged, err := headCommit.GetFilesChangedSinceCommit(prPayload.PullRequest.MergeBase)
481+
filesChanged, err := gitRepo.GetFilesChangedBetween(prPayload.PullRequest.MergeBase, headCommit.ID.String())
482482
if err != nil {
483483
log.Error("GetFilesChangedSinceCommit [commit_sha1: %s]: %v", headCommit.ID.String(), err)
484484
} else {
@@ -491,7 +491,7 @@ func matchPullRequestEvent(gitRepo *git.Repository, commit *git.Commit, prPayloa
491491
}
492492
}
493493
case "paths-ignore":
494-
filesChanged, err := headCommit.GetFilesChangedSinceCommit(prPayload.PullRequest.MergeBase)
494+
filesChanged, err := gitRepo.GetFilesChangedBetween(prPayload.PullRequest.MergeBase, headCommit.ID.String())
495495
if err != nil {
496496
log.Error("GetFilesChangedSinceCommit [commit_sha1: %s]: %v", headCommit.ID.String(), err)
497497
} else {

‎modules/fileicon/entry.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ type EntryInfo struct {
1212
IsOpen bool
1313
}
1414

15-
func EntryInfoFromGitTreeEntry(commit *git.Commit, fullPath string, gitEntry *git.TreeEntry) *EntryInfo {
15+
func EntryInfoFromGitTreeEntry(tree *git.Tree, fullPath string, gitEntry *git.TreeEntry) *EntryInfo {
1616
ret := &EntryInfo{BaseName: gitEntry.Name(), EntryMode: gitEntry.Mode()}
1717
if gitEntry.IsLink() {
18-
if res, err := git.EntryFollowLink(commit, fullPath, gitEntry); err == nil && res.TargetEntry.IsDir() {
18+
if res, err := git.EntryFollowLink(tree, fullPath, gitEntry); err == nil && res.TargetEntry.IsDir() {
1919
ret.SymlinkToMode = res.TargetEntry.Mode()
2020
}
2121
}

‎modules/git/blame.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func (r *BlameReader) Close() error {
132132
}
133133

134134
// CreateBlameReader creates reader for given repository, commit and file
135-
func CreateBlameReader(ctx context.Context, objectFormat ObjectFormat, repoPath string, commit *Commit, file string, bypassBlameIgnore bool) (rd *BlameReader, err error) {
135+
func CreateBlameReader(ctx context.Context, repo*Repository, objectFormat ObjectFormat, repoPath string, commit *Commit, file string, bypassBlameIgnore bool) (rd *BlameReader, err error) {
136136
var ignoreRevsFileName string
137137
var ignoreRevsFileCleanup func()
138138
defer func() {
@@ -144,7 +144,8 @@ func CreateBlameReader(ctx context.Context, objectFormat ObjectFormat, repoPath
144144
cmd := NewCommandNoGlobals("blame", "--porcelain")
145145

146146
if DefaultFeatures().CheckVersionAtLeast("2.23") && !bypassBlameIgnore {
147-
ignoreRevsFileName, ignoreRevsFileCleanup, err = tryCreateBlameIgnoreRevsFile(commit)
147+
tree := NewTree(repo, commit.TreeID)
148+
ignoreRevsFileName, ignoreRevsFileCleanup, err = tryCreateBlameIgnoreRevsFile(tree)
148149
if err != nil && !IsErrNotExist(err) {
149150
return nil, err
150151
}
@@ -190,8 +191,8 @@ func CreateBlameReader(ctx context.Context, objectFormat ObjectFormat, repoPath
190191
}, nil
191192
}
192193

193-
func tryCreateBlameIgnoreRevsFile(commit*Commit) (string, func(), error) {
194-
entry, err := commit.GetTreeEntryByPath(".git-blame-ignore-revs")
194+
func tryCreateBlameIgnoreRevsFile(tree*Tree) (string, func(), error) {
195+
entry, err := tree.GetTreeEntryByPath(".git-blame-ignore-revs")
195196
if err != nil {
196197
return "", nil, err
197198
}

‎modules/git/blame_sha256_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestReadingBlameOutputSha256(t *testing.T) {
4747
}
4848

4949
for _, bypass := range []bool{false, true} {
50-
blameReader, err := CreateBlameReader(ctx, Sha256ObjectFormat, "./tests/repos/repo5_pulls_sha256", commit, "README.md", bypass)
50+
blameReader, err := CreateBlameReader(ctx, repo, Sha256ObjectFormat, "./tests/repos/repo5_pulls_sha256", commit, "README.md", bypass)
5151
assert.NoError(t, err)
5252
assert.NotNil(t, blameReader)
5353
defer blameReader.Close()
@@ -131,7 +131,7 @@ func TestReadingBlameOutputSha256(t *testing.T) {
131131
for _, c := range cases {
132132
commit, err := repo.GetCommit(c.CommitID)
133133
assert.NoError(t, err)
134-
blameReader, err := CreateBlameReader(ctx, objectFormat, "./tests/repos/repo6_blame_sha256", commit, "blame.txt", c.Bypass)
134+
blameReader, err := CreateBlameReader(ctx, repo, objectFormat, "./tests/repos/repo6_blame_sha256", commit, "blame.txt", c.Bypass)
135135
assert.NoError(t, err)
136136
assert.NotNil(t, blameReader)
137137
defer blameReader.Close()

‎modules/git/blame_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestReadingBlameOutput(t *testing.T) {
4242
}
4343

4444
for _, bypass := range []bool{false, true} {
45-
blameReader, err := CreateBlameReader(ctx, Sha1ObjectFormat, "./tests/repos/repo5_pulls", commit, "README.md", bypass)
45+
blameReader, err := CreateBlameReader(ctx, repo, Sha1ObjectFormat, "./tests/repos/repo5_pulls", commit, "README.md", bypass)
4646
assert.NoError(t, err)
4747
assert.NotNil(t, blameReader)
4848
defer blameReader.Close()
@@ -127,7 +127,7 @@ func TestReadingBlameOutput(t *testing.T) {
127127
commit, err := repo.GetCommit(c.CommitID)
128128
assert.NoError(t, err)
129129

130-
blameReader, err := CreateBlameReader(ctx, objectFormat, "./tests/repos/repo6_blame", commit, "blame.txt", c.Bypass)
130+
blameReader, err := CreateBlameReader(ctx, repo, objectFormat, "./tests/repos/repo6_blame", commit, "blame.txt", c.Bypass)
131131
assert.NoError(t, err)
132132
assert.NotNil(t, blameReader)
133133
defer blameReader.Close()

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /