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
|
package git2go
import (
"bytes"
"context"
"encoding/gob"
"fmt"
"gitlab.com/gitlab-org/gitaly/v15/internal/git/conflict"
"gitlab.com/gitlab-org/gitaly/v15/internal/git/repository"
)
// ResolveCommand contains arguments to perform a merge commit and resolve any
// conflicts produced from that merge commit
type ResolveCommand struct {
MergeCommand
Resolutions []conflict.Resolution
}
// ResolveResult returns information about the successful merge and resolution
type ResolveResult struct {
MergeResult
// Err is set if an error occurred. Err must exist on all gob serialized
// results so that any error can be returned.
Err error
}
// Resolve will attempt merging and resolving conflicts for the provided request
func (b *Executor) Resolve(ctx context.Context, repo repository.GitRepo, r ResolveCommand) (ResolveResult, error) {
r.SigningKey = b.signingKey
if err := r.verify(); err != nil {
return ResolveResult{}, fmt.Errorf("resolve: %w: %s", ErrInvalidArgument, err.Error())
}
input := &bytes.Buffer{}
if err := gob.NewEncoder(input).Encode(r); err != nil {
return ResolveResult{}, fmt.Errorf("resolve: %w", err)
}
stdout, err := b.run(ctx, repo, input, "resolve")
if err != nil {
return ResolveResult{}, err
}
var response ResolveResult
if err := gob.NewDecoder(stdout).Decode(&response); err != nil {
return ResolveResult{}, fmt.Errorf("resolve: %w", err)
}
if response.Err != nil {
return ResolveResult{}, response.Err
}
return response, nil
}
|
