2014-04-13 07:05:36 +05:30
|
|
|
// Copyright 2014 The Gogs Authors. All rights reserved.
|
2019-09-06 07:50:09 +05:30
|
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
2014-04-13 07:05:36 +05:30
|
|
|
// Use of this source code is governed by a MIT-style
|
|
|
|
// license that can be found in the LICENSE file.
|
|
|
|
|
2019-09-06 07:50:09 +05:30
|
|
|
package gitdiff
|
2014-04-13 07:05:36 +05:30
|
|
|
|
|
|
|
import (
|
|
|
|
"bufio"
|
2014-12-09 12:48:25 +05:30
|
|
|
"bytes"
|
2019-11-30 20:10:22 +05:30
|
|
|
"context"
|
2014-06-19 10:38:03 +05:30
|
|
|
"fmt"
|
2016-01-09 12:21:17 +05:30
|
|
|
"html/template"
|
2014-04-13 07:05:36 +05:30
|
|
|
"io"
|
2015-12-14 20:08:21 +05:30
|
|
|
"io/ioutil"
|
2019-11-15 08:22:59 +05:30
|
|
|
"net/url"
|
2014-04-13 07:05:36 +05:30
|
|
|
"os"
|
|
|
|
"os/exec"
|
2018-08-06 10:13:22 +05:30
|
|
|
"sort"
|
2018-02-10 23:49:26 +05:30
|
|
|
"strconv"
|
2014-04-13 07:05:36 +05:30
|
|
|
"strings"
|
|
|
|
|
2019-09-06 07:50:09 +05:30
|
|
|
"code.gitea.io/gitea/models"
|
2019-08-15 17:37:28 +05:30
|
|
|
"code.gitea.io/gitea/modules/charset"
|
2019-03-27 15:03:00 +05:30
|
|
|
"code.gitea.io/gitea/modules/git"
|
2016-12-06 23:28:31 +05:30
|
|
|
"code.gitea.io/gitea/modules/highlight"
|
2016-11-10 21:54:48 +05:30
|
|
|
"code.gitea.io/gitea/modules/log"
|
|
|
|
"code.gitea.io/gitea/modules/process"
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
2019-08-23 22:10:30 +05:30
|
|
|
|
2016-11-05 22:26:35 +05:30
|
|
|
"github.com/sergi/go-diff/diffmatchpatch"
|
2019-08-15 17:37:28 +05:30
|
|
|
stdcharset "golang.org/x/net/html/charset"
|
2016-11-05 22:26:35 +05:30
|
|
|
"golang.org/x/text/transform"
|
2014-04-13 07:05:36 +05:30
|
|
|
)
|
|
|
|
|
2016-11-24 14:00:08 +05:30
|
|
|
// DiffLineType represents the type of a DiffLine.
|
2016-01-07 01:30:40 +05:30
|
|
|
type DiffLineType uint8
|
|
|
|
|
2016-11-22 16:38:23 +05:30
|
|
|
// DiffLineType possible values.
|
2014-04-13 07:05:36 +05:30
|
|
|
const (
|
2016-11-07 21:54:59 +05:30
|
|
|
DiffLinePlain DiffLineType = iota + 1
|
|
|
|
DiffLineAdd
|
|
|
|
DiffLineDel
|
2016-11-07 22:03:03 +05:30
|
|
|
DiffLineSection
|
2014-04-13 07:05:36 +05:30
|
|
|
)
|
|
|
|
|
2016-11-24 14:00:08 +05:30
|
|
|
// DiffFileType represents the type of a DiffFile.
|
2016-01-07 01:30:40 +05:30
|
|
|
type DiffFileType uint8
|
|
|
|
|
2016-11-22 16:38:23 +05:30
|
|
|
// DiffFileType possible values.
|
2014-04-13 07:05:36 +05:30
|
|
|
const (
|
2016-11-07 21:54:59 +05:30
|
|
|
DiffFileAdd DiffFileType = iota + 1
|
|
|
|
DiffFileChange
|
|
|
|
DiffFileDel
|
2016-11-07 22:03:03 +05:30
|
|
|
DiffFileRename
|
2014-04-13 07:05:36 +05:30
|
|
|
)
|
|
|
|
|
2019-11-15 08:22:59 +05:30
|
|
|
// DiffLineExpandDirection represents the DiffLineSection expand direction
|
|
|
|
type DiffLineExpandDirection uint8
|
|
|
|
|
|
|
|
// DiffLineExpandDirection possible values.
|
|
|
|
const (
|
|
|
|
DiffLineExpandNone DiffLineExpandDirection = iota + 1
|
|
|
|
DiffLineExpandSingle
|
|
|
|
DiffLineExpandUpDown
|
|
|
|
DiffLineExpandUp
|
|
|
|
DiffLineExpandDown
|
|
|
|
)
|
|
|
|
|
2016-11-24 14:00:08 +05:30
|
|
|
// DiffLine represents a line difference in a DiffSection.
|
2014-04-13 07:05:36 +05:30
|
|
|
type DiffLine struct {
|
2019-11-15 08:22:59 +05:30
|
|
|
LeftIdx int
|
|
|
|
RightIdx int
|
|
|
|
Type DiffLineType
|
|
|
|
Content string
|
|
|
|
Comments []*models.Comment
|
|
|
|
SectionInfo *DiffLineSectionInfo
|
|
|
|
}
|
|
|
|
|
|
|
|
// DiffLineSectionInfo represents diff line section meta data
|
|
|
|
type DiffLineSectionInfo struct {
|
|
|
|
Path string
|
|
|
|
LastLeftIdx int
|
|
|
|
LastRightIdx int
|
|
|
|
LeftIdx int
|
|
|
|
RightIdx int
|
|
|
|
LeftHunkSize int
|
|
|
|
RightHunkSize int
|
2014-04-13 07:05:36 +05:30
|
|
|
}
|
|
|
|
|
2019-11-15 08:22:59 +05:30
|
|
|
// BlobExceprtChunkSize represent max lines of excerpt
|
|
|
|
const BlobExceprtChunkSize = 20
|
|
|
|
|
2016-11-24 14:00:08 +05:30
|
|
|
// GetType returns the type of a DiffLine.
|
2016-01-07 01:30:40 +05:30
|
|
|
func (d *DiffLine) GetType() int {
|
|
|
|
return int(d.Type)
|
2014-04-13 07:05:36 +05:30
|
|
|
}
|
|
|
|
|
2018-08-06 10:13:22 +05:30
|
|
|
// CanComment returns whether or not a line can get commented
|
|
|
|
func (d *DiffLine) CanComment() bool {
|
|
|
|
return len(d.Comments) == 0 && d.Type != DiffLineSection
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetCommentSide returns the comment side of the first comment, if not set returns empty string
|
|
|
|
func (d *DiffLine) GetCommentSide() string {
|
|
|
|
if len(d.Comments) == 0 {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
return d.Comments[0].DiffSide()
|
|
|
|
}
|
|
|
|
|
2019-06-25 01:53:52 +05:30
|
|
|
// GetLineTypeMarker returns the line type marker
|
|
|
|
func (d *DiffLine) GetLineTypeMarker() string {
|
|
|
|
if strings.IndexByte(" +-", d.Content[0]) > -1 {
|
|
|
|
return d.Content[0:1]
|
|
|
|
}
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
2019-11-15 08:22:59 +05:30
|
|
|
// GetBlobExcerptQuery builds query string to get blob excerpt
|
|
|
|
func (d *DiffLine) GetBlobExcerptQuery() string {
|
|
|
|
query := fmt.Sprintf(
|
|
|
|
"last_left=%d&last_right=%d&"+
|
|
|
|
"left=%d&right=%d&"+
|
|
|
|
"left_hunk_size=%d&right_hunk_size=%d&"+
|
|
|
|
"path=%s",
|
|
|
|
d.SectionInfo.LastLeftIdx, d.SectionInfo.LastRightIdx,
|
|
|
|
d.SectionInfo.LeftIdx, d.SectionInfo.RightIdx,
|
|
|
|
d.SectionInfo.LeftHunkSize, d.SectionInfo.RightHunkSize,
|
|
|
|
url.QueryEscape(d.SectionInfo.Path))
|
|
|
|
return query
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetExpandDirection gets DiffLineExpandDirection
|
|
|
|
func (d *DiffLine) GetExpandDirection() DiffLineExpandDirection {
|
|
|
|
if d.Type != DiffLineSection || d.SectionInfo == nil || d.SectionInfo.RightIdx-d.SectionInfo.LastRightIdx <= 1 {
|
|
|
|
return DiffLineExpandNone
|
|
|
|
}
|
|
|
|
if d.SectionInfo.LastLeftIdx <= 0 && d.SectionInfo.LastRightIdx <= 0 {
|
|
|
|
return DiffLineExpandUp
|
|
|
|
} else if d.SectionInfo.RightIdx-d.SectionInfo.LastRightIdx > BlobExceprtChunkSize && d.SectionInfo.RightHunkSize > 0 {
|
|
|
|
return DiffLineExpandUpDown
|
|
|
|
} else if d.SectionInfo.LeftHunkSize <= 0 && d.SectionInfo.RightHunkSize <= 0 {
|
|
|
|
return DiffLineExpandDown
|
|
|
|
}
|
|
|
|
return DiffLineExpandSingle
|
|
|
|
}
|
|
|
|
|
2020-01-23 22:58:15 +05:30
|
|
|
func getDiffLineSectionInfo(treePath, line string, lastLeftIdx, lastRightIdx int) *DiffLineSectionInfo {
|
2020-01-28 13:32:03 +05:30
|
|
|
leftLine, leftHunk, rightLine, righHunk := git.ParseDiffHunkString(line)
|
2020-01-23 22:58:15 +05:30
|
|
|
|
2019-11-15 08:22:59 +05:30
|
|
|
return &DiffLineSectionInfo{
|
2020-01-23 22:58:15 +05:30
|
|
|
Path: treePath,
|
2019-11-15 08:22:59 +05:30
|
|
|
LastLeftIdx: lastLeftIdx,
|
|
|
|
LastRightIdx: lastRightIdx,
|
|
|
|
LeftIdx: leftLine,
|
|
|
|
RightIdx: rightLine,
|
|
|
|
LeftHunkSize: leftHunk,
|
|
|
|
RightHunkSize: righHunk,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-27 03:05:07 +05:30
|
|
|
// escape a line's content or return <br> needed for copy/paste purposes
|
|
|
|
func getLineContent(content string) string {
|
|
|
|
if len(content) > 0 {
|
2020-07-01 03:04:03 +05:30
|
|
|
return content
|
2019-06-27 03:05:07 +05:30
|
|
|
}
|
2020-07-01 03:04:03 +05:30
|
|
|
return "\n"
|
2019-06-27 03:05:07 +05:30
|
|
|
}
|
|
|
|
|
2016-11-24 14:00:08 +05:30
|
|
|
// DiffSection represents a section of a DiffFile.
|
2014-04-13 07:05:36 +05:30
|
|
|
type DiffSection struct {
|
2020-07-01 03:04:03 +05:30
|
|
|
FileName string
|
|
|
|
Name string
|
|
|
|
Lines []*DiffLine
|
2014-04-13 07:05:36 +05:30
|
|
|
}
|
|
|
|
|
2016-01-09 12:21:17 +05:30
|
|
|
var (
|
2019-06-25 01:53:52 +05:30
|
|
|
addedCodePrefix = []byte(`<span class="added-code">`)
|
|
|
|
removedCodePrefix = []byte(`<span class="removed-code">`)
|
|
|
|
codeTagSuffix = []byte(`</span>`)
|
2016-01-09 12:21:17 +05:30
|
|
|
)
|
|
|
|
|
2020-07-01 03:04:03 +05:30
|
|
|
func diffToHTML(fileName string, diffs []diffmatchpatch.Diff, lineType DiffLineType) template.HTML {
|
2016-08-07 22:19:47 +05:30
|
|
|
buf := bytes.NewBuffer(nil)
|
2020-07-16 19:28:54 +05:30
|
|
|
var addSpan bool
|
2016-01-09 12:21:17 +05:30
|
|
|
for i := range diffs {
|
2016-08-07 22:19:47 +05:30
|
|
|
switch {
|
2020-07-16 19:28:54 +05:30
|
|
|
case diffs[i].Type == diffmatchpatch.DiffEqual:
|
|
|
|
// Looking for the case where our 3rd party diff library previously detected a string difference
|
|
|
|
// in the middle of a span class because we highlight them first. This happens when added/deleted code
|
|
|
|
// also changes the chroma class name. If found, just move the openining span code forward into the next section
|
|
|
|
if addSpan {
|
|
|
|
diffs[i].Text = "<span class=\"" + diffs[i].Text
|
|
|
|
}
|
|
|
|
if strings.HasSuffix(diffs[i].Text, "<span class=\"") {
|
|
|
|
addSpan = true
|
|
|
|
buf.WriteString(strings.TrimSuffix(diffs[i].Text, "<span class=\""))
|
|
|
|
} else {
|
|
|
|
addSpan = false
|
|
|
|
buf.WriteString(getLineContent(diffs[i].Text))
|
|
|
|
}
|
2016-11-07 21:54:59 +05:30
|
|
|
case diffs[i].Type == diffmatchpatch.DiffInsert && lineType == DiffLineAdd:
|
2020-07-16 19:28:54 +05:30
|
|
|
if addSpan {
|
|
|
|
addSpan = false
|
|
|
|
diffs[i].Text = "<span class=\"" + diffs[i].Text
|
|
|
|
}
|
|
|
|
// Print existing closing span first before opening added-code span so it doesn't unintentionally close it
|
|
|
|
if strings.HasPrefix(diffs[i].Text, "</span>") {
|
|
|
|
buf.WriteString("</span>")
|
|
|
|
diffs[i].Text = strings.TrimPrefix(diffs[i].Text, "</span>")
|
|
|
|
}
|
|
|
|
if strings.HasSuffix(diffs[i].Text, "<span class=\"") {
|
|
|
|
addSpan = true
|
|
|
|
diffs[i].Text = strings.TrimSuffix(diffs[i].Text, "<span class=\"")
|
|
|
|
}
|
2016-01-09 12:21:17 +05:30
|
|
|
buf.Write(addedCodePrefix)
|
2020-07-11 11:13:12 +05:30
|
|
|
buf.WriteString(getLineContent(diffs[i].Text))
|
2016-01-09 12:21:17 +05:30
|
|
|
buf.Write(codeTagSuffix)
|
2016-11-07 21:54:59 +05:30
|
|
|
case diffs[i].Type == diffmatchpatch.DiffDelete && lineType == DiffLineDel:
|
2020-07-16 19:28:54 +05:30
|
|
|
if addSpan {
|
|
|
|
addSpan = false
|
|
|
|
diffs[i].Text = "<span class=\"" + diffs[i].Text
|
|
|
|
}
|
|
|
|
if strings.HasPrefix(diffs[i].Text, "</span>") {
|
|
|
|
buf.WriteString("</span>")
|
|
|
|
diffs[i].Text = strings.TrimPrefix(diffs[i].Text, "</span>")
|
|
|
|
}
|
|
|
|
if strings.HasSuffix(diffs[i].Text, "<span class=\"") {
|
|
|
|
addSpan = true
|
|
|
|
diffs[i].Text = strings.TrimSuffix(diffs[i].Text, "<span class=\"")
|
|
|
|
}
|
2016-01-09 12:21:17 +05:30
|
|
|
buf.Write(removedCodePrefix)
|
2020-07-11 11:13:12 +05:30
|
|
|
buf.WriteString(getLineContent(diffs[i].Text))
|
2016-01-09 12:21:17 +05:30
|
|
|
buf.Write(codeTagSuffix)
|
2016-01-04 02:56:46 +05:30
|
|
|
}
|
|
|
|
}
|
2016-01-09 12:21:17 +05:30
|
|
|
return template.HTML(buf.Bytes())
|
2016-01-04 02:56:46 +05:30
|
|
|
}
|
|
|
|
|
2016-11-22 16:38:23 +05:30
|
|
|
// GetLine gets a specific line by type (add or del) and file line number
|
2016-01-08 18:20:25 +05:30
|
|
|
func (diffSection *DiffSection) GetLine(lineType DiffLineType, idx int) *DiffLine {
|
2016-08-07 22:19:47 +05:30
|
|
|
var (
|
|
|
|
difference = 0
|
|
|
|
addCount = 0
|
|
|
|
delCount = 0
|
|
|
|
matchDiffLine *DiffLine
|
|
|
|
)
|
|
|
|
|
|
|
|
LOOP:
|
2016-01-08 18:20:25 +05:30
|
|
|
for _, diffLine := range diffSection.Lines {
|
2016-08-07 22:19:47 +05:30
|
|
|
switch diffLine.Type {
|
2016-11-07 21:54:59 +05:30
|
|
|
case DiffLineAdd:
|
2016-08-07 22:19:47 +05:30
|
|
|
addCount++
|
2016-11-07 21:54:59 +05:30
|
|
|
case DiffLineDel:
|
2016-08-07 22:19:47 +05:30
|
|
|
delCount++
|
|
|
|
default:
|
|
|
|
if matchDiffLine != nil {
|
|
|
|
break LOOP
|
|
|
|
}
|
2016-01-08 18:20:25 +05:30
|
|
|
difference = diffLine.RightIdx - diffLine.LeftIdx
|
2016-08-07 22:19:47 +05:30
|
|
|
addCount = 0
|
|
|
|
delCount = 0
|
2016-01-04 02:56:46 +05:30
|
|
|
}
|
|
|
|
|
2016-08-07 22:19:47 +05:30
|
|
|
switch lineType {
|
2016-11-07 21:54:59 +05:30
|
|
|
case DiffLineDel:
|
2016-01-09 12:21:17 +05:30
|
|
|
if diffLine.RightIdx == 0 && diffLine.LeftIdx == idx-difference {
|
2016-08-07 22:19:47 +05:30
|
|
|
matchDiffLine = diffLine
|
2016-01-08 18:20:25 +05:30
|
|
|
}
|
2016-11-07 21:54:59 +05:30
|
|
|
case DiffLineAdd:
|
2016-01-09 12:21:17 +05:30
|
|
|
if diffLine.LeftIdx == 0 && diffLine.RightIdx == idx+difference {
|
2016-08-07 22:19:47 +05:30
|
|
|
matchDiffLine = diffLine
|
2016-01-04 02:56:46 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-08-07 22:19:47 +05:30
|
|
|
|
|
|
|
if addCount == delCount {
|
|
|
|
return matchDiffLine
|
|
|
|
}
|
2016-01-04 02:56:46 +05:30
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2016-08-07 22:19:47 +05:30
|
|
|
var diffMatchPatch = diffmatchpatch.New()
|
|
|
|
|
|
|
|
func init() {
|
|
|
|
diffMatchPatch.DiffEditCost = 100
|
|
|
|
}
|
|
|
|
|
2016-11-22 16:38:23 +05:30
|
|
|
// GetComputedInlineDiffFor computes inline diff for the given line.
|
2016-01-28 02:24:08 +05:30
|
|
|
func (diffSection *DiffSection) GetComputedInlineDiffFor(diffLine *DiffLine) template.HTML {
|
2016-08-07 22:19:47 +05:30
|
|
|
if setting.Git.DisableDiffHighlight {
|
2019-06-27 03:05:07 +05:30
|
|
|
return template.HTML(getLineContent(diffLine.Content[1:]))
|
2016-01-28 02:24:08 +05:30
|
|
|
}
|
2020-07-01 03:04:03 +05:30
|
|
|
|
2016-08-07 22:19:47 +05:30
|
|
|
var (
|
|
|
|
compareDiffLine *DiffLine
|
|
|
|
diff1 string
|
|
|
|
diff2 string
|
|
|
|
)
|
2016-01-04 02:56:46 +05:30
|
|
|
|
2016-01-28 02:24:08 +05:30
|
|
|
// try to find equivalent diff line. ignore, otherwise
|
2016-08-07 22:19:47 +05:30
|
|
|
switch diffLine.Type {
|
2020-07-01 03:04:03 +05:30
|
|
|
case DiffLineSection:
|
|
|
|
return template.HTML(getLineContent(diffLine.Content[1:]))
|
2016-11-07 21:54:59 +05:30
|
|
|
case DiffLineAdd:
|
|
|
|
compareDiffLine = diffSection.GetLine(DiffLineDel, diffLine.RightIdx)
|
2016-01-28 02:24:08 +05:30
|
|
|
if compareDiffLine == nil {
|
2020-07-09 02:32:38 +05:30
|
|
|
return template.HTML(highlight.Code(diffSection.FileName, diffLine.Content[1:]))
|
2016-01-28 02:24:08 +05:30
|
|
|
}
|
|
|
|
diff1 = compareDiffLine.Content
|
|
|
|
diff2 = diffLine.Content
|
2016-11-07 21:54:59 +05:30
|
|
|
case DiffLineDel:
|
|
|
|
compareDiffLine = diffSection.GetLine(DiffLineAdd, diffLine.LeftIdx)
|
2016-01-28 02:24:08 +05:30
|
|
|
if compareDiffLine == nil {
|
2020-07-09 02:32:38 +05:30
|
|
|
return template.HTML(highlight.Code(diffSection.FileName, diffLine.Content[1:]))
|
2016-01-04 02:56:46 +05:30
|
|
|
}
|
2016-01-28 02:24:08 +05:30
|
|
|
diff1 = diffLine.Content
|
|
|
|
diff2 = compareDiffLine.Content
|
2016-08-07 22:19:47 +05:30
|
|
|
default:
|
2019-06-25 01:53:52 +05:30
|
|
|
if strings.IndexByte(" +-", diffLine.Content[0]) > -1 {
|
2020-07-09 02:32:38 +05:30
|
|
|
return template.HTML(highlight.Code(diffSection.FileName, diffLine.Content[1:]))
|
2019-06-25 01:53:52 +05:30
|
|
|
}
|
2020-07-01 03:04:03 +05:30
|
|
|
return template.HTML(highlight.Code(diffSection.FileName, diffLine.Content))
|
2016-01-28 02:24:08 +05:30
|
|
|
}
|
2016-01-04 02:56:46 +05:30
|
|
|
|
2020-07-11 11:13:12 +05:30
|
|
|
diffRecord := diffMatchPatch.DiffMain(highlight.Code(diffSection.FileName, diff1[1:]), highlight.Code(diffSection.FileName, diff2[1:]), true)
|
2016-08-07 22:19:47 +05:30
|
|
|
diffRecord = diffMatchPatch.DiffCleanupEfficiency(diffRecord)
|
2020-07-01 03:04:03 +05:30
|
|
|
return diffToHTML(diffSection.FileName, diffRecord, diffLine.Type)
|
2016-01-04 02:56:46 +05:30
|
|
|
}
|
|
|
|
|
2016-11-24 14:00:08 +05:30
|
|
|
// DiffFile represents a file diff.
|
2014-04-13 07:05:36 +05:30
|
|
|
type DiffFile struct {
|
|
|
|
Name string
|
2015-11-03 06:25:24 +05:30
|
|
|
OldName string
|
2014-05-13 22:10:32 +05:30
|
|
|
Index int
|
2014-04-13 07:05:36 +05:30
|
|
|
Addition, Deletion int
|
2016-01-07 01:30:40 +05:30
|
|
|
Type DiffFileType
|
2015-02-06 14:32:32 +05:30
|
|
|
IsCreated bool
|
|
|
|
IsDeleted bool
|
2014-04-16 05:31:20 +05:30
|
|
|
IsBin bool
|
2016-12-26 06:46:37 +05:30
|
|
|
IsLFSFile bool
|
2015-11-03 06:25:24 +05:30
|
|
|
IsRenamed bool
|
2016-07-22 23:48:56 +05:30
|
|
|
IsSubmodule bool
|
2014-04-13 07:05:36 +05:30
|
|
|
Sections []*DiffSection
|
2016-06-29 20:41:00 +05:30
|
|
|
IsIncomplete bool
|
2014-04-13 07:05:36 +05:30
|
|
|
}
|
|
|
|
|
2016-11-22 16:38:23 +05:30
|
|
|
// GetType returns type of diff file.
|
2016-01-07 01:30:40 +05:30
|
|
|
func (diffFile *DiffFile) GetType() int {
|
|
|
|
return int(diffFile.Type)
|
|
|
|
}
|
|
|
|
|
2019-11-15 08:22:59 +05:30
|
|
|
// GetTailSection creates a fake DiffLineSection if the last section is not the end of the file
|
|
|
|
func (diffFile *DiffFile) GetTailSection(gitRepo *git.Repository, leftCommitID, rightCommitID string) *DiffSection {
|
2020-01-22 12:50:58 +05:30
|
|
|
if len(diffFile.Sections) == 0 || diffFile.Type != DiffFileChange || diffFile.IsBin || diffFile.IsLFSFile {
|
2019-11-15 08:22:59 +05:30
|
|
|
return nil
|
|
|
|
}
|
|
|
|
leftCommit, err := gitRepo.GetCommit(leftCommitID)
|
|
|
|
if err != nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
rightCommit, err := gitRepo.GetCommit(rightCommitID)
|
|
|
|
if err != nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
lastSection := diffFile.Sections[len(diffFile.Sections)-1]
|
|
|
|
lastLine := lastSection.Lines[len(lastSection.Lines)-1]
|
|
|
|
leftLineCount := getCommitFileLineCount(leftCommit, diffFile.Name)
|
|
|
|
rightLineCount := getCommitFileLineCount(rightCommit, diffFile.Name)
|
|
|
|
if leftLineCount <= lastLine.LeftIdx || rightLineCount <= lastLine.RightIdx {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
tailDiffLine := &DiffLine{
|
|
|
|
Type: DiffLineSection,
|
|
|
|
Content: " ",
|
|
|
|
SectionInfo: &DiffLineSectionInfo{
|
|
|
|
Path: diffFile.Name,
|
|
|
|
LastLeftIdx: lastLine.LeftIdx,
|
|
|
|
LastRightIdx: lastLine.RightIdx,
|
|
|
|
LeftIdx: leftLineCount,
|
|
|
|
RightIdx: rightLineCount,
|
|
|
|
}}
|
2020-07-01 03:04:03 +05:30
|
|
|
tailSection := &DiffSection{FileName: diffFile.Name, Lines: []*DiffLine{tailDiffLine}}
|
2019-11-15 08:22:59 +05:30
|
|
|
return tailSection
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
func getCommitFileLineCount(commit *git.Commit, filePath string) int {
|
|
|
|
blob, err := commit.GetBlobByPath(filePath)
|
|
|
|
if err != nil {
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
lineCount, err := blob.GetBlobLineCount()
|
|
|
|
if err != nil {
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
return lineCount
|
|
|
|
}
|
|
|
|
|
2016-11-24 14:00:08 +05:30
|
|
|
// Diff represents a difference between two git trees.
|
2014-04-13 07:05:36 +05:30
|
|
|
type Diff struct {
|
2020-05-26 11:28:07 +05:30
|
|
|
NumFiles, TotalAddition, TotalDeletion int
|
|
|
|
Files []*DiffFile
|
|
|
|
IsIncomplete bool
|
2014-04-13 07:05:36 +05:30
|
|
|
}
|
|
|
|
|
2018-08-06 10:13:22 +05:30
|
|
|
// LoadComments loads comments into each line
|
2019-09-06 07:50:09 +05:30
|
|
|
func (diff *Diff) LoadComments(issue *models.Issue, currentUser *models.User) error {
|
|
|
|
allComments, err := models.FetchCodeComments(issue, currentUser)
|
2018-08-06 10:13:22 +05:30
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
for _, file := range diff.Files {
|
|
|
|
if lineCommits, ok := allComments[file.Name]; ok {
|
|
|
|
for _, section := range file.Sections {
|
|
|
|
for _, line := range section.Lines {
|
|
|
|
if comments, ok := lineCommits[int64(line.LeftIdx*-1)]; ok {
|
|
|
|
line.Comments = append(line.Comments, comments...)
|
|
|
|
}
|
|
|
|
if comments, ok := lineCommits[int64(line.RightIdx)]; ok {
|
|
|
|
line.Comments = append(line.Comments, comments...)
|
|
|
|
}
|
|
|
|
sort.SliceStable(line.Comments, func(i, j int) bool {
|
|
|
|
return line.Comments[i].CreatedUnix < line.Comments[j].CreatedUnix
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2016-11-22 16:38:23 +05:30
|
|
|
const cmdDiffHead = "diff --git "
|
2014-04-13 07:05:36 +05:30
|
|
|
|
2016-11-24 14:00:08 +05:30
|
|
|
// ParsePatch builds a Diff object from a io.Reader and some
|
|
|
|
// parameters.
|
2016-07-30 21:09:58 +05:30
|
|
|
// TODO: move this function to gogits/git-module
|
2017-01-05 06:20:34 +05:30
|
|
|
func ParsePatch(maxLines, maxLineCharacters, maxFiles int, reader io.Reader) (*Diff, error) {
|
2014-04-13 07:05:36 +05:30
|
|
|
var (
|
2020-07-01 03:04:03 +05:30
|
|
|
diff = &Diff{Files: make([]*DiffFile, 0)}
|
2017-12-12 06:02:36 +05:30
|
|
|
curFile = &DiffFile{}
|
2014-04-13 07:05:36 +05:30
|
|
|
curSection = &DiffSection{
|
|
|
|
Lines: make([]*DiffLine, 0, 10),
|
|
|
|
}
|
|
|
|
|
|
|
|
leftLine, rightLine int
|
2015-12-02 11:40:13 +05:30
|
|
|
lineCount int
|
2016-06-29 20:41:00 +05:30
|
|
|
curFileLinesCount int
|
2016-12-26 06:46:37 +05:30
|
|
|
curFileLFSPrefix bool
|
2014-04-13 07:05:36 +05:30
|
|
|
)
|
|
|
|
|
2015-12-02 11:40:13 +05:30
|
|
|
input := bufio.NewReader(reader)
|
|
|
|
isEOF := false
|
2016-06-29 20:41:00 +05:30
|
|
|
for !isEOF {
|
2017-11-29 04:52:24 +05:30
|
|
|
var linebuf bytes.Buffer
|
|
|
|
for {
|
|
|
|
b, err := input.ReadByte()
|
|
|
|
if err != nil {
|
|
|
|
if err == io.EOF {
|
|
|
|
isEOF = true
|
|
|
|
break
|
|
|
|
} else {
|
|
|
|
return nil, fmt.Errorf("ReadByte: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if b == '\n' {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
if linebuf.Len() < maxLineCharacters {
|
|
|
|
linebuf.WriteByte(b)
|
|
|
|
} else if linebuf.Len() == maxLineCharacters {
|
|
|
|
curFile.IsIncomplete = true
|
2015-12-02 11:40:13 +05:30
|
|
|
}
|
|
|
|
}
|
2017-11-29 04:52:24 +05:30
|
|
|
line := linebuf.String()
|
2014-04-13 07:05:36 +05:30
|
|
|
|
2016-06-29 20:41:00 +05:30
|
|
|
if strings.HasPrefix(line, "+++ ") || strings.HasPrefix(line, "--- ") || len(line) == 0 {
|
2014-09-17 09:33:03 +05:30
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2016-12-26 06:46:37 +05:30
|
|
|
trimLine := strings.Trim(line, "+- ")
|
|
|
|
|
2019-09-06 07:50:09 +05:30
|
|
|
if trimLine == models.LFSMetaFileIdentifier {
|
2016-12-26 06:46:37 +05:30
|
|
|
curFileLFSPrefix = true
|
|
|
|
}
|
|
|
|
|
2019-09-06 07:50:09 +05:30
|
|
|
if curFileLFSPrefix && strings.HasPrefix(trimLine, models.LFSMetaFileOidPrefix) {
|
|
|
|
oid := strings.TrimPrefix(trimLine, models.LFSMetaFileOidPrefix)
|
2016-12-26 06:46:37 +05:30
|
|
|
|
|
|
|
if len(oid) == 64 {
|
2019-09-06 07:50:09 +05:30
|
|
|
m := &models.LFSMetaObject{Oid: oid}
|
|
|
|
count, err := models.Count(m)
|
2016-12-26 06:46:37 +05:30
|
|
|
|
|
|
|
if err == nil && count > 0 {
|
|
|
|
curFile.IsBin = true
|
|
|
|
curFile.IsLFSFile = true
|
|
|
|
curSection.Lines = nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-29 20:41:00 +05:30
|
|
|
curFileLinesCount++
|
2015-12-02 11:40:13 +05:30
|
|
|
lineCount++
|
2014-04-13 07:05:36 +05:30
|
|
|
|
2017-01-05 06:20:34 +05:30
|
|
|
// Diff data too large, we only show the first about maxLines lines
|
2017-11-29 04:52:24 +05:30
|
|
|
if curFileLinesCount >= maxLines {
|
2016-06-29 20:41:00 +05:30
|
|
|
curFile.IsIncomplete = true
|
2014-04-13 07:05:36 +05:30
|
|
|
}
|
2014-04-16 05:31:20 +05:30
|
|
|
switch {
|
|
|
|
case line[0] == ' ':
|
2016-11-07 21:54:59 +05:30
|
|
|
diffLine := &DiffLine{Type: DiffLinePlain, Content: line, LeftIdx: leftLine, RightIdx: rightLine}
|
2014-04-13 07:05:36 +05:30
|
|
|
leftLine++
|
|
|
|
rightLine++
|
|
|
|
curSection.Lines = append(curSection.Lines, diffLine)
|
2020-07-01 03:04:03 +05:30
|
|
|
curSection.FileName = curFile.Name
|
2014-04-13 07:05:36 +05:30
|
|
|
continue
|
2014-04-16 05:31:20 +05:30
|
|
|
case line[0] == '@':
|
2014-04-13 07:05:36 +05:30
|
|
|
curSection = &DiffSection{}
|
|
|
|
curFile.Sections = append(curFile.Sections, curSection)
|
2020-01-23 22:58:15 +05:30
|
|
|
lineSectionInfo := getDiffLineSectionInfo(curFile.Name, line, leftLine-1, rightLine-1)
|
2019-11-15 08:22:59 +05:30
|
|
|
diffLine := &DiffLine{
|
|
|
|
Type: DiffLineSection,
|
|
|
|
Content: line,
|
|
|
|
SectionInfo: lineSectionInfo,
|
2015-07-29 20:25:01 +05:30
|
|
|
}
|
2019-11-15 08:22:59 +05:30
|
|
|
curSection.Lines = append(curSection.Lines, diffLine)
|
2020-07-01 03:04:03 +05:30
|
|
|
curSection.FileName = curFile.Name
|
2019-11-15 08:22:59 +05:30
|
|
|
// update line number.
|
|
|
|
leftLine = lineSectionInfo.LeftIdx
|
|
|
|
rightLine = lineSectionInfo.RightIdx
|
2014-04-13 07:05:36 +05:30
|
|
|
continue
|
2014-04-16 05:31:20 +05:30
|
|
|
case line[0] == '+':
|
2014-04-13 07:05:36 +05:30
|
|
|
curFile.Addition++
|
|
|
|
diff.TotalAddition++
|
2016-11-07 21:54:59 +05:30
|
|
|
diffLine := &DiffLine{Type: DiffLineAdd, Content: line, RightIdx: rightLine}
|
2014-04-13 07:05:36 +05:30
|
|
|
rightLine++
|
|
|
|
curSection.Lines = append(curSection.Lines, diffLine)
|
2020-07-01 03:04:03 +05:30
|
|
|
curSection.FileName = curFile.Name
|
2014-04-13 07:05:36 +05:30
|
|
|
continue
|
2014-04-16 05:31:20 +05:30
|
|
|
case line[0] == '-':
|
2014-04-13 07:05:36 +05:30
|
|
|
curFile.Deletion++
|
|
|
|
diff.TotalDeletion++
|
2016-11-07 21:54:59 +05:30
|
|
|
diffLine := &DiffLine{Type: DiffLineDel, Content: line, LeftIdx: leftLine}
|
2014-04-13 07:05:36 +05:30
|
|
|
if leftLine > 0 {
|
|
|
|
leftLine++
|
|
|
|
}
|
|
|
|
curSection.Lines = append(curSection.Lines, diffLine)
|
2020-07-01 03:04:03 +05:30
|
|
|
curSection.FileName = curFile.Name
|
2014-04-16 05:31:20 +05:30
|
|
|
case strings.HasPrefix(line, "Binary"):
|
|
|
|
curFile.IsBin = true
|
2014-04-13 07:05:36 +05:30
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get new file.
|
2016-11-22 16:38:23 +05:30
|
|
|
if strings.HasPrefix(line, cmdDiffHead) {
|
2019-11-28 14:35:57 +05:30
|
|
|
if len(diff.Files) >= maxFiles {
|
|
|
|
diff.IsIncomplete = true
|
|
|
|
_, err := io.Copy(ioutil.Discard, reader)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("Copy: %v", err)
|
|
|
|
}
|
|
|
|
break
|
|
|
|
}
|
|
|
|
|
2019-07-22 15:05:54 +05:30
|
|
|
var middle int
|
2015-11-03 06:25:24 +05:30
|
|
|
|
2015-11-20 11:48:50 +05:30
|
|
|
// Note: In case file name is surrounded by double quotes (it happens only in git-shell).
|
|
|
|
// e.g. diff --git "a/xxx" "b/xxx"
|
2016-11-22 16:38:23 +05:30
|
|
|
hasQuote := line[len(cmdDiffHead)] == '"'
|
2015-11-03 06:25:24 +05:30
|
|
|
if hasQuote {
|
|
|
|
middle = strings.Index(line, ` "b/`)
|
|
|
|
} else {
|
|
|
|
middle = strings.Index(line, " b/")
|
|
|
|
}
|
2014-04-13 07:05:36 +05:30
|
|
|
|
2016-11-22 16:38:23 +05:30
|
|
|
beg := len(cmdDiffHead)
|
2015-11-03 06:25:24 +05:30
|
|
|
a := line[beg+2 : middle]
|
|
|
|
b := line[middle+3:]
|
2019-03-14 21:39:53 +05:30
|
|
|
|
2015-11-03 06:25:24 +05:30
|
|
|
if hasQuote {
|
2019-03-14 21:39:53 +05:30
|
|
|
// Keep the entire string in double quotes for now
|
|
|
|
a = line[beg:middle]
|
|
|
|
b = line[middle+1:]
|
|
|
|
|
2018-02-10 23:49:26 +05:30
|
|
|
var err error
|
|
|
|
a, err = strconv.Unquote(a)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("Unquote: %v", err)
|
|
|
|
}
|
|
|
|
b, err = strconv.Unquote(b)
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("Unquote: %v", err)
|
|
|
|
}
|
2019-03-14 21:39:53 +05:30
|
|
|
// Now remove the /a /b
|
|
|
|
a = a[2:]
|
|
|
|
b = b[2:]
|
|
|
|
|
2015-08-20 13:38:26 +05:30
|
|
|
}
|
|
|
|
|
2014-04-13 07:05:36 +05:30
|
|
|
curFile = &DiffFile{
|
2017-06-14 14:37:09 +05:30
|
|
|
Name: b,
|
|
|
|
OldName: a,
|
|
|
|
Index: len(diff.Files) + 1,
|
|
|
|
Type: DiffFileChange,
|
|
|
|
Sections: make([]*DiffSection, 0, 10),
|
|
|
|
IsRenamed: a != b,
|
2014-04-13 07:05:36 +05:30
|
|
|
}
|
|
|
|
diff.Files = append(diff.Files, curFile)
|
2016-06-29 20:41:00 +05:30
|
|
|
curFileLinesCount = 0
|
2019-11-15 08:22:59 +05:30
|
|
|
leftLine = 1
|
|
|
|
rightLine = 1
|
2016-12-26 06:46:37 +05:30
|
|
|
curFileLFSPrefix = false
|
2014-04-13 07:05:36 +05:30
|
|
|
|
2016-07-22 23:48:56 +05:30
|
|
|
// Check file diff type and is submodule.
|
2015-12-02 11:40:13 +05:30
|
|
|
for {
|
|
|
|
line, err := input.ReadString('\n')
|
|
|
|
if err != nil {
|
|
|
|
if err == io.EOF {
|
|
|
|
isEOF = true
|
|
|
|
} else {
|
|
|
|
return nil, fmt.Errorf("ReadString: %v", err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-13 07:05:36 +05:30
|
|
|
switch {
|
2015-12-02 11:40:13 +05:30
|
|
|
case strings.HasPrefix(line, "new file"):
|
2016-11-07 21:54:59 +05:30
|
|
|
curFile.Type = DiffFileAdd
|
2015-02-06 14:32:32 +05:30
|
|
|
curFile.IsCreated = true
|
2015-12-02 11:40:13 +05:30
|
|
|
case strings.HasPrefix(line, "deleted"):
|
2016-11-07 21:54:59 +05:30
|
|
|
curFile.Type = DiffFileDel
|
2015-02-06 14:32:32 +05:30
|
|
|
curFile.IsDeleted = true
|
2015-12-02 11:40:13 +05:30
|
|
|
case strings.HasPrefix(line, "index"):
|
2016-11-07 21:54:59 +05:30
|
|
|
curFile.Type = DiffFileChange
|
2015-12-02 11:40:13 +05:30
|
|
|
case strings.HasPrefix(line, "similarity index 100%"):
|
2016-11-07 22:03:03 +05:30
|
|
|
curFile.Type = DiffFileRename
|
2014-04-13 07:05:36 +05:30
|
|
|
}
|
|
|
|
if curFile.Type > 0 {
|
2016-07-22 23:48:56 +05:30
|
|
|
if strings.HasSuffix(line, " 160000\n") {
|
|
|
|
curFile.IsSubmodule = true
|
|
|
|
}
|
2014-04-13 07:05:36 +05:30
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-02 11:40:13 +05:30
|
|
|
// FIXME: detect encoding while parsing.
|
|
|
|
var buf bytes.Buffer
|
2015-07-29 20:25:01 +05:30
|
|
|
for _, f := range diff.Files {
|
|
|
|
buf.Reset()
|
|
|
|
for _, sec := range f.Sections {
|
|
|
|
for _, l := range sec.Lines {
|
|
|
|
buf.WriteString(l.Content)
|
|
|
|
buf.WriteString("\n")
|
|
|
|
}
|
|
|
|
}
|
2019-08-15 17:37:28 +05:30
|
|
|
charsetLabel, err := charset.DetectEncoding(buf.Bytes())
|
2016-01-01 08:43:47 +05:30
|
|
|
if charsetLabel != "UTF-8" && err == nil {
|
2019-08-15 17:37:28 +05:30
|
|
|
encoding, _ := stdcharset.Lookup(charsetLabel)
|
2015-07-29 20:25:01 +05:30
|
|
|
if encoding != nil {
|
|
|
|
d := encoding.NewDecoder()
|
2014-12-09 12:48:25 +05:30
|
|
|
for _, sec := range f.Sections {
|
|
|
|
for _, l := range sec.Lines {
|
2014-12-22 14:31:52 +05:30
|
|
|
if c, _, err := transform.String(d, l.Content); err == nil {
|
|
|
|
l.Content = c
|
|
|
|
}
|
2014-12-09 12:48:25 +05:30
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-05-26 11:28:07 +05:30
|
|
|
diff.NumFiles = len(diff.Files)
|
2014-04-13 07:05:36 +05:30
|
|
|
return diff, nil
|
|
|
|
}
|
|
|
|
|
2016-11-24 14:00:08 +05:30
|
|
|
// GetDiffRange builds a Diff between two commits of a repository.
|
|
|
|
// passing the empty string as beforeCommitID returns a diff from the
|
|
|
|
// parent commit.
|
2017-01-05 06:20:34 +05:30
|
|
|
func GetDiffRange(repoPath, beforeCommitID, afterCommitID string, maxLines, maxLineCharacters, maxFiles int) (*Diff, error) {
|
2018-08-14 23:19:33 +05:30
|
|
|
return GetDiffRangeWithWhitespaceBehavior(repoPath, beforeCommitID, afterCommitID, maxLines, maxLineCharacters, maxFiles, "")
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetDiffRangeWithWhitespaceBehavior builds a Diff between two commits of a repository.
|
|
|
|
// Passing the empty string as beforeCommitID returns a diff from the parent commit.
|
|
|
|
// The whitespaceBehavior is either an empty string or a git flag
|
|
|
|
func GetDiffRangeWithWhitespaceBehavior(repoPath, beforeCommitID, afterCommitID string, maxLines, maxLineCharacters, maxFiles int, whitespaceBehavior string) (*Diff, error) {
|
2016-07-30 21:09:58 +05:30
|
|
|
gitRepo, err := git.OpenRepository(repoPath)
|
2014-04-13 07:05:36 +05:30
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2019-11-13 12:31:19 +05:30
|
|
|
defer gitRepo.Close()
|
2014-04-13 07:05:36 +05:30
|
|
|
|
2016-07-30 21:09:58 +05:30
|
|
|
commit, err := gitRepo.GetCommit(afterCommitID)
|
2014-04-13 07:05:36 +05:30
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2019-11-30 20:10:22 +05:30
|
|
|
// FIXME: graceful: These commands should likely have a timeout
|
|
|
|
ctx, cancel := context.WithCancel(git.DefaultContext)
|
|
|
|
defer cancel()
|
2014-05-29 07:45:15 +05:30
|
|
|
var cmd *exec.Cmd
|
2020-05-30 02:44:00 +05:30
|
|
|
if (len(beforeCommitID) == 0 || beforeCommitID == git.EmptySHA) && commit.ParentCount() == 0 {
|
2019-11-30 20:10:22 +05:30
|
|
|
cmd = exec.CommandContext(ctx, git.GitExecutable, "show", afterCommitID)
|
2014-05-29 07:45:15 +05:30
|
|
|
} else {
|
2018-08-14 23:19:33 +05:30
|
|
|
actualBeforeCommitID := beforeCommitID
|
|
|
|
if len(actualBeforeCommitID) == 0 {
|
|
|
|
parentCommit, _ := commit.Parent(0)
|
|
|
|
actualBeforeCommitID = parentCommit.ID.String()
|
|
|
|
}
|
|
|
|
diffArgs := []string{"diff", "-M"}
|
|
|
|
if len(whitespaceBehavior) != 0 {
|
|
|
|
diffArgs = append(diffArgs, whitespaceBehavior)
|
|
|
|
}
|
|
|
|
diffArgs = append(diffArgs, actualBeforeCommitID)
|
|
|
|
diffArgs = append(diffArgs, afterCommitID)
|
2019-11-30 20:10:22 +05:30
|
|
|
cmd = exec.CommandContext(ctx, git.GitExecutable, diffArgs...)
|
2019-11-15 08:22:59 +05:30
|
|
|
beforeCommitID = actualBeforeCommitID
|
2014-04-13 07:05:36 +05:30
|
|
|
}
|
2014-05-29 07:45:15 +05:30
|
|
|
cmd.Dir = repoPath
|
|
|
|
cmd.Stderr = os.Stderr
|
2014-07-07 03:02:36 +05:30
|
|
|
|
2015-12-02 11:40:13 +05:30
|
|
|
stdout, err := cmd.StdoutPipe()
|
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("StdoutPipe: %v", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if err = cmd.Start(); err != nil {
|
|
|
|
return nil, fmt.Errorf("Start: %v", err)
|
|
|
|
}
|
2014-07-07 03:02:36 +05:30
|
|
|
|
2019-11-30 20:10:22 +05:30
|
|
|
pid := process.GetManager().Add(fmt.Sprintf("GetDiffRange [repo_path: %s]", repoPath), cancel)
|
2017-01-17 11:28:58 +05:30
|
|
|
defer process.GetManager().Remove(pid)
|
2015-12-02 11:40:13 +05:30
|
|
|
|
2017-01-05 06:20:34 +05:30
|
|
|
diff, err := ParsePatch(maxLines, maxLineCharacters, maxFiles, stdout)
|
2015-12-02 11:40:13 +05:30
|
|
|
if err != nil {
|
|
|
|
return nil, fmt.Errorf("ParsePatch: %v", err)
|
|
|
|
}
|
2019-11-15 08:22:59 +05:30
|
|
|
for _, diffFile := range diff.Files {
|
|
|
|
tailSection := diffFile.GetTailSection(gitRepo, beforeCommitID, afterCommitID)
|
|
|
|
if tailSection != nil {
|
|
|
|
diffFile.Sections = append(diffFile.Sections, tailSection)
|
|
|
|
}
|
|
|
|
}
|
2015-12-02 11:40:13 +05:30
|
|
|
|
|
|
|
if err = cmd.Wait(); err != nil {
|
|
|
|
return nil, fmt.Errorf("Wait: %v", err)
|
|
|
|
}
|
|
|
|
|
2020-05-30 02:44:00 +05:30
|
|
|
shortstatArgs := []string{beforeCommitID + "..." + afterCommitID}
|
|
|
|
if len(beforeCommitID) == 0 || beforeCommitID == git.EmptySHA {
|
|
|
|
shortstatArgs = []string{git.EmptyTreeSHA, afterCommitID}
|
|
|
|
}
|
|
|
|
diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(repoPath, shortstatArgs...)
|
2020-07-29 23:23:04 +05:30
|
|
|
if err != nil && strings.Contains(err.Error(), "no merge base") {
|
|
|
|
// git >= 2.28 now returns an error if base and head have become unrelated.
|
|
|
|
// previously it would return the results of git diff --shortstat base head so let's try that...
|
|
|
|
shortstatArgs = []string{beforeCommitID, afterCommitID}
|
|
|
|
diff.NumFiles, diff.TotalAddition, diff.TotalDeletion, err = git.GetDiffShortStat(repoPath, shortstatArgs...)
|
|
|
|
}
|
2020-05-26 11:28:07 +05:30
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2015-12-02 11:40:13 +05:30
|
|
|
return diff, nil
|
2014-04-13 07:05:36 +05:30
|
|
|
}
|
2016-07-30 20:32:22 +05:30
|
|
|
|
2016-11-24 14:00:08 +05:30
|
|
|
// GetDiffCommit builds a Diff representing the given commitID.
|
2017-01-05 06:20:34 +05:30
|
|
|
func GetDiffCommit(repoPath, commitID string, maxLines, maxLineCharacters, maxFiles int) (*Diff, error) {
|
|
|
|
return GetDiffRange(repoPath, "", commitID, maxLines, maxLineCharacters, maxFiles)
|
2014-08-26 17:50:18 +05:30
|
|
|
}
|
2019-09-06 07:50:09 +05:30
|
|
|
|
|
|
|
// CommentAsDiff returns c.Patch as *Diff
|
|
|
|
func CommentAsDiff(c *models.Comment) (*Diff, error) {
|
|
|
|
diff, err := ParsePatch(setting.Git.MaxGitDiffLines,
|
|
|
|
setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles, strings.NewReader(c.Patch))
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
if len(diff.Files) == 0 {
|
|
|
|
return nil, fmt.Errorf("no file found for comment ID: %d", c.ID)
|
|
|
|
}
|
|
|
|
secs := diff.Files[0].Sections
|
|
|
|
if len(secs) == 0 {
|
|
|
|
return nil, fmt.Errorf("no sections found for comment ID: %d", c.ID)
|
|
|
|
}
|
|
|
|
return diff, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// CommentMustAsDiff executes AsDiff and logs the error instead of returning
|
|
|
|
func CommentMustAsDiff(c *models.Comment) *Diff {
|
|
|
|
diff, err := CommentAsDiff(c)
|
|
|
|
if err != nil {
|
|
|
|
log.Warn("CommentMustAsDiff: %v", err)
|
|
|
|
}
|
|
|
|
return diff
|
|
|
|
}
|