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 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229
|
//go:build static && system_libgit2
package main
import (
"bytes"
"context"
"encoding/gob"
"errors"
"flag"
"fmt"
"io"
"os"
"os/exec"
"path/filepath"
git "github.com/libgit2/git2go/v34"
"gitlab.com/gitlab-org/gitaly/v16/cmd/gitaly-git2go/git2goutil"
"gitlab.com/gitlab-org/gitaly/v16/internal/git2go"
)
type patchIterator struct {
value git2go.Patch
decoder *gob.Decoder
error error
}
func (iter *patchIterator) Next() bool {
if err := iter.decoder.Decode(&iter.value); err != nil {
if !errors.Is(err, io.EOF) {
iter.error = fmt.Errorf("decode patch: %w", err)
}
return false
}
return true
}
func (iter *patchIterator) Value() git2go.Patch { return iter.value }
func (iter *patchIterator) Err() error { return iter.error }
type applySubcommand struct {
gitBinaryPath string
signingKeyPath string
}
func (cmd *applySubcommand) Flags() *flag.FlagSet {
fs := flag.NewFlagSet("apply", flag.ExitOnError)
fs.StringVar(&cmd.gitBinaryPath, "git-binary-path", "", "Path to the Git binary.")
fs.StringVar(&cmd.signingKeyPath, "signing-key", "", "Path to the OpenPGP signing key.")
return fs
}
// Run runs the subcommand.
func (cmd *applySubcommand) Run(ctx context.Context, decoder *gob.Decoder, encoder *gob.Encoder) error {
var params git2go.ApplyParams
if err := decoder.Decode(¶ms); err != nil {
return fmt.Errorf("decode params: %w", err)
}
params.Patches = &patchIterator{decoder: decoder}
commitID, err := cmd.apply(ctx, params)
return encoder.Encode(git2go.Result{
CommitID: commitID,
Err: git2go.SerializableError(err),
})
}
func (cmd *applySubcommand) apply(ctx context.Context, params git2go.ApplyParams) (string, error) {
repo, err := git2goutil.OpenRepository(params.Repository)
if err != nil {
return "", fmt.Errorf("open repository: %w", err)
}
commitOID, err := git.NewOid(params.ParentCommit)
if err != nil {
return "", fmt.Errorf("parse parent commit oid: %w", err)
}
committer := git.Signature(params.Committer)
for i := 0; params.Patches.Next(); i++ {
commitOID, err = cmd.applyPatch(ctx, repo, &committer, commitOID, params.Patches.Value())
if err != nil {
return "", fmt.Errorf("apply patch [%d]: %w", i+1, err)
}
}
if err := params.Patches.Err(); err != nil {
return "", fmt.Errorf("reading patches: %w", err)
}
return commitOID.String(), nil
}
func (cmd *applySubcommand) applyPatch(
ctx context.Context,
repo *git.Repository,
committer *git.Signature,
parentCommitOID *git.Oid,
patch git2go.Patch,
) (*git.Oid, error) {
parentCommit, err := repo.LookupCommit(parentCommitOID)
if err != nil {
return nil, fmt.Errorf("lookup commit: %w", err)
}
parentTree, err := parentCommit.Tree()
if err != nil {
return nil, fmt.Errorf("lookup tree: %w", err)
}
diff, err := git.DiffFromBuffer(patch.Diff, repo)
if err != nil {
return nil, fmt.Errorf("diff from buffer: %w", err)
}
patchedIndex, err := repo.ApplyToTree(diff, parentTree, nil)
if err != nil {
if !git.IsErrorCode(err, git.ErrorCodeApplyFail) {
return nil, fmt.Errorf("apply to tree: %w", err)
}
patchedIndex, err = cmd.threeWayMerge(ctx, repo, parentTree, diff, patch.Diff)
if err != nil {
return nil, fmt.Errorf("three way merge: %w", err)
}
}
patchedTreeOID, err := patchedIndex.WriteTreeTo(repo)
if err != nil {
return nil, fmt.Errorf("write patched tree: %w", err)
}
patchedTree, err := repo.LookupTree(patchedTreeOID)
if err != nil {
return nil, fmt.Errorf("lookup tree: %w", err)
}
author := git.Signature(patch.Author)
patchedCommitID, err := git2goutil.NewCommitSubmitter(repo, cmd.signingKeyPath).
Commit(&author, committer, git.MessageEncodingUTF8, patch.Message, patchedTree, parentCommit)
if err != nil {
return nil, fmt.Errorf("create commit: %w", err)
}
return patchedCommitID, nil
}
// threeWayMerge attempts a three-way merge as a fallback if applying the patch fails.
// Fallback three-way merge is only possible if the patch records the pre-image blobs
// and the repository contains them. It works as follows:
//
// 1. An index that contains only the pre-image blobs of the patch is built. This is done
// by calling `git apply --build-fake-ancestor`. The tree of the index is the fake
// ancestor tree.
// 2. The fake ancestor tree is patched to produce the post-image tree of the patch.
// 3. Three-way merge is performed with fake ancestor tree as the common ancestor, the
// base commit's tree as our tree and the patched fake ancestor tree as their tree.
func (cmd *applySubcommand) threeWayMerge(
ctx context.Context,
repo *git.Repository,
our *git.Tree,
diff *git.Diff,
rawDiff []byte,
) (*git.Index, error) {
ancestorTree, err := cmd.buildFakeAncestor(ctx, repo, rawDiff)
if err != nil {
return nil, fmt.Errorf("build fake ancestor: %w", err)
}
patchedAncestorIndex, err := repo.ApplyToTree(diff, ancestorTree, nil)
if err != nil {
return nil, fmt.Errorf("patch fake ancestor: %w", err)
}
patchedAncestorTreeOID, err := patchedAncestorIndex.WriteTreeTo(repo)
if err != nil {
return nil, fmt.Errorf("write patched fake ancestor: %w", err)
}
patchedTree, err := repo.LookupTree(patchedAncestorTreeOID)
if err != nil {
return nil, fmt.Errorf("lookup patched tree: %w", err)
}
patchedIndex, err := repo.MergeTrees(ancestorTree, our, patchedTree, nil)
if err != nil {
return nil, fmt.Errorf("merge trees: %w", err)
}
if patchedIndex.HasConflicts() {
return nil, git2go.ErrMergeConflict
}
return patchedIndex, nil
}
func (cmd *applySubcommand) buildFakeAncestor(ctx context.Context, repo *git.Repository, diff []byte) (*git.Tree, error) {
dir, err := os.MkdirTemp("", "gitaly-git2go")
if err != nil {
return nil, fmt.Errorf("create temporary directory: %w", err)
}
defer func() { _ = os.RemoveAll(dir) }()
file := filepath.Join(dir, "patch-merge-index")
gitCmd := exec.CommandContext(ctx, cmd.gitBinaryPath, "--git-dir", repo.Path(), "apply", "--build-fake-ancestor", file)
gitCmd.Stdin = bytes.NewReader(diff)
if _, err := gitCmd.Output(); err != nil {
var exitError *exec.ExitError
if errors.As(err, &exitError) {
err = fmt.Errorf("%w, stderr: %q", err, exitError.Stderr)
}
return nil, fmt.Errorf("git: %w", err)
}
fakeAncestor, err := git.OpenIndex(file)
if err != nil {
return nil, fmt.Errorf("open fake ancestor index: %w", err)
}
ancestorTreeOID, err := fakeAncestor.WriteTreeTo(repo)
if err != nil {
return nil, fmt.Errorf("write fake ancestor tree: %w", err)
}
return repo.LookupTree(ancestorTreeOID)
}
|