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
|
package git2go
import (
"context"
"errors"
"fmt"
"time"
"gitlab.com/gitlab-org/gitaly/v14/internal/git/repository"
)
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
// AuthorName is the author name of merge commit.
AuthorName string
// AuthorMail is the author mail of merge commit.
AuthorMail string
// AuthorDate is the author date of merge commit.
AuthorDate time.Time
// CommitterName. Can be empty if all Committer* vars are empty.
// In that case AuthorName is used instead.
CommitterName string
// CommitterMail. Can be empty if all Committer* vars are empty.
// In that case AuthorMail is used instead.
CommitterMail string
// CommitterDate. Can be empty if all Committer* vars are empty.
// In that case AuthorDate is used instead.
CommitterDate time.Time
// Message is the message to be used for the merge commit.
Message string
// Ours is the commit into which theirs is to be merged.
Ours string
// Theirs is the commit that is to be merged into ours.
Theirs string
// AllowConflicts controls whether conflicts are allowed. If they are,
// then conflicts will be committed as part of the result.
AllowConflicts bool
// Squash controls whether to perform squash merge.
// If set to `true`, then the resulting commit will have `Ours` as its only parent.
// Otherwise, a merge commit will be created with `Ours` and `Theirs` as its parents.
Squash bool
}
// MergeResult contains results from a merge.
type MergeResult struct {
// CommitID is the object ID of the generated merge commit.
CommitID string
}
// 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())
}
commitID, err := b.runWithGob(ctx, repo, "merge", m)
if err != nil {
return MergeResult{}, err
}
return MergeResult{
CommitID: commitID.String(),
}, 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")
}
// If at least one Committer* var is set, require all of them to be set.
if m.CommitterMail != "" || !m.CommitterDate.IsZero() || m.CommitterName != "" {
if m.CommitterMail == "" {
return errors.New("missing committer mail")
}
if m.CommitterName == "" {
return errors.New("missing committer name")
}
if m.CommitterDate.IsZero() {
return errors.New("missing committer date")
}
}
return nil
}
|
