Update code.gitea.io/git (#3137)
This commit is contained in:
parent
682ac11958
commit
58a7de2aea
31 changed files with 3274 additions and 405 deletions
114
vendor/code.gitea.io/git/tree_entry.go
generated
vendored
114
vendor/code.gitea.io/git/tree_entry.go
generated
vendored
|
@ -5,10 +5,6 @@
|
|||
package git
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
@ -162,113 +158,3 @@ func (tes Entries) Sort() {
|
|||
func (tes Entries) CustomSort(cmp func(s1, s2 string) bool) {
|
||||
sort.Sort(customSortableEntries{cmp, tes})
|
||||
}
|
||||
|
||||
type commitInfo struct {
|
||||
entryName string
|
||||
infos []interface{}
|
||||
err error
|
||||
}
|
||||
|
||||
// GetCommitsInfo takes advantages of concurrency to speed up getting information
|
||||
// of all commits that are corresponding to these entries. This method will automatically
|
||||
// choose the right number of goroutine (concurrency) to use related of the host CPU.
|
||||
func (tes Entries) GetCommitsInfo(commit *Commit, treePath string) ([][]interface{}, error) {
|
||||
return tes.GetCommitsInfoWithCustomConcurrency(commit, treePath, 0)
|
||||
}
|
||||
|
||||
// GetCommitsInfoWithCustomConcurrency takes advantages of concurrency to speed up getting information
|
||||
// of all commits that are corresponding to these entries. If the given maxConcurrency is negative or
|
||||
// equal to zero: the right number of goroutine (concurrency) to use will be chosen related of the
|
||||
// host CPU.
|
||||
func (tes Entries) GetCommitsInfoWithCustomConcurrency(commit *Commit, treePath string, maxConcurrency int) ([][]interface{}, error) {
|
||||
if len(tes) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
if maxConcurrency <= 0 {
|
||||
maxConcurrency = runtime.NumCPU()
|
||||
}
|
||||
|
||||
// Length of taskChan determines how many goroutines (subprocesses) can run at the same time.
|
||||
// The length of revChan should be same as taskChan so goroutines whoever finished job can
|
||||
// exit as early as possible, only store data inside channel.
|
||||
taskChan := make(chan bool, maxConcurrency)
|
||||
revChan := make(chan commitInfo, maxConcurrency)
|
||||
doneChan := make(chan error)
|
||||
|
||||
// Receive loop will exit when it collects same number of data pieces as tree entries.
|
||||
// It notifies doneChan before exits or notify early with possible error.
|
||||
infoMap := make(map[string][]interface{}, len(tes))
|
||||
go func() {
|
||||
i := 0
|
||||
for info := range revChan {
|
||||
if info.err != nil {
|
||||
doneChan <- info.err
|
||||
return
|
||||
}
|
||||
|
||||
infoMap[info.entryName] = info.infos
|
||||
i++
|
||||
if i == len(tes) {
|
||||
break
|
||||
}
|
||||
}
|
||||
doneChan <- nil
|
||||
}()
|
||||
|
||||
for i := range tes {
|
||||
// When taskChan is idle (or has empty slots), put operation will not block.
|
||||
// However when taskChan is full, code will block and wait any running goroutines to finish.
|
||||
taskChan <- true
|
||||
|
||||
if tes[i].Type != ObjectCommit {
|
||||
go func(i int) {
|
||||
cinfo := commitInfo{entryName: tes[i].Name()}
|
||||
c, err := commit.GetCommitByPath(filepath.Join(treePath, tes[i].Name()))
|
||||
if err != nil {
|
||||
cinfo.err = fmt.Errorf("GetCommitByPath (%s/%s): %v", treePath, tes[i].Name(), err)
|
||||
} else {
|
||||
cinfo.infos = []interface{}{tes[i], c}
|
||||
}
|
||||
revChan <- cinfo
|
||||
<-taskChan // Clear one slot from taskChan to allow new goroutines to start.
|
||||
}(i)
|
||||
continue
|
||||
}
|
||||
|
||||
// Handle submodule
|
||||
go func(i int) {
|
||||
cinfo := commitInfo{entryName: tes[i].Name()}
|
||||
sm, err := commit.GetSubModule(path.Join(treePath, tes[i].Name()))
|
||||
if err != nil && !IsErrNotExist(err) {
|
||||
cinfo.err = fmt.Errorf("GetSubModule (%s/%s): %v", treePath, tes[i].Name(), err)
|
||||
revChan <- cinfo
|
||||
return
|
||||
}
|
||||
|
||||
smURL := ""
|
||||
if sm != nil {
|
||||
smURL = sm.URL
|
||||
}
|
||||
|
||||
c, err := commit.GetCommitByPath(filepath.Join(treePath, tes[i].Name()))
|
||||
if err != nil {
|
||||
cinfo.err = fmt.Errorf("GetCommitByPath (%s/%s): %v", treePath, tes[i].Name(), err)
|
||||
} else {
|
||||
cinfo.infos = []interface{}{tes[i], NewSubModuleFile(c, smURL, tes[i].ID.String())}
|
||||
}
|
||||
revChan <- cinfo
|
||||
<-taskChan
|
||||
}(i)
|
||||
}
|
||||
|
||||
if err := <-doneChan; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
commitsInfo := make([][]interface{}, len(tes))
|
||||
for i := 0; i < len(tes); i++ {
|
||||
commitsInfo[i] = infoMap[tes[i].Name()]
|
||||
}
|
||||
return commitsInfo, nil
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue