1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
package command
import (
"errors"
"github.com/isacikgoz/gitbatch/core/git"
gogit "gopkg.in/src-d/go-git.v4"
"gopkg.in/src-d/go-git.v4/plumbing"
)
var (
diffCmdMode string
diffCommand = "diff"
diffCmdModeLegacy = "git"
diffCmdModeNative = "go-git"
)
// Diff is a wrapper function for "git diff" command
// Diff function returns the diff to previous commit detail of the given has
// of a specific commit
func Diff(r *git.Repository, hash string) (diff string, err error) {
diffCmdMode = diffCmdModeNative
switch diffCmdMode {
case diffCmdModeLegacy:
return diffWithGit(r, hash)
case diffCmdModeNative:
return diffWithGoGit(r, hash)
}
return diff, errors.New("Unhandled diff operation")
}
func diffWithGit(r *git.Repository, hash string) (diff string, err error) {
return diff, nil
}
func diffWithGoGit(r *git.Repository, hash string) (diff string, err error) {
currentCommitIndex := 0
for i, cs := range r.Commits {
if cs.Hash == hash {
currentCommitIndex = i
}
}
if len(r.Commits)-currentCommitIndex <= 1 {
return "there is no diff", nil
}
// maybe we dont need to log the repo again?
commits, err := r.Repo.Log(&gogit.LogOptions{
From: plumbing.NewHash(r.State.Commit.Hash),
Order: gogit.LogOrderCommitterTime,
})
if err != nil {
return "", err
}
currentCommit, err := commits.Next()
if err != nil {
return "", err
}
currentTree, err := currentCommit.Tree()
if err != nil {
return diff, err
}
prevCommit, err := commits.Next()
if err != nil {
return "", err
}
prevTree, err := prevCommit.Tree()
if err != nil {
return diff, err
}
changes, err := prevTree.Diff(currentTree)
if err != nil {
return "", err
}
// here we collect the actual diff
for _, c := range changes {
patch, err := c.Patch()
if err != nil {
break
}
diff = diff + patch.String() + "\n"
}
return diff, nil
}
|
