Something went wrong. Try again.
forked from tangled.org/core
Something went wrong. Try again.
7.0 kB · 278 lines
Go
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279package git
import ( "bytes" "fmt" "os" "os/exec" "regexp" "strings"
"github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" "tangled.sh/tangled.sh/core/patchutil")
type ErrMerge struct { Message string Conflicts []ConflictInfo HasConflict bool OtherError error}
type ConflictInfo struct { Filename string Reason string}
// MergeOptions specifies the configuration for a merge operationtype MergeOptions struct { CommitMessage string CommitBody string AuthorName string AuthorEmail string FormatPatch bool}
func (e ErrMerge) Error() string { if e.HasConflict { return fmt.Sprintf("merge failed due to conflicts: %s (%d conflicts)", e.Message, len(e.Conflicts)) } if e.OtherError != nil { return fmt.Sprintf("merge failed: %s: %v", e.Message, e.OtherError) } return fmt.Sprintf("merge failed: %s", e.Message)}
func (g *GitRepo) createTempFileWithPatch(patchData []byte) (string, error) { tmpFile, err := os.CreateTemp("", "git-patch-*.patch") if err != nil { return "", fmt.Errorf("failed to create temporary patch file: %w", err) }
if _, err := tmpFile.Write(patchData); err != nil { tmpFile.Close() os.Remove(tmpFile.Name()) return "", fmt.Errorf("failed to write patch data to temporary file: %w", err) }
if err := tmpFile.Close(); err != nil { os.Remove(tmpFile.Name()) return "", fmt.Errorf("failed to close temporary patch file: %w", err) }
return tmpFile.Name(), nil}
func (g *GitRepo) cloneRepository(targetBranch string) (string, error) { tmpDir, err := os.MkdirTemp("", "git-clone-") if err != nil { return "", fmt.Errorf("failed to create temporary directory: %w", err) }
_, err = git.PlainClone(tmpDir, false, &git.CloneOptions{ URL: "file://" + g.path, Depth: 1, SingleBranch: true, ReferenceName: plumbing.NewBranchReferenceName(targetBranch), }) if err != nil { os.RemoveAll(tmpDir) return "", fmt.Errorf("failed to clone repository: %w", err) }
return tmpDir, nil}
func (g *GitRepo) applyPatch(tmpDir, patchFile string, checkOnly bool, opts *MergeOptions) error { var stderr bytes.Buffer var cmd *exec.Cmd
if checkOnly { cmd = exec.Command("git", "-C", tmpDir, "apply", "--check", "-v", patchFile) } else { // if patch is a format-patch, apply using 'git am' if opts.FormatPatch { amCmd := exec.Command("git", "-C", tmpDir, "am", patchFile) amCmd.Stderr = &stderr if err := amCmd.Run(); err != nil { return fmt.Errorf("patch application failed: %s", stderr.String()) } return nil }
// else, apply using 'git apply' and commit it manually exec.Command("git", "-C", tmpDir, "config", "advice.mergeConflict", "false").Run() if opts != nil { applyCmd := exec.Command("git", "-C", tmpDir, "apply", patchFile) applyCmd.Stderr = &stderr if err := applyCmd.Run(); err != nil { return fmt.Errorf("patch application failed: %s", stderr.String()) }
stageCmd := exec.Command("git", "-C", tmpDir, "add", ".") if err := stageCmd.Run(); err != nil { return fmt.Errorf("failed to stage changes: %w", err) }
commitArgs := []string{"-C", tmpDir, "commit"}
// Set author if provided authorName := opts.AuthorName authorEmail := opts.AuthorEmail
if authorEmail == "" { authorEmail = "noreply@tangled.sh" }
if authorName == "" { authorName = "Tangled" }
if authorName != "" { commitArgs = append(commitArgs, "--author", fmt.Sprintf("%s <%s>", authorName, authorEmail)) }
commitArgs = append(commitArgs, "-m", opts.CommitMessage)
if opts.CommitBody != "" { commitArgs = append(commitArgs, "-m", opts.CommitBody) }
cmd = exec.Command("git", commitArgs...) } else { // If no commit message specified, use git-am which automatically creates a commit cmd = exec.Command("git", "-C", tmpDir, "am", patchFile) } }
cmd.Stderr = &stderr
if err := cmd.Run(); err != nil { if checkOnly { conflicts := parseGitApplyErrors(stderr.String()) return &ErrMerge{ Message: "patch cannot be applied cleanly", Conflicts: conflicts, HasConflict: len(conflicts) > 0, OtherError: err, } } return fmt.Errorf("patch application failed: %s", stderr.String()) }
return nil}
func (g *GitRepo) MergeCheck(patchData []byte, targetBranch string) error { var opts MergeOptions opts.FormatPatch = patchutil.IsFormatPatch(string(patchData))
patchFile, err := g.createTempFileWithPatch(patchData) if err != nil { return &ErrMerge{ Message: err.Error(), OtherError: err, } } defer os.Remove(patchFile)
tmpDir, err := g.cloneRepository(targetBranch) if err != nil { return &ErrMerge{ Message: err.Error(), OtherError: err, } } defer os.RemoveAll(tmpDir)
return g.applyPatch(tmpDir, patchFile, true, &opts)}
func (g *GitRepo) Merge(patchData []byte, targetBranch string) error { return g.MergeWithOptions(patchData, targetBranch, nil)}
func (g *GitRepo) MergeWithOptions(patchData []byte, targetBranch string, opts *MergeOptions) error { patchFile, err := g.createTempFileWithPatch(patchData) if err != nil { return &ErrMerge{ Message: err.Error(), OtherError: err, } } defer os.Remove(patchFile)
tmpDir, err := g.cloneRepository(targetBranch) if err != nil { return &ErrMerge{ Message: err.Error(), OtherError: err, } } defer os.RemoveAll(tmpDir)
if err := g.applyPatch(tmpDir, patchFile, false, opts); err != nil { return err }
pushCmd := exec.Command("git", "-C", tmpDir, "push") if err := pushCmd.Run(); err != nil { return &ErrMerge{ Message: "failed to push changes to bare repository", OtherError: err, } }
return nil}
func parseGitApplyErrors(errorOutput string) []ConflictInfo { var conflicts []ConflictInfo lines := strings.Split(errorOutput, "\n")
var currentFile string
for i := range lines { line := strings.TrimSpace(lines[i])
if strings.HasPrefix(line, "error: patch failed:") { parts := strings.SplitN(line, ":", 3) if len(parts) >= 3 { currentFile = strings.TrimSpace(parts[2]) } continue }
if match := regexp.MustCompile(`^error: (.*):(\d+): (.*)$`).FindStringSubmatch(line); len(match) >= 4 { if currentFile == "" { currentFile = match[1] }
conflicts = append(conflicts, ConflictInfo{ Filename: currentFile, Reason: match[3], }) continue }
if strings.Contains(line, "already exists in working directory") { conflicts = append(conflicts, ConflictInfo{ Filename: currentFile, Reason: "file already exists", }) } else if strings.Contains(line, "does not exist in working tree") { conflicts = append(conflicts, ConflictInfo{ Filename: currentFile, Reason: "file does not exist", }) } else if strings.Contains(line, "patch does not apply") { conflicts = append(conflicts, ConflictInfo{ Filename: currentFile, Reason: "patch does not apply", }) } }
return conflicts}