From 5cb201dc93bf41556556f2154ea28755907fd550 Mon Sep 17 00:00:00 2001 From: zeripath Date: Tue, 26 May 2020 06:58:07 +0100 Subject: Fix numbr of files, total additions, and deletions (#11614) Signed-off-by: Andrew Thornton Co-authored-by: techknowlogick --- services/gitdiff/gitdiff.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'services') diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go index 6867f8e0a4..af88ed4d40 100644 --- a/services/gitdiff/gitdiff.go +++ b/services/gitdiff/gitdiff.go @@ -367,9 +367,9 @@ func getCommitFileLineCount(commit *git.Commit, filePath string) int { // Diff represents a difference between two git trees. type Diff struct { - TotalAddition, TotalDeletion int - Files []*DiffFile - IsIncomplete bool + NumFiles, TotalAddition, TotalDeletion int + Files []*DiffFile + IsIncomplete bool } // LoadComments loads comments into each line @@ -398,11 +398,6 @@ func (diff *Diff) LoadComments(issue *models.Issue, currentUser *models.User) er return nil } -// NumFiles returns number of files changes in a diff. -func (diff *Diff) NumFiles() int { - return len(diff.Files) -} - const cmdDiffHead = "diff --git " // ParsePatch builds a Diff object from a io.Reader and some @@ -639,7 +634,7 @@ func ParsePatch(maxLines, maxLineCharacters, maxFiles int, reader io.Reader) (*D } } } - + diff.NumFiles = len(diff.Files) return diff, nil } @@ -716,6 +711,11 @@ func GetDiffRangeWithWhitespaceBehavior(repoPath, beforeCommitID, afterCommitID return nil, fmt.Errorf("Wait: %v", err) } + diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(repoPath, beforeCommitID+"..."+afterCommitID) + if err != nil { + return nil, err + } + return diff, nil } -- cgit v1.2.3