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
|
package git2go
import (
"context"
"errors"
"fmt"
"io"
"time"
"gitlab.com/gitlab-org/gitaly/v14/internal/git/repository"
"gitlab.com/gitlab-org/gitaly/v14/internal/metadata/featureflag"
)
const (
// MergeRecursionLimit limits how many virtual merge bases are computed
// in a recursive merge.
MergeRecursionLimit = 20
)
// MergeCommand contains parameters to perform a merge.
type MergeCommand struct {
// Repository is the path to execute merge in.
Repository string `json:"repository"`
// AuthorName is the author name of merge commit.
AuthorName string `json:"author_name"`
// AuthorMail is the author mail of merge commit.
AuthorMail string `json:"author_mail"`
// AuthorDate is the auithor date of merge commit.
AuthorDate time.Time `json:"author_date"`
// Message is the message to be used for the merge commit.
Message string `json:"message"`
// Ours is the commit that is to be merged into theirs.
Ours string `json:"ours"`
// Theirs is the commit into which ours is to be merged.
Theirs string `json:"theirs"`
// AllowConflicts controls whether conflicts are allowed. If they are,
// then conflicts will be committed as part of the result.
AllowConflicts bool `json:"allow_conflicts"`
}
// MergeResult contains results from a merge.
type MergeResult struct {
// CommitID is the object ID of the generated merge commit.
CommitID string `json:"commit_id"`
}
// MergeCommandFromSerialized deserializes the merge request from its JSON representation encoded with base64.
func MergeCommandFromSerialized(serialized string) (MergeCommand, error) {
var request MergeCommand
if err := deserialize(serialized, &request); err != nil {
return MergeCommand{}, err
}
if err := request.verify(); err != nil {
return MergeCommand{}, fmt.Errorf("merge: %w: %s", ErrInvalidArgument, err.Error())
}
return request, nil
}
// SerializeTo serializes the merge result and writes it into the writer.
func (m MergeResult) SerializeTo(w io.Writer) error {
return serializeTo(w, m)
}
// Merge performs a merge via gitaly-git2go.
func (b Executor) Merge(ctx context.Context, repo repository.GitRepo, m MergeCommand) (MergeResult, error) {
if err := m.verify(); err != nil {
return MergeResult{}, fmt.Errorf("merge: %w: %s", ErrInvalidArgument, err.Error())
}
if featureflag.Git2GoMergeGob.IsEnabled(ctx) {
commitID, err := b.runWithGob(ctx, repo, "merge", m)
if err != nil {
return MergeResult{}, err
}
return MergeResult{
CommitID: commitID.String(),
}, nil
}
serialized, err := serialize(m)
if err != nil {
return MergeResult{}, err
}
stdout, err := b.run(ctx, repo, nil, "merge", "-request", serialized)
if err != nil {
return MergeResult{}, err
}
var response MergeResult
if err := deserialize(stdout.String(), &response); err != nil {
return MergeResult{}, err
}
return response, nil
}
func (m MergeCommand) verify() error {
if m.Repository == "" {
return errors.New("missing repository")
}
if m.AuthorName == "" {
return errors.New("missing author name")
}
if m.AuthorMail == "" {
return errors.New("missing author mail")
}
if m.Message == "" {
return errors.New("missing message")
}
if m.Ours == "" {
return errors.New("missing ours")
}
if m.Theirs == "" {
return errors.New("missing theirs")
}
return nil
}
|
