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
|
package testhelper
import (
"bytes"
"fmt"
"os"
"os/exec"
"path"
"strings"
"testing"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/internal/helper/text"
)
// CreateCommitOpts holds extra options for CreateCommit.
type CreateCommitOpts struct {
Message string
ParentID string
}
const (
committerName = "Scrooge McDuck"
committerEmail = "scrooge@mcduck.com"
)
// CreateCommit makes a new empty commit and updates the named branch to point to it.
func CreateCommit(t *testing.T, repoPath, branchName string, opts *CreateCommitOpts) string {
message := "message"
// The ID of an arbitrary commit known to exist in the test repository.
parentID := "1a0b36b3cdad1d2ee32457c102a8c0b7056fa863"
if opts != nil {
if opts.Message != "" {
message = opts.Message
}
if opts.ParentID != "" {
parentID = opts.ParentID
}
}
// message can be very large, passing it directly in args would blow things up!
stdin := bytes.NewBufferString(message)
// Use 'commit-tree' instead of 'commit' because we are in a bare
// repository. What we do here is the same as "commit -m message
// --allow-empty".
commitArgs := []string{
"-c", fmt.Sprintf("user.name=%s", committerName),
"-c", fmt.Sprintf("user.email=%s", committerEmail),
"-C", repoPath,
"commit-tree", "-F", "-", "-p", parentID, parentID + "^{tree}",
}
newCommit := MustRunCommand(t, stdin, "git", commitArgs...)
newCommitID := text.ChompBytes(newCommit)
MustRunCommand(t, nil, "git", "-C", repoPath, "update-ref", "refs/heads/"+branchName, newCommitID)
return newCommitID
}
// CreateCommitInAlternateObjectDirectory runs a command such that its created
// objects will live in an alternate objects directory. It returns the current
// head after the command is run and the alternate objects directory path
func CreateCommitInAlternateObjectDirectory(t *testing.T, repoPath, altObjectsDir string, cmd *exec.Cmd) (currentHead []byte) {
gitPath := path.Join(repoPath, ".git")
altObjectsPath := path.Join(gitPath, altObjectsDir)
gitObjectEnv := []string{
fmt.Sprintf("GIT_OBJECT_DIRECTORY=%s", altObjectsPath),
fmt.Sprintf("GIT_ALTERNATE_OBJECT_DIRECTORIES=%s", path.Join(gitPath, "objects")),
}
require.NoError(t, os.MkdirAll(altObjectsPath, 0755))
// Because we set 'gitObjectEnv', the new objects created by this command
// will go into 'find-commits-alt-test-repo/.git/alt-objects'.
cmd.Env = append(cmd.Env, gitObjectEnv...)
if output, err := cmd.Output(); err != nil {
stderr := err.(*exec.ExitError).Stderr
t.Fatalf("stdout: %s, stderr: %s", output, stderr)
}
cmd = exec.Command("git", "-C", repoPath, "rev-parse", "HEAD")
cmd.Env = gitObjectEnv
currentHead, err := cmd.Output()
require.NoError(t, err)
return currentHead[:len(currentHead)-1]
}
// CommitBlobWithName will create a commit for the specified blob with the
// specified name. This enables testing situations where the filepath is not
// possible due to filesystem constraints (e.g. non-UTF characters). The commit
// ID is returned.
func CommitBlobWithName(t *testing.T, testRepoPath, blobID, fileName, commitMessage string) string {
mktreeIn := strings.NewReader(fmt.Sprintf("100644 blob %s\t%s", blobID, fileName))
treeID := text.ChompBytes(MustRunCommand(t, mktreeIn, "git", "-C", testRepoPath, "mktree"))
return text.ChompBytes(
MustRunCommand(t, nil, "git",
"-c", fmt.Sprintf("user.name=%s", committerName),
"-c", fmt.Sprintf("user.email=%s", committerEmail),
"-C", testRepoPath, "commit-tree", treeID, "-m", commitMessage),
)
}
// CreateCommitOnNewBranch creates a branch and a commit, returning the commit sha and the branch name respectivelyi
func CreateCommitOnNewBranch(t *testing.T, repoPath string) (string, string) {
nonce, err := text.RandomHex(4)
require.NoError(t, err)
newBranch := "branch-" + nonce
sha := CreateCommit(t, repoPath, newBranch, &CreateCommitOpts{
Message: "a new branch and commit " + nonce,
})
return sha, newBranch
}
|
