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
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
|
// +build static,system_libgit2
package main
import (
"context"
"errors"
"flag"
"fmt"
"io"
"os"
"time"
git "github.com/libgit2/git2go/v31"
"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/conflicts"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
)
type mergeSubcommand struct {
request string
}
func (cmd *mergeSubcommand) Flags() *flag.FlagSet {
flags := flag.NewFlagSet("merge", flag.ExitOnError)
flags.StringVar(&cmd.request, "request", "", "git2go.MergeCommand")
return flags
}
func (cmd *mergeSubcommand) Run(context.Context, io.Reader, io.Writer) error {
request, err := git2go.MergeCommandFromSerialized(cmd.request)
if err != nil {
return err
}
if request.AuthorDate.IsZero() {
request.AuthorDate = time.Now()
}
repo, err := git.OpenRepository(request.Repository)
if err != nil {
return fmt.Errorf("could not open repository: %w", err)
}
defer repo.Free()
ours, err := lookupCommit(repo, request.Ours)
if err != nil {
return fmt.Errorf("ours commit lookup: %w", err)
}
theirs, err := lookupCommit(repo, request.Theirs)
if err != nil {
return fmt.Errorf("theirs commit lookup: %w", err)
}
mergeOpts, err := git.DefaultMergeOptions()
if err != nil {
return fmt.Errorf("could not create merge options: %w", err)
}
mergeOpts.RecursionLimit = git2go.MergeRecursionLimit
index, err := repo.MergeCommits(ours, theirs, &mergeOpts)
if err != nil {
return fmt.Errorf("could not merge commits: %w", err)
}
defer index.Free()
if index.HasConflicts() {
if !request.AllowConflicts {
return errors.New("could not auto-merge due to conflicts")
}
if err := resolveConflicts(repo, index); err != nil {
return fmt.Errorf("could not resolve conflicts: %w", err)
}
}
tree, err := index.WriteTreeTo(repo)
if err != nil {
return fmt.Errorf("could not write tree: %w", err)
}
committer := git.Signature(git2go.NewSignature(request.AuthorName, request.AuthorMail, request.AuthorDate))
commit, err := repo.CreateCommitFromIds("", &committer, &committer, request.Message, tree, ours.Id(), theirs.Id())
if err != nil {
return fmt.Errorf("could not create merge commit: %w", err)
}
response := git2go.MergeResult{
CommitID: commit.String(),
}
if err := response.SerializeTo(os.Stdout); err != nil {
return err
}
return nil
}
func resolveConflicts(repo *git.Repository, index *git.Index) error {
// We need to get all conflicts up front as resolving conflicts as we
// iterate breaks the iterator.
indexConflicts, err := getConflicts(index)
if err != nil {
return err
}
for _, conflict := range indexConflicts {
merge, err := conflicts.Merge(repo, conflict)
if err != nil {
return err
}
mergedBlob, err := repo.CreateBlobFromBuffer(merge.Contents)
if err != nil {
return err
}
mergedIndexEntry := git.IndexEntry{
Path: merge.Path,
Mode: git.Filemode(merge.Mode),
Id: mergedBlob,
}
if err := index.Add(&mergedIndexEntry); err != nil {
return err
}
if err := index.RemoveConflict(merge.Path); err != nil {
return err
}
}
if index.HasConflicts() {
return errors.New("index still has conflicts")
}
return nil
}
func getConflicts(index *git.Index) ([]git.IndexConflict, error) {
var conflicts []git.IndexConflict
iterator, err := index.ConflictIterator()
if err != nil {
return nil, err
}
defer iterator.Free()
for {
conflict, err := iterator.Next()
if err != nil {
if git.IsErrorCode(err, git.ErrIterOver) {
break
}
return nil, err
}
conflicts = append(conflicts, conflict)
}
return conflicts, nil
}
|
