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
|
package diff
import (
"context"
"errors"
"strings"
"gitlab.com/gitlab-org/gitaly/v16/internal/git"
"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service"
"gitlab.com/gitlab-org/gitaly/v16/internal/structerr"
"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
)
func (s *server) GetPatchID(ctx context.Context, in *gitalypb.GetPatchIDRequest) (*gitalypb.GetPatchIDResponse, error) {
if err := validatePatchIDRequest(in); err != nil {
return nil, structerr.NewInvalidArgument("%w", err)
}
var diffCmdStderr strings.Builder
diffCmd, err := s.gitCmdFactory.New(ctx, in.Repository,
git.Command{
Name: "diff",
Args: []string{string(in.GetOldRevision()), string(in.GetNewRevision())},
Flags: []git.Option{
// git-patch-id(1) will ignore binary diffs, and computing binary
// diffs would be expensive anyway for large blobs. This means that
// we must instead use the pre- and post-image blob IDs that
// git-diff(1) prints for binary diffs as input to git-patch-id(1),
// but unfortunately this is only honored in Git v2.39.0 and newer.
// We have no other choice than to accept this though, so we instead
// just ask git-diff(1) to print the full blob IDs for the pre- and
// post-image blobs instead of abbreviated ones so that we can avoid
// any kind of potential prefix collisions.
git.Flag{Name: "--full-index"},
},
},
git.WithStderr(&diffCmdStderr),
)
if err != nil {
return nil, structerr.New("spawning diff: %w", err)
}
var patchIDStdout strings.Builder
var patchIDStderr strings.Builder
patchIDCmd, err := s.gitCmdFactory.NewWithoutRepo(ctx,
git.Command{
Name: "patch-id",
Flags: []git.Option{git.Flag{Name: "--stable"}},
},
git.WithStdin(diffCmd),
git.WithStdout(&patchIDStdout),
git.WithStderr(&patchIDStderr),
)
if err != nil {
return nil, structerr.New("spawning patch-id: %w", err)
}
if err := patchIDCmd.Wait(); err != nil {
return nil, structerr.New("waiting for patch-id: %w", err).WithMetadata("stderr", patchIDStderr.String())
}
if err := diffCmd.Wait(); err != nil {
return nil, structerr.New("waiting for git-diff: %w", err).WithMetadata("stderr", diffCmdStderr.String())
}
if patchIDStdout.Len() == 0 {
return nil, structerr.NewFailedPrecondition("no difference between old and new revision")
}
// When computing patch IDs for commits directly via e.g. `git show | git patch-id` then the second
// field printed by git-patch-id(1) denotes the commit of the patch ID. As we only generate patch IDs
// from a diff here the second field will always be the zero OID, so we ignore it.
patchID, _, found := strings.Cut(patchIDStdout.String(), " ")
if !found {
return nil, structerr.NewFailedPrecondition("unexpected patch ID format")
}
return &gitalypb.GetPatchIDResponse{PatchId: patchID}, nil
}
func validatePatchIDRequest(in *gitalypb.GetPatchIDRequest) error {
if err := service.ValidateRepository(in.GetRepository()); err != nil {
return err
}
if string(in.GetOldRevision()) == "" {
return errors.New("empty OldRevision")
}
if string(in.GetNewRevision()) == "" {
return errors.New("empty NewRevision")
}
return nil
}
|
