mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-06-05 14:20:16 +00:00
update go git from v4.10.0 to v4.11.0 (#7096)
This commit is contained in:
parent
fb4438a815
commit
8a343dda39
15 changed files with 93 additions and 40 deletions
18
vendor/gopkg.in/src-d/go-git.v4/utils/diff/diff.go
generated
vendored
18
vendor/gopkg.in/src-d/go-git.v4/utils/diff/diff.go
generated
vendored
|
@ -8,14 +8,30 @@ package diff
|
|||
|
||||
import (
|
||||
"bytes"
|
||||
"time"
|
||||
|
||||
"github.com/sergi/go-diff/diffmatchpatch"
|
||||
)
|
||||
|
||||
// Do computes the (line oriented) modifications needed to turn the src
|
||||
// string into the dst string.
|
||||
// string into the dst string. The underlying algorithm is Meyers,
|
||||
// its complexity is O(N*d) where N is min(lines(src), lines(dst)) and d
|
||||
// is the size of the diff.
|
||||
func Do(src, dst string) (diffs []diffmatchpatch.Diff) {
|
||||
// the default timeout is time.Second which may be too small under heavy load
|
||||
return DoWithTimeout(src, dst, time.Hour)
|
||||
}
|
||||
|
||||
// DoWithTimeout computes the (line oriented) modifications needed to turn the src
|
||||
// string into the dst string. The `timeout` argument specifies the maximum
|
||||
// amount of time it is allowed to spend in this function. If the timeout
|
||||
// is exceeded, the parts of the strings which were not considered are turned into
|
||||
// a bulk delete+insert and the half-baked suboptimal result is returned at once.
|
||||
// The underlying algorithm is Meyers, its complexity is O(N*d) where N is
|
||||
// min(lines(src), lines(dst)) and d is the size of the diff.
|
||||
func DoWithTimeout (src, dst string, timeout time.Duration) (diffs []diffmatchpatch.Diff) {
|
||||
dmp := diffmatchpatch.New()
|
||||
dmp.DiffTimeout = timeout
|
||||
wSrc, wDst, warray := dmp.DiffLinesToRunes(src, dst)
|
||||
diffs = dmp.DiffMainRunes(wSrc, wDst, false)
|
||||
diffs = dmp.DiffCharsToLines(diffs, warray)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue