2014-03-26 04:53:01 +01: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 (
|
2014-03-26 11:33:09 +01:00
|
|
|
"bufio"
|
2014-03-26 04:53:01 +01:00
|
|
|
"container/list"
|
|
|
|
"fmt"
|
2014-03-26 10:57:13 +01:00
|
|
|
"io"
|
|
|
|
"os"
|
|
|
|
"os/exec"
|
2014-03-26 11:33:09 +01:00
|
|
|
"path"
|
|
|
|
"strings"
|
2014-03-26 04:53:01 +01:00
|
|
|
|
|
|
|
"github.com/gogits/git"
|
|
|
|
)
|
|
|
|
|
|
|
|
// RepoFile represents a file object in git repository.
|
|
|
|
type RepoFile struct {
|
|
|
|
*git.TreeEntry
|
|
|
|
Path string
|
|
|
|
Size int64
|
|
|
|
Repo *git.Repository
|
|
|
|
Commit *git.Commit
|
|
|
|
}
|
|
|
|
|
|
|
|
// LookupBlob returns the content of an object.
|
|
|
|
func (file *RepoFile) LookupBlob() (*git.Blob, error) {
|
|
|
|
if file.Repo == nil {
|
|
|
|
return nil, ErrRepoFileNotLoaded
|
|
|
|
}
|
|
|
|
|
|
|
|
return file.Repo.LookupBlob(file.Id)
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetBranches returns all branches of given repository.
|
|
|
|
func GetBranches(userName, reposName string) ([]string, error) {
|
|
|
|
repo, err := git.OpenRepository(RepoPath(userName, reposName))
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
refs, err := repo.AllReferences()
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
brs := make([]string, len(refs))
|
|
|
|
for i, ref := range refs {
|
|
|
|
brs[i] = ref.Name
|
|
|
|
}
|
|
|
|
return brs, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func GetTargetFile(userName, reposName, branchName, commitId, rpath string) (*RepoFile, error) {
|
|
|
|
repo, err := git.OpenRepository(RepoPath(userName, reposName))
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
commit, err := repo.GetCommit(branchName, commitId)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
parts := strings.Split(path.Clean(rpath), "/")
|
|
|
|
|
|
|
|
var entry *git.TreeEntry
|
|
|
|
tree := commit.Tree
|
|
|
|
for i, part := range parts {
|
|
|
|
if i == len(parts)-1 {
|
|
|
|
entry = tree.EntryByName(part)
|
|
|
|
if entry == nil {
|
|
|
|
return nil, ErrRepoFileNotExist
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
tree, err = repo.SubTree(tree, part)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
size, err := repo.ObjectSize(entry.Id)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
repoFile := &RepoFile{
|
|
|
|
entry,
|
|
|
|
rpath,
|
|
|
|
size,
|
|
|
|
repo,
|
|
|
|
commit,
|
|
|
|
}
|
|
|
|
|
|
|
|
return repoFile, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetReposFiles returns a list of file object in given directory of repository.
|
|
|
|
func GetReposFiles(userName, reposName, branchName, commitId, rpath string) ([]*RepoFile, error) {
|
|
|
|
repo, err := git.OpenRepository(RepoPath(userName, reposName))
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
commit, err := repo.GetCommit(branchName, commitId)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
var repodirs []*RepoFile
|
|
|
|
var repofiles []*RepoFile
|
|
|
|
commit.Tree.Walk(func(dirname string, entry *git.TreeEntry) int {
|
|
|
|
if dirname == rpath {
|
|
|
|
// TODO: size get method shoule be improved
|
|
|
|
size, err := repo.ObjectSize(entry.Id)
|
|
|
|
if err != nil {
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
|
|
|
var cm = commit
|
|
|
|
var i int
|
|
|
|
for {
|
|
|
|
i = i + 1
|
|
|
|
//fmt.Println(".....", i, cm.Id(), cm.ParentCount())
|
|
|
|
if cm.ParentCount() == 0 {
|
|
|
|
break
|
|
|
|
} else if cm.ParentCount() == 1 {
|
|
|
|
pt, _ := repo.SubTree(cm.Parent(0).Tree, dirname)
|
|
|
|
if pt == nil {
|
|
|
|
break
|
|
|
|
}
|
|
|
|
pEntry := pt.EntryByName(entry.Name)
|
|
|
|
if pEntry == nil || !pEntry.Id.Equal(entry.Id) {
|
|
|
|
break
|
|
|
|
} else {
|
|
|
|
cm = cm.Parent(0)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
var emptyCnt = 0
|
|
|
|
var sameIdcnt = 0
|
|
|
|
var lastSameCm *git.Commit
|
|
|
|
//fmt.Println(".....", cm.ParentCount())
|
|
|
|
for i := 0; i < cm.ParentCount(); i++ {
|
|
|
|
//fmt.Println("parent", i, cm.Parent(i).Id())
|
|
|
|
p := cm.Parent(i)
|
|
|
|
pt, _ := repo.SubTree(p.Tree, dirname)
|
|
|
|
var pEntry *git.TreeEntry
|
|
|
|
if pt != nil {
|
|
|
|
pEntry = pt.EntryByName(entry.Name)
|
|
|
|
}
|
|
|
|
|
|
|
|
//fmt.Println("pEntry", pEntry)
|
|
|
|
|
|
|
|
if pEntry == nil {
|
|
|
|
emptyCnt = emptyCnt + 1
|
|
|
|
if emptyCnt+sameIdcnt == cm.ParentCount() {
|
|
|
|
if lastSameCm == nil {
|
|
|
|
goto loop
|
|
|
|
} else {
|
|
|
|
cm = lastSameCm
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
//fmt.Println(i, "pEntry", pEntry.Id, "entry", entry.Id)
|
|
|
|
if !pEntry.Id.Equal(entry.Id) {
|
|
|
|
goto loop
|
|
|
|
} else {
|
|
|
|
lastSameCm = cm.Parent(i)
|
|
|
|
sameIdcnt = sameIdcnt + 1
|
|
|
|
if emptyCnt+sameIdcnt == cm.ParentCount() {
|
|
|
|
// TODO: now follow the first parent commit?
|
|
|
|
cm = lastSameCm
|
|
|
|
//fmt.Println("sameId...")
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
loop:
|
|
|
|
|
|
|
|
rp := &RepoFile{
|
|
|
|
entry,
|
|
|
|
path.Join(dirname, entry.Name),
|
|
|
|
size,
|
|
|
|
repo,
|
|
|
|
cm,
|
|
|
|
}
|
|
|
|
|
|
|
|
if entry.IsFile() {
|
|
|
|
repofiles = append(repofiles, rp)
|
|
|
|
} else if entry.IsDir() {
|
|
|
|
repodirs = append(repodirs, rp)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0
|
|
|
|
})
|
|
|
|
|
|
|
|
return append(repodirs, repofiles...), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func GetCommit(userName, repoName, branchname, commitid string) (*git.Commit, error) {
|
|
|
|
repo, err := git.OpenRepository(RepoPath(userName, repoName))
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return repo.GetCommit(branchname, commitid)
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetCommits returns all commits of given branch of repository.
|
|
|
|
func GetCommits(userName, reposName, branchname string) (*list.List, error) {
|
|
|
|
repo, err := git.OpenRepository(RepoPath(userName, reposName))
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
r, err := repo.LookupReference(fmt.Sprintf("refs/heads/%s", branchname))
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return r.AllCommits()
|
|
|
|
}
|
|
|
|
|
2014-03-26 11:33:09 +01:00
|
|
|
// Diff line types.
|
2014-03-26 10:57:13 +01:00
|
|
|
const (
|
2014-03-26 11:33:09 +01:00
|
|
|
DIFF_LINE_PLAIN = iota + 1
|
|
|
|
DIFF_LINE_ADD
|
|
|
|
DIFF_LINE_DEL
|
|
|
|
DIFF_LINE_SECTION
|
2014-03-26 10:57:13 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
const (
|
2014-03-26 11:33:09 +01:00
|
|
|
DIFF_FILE_ADD = iota + 1
|
|
|
|
DIFF_FILE_CHANGE
|
|
|
|
DIFF_FILE_DEL
|
2014-03-26 10:57:13 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
type DiffLine struct {
|
2014-03-26 11:33:09 +01:00
|
|
|
LeftIdx int
|
2014-03-26 10:57:13 +01:00
|
|
|
RightIdx int
|
2014-03-26 11:33:09 +01:00
|
|
|
Type int
|
|
|
|
Content string
|
2014-03-26 10:57:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
type DiffSection struct {
|
2014-03-26 11:33:09 +01:00
|
|
|
Name string
|
2014-03-26 10:57:13 +01:00
|
|
|
Lines []*DiffLine
|
|
|
|
}
|
|
|
|
|
2014-03-26 04:53:01 +01:00
|
|
|
type DiffFile struct {
|
|
|
|
Name string
|
|
|
|
Addition, Deletion int
|
2014-03-26 10:57:13 +01:00
|
|
|
Type int
|
2014-03-26 11:33:09 +01:00
|
|
|
Sections []*DiffSection
|
2014-03-26 04:53:01 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
type Diff struct {
|
|
|
|
TotalAddition, TotalDeletion int
|
|
|
|
Files []*DiffFile
|
|
|
|
}
|
|
|
|
|
2014-03-26 10:57:13 +01:00
|
|
|
func (diff *Diff) NumFiles() int {
|
|
|
|
return len(diff.Files)
|
|
|
|
}
|
|
|
|
|
2014-03-26 11:33:09 +01:00
|
|
|
const DIFF_HEAD = "diff --git "
|
2014-03-26 10:57:13 +01:00
|
|
|
|
|
|
|
func ParsePatch(reader io.Reader) (*Diff, error) {
|
|
|
|
scanner := bufio.NewScanner(reader)
|
|
|
|
var totalAdd, totalDel int
|
|
|
|
var curFile *DiffFile
|
2014-03-26 11:33:09 +01:00
|
|
|
curSection := &DiffSection{
|
|
|
|
Lines: make([]*DiffLine, 0, 10),
|
|
|
|
}
|
2014-03-26 10:57:13 +01:00
|
|
|
//var leftLine, rightLine int
|
2014-03-26 11:33:09 +01:00
|
|
|
diff := &Diff{Files: make([]*DiffFile, 0)}
|
2014-03-26 10:57:13 +01:00
|
|
|
var i int
|
|
|
|
for scanner.Scan() {
|
|
|
|
line := scanner.Text()
|
|
|
|
fmt.Println(i, line)
|
|
|
|
i = i + 1
|
|
|
|
if line == "" {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if line[0] == ' ' {
|
2014-03-26 11:33:09 +01:00
|
|
|
diffLine := &DiffLine{Type: DIFF_LINE_PLAIN, Content: line}
|
2014-03-26 10:57:13 +01:00
|
|
|
curSection.Lines = append(curSection.Lines, diffLine)
|
|
|
|
continue
|
|
|
|
} else if line[0] == '@' {
|
2014-03-26 11:02:08 +01:00
|
|
|
curSection = &DiffSection{}
|
|
|
|
curFile.Sections = append(curFile.Sections, curSection)
|
2014-03-26 10:57:13 +01:00
|
|
|
ss := strings.Split(line, "@@")
|
2014-03-26 11:33:09 +01:00
|
|
|
diffLine := &DiffLine{Type: DIFF_LINE_SECTION, Content: "@@" + ss[len(ss)-2] + "@@"}
|
2014-03-26 10:57:13 +01:00
|
|
|
curSection.Lines = append(curSection.Lines, diffLine)
|
|
|
|
|
2014-03-26 11:33:09 +01:00
|
|
|
diffLine = &DiffLine{Type: DIFF_LINE_PLAIN, Content: ss[len(ss)-1]}
|
2014-03-26 10:57:13 +01:00
|
|
|
curSection.Lines = append(curSection.Lines, diffLine)
|
|
|
|
continue
|
|
|
|
} else if line[0] == '+' {
|
2014-03-26 11:33:09 +01:00
|
|
|
diffLine := &DiffLine{Type: DIFF_LINE_ADD, Content: line}
|
2014-03-26 10:57:13 +01:00
|
|
|
curSection.Lines = append(curSection.Lines, diffLine)
|
|
|
|
continue
|
|
|
|
} else if line[0] == '-' {
|
2014-03-26 11:33:09 +01:00
|
|
|
diffLine := &DiffLine{Type: DIFF_LINE_DEL, Content: line}
|
2014-03-26 10:57:13 +01:00
|
|
|
curSection.Lines = append(curSection.Lines, diffLine)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2014-03-26 11:33:09 +01:00
|
|
|
if strings.HasPrefix(line, DIFF_HEAD) {
|
2014-03-26 10:57:13 +01:00
|
|
|
if curFile != nil {
|
|
|
|
curFile.Addition, totalAdd = totalAdd, 0
|
|
|
|
curFile.Deletion, totalDel = totalDel, 0
|
|
|
|
curFile = nil
|
|
|
|
}
|
2014-03-26 11:33:09 +01:00
|
|
|
fs := strings.Split(line[len(DIFF_HEAD):], " ")
|
2014-03-26 10:57:13 +01:00
|
|
|
a := fs[0]
|
2014-03-26 11:33:09 +01:00
|
|
|
|
2014-03-26 10:57:13 +01:00
|
|
|
curFile = &DiffFile{
|
2014-03-26 11:33:09 +01:00
|
|
|
Name: a[strings.Index(a, "/")+1:],
|
|
|
|
Type: DIFF_FILE_CHANGE,
|
|
|
|
Sections: make([]*DiffSection, 0),
|
2014-03-26 10:57:13 +01:00
|
|
|
}
|
|
|
|
diff.Files = append(diff.Files, curFile)
|
|
|
|
scanner.Scan()
|
|
|
|
scanner.Scan()
|
|
|
|
if scanner.Text() == "--- /dev/null" {
|
2014-03-26 11:33:09 +01:00
|
|
|
curFile.Type = DIFF_FILE_ADD
|
2014-03-26 10:57:13 +01:00
|
|
|
}
|
|
|
|
scanner.Scan()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return diff, nil
|
|
|
|
}
|
|
|
|
|
2014-03-26 04:53:01 +01:00
|
|
|
func GetDiff(repoPath, commitid string) (*Diff, error) {
|
2014-03-26 10:57:13 +01:00
|
|
|
repo, err := git.OpenRepository(repoPath)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
commit, err := repo.GetCommit("", commitid)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
2014-03-26 11:43:58 +01:00
|
|
|
// ????
|
2014-03-26 10:57:13 +01:00
|
|
|
if commit.ParentCount() == 0 {
|
2014-03-26 11:43:58 +01:00
|
|
|
return &Diff{}, err
|
2014-03-26 10:57:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
rd, wr := io.Pipe()
|
|
|
|
go func() {
|
|
|
|
cmd := exec.Command("git", "diff", commitid, commit.Parent(0).Oid.String())
|
|
|
|
cmd.Dir = repoPath
|
|
|
|
cmd.Stdout = wr
|
|
|
|
cmd.Stdin = os.Stdin
|
|
|
|
cmd.Stderr = os.Stderr
|
|
|
|
cmd.Run()
|
|
|
|
//if err != nil {
|
|
|
|
// return nil, err
|
|
|
|
//}
|
|
|
|
wr.Close()
|
|
|
|
}()
|
|
|
|
|
|
|
|
defer rd.Close()
|
|
|
|
|
|
|
|
return ParsePatch(rd)
|
|
|
|
}
|
|
|
|
|
|
|
|
/*func GetDiff(repoPath, commitid string) (*Diff, error) {
|
2014-03-26 04:53:01 +01:00
|
|
|
stdout, _, err := com.ExecCmdDir(repoPath, "git", "show", commitid)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Sperate parts by file.
|
2014-03-26 05:13:01 +01:00
|
|
|
startIndex := strings.Index(stdout, "diff --git ") + 12
|
2014-03-26 04:53:01 +01:00
|
|
|
|
|
|
|
// First part is commit information.
|
|
|
|
// Check if it's a merge.
|
2014-03-26 05:13:01 +01:00
|
|
|
mergeIndex := strings.Index(stdout[:startIndex], "merge")
|
2014-03-26 04:53:01 +01:00
|
|
|
if mergeIndex > -1 {
|
2014-03-26 05:13:01 +01:00
|
|
|
mergeCommit := strings.SplitN(strings.Split(stdout[:startIndex], "\n")[1], "", 3)[2]
|
2014-03-26 04:53:01 +01:00
|
|
|
return GetDiff(repoPath, mergeCommit)
|
|
|
|
}
|
|
|
|
|
2014-03-26 05:13:01 +01:00
|
|
|
parts := strings.Split(stdout[startIndex:], "diff --git ")
|
|
|
|
diff := &Diff{NumFiles: len(parts)}
|
2014-03-26 04:53:01 +01:00
|
|
|
diff.Files = make([]*DiffFile, 0, diff.NumFiles)
|
2014-03-26 05:13:01 +01:00
|
|
|
for _, part := range parts {
|
2014-03-26 04:53:01 +01:00
|
|
|
infos := strings.SplitN(part, "\n", 6)
|
2014-03-26 05:13:01 +01:00
|
|
|
maxIndex := len(infos) - 1
|
|
|
|
infos[maxIndex] = strings.TrimSuffix(strings.TrimSuffix(infos[maxIndex], "\n"), "\n\\ No newline at end of file")
|
2014-03-26 04:53:01 +01:00
|
|
|
|
|
|
|
file := &DiffFile{
|
|
|
|
Name: strings.TrimPrefix(strings.Split(infos[0], " ")[0], "a/"),
|
2014-03-26 05:13:01 +01:00
|
|
|
Content: strings.Split(infos[maxIndex], "\n"),
|
2014-03-26 04:53:01 +01:00
|
|
|
}
|
|
|
|
diff.Files = append(diff.Files, file)
|
|
|
|
}
|
|
|
|
return diff, nil
|
2014-03-26 10:57:13 +01:00
|
|
|
}*/
|