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
|
package catfile
import (
"bufio"
"bytes"
"context"
"fmt"
"io"
"gitlab.com/gitlab-org/gitaly/v16/internal/git"
"gitlab.com/gitlab-org/gitaly/v16/internal/git/trailerparser"
"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
)
// GetCommit looks up a commit by revision using an existing Batch instance.
func GetCommit(ctx context.Context, objectReader ObjectContentReader, revision git.Revision) (*gitalypb.GitCommit, error) {
object, err := objectReader.Object(ctx, revision+"^{commit}")
if err != nil {
return nil, err
}
return NewParser().ParseCommit(object)
}
// GetCommitWithTrailers looks up a commit by revision using an existing Batch instance, and
// includes Git trailers in the returned commit.
func GetCommitWithTrailers(
ctx context.Context,
gitCmdFactory git.CommandFactory,
repo storage.Repository,
objectReader ObjectContentReader,
revision git.Revision,
) (*gitalypb.GitCommit, error) {
commit, err := GetCommit(ctx, objectReader, revision)
if err != nil {
return nil, err
}
// We use the commit ID here instead of revision. This way we still get
// trailers if the revision is not a SHA but e.g. a tag name.
showCmd, err := gitCmdFactory.New(ctx, repo, git.Command{
Name: "show",
Args: []string{commit.Id},
Flags: []git.Option{
git.Flag{Name: "--format=%(trailers:unfold,separator=%x00)"},
git.Flag{Name: "--no-patch"},
},
})
if err != nil {
return nil, fmt.Errorf("error when creating git show command: %w", err)
}
scanner := bufio.NewScanner(showCmd)
if scanner.Scan() {
if len(scanner.Text()) > 0 {
commit.Trailers = trailerparser.Parse([]byte(scanner.Text()))
}
if scanner.Scan() {
return nil, fmt.Errorf("git show produced more than one line of output, the second line is: %v", scanner.Text())
}
}
return commit, nil
}
// GetCommitMessage looks up a commit message and returns it in its entirety.
func GetCommitMessage(ctx context.Context, objectReader ObjectContentReader, repo storage.Repository, revision git.Revision) ([]byte, error) {
obj, err := objectReader.Object(ctx, revision+"^{commit}")
if err != nil {
return nil, err
}
_, body, err := splitRawCommit(obj)
if err != nil {
return nil, err
}
return body, nil
}
func splitRawCommit(object git.Object) ([]byte, []byte, error) {
raw, err := io.ReadAll(object)
if err != nil {
return nil, nil, err
}
header, body, _ := bytes.Cut(raw, []byte("\n\n"))
return header, body, nil
}
|
