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
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
|
package repository
import (
"context"
"fmt"
"io"
"regexp"
"strconv"
"unicode/utf8"
"github.com/golang/protobuf/proto"
"gitlab.com/gitlab-org/gitaly/internal/git"
"gitlab.com/gitlab-org/gitaly/internal/git/catfile"
"gitlab.com/gitlab-org/gitaly/internal/git/rawdiff"
"gitlab.com/gitlab-org/gitaly/internal/helper"
"gitlab.com/gitlab-org/gitaly/internal/helper/chunk"
"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
)
func (s *server) GetRawChanges(req *gitalypb.GetRawChangesRequest, stream gitalypb.RepositoryService_GetRawChangesServer) error {
ctx := stream.Context()
repo := req.Repository
batch, err := catfile.New(stream.Context(), s.gitCmdFactory, repo)
if err != nil {
return helper.ErrInternal(err)
}
if err := validateRawChangesRequest(ctx, req, batch); err != nil {
return helper.ErrInvalidArgument(err)
}
if err := s.getRawChanges(stream, repo, batch, req.GetFromRevision(), req.GetToRevision()); err != nil {
return helper.ErrInternal(err)
}
return nil
}
func validateRawChangesRequest(ctx context.Context, req *gitalypb.GetRawChangesRequest, batch catfile.Batch) error {
if from := req.FromRevision; !git.ObjectID(from).IsZeroOID() {
if _, err := batch.Info(ctx, git.Revision(from)); err != nil {
return fmt.Errorf("invalid 'from' revision: %q", from)
}
}
if to := req.ToRevision; !git.ObjectID(to).IsZeroOID() {
if _, err := batch.Info(ctx, git.Revision(to)); err != nil {
return fmt.Errorf("invalid 'to' revision: %q", to)
}
}
return nil
}
func (s *server) getRawChanges(stream gitalypb.RepositoryService_GetRawChangesServer, repo *gitalypb.Repository, batch catfile.Batch, from, to string) error {
if git.ObjectID(to).IsZeroOID() {
return nil
}
if git.ObjectID(from).IsZeroOID() {
from = git.EmptyTreeOID.String()
}
ctx := stream.Context()
diffCmd, err := s.gitCmdFactory.New(ctx, repo, git.SubCmd{
Name: "diff",
Flags: []git.Option{git.Flag{Name: "--raw"}, git.Flag{Name: "-z"}},
Args: []string{from, to},
})
if err != nil {
return fmt.Errorf("start git diff: %v", err)
}
p := rawdiff.NewParser(diffCmd)
chunker := chunk.New(&rawChangesSender{stream: stream})
for {
d, err := p.NextDiff()
if err == io.EOF {
break // happy path
}
if err != nil {
return fmt.Errorf("read diff: %v", err)
}
change, err := changeFromDiff(ctx, batch, d)
if err != nil {
return fmt.Errorf("build change from diff line: %v", err)
}
if err := chunker.Send(change); err != nil {
return fmt.Errorf("send response: %v", err)
}
}
if err := diffCmd.Wait(); err != nil {
return fmt.Errorf("wait git diff: %v", err)
}
return chunker.Flush()
}
type rawChangesSender struct {
stream gitalypb.RepositoryService_GetRawChangesServer
changes []*gitalypb.GetRawChangesResponse_RawChange
}
func (s *rawChangesSender) Reset() { s.changes = nil }
func (s *rawChangesSender) Append(m proto.Message) {
s.changes = append(s.changes, m.(*gitalypb.GetRawChangesResponse_RawChange))
}
func (s *rawChangesSender) Send() error {
response := &gitalypb.GetRawChangesResponse{RawChanges: s.changes}
return s.stream.Send(response)
}
// Ordinarily, Git uses 0000000000000000000000000000000000000000, the
// "null SHA", to represent a non-existing object. In the output of `git
// diff --raw` however there are only abbreviated SHA's, i.e. with less
// than 40 characters. Within this context the null SHA is a string that
// consists of 1 to 40 zeroes.
var zeroRegexp = regexp.MustCompile(`\A0+\z`)
const submoduleTreeEntryMode = "160000"
func changeFromDiff(ctx context.Context, batch catfile.Batch, d *rawdiff.Diff) (*gitalypb.GetRawChangesResponse_RawChange, error) {
resp := &gitalypb.GetRawChangesResponse_RawChange{}
newMode64, err := strconv.ParseInt(d.DstMode, 8, 32)
if err != nil {
return nil, err
}
resp.NewMode = int32(newMode64)
oldMode64, err := strconv.ParseInt(d.SrcMode, 8, 32)
if err != nil {
return nil, err
}
resp.OldMode = int32(oldMode64)
if err := setOperationAndPaths(d, resp); err != nil {
return nil, err
}
shortBlobID := d.DstSHA
blobMode := d.DstMode
if zeroRegexp.MatchString(shortBlobID) {
shortBlobID = d.SrcSHA
blobMode = d.SrcMode
}
if blobMode != submoduleTreeEntryMode {
info, err := batch.Info(ctx, git.Revision(shortBlobID))
if err != nil {
return nil, fmt.Errorf("find %q: %v", shortBlobID, err)
}
resp.BlobId = info.Oid.String()
resp.Size = info.Size
}
return resp, nil
}
// InvalidUTF8PathPlaceholder is a temporary placeholder that indicates the
const InvalidUTF8PathPlaceholder = "ENCODING ERROR gitaly#1470"
func setOperationAndPaths(d *rawdiff.Diff, resp *gitalypb.GetRawChangesResponse_RawChange) error {
if len(d.Status) == 0 {
return fmt.Errorf("empty diff status")
}
resp.NewPathBytes = []byte(d.SrcPath)
resp.OldPathBytes = []byte(d.SrcPath)
switch d.Status[0] {
case 'A':
resp.Operation = gitalypb.GetRawChangesResponse_RawChange_ADDED
resp.OldPathBytes = nil
case 'C':
resp.Operation = gitalypb.GetRawChangesResponse_RawChange_COPIED
resp.NewPathBytes = []byte(d.DstPath)
case 'D':
resp.Operation = gitalypb.GetRawChangesResponse_RawChange_DELETED
resp.NewPathBytes = nil
case 'M':
resp.Operation = gitalypb.GetRawChangesResponse_RawChange_MODIFIED
case 'R':
resp.Operation = gitalypb.GetRawChangesResponse_RawChange_RENAMED
resp.NewPathBytes = []byte(d.DstPath)
case 'T':
resp.Operation = gitalypb.GetRawChangesResponse_RawChange_TYPE_CHANGED
default:
resp.Operation = gitalypb.GetRawChangesResponse_RawChange_UNKNOWN
}
resp.OldPath = string(resp.OldPathBytes)
resp.NewPath = string(resp.NewPathBytes)
if !utf8.ValidString(resp.OldPath) {
resp.OldPath = InvalidUTF8PathPlaceholder
}
if !utf8.ValidString(resp.NewPath) {
resp.NewPath = InvalidUTF8PathPlaceholder
}
return nil
}
|
