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
|
package diff
import (
"fmt"
"gitlab.com/gitlab-org/gitaly/v16/internal/git"
"gitlab.com/gitlab-org/gitaly/v16/internal/git/gitattributes"
"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/diff"
"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/linguist"
"gitlab.com/gitlab-org/gitaly/v16/internal/log"
"gitlab.com/gitlab-org/gitaly/v16/internal/structerr"
"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
)
func (s *server) CommitDiff(in *gitalypb.CommitDiffRequest, stream gitalypb.DiffService_CommitDiffServer) error {
ctx := stream.Context()
s.logger.WithFields(log.Fields{
"LeftCommitId": in.LeftCommitId,
"RightCommitId": in.RightCommitId,
"Paths": logPaths(in.Paths),
}).DebugContext(ctx, "CommitDiff")
if err := validateRequest(s.locator, in); err != nil {
return structerr.NewInvalidArgument("%w", err)
}
leftSha := in.LeftCommitId
rightSha := in.RightCommitId
whitespaceChanges := in.GetWhitespaceChanges()
paths := in.GetPaths()
repo := s.localrepo(in.GetRepository())
objectHash, err := repo.ObjectHash(ctx)
if err != nil {
return fmt.Errorf("detecting object format: %w", err)
}
cmd := git.Command{
Name: "diff",
Flags: []git.Option{
git.Flag{Name: "--patch"},
git.Flag{Name: "--raw"},
git.Flag{Name: fmt.Sprintf("--abbrev=%d", objectHash.EncodedLen())},
git.Flag{Name: "--full-index"},
git.Flag{Name: "--find-renames=30%"},
},
Args: []string{leftSha, rightSha},
}
if whitespaceChanges == gitalypb.CommitDiffRequest_WHITESPACE_CHANGES_IGNORE_ALL {
cmd.Flags = append(cmd.Flags, git.Flag{Name: "--ignore-all-space"})
} else if whitespaceChanges == gitalypb.CommitDiffRequest_WHITESPACE_CHANGES_IGNORE {
cmd.Flags = append(cmd.Flags, git.Flag{Name: "--ignore-space-change"})
}
if in.GetDiffMode() == gitalypb.CommitDiffRequest_WORDDIFF {
cmd.Flags = append(cmd.Flags, git.Flag{Name: "--word-diff=porcelain"})
}
if len(paths) > 0 {
for _, path := range paths {
cmd.PostSepArgs = append(cmd.PostSepArgs, string(path))
}
}
var limits diff.Limits
if in.EnforceLimits {
limits.EnforceLimits = true
limits.MaxFiles = int(in.MaxFiles)
limits.MaxLines = int(in.MaxLines)
limits.MaxBytes = int(in.MaxBytes)
limits.MaxPatchBytes = int(in.MaxPatchBytes)
if len(in.MaxPatchBytesForFileExtension) > 0 {
limits.MaxPatchBytesForFileExtension = map[string]int{}
for extension, size := range in.MaxPatchBytesForFileExtension {
limits.MaxPatchBytesForFileExtension[extension] = int(size)
}
}
}
limits.CollapseDiffs = in.CollapseDiffs
limits.CollectAllPaths = in.CollectAllPaths
limits.SafeMaxFiles = int(in.SafeMaxFiles)
limits.SafeMaxLines = int(in.SafeMaxLines)
limits.SafeMaxBytes = int(in.SafeMaxBytes)
var linguistInstance *linguist.Instance
var checkAttrCmd *gitattributes.CheckAttrCmd
var checkAttrFinish func()
if in.CollapseGenerated && in.CollapseDiffs {
linguistInstance = linguist.New(s.logger, s.catfileCache, repo)
checkAttrCmd, checkAttrFinish, err = linguistInstance.CheckAttrGenerated(ctx, git.Revision(leftSha))
if err != nil {
return structerr.NewAborted("send: %w", err)
}
defer checkAttrFinish()
}
return s.eachDiff(ctx, repo, cmd, limits, func(diff *diff.Diff) error {
response := &gitalypb.CommitDiffResponse{
FromPath: diff.FromPath,
ToPath: diff.ToPath,
FromId: diff.FromID,
ToId: diff.ToID,
OldMode: diff.OldMode,
NewMode: diff.NewMode,
Binary: diff.Binary,
OverflowMarker: diff.OverflowMarker,
Collapsed: diff.Collapsed,
TooLarge: diff.TooLarge,
}
patch := diff.Patch
if in.CollapseGenerated && in.CollapseDiffs {
oid := git.ObjectID(diff.FromID)
if objectHash.IsZeroOID(oid) {
oid = git.ObjectID(diff.ToID)
}
linguistGenerated, err := linguistInstance.IsGenerated(ctx, checkAttrCmd, string(diff.FromPath), oid)
if err != nil {
return structerr.NewAborted("send: %w", err)
}
if linguistGenerated {
response.Generated = true
response.Collapsed = true
patch = nil
}
}
if len(patch) <= s.MsgSizeThreshold {
response.RawPatchData = patch
response.EndOfPatch = true
if err := stream.Send(response); err != nil {
return structerr.NewAborted("send: %w", err)
}
} else {
for len(patch) > 0 {
if len(patch) > s.MsgSizeThreshold {
response.RawPatchData = patch[:s.MsgSizeThreshold]
patch = patch[s.MsgSizeThreshold:]
} else {
response.RawPatchData = patch
response.EndOfPatch = true
patch = nil
}
if err := stream.Send(response); err != nil {
return structerr.NewAborted("send: %w", err)
}
// Use a new response so we don't send other fields (FromPath, ...) over and over
response = &gitalypb.CommitDiffResponse{}
}
}
return nil
})
}
|
