gitea-1120-rc1/models/git_diff.go

413 lines
10 KiB
Go
Raw Normal View History

2014-04-13 09:35:36 +08:00
// Copyright 2014 The Gogs Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package models
import (
"bufio"
2014-12-09 15:18:25 +08:00
"bytes"
2014-06-19 13:08:03 +08:00
"fmt"
2014-04-13 09:35:36 +08:00
"io"
2015-12-14 22:38:21 +08:00
"io/ioutil"
2014-04-13 09:35:36 +08:00
"os"
"os/exec"
"strings"
"html/template"
"html"
2014-04-13 09:35:36 +08:00
"github.com/Unknwon/com"
"golang.org/x/net/html/charset"
"golang.org/x/text/transform"
2015-12-16 06:25:45 +08:00
"github.com/gogits/git-module"
2014-07-26 12:24:27 +08:00
2014-12-09 15:18:25 +08:00
"github.com/gogits/gogs/modules/base"
2014-04-13 09:35:36 +08:00
"github.com/gogits/gogs/modules/log"
2014-06-19 13:08:03 +08:00
"github.com/gogits/gogs/modules/process"
"github.com/sergi/go-diff/diffmatchpatch"
2014-04-13 09:35:36 +08:00
)
type DiffLineType uint8
2014-04-13 09:35:36 +08:00
const (
DIFF_LINE_PLAIN DiffLineType = iota + 1
DIFF_LINE_ADD DiffLineType = iota + 1
DIFF_LINE_DEL DiffLineType = iota + 1
DIFF_LINE_SECTION DiffLineType = iota + 1
2014-04-13 09:35:36 +08:00
)
type DiffFileType uint8
2014-04-13 09:35:36 +08:00
const (
DIFF_FILE_ADD DiffFileType = iota + 1
DIFF_FILE_CHANGE DiffFileType = iota + 1
DIFF_FILE_DEL DiffFileType = iota + 1
DIFF_FILE_RENAME DiffFileType = iota + 1
2014-04-13 09:35:36 +08:00
)
type DiffLine struct {
LeftIdx int
RightIdx int
Type DiffLineType
2014-04-13 09:35:36 +08:00
Content string
ParsedContent template.HTML
2014-04-13 09:35:36 +08:00
}
func (d *DiffLine) GetType() int {
return int(d.Type)
2014-04-13 09:35:36 +08:00
}
type DiffSection struct {
Name string
Lines []*DiffLine
}
func diffToHtml(diffRecord []diffmatchpatch.Diff, lineType DiffLineType) template.HTML {
result := ""
for _, s := range diffRecord {
if s.Type == diffmatchpatch.DiffInsert && lineType == DIFF_LINE_ADD {
result = result + "<span class=\"added-code\">"+html.EscapeString(s.Text)+"</span>"
} else if s.Type == diffmatchpatch.DiffDelete && lineType == DIFF_LINE_DEL {
result = result + "<span class=\"removed-code\">"+html.EscapeString(s.Text)+"</span>"
} else if s.Type == diffmatchpatch.DiffEqual {
result = result + html.EscapeString(s.Text)
}
}
return template.HTML(result)
}
func (diffSection *DiffSection) GetLeftLine(idx int, sliceIdx int) *DiffLine {
for i, diffLine := range diffSection.Lines {
if diffLine.LeftIdx == idx && diffLine.RightIdx == 0 {
// ignore the the lines are too far from each other
if i > sliceIdx-5 && i < sliceIdx+5 {
return diffLine
} else {
return nil
}
}
}
return nil
}
func (diffSection *DiffSection) GetRightLine(idx int, sliceIdx int) *DiffLine {
for i, diffLine := range diffSection.Lines {
if diffLine.RightIdx == idx && diffLine.LeftIdx == 0 {
// ignore the the lines are too far from each other
if i > sliceIdx-5 && i < sliceIdx+5 {
return diffLine
} else {
return nil
}
}
}
return nil
}
// computes diff of each diff line and set the HTML on diffLine.ParsedContent
func (diffSection *DiffSection) ComputeLinesDiff() {
for i, diffLine := range diffSection.Lines {
var compareDiffLine *DiffLine
var diff1, diff2 string
// default content: as is
diffLine.ParsedContent = template.HTML(html.EscapeString(diffLine.Content[1:]))
// just compute diff for adds and removes
if diffLine.Type != DIFF_LINE_ADD && diffLine.Type != DIFF_LINE_DEL {
continue
}
// try to find equivalent diff line. ignore, otherwise
if diffLine.Type == DIFF_LINE_ADD {
compareDiffLine = diffSection.GetLeftLine(diffLine.RightIdx, i)
if compareDiffLine == nil {
continue
}
diff1 = compareDiffLine.Content
diff2 = diffLine.Content
} else {
compareDiffLine = diffSection.GetRightLine(diffLine.LeftIdx, i)
if compareDiffLine == nil {
continue
}
diff1 = diffLine.Content
diff2 = compareDiffLine.Content
}
dmp := diffmatchpatch.New()
diffRecord := dmp.DiffMain(diff1[1:], diff2[1:], true)
diffRecord = dmp.DiffCleanupSemantic(diffRecord)
diffLine.ParsedContent = diffToHtml(diffRecord, diffLine.Type)
}
}
2014-04-13 09:35:36 +08:00
type DiffFile struct {
Name string
2015-11-03 08:55:24 +08:00
OldName string
2014-05-14 00:40:32 +08:00
Index int
2014-04-13 09:35:36 +08:00
Addition, Deletion int
Type DiffFileType
IsCreated bool
IsDeleted bool
2014-04-16 08:01:20 +08:00
IsBin bool
2015-11-03 08:55:24 +08:00
IsRenamed bool
2014-04-13 09:35:36 +08:00
Sections []*DiffSection
}
func (diffFile *DiffFile) GetType() int {
return int(diffFile.Type)
}
2014-04-13 09:35:36 +08:00
type Diff struct {
TotalAddition, TotalDeletion int
Files []*DiffFile
}
func (diff *Diff) NumFiles() int {
return len(diff.Files)
}
const DIFF_HEAD = "diff --git "
func ParsePatch(maxlines int, reader io.Reader) (*Diff, error) {
2014-04-13 09:35:36 +08:00
var (
diff = &Diff{Files: make([]*DiffFile, 0)}
2014-04-13 09:35:36 +08:00
curFile *DiffFile
curSection = &DiffSection{
Lines: make([]*DiffLine, 0, 10),
}
leftLine, rightLine int
lineCount int
2014-04-13 09:35:36 +08:00
)
input := bufio.NewReader(reader)
isEOF := false
for {
if isEOF {
break
}
line, err := input.ReadString('\n')
if err != nil {
if err == io.EOF {
isEOF = true
} else {
return nil, fmt.Errorf("ReadString: %v", err)
}
}
if len(line) > 0 && line[len(line)-1] == '\n' {
// Remove line break.
line = line[:len(line)-1]
2014-04-13 09:35:36 +08:00
}
if strings.HasPrefix(line, "+++ ") || strings.HasPrefix(line, "--- ") {
continue
} else if len(line) == 0 {
continue
}
lineCount++
2014-04-13 09:35:36 +08:00
// Diff data too large, we only show the first about maxlines lines
if lineCount >= maxlines {
2014-04-13 09:35:36 +08:00
log.Warn("Diff data too large")
2015-12-14 22:38:21 +08:00
io.Copy(ioutil.Discard, reader)
2015-10-18 05:25:45 +08:00
diff.Files = nil
return diff, nil
2014-04-13 09:35:36 +08:00
}
2014-04-16 08:01:20 +08:00
switch {
case line[0] == ' ':
2014-04-13 09:35:36 +08:00
diffLine := &DiffLine{Type: DIFF_LINE_PLAIN, Content: line, LeftIdx: leftLine, RightIdx: rightLine}
leftLine++
rightLine++
curSection.Lines = append(curSection.Lines, diffLine)
continue
2014-04-16 08:01:20 +08:00
case line[0] == '@':
2014-04-13 09:35:36 +08:00
curSection = &DiffSection{}
curFile.Sections = append(curFile.Sections, curSection)
ss := strings.Split(line, "@@")
diffLine := &DiffLine{Type: DIFF_LINE_SECTION, Content: line}
curSection.Lines = append(curSection.Lines, diffLine)
// Parse line number.
2015-07-29 22:55:01 +08:00
ranges := strings.Split(ss[1][1:], " ")
2014-07-26 12:24:27 +08:00
leftLine, _ = com.StrTo(strings.Split(ranges[0], ",")[0][1:]).Int()
2015-07-29 22:55:01 +08:00
if len(ranges) > 1 {
rightLine, _ = com.StrTo(strings.Split(ranges[1], ",")[0]).Int()
} else {
log.Warn("Parse line number failed: %v", line)
rightLine = leftLine
}
2014-04-13 09:35:36 +08:00
continue
2014-04-16 08:01:20 +08:00
case line[0] == '+':
2014-04-13 09:35:36 +08:00
curFile.Addition++
diff.TotalAddition++
diffLine := &DiffLine{Type: DIFF_LINE_ADD, Content: line, RightIdx: rightLine}
rightLine++
curSection.Lines = append(curSection.Lines, diffLine)
continue
2014-04-16 08:01:20 +08:00
case line[0] == '-':
2014-04-13 09:35:36 +08:00
curFile.Deletion++
diff.TotalDeletion++
diffLine := &DiffLine{Type: DIFF_LINE_DEL, Content: line, LeftIdx: leftLine}
if leftLine > 0 {
leftLine++
}
curSection.Lines = append(curSection.Lines, diffLine)
2014-04-16 08:01:20 +08:00
case strings.HasPrefix(line, "Binary"):
curFile.IsBin = true
2014-04-13 09:35:36 +08:00
continue
}
// Get new file.
if strings.HasPrefix(line, DIFF_HEAD) {
2015-11-03 08:55:24 +08:00
middle := -1
2015-11-20 14:18:50 +08:00
// Note: In case file name is surrounded by double quotes (it happens only in git-shell).
// e.g. diff --git "a/xxx" "b/xxx"
hasQuote := line[len(DIFF_HEAD)] == '"'
2015-11-03 08:55:24 +08:00
if hasQuote {
middle = strings.Index(line, ` "b/`)
} else {
middle = strings.Index(line, " b/")
}
2014-04-13 09:35:36 +08:00
2015-11-03 08:55:24 +08:00
beg := len(DIFF_HEAD)
a := line[beg+2 : middle]
b := line[middle+3:]
if hasQuote {
2015-11-20 14:18:50 +08:00
a = string(git.UnescapeChars([]byte(a[1 : len(a)-1])))
b = string(git.UnescapeChars([]byte(b[1 : len(b)-1])))
2015-08-20 16:08:26 +08:00
}
2014-04-13 09:35:36 +08:00
curFile = &DiffFile{
2015-11-03 08:55:24 +08:00
Name: a,
2014-05-14 00:40:32 +08:00
Index: len(diff.Files) + 1,
2014-04-13 09:35:36 +08:00
Type: DIFF_FILE_CHANGE,
Sections: make([]*DiffSection, 0, 10),
}
diff.Files = append(diff.Files, curFile)
// Check file diff type.
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 09:35:36 +08:00
switch {
case strings.HasPrefix(line, "new file"):
2014-04-13 09:35:36 +08:00
curFile.Type = DIFF_FILE_ADD
curFile.IsCreated = true
case strings.HasPrefix(line, "deleted"):
2014-04-13 09:35:36 +08:00
curFile.Type = DIFF_FILE_DEL
curFile.IsDeleted = true
case strings.HasPrefix(line, "index"):
2014-04-13 09:35:36 +08:00
curFile.Type = DIFF_FILE_CHANGE
case strings.HasPrefix(line, "similarity index 100%"):
2015-11-03 08:55:24 +08:00
curFile.Type = DIFF_FILE_RENAME
curFile.IsRenamed = true
curFile.OldName = curFile.Name
curFile.Name = b
2014-04-13 09:35:36 +08:00
}
if curFile.Type > 0 {
break
}
}
}
}
// FIXME: detect encoding while parsing.
var buf bytes.Buffer
2015-07-29 22:55:01 +08:00
for _, f := range diff.Files {
buf.Reset()
for _, sec := range f.Sections {
for _, l := range sec.Lines {
buf.WriteString(l.Content)
buf.WriteString("\n")
}
}
charsetLabel, err := base.DetectEncoding(buf.Bytes())
if charsetLabel != "UTF-8" && err == nil {
2015-07-29 22:55:01 +08:00
encoding, _ := charset.Lookup(charsetLabel)
if encoding != nil {
d := encoding.NewDecoder()
2014-12-09 15:18:25 +08:00
for _, sec := range f.Sections {
for _, l := range sec.Lines {
if c, _, err := transform.String(d, l.Content); err == nil {
l.Content = c
}
2014-12-09 15:18:25 +08:00
}
}
}
}
}
2014-04-13 09:35:36 +08:00
return diff, nil
}
func GetDiffRange(repoPath, beforeCommitID string, afterCommitID string, maxlines int) (*Diff, error) {
2014-04-13 09:35:36 +08:00
repo, err := git.OpenRepository(repoPath)
if err != nil {
return nil, err
}
commit, err := repo.GetCommit(afterCommitID)
2014-04-13 09:35:36 +08:00
if err != nil {
return nil, err
}
2014-05-29 10:15:15 +08:00
var cmd *exec.Cmd
2014-08-26 20:20:18 +08:00
// if "after" commit given
if len(beforeCommitID) == 0 {
2014-08-26 20:20:18 +08:00
// First commit of repository.
if commit.ParentCount() == 0 {
cmd = exec.Command("git", "show", afterCommitID)
2014-08-26 20:20:18 +08:00
} else {
c, _ := commit.Parent(0)
cmd = exec.Command("git", "diff", "-M", c.ID.String(), afterCommitID)
2014-08-26 20:20:18 +08:00
}
2014-05-29 10:15:15 +08:00
} else {
cmd = exec.Command("git", "diff", "-M", beforeCommitID, afterCommitID)
2014-04-13 09:35:36 +08:00
}
2014-05-29 10:15:15 +08:00
cmd.Dir = repoPath
cmd.Stderr = os.Stderr
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)
}
pid := process.Add(fmt.Sprintf("GetDiffRange (%s)", repoPath), cmd)
defer process.Remove(pid)
diff, err := ParsePatch(maxlines, stdout)
if err != nil {
return nil, fmt.Errorf("ParsePatch: %v", err)
}
if err = cmd.Wait(); err != nil {
return nil, fmt.Errorf("Wait: %v", err)
}
return diff, nil
2014-04-13 09:35:36 +08:00
}
2014-08-26 20:20:18 +08:00
func GetDiffCommit(repoPath, commitId string, maxlines int) (*Diff, error) {
return GetDiffRange(repoPath, "", commitId, maxlines)
2014-08-26 20:20:18 +08:00
}