From 6599869f2881a7ae690a68e5a08e2c2a0703aaf2 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 17 Oct 2015 17:25:45 -0400 Subject: [PATCH] #1790 fast return for too large diff --- gogs.go | 2 +- models/git_diff.go | 14 +++----------- templates/.VERSION | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/gogs.go b/gogs.go index f1e83532f..a7d44a2aa 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.6.16.1015 Beta" +const APP_VER = "0.6.16.1017 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/git_diff.go b/models/git_diff.go index 669856500..2335e4680 100644 --- a/models/git_diff.go +++ b/models/git_diff.go @@ -86,7 +86,6 @@ func ParsePatch(pid int64, maxlines int, cmd *exec.Cmd, reader io.Reader) (*Diff } leftLine, rightLine int - isTooLong bool // FIXME: Should use cache in the future. buf bytes.Buffer ) @@ -107,9 +106,10 @@ func ParsePatch(pid int64, maxlines int, cmd *exec.Cmd, reader io.Reader) (*Diff i = i + 1 // Diff data too large, we only show the first about maxlines lines - if i == maxlines { - isTooLong = true + if i >= maxlines { log.Warn("Diff data too large") + diff.Files = nil + return diff, nil } switch { @@ -120,10 +120,6 @@ func ParsePatch(pid int64, maxlines int, cmd *exec.Cmd, reader io.Reader) (*Diff curSection.Lines = append(curSection.Lines, diffLine) continue case line[0] == '@': - if isTooLong { - break - } - curSection = &DiffSection{} curFile.Sections = append(curFile.Sections, curSection) ss := strings.Split(line, "@@") @@ -162,10 +158,6 @@ func ParsePatch(pid int64, maxlines int, cmd *exec.Cmd, reader io.Reader) (*Diff // Get new file. if strings.HasPrefix(line, DIFF_HEAD) { - if isTooLong { - break - } - beg := len(DIFF_HEAD) a := line[beg : (len(line)-beg)/2+beg] diff --git a/templates/.VERSION b/templates/.VERSION index 581883e0c..ddb56b4d0 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.16.1015 Beta \ No newline at end of file +0.6.16.1017 Beta \ No newline at end of file