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
|
package git2go
import (
"context"
"fmt"
"gitlab.com/gitlab-org/gitaly/internal/git/conflict"
"gitlab.com/gitlab-org/gitaly/internal/gitaly/config"
)
type ResolveCommand struct {
MergeCommand `json:"merge_command"`
Resolutions []conflict.Resolution `json:"conflict_files"`
}
type ResolveResult struct{}
func ResolveCommandFromSerialized(serialized string) (ResolveCommand, error) {
var request ResolveCommand
if err := deserialize(serialized, &request); err != nil {
return ResolveCommand{}, err
}
if err := request.verify(); err != nil {
return ResolveCommand{}, fmt.Errorf("resolve: %w: %s", ErrInvalidArgument, err.Error())
}
return request, nil
}
func (r ResolveCommand) Run(ctx context.Context, cfg config.Cfg) (ResolveResult, error) {
if err := r.verify(); err != nil {
return ResolveResult{}, fmt.Errorf("resolve: %w: %s", ErrInvalidArgument, err.Error())
}
serialized, err := serialize(r)
if err != nil {
return ResolveResult{}, err
}
stdout, err := run(ctx, cfg, "resolve", serialized)
if err != nil {
return ResolveResult{}, err
}
var response ResolveResult
if err := deserialize(stdout, &response); err != nil {
return ResolveResult{}, err
}
return response, nil
}
|
