commit 737ce2b2f5079f6a86e5e496a6b7c48cc200d2f1 · notnite.com/core

+3 -3

knotserver/git.go

···

       25
       25
        
       	}

     

       26
       26
        
       

     

       27
       27
        
       	if err := cmd.InfoRefs(); err != nil {

     

       28
       28
       -
       		http.Error(w, err.Error(), 500)

     

       28
       28
       +
       		writeError(w, err.Error(), 500)

     

       29
       29
        
       		d.l.Error("git: failed to execute git-upload-pack (info/refs)", "handler", "InfoRefs", "error", err)

     

       30
       30
        
       		return

     

       31
       31
        
       	}

     
···

       52
       52
        
       	if r.Header.Get("Content-Encoding") == "gzip" {

     

       53
       53
        
       		reader, err := gzip.NewReader(r.Body)

     

       54
       54
        
       		if err != nil {

     

       55
       55
       -
       			http.Error(w, err.Error(), 500)

     

       55
       55
       +
       			writeError(w, err.Error(), 500)

     

       56
       56
        
       			d.l.Error("git: failed to create gzip reader", "handler", "UploadPack", "error", err)

     

       57
       57
        
       			return

     

       58
       58
        
       		}

     
···

       61
       61
        
       

     

       62
       62
        
       	cmd.Stdin = reader

     

       63
       63
        
       	if err := cmd.UploadPack(); err != nil {

     

       64
       64
       -
       		http.Error(w, err.Error(), 500)

     

       64
       64
       +
       		writeError(w, err.Error(), 500)

     

       65
       65
        
       		d.l.Error("git: failed to execute git-upload-pack", "handler", "UploadPack", "error", err)

     

       66
       66
        
       		return

     

       67
       67
        
       	}

+210

knotserver/git/merge.go

···

       1
       1
       +
       package git

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"bytes"

     

       5
       5
       +
       	"fmt"

     

       6
       6
       +
       	"os"

     

       7
       7
       +
       	"os/exec"

     

       8
       8
       +
       	"regexp"

     

       9
       9
       +
       	"strings"

     

       10
       10
       +
       

     

       11
       11
       +
       	"github.com/go-git/go-git/v5"

     

       12
       12
       +
       	"github.com/go-git/go-git/v5/plumbing"

     

       13
       13
       +
       )

     

       14
       14
       +
       

     

       15
       15
       +
       type MergeError struct {

     

       16
       16
       +
       	Message     string

     

       17
       17
       +
       	Conflicts   []ConflictInfo

     

       18
       18
       +
       	HasConflict bool

     

       19
       19
       +
       	OtherError  error

     

       20
       20
       +
       }

     

       21
       21
       +
       

     

       22
       22
       +
       type ConflictInfo struct {

     

       23
       23
       +
       	Filename string

     

       24
       24
       +
       	Reason   string

     

       25
       25
       +
       }

     

       26
       26
       +
       

     

       27
       27
       +
       func (e MergeError) Error() string {

     

       28
       28
       +
       	if e.HasConflict {

     

       29
       29
       +
       		return fmt.Sprintf("merge failed due to conflicts: %s (%d conflicts)", e.Message, len(e.Conflicts))

     

       30
       30
       +
       	}

     

       31
       31
       +
       	if e.OtherError != nil {

     

       32
       32
       +
       		return fmt.Sprintf("merge failed: %s: %v", e.Message, e.OtherError)

     

       33
       33
       +
       	}

     

       34
       34
       +
       	return fmt.Sprintf("merge failed: %s", e.Message)

     

       35
       35
       +
       }

     

       36
       36
       +
       

     

       37
       37
       +
       func (g *GitRepo) createTempFileWithPatch(patchData []byte) (string, error) {

     

       38
       38
       +
       	tmpFile, err := os.CreateTemp("", "git-patch-*.patch")

     

       39
       39
       +
       	if err != nil {

     

       40
       40
       +
       		return "", fmt.Errorf("failed to create temporary patch file: %w", err)

     

       41
       41
       +
       	}

     

       42
       42
       +
       

     

       43
       43
       +
       	if _, err := tmpFile.Write(patchData); err != nil {

     

       44
       44
       +
       		tmpFile.Close()

     

       45
       45
       +
       		os.Remove(tmpFile.Name())

     

       46
       46
       +
       		return "", fmt.Errorf("failed to write patch data to temporary file: %w", err)

     

       47
       47
       +
       	}

     

       48
       48
       +
       

     

       49
       49
       +
       	if err := tmpFile.Close(); err != nil {

     

       50
       50
       +
       		os.Remove(tmpFile.Name())

     

       51
       51
       +
       		return "", fmt.Errorf("failed to close temporary patch file: %w", err)

     

       52
       52
       +
       	}

     

       53
       53
       +
       

     

       54
       54
       +
       	return tmpFile.Name(), nil

     

       55
       55
       +
       }

     

       56
       56
       +
       

     

       57
       57
       +
       func (g *GitRepo) cloneRepository(targetBranch string) (string, error) {

     

       58
       58
       +
       	tmpDir, err := os.MkdirTemp("", "git-clone-")

     

       59
       59
       +
       	if err != nil {

     

       60
       60
       +
       		return "", fmt.Errorf("failed to create temporary directory: %w", err)

     

       61
       61
       +
       	}

     

       62
       62
       +
       

     

       63
       63
       +
       	_, err = git.PlainClone(tmpDir, false, &git.CloneOptions{

     

       64
       64
       +
       		URL:           "file://" + g.path,

     

       65
       65
       +
       		Depth:         1,

     

       66
       66
       +
       		SingleBranch:  true,

     

       67
       67
       +
       		ReferenceName: plumbing.NewBranchReferenceName(targetBranch),

     

       68
       68
       +
       	})

     

       69
       69
       +
       	if err != nil {

     

       70
       70
       +
       		os.RemoveAll(tmpDir)

     

       71
       71
       +
       		return "", fmt.Errorf("failed to clone repository: %w", err)

     

       72
       72
       +
       	}

     

       73
       73
       +
       

     

       74
       74
       +
       	return tmpDir, nil

     

       75
       75
       +
       }

     

       76
       76
       +
       

     

       77
       77
       +
       func (g *GitRepo) applyPatch(tmpDir, patchFile string, checkOnly bool) error {

     

       78
       78
       +
       	var stderr bytes.Buffer

     

       79
       79
       +
       	var cmd *exec.Cmd

     

       80
       80
       +
       

     

       81
       81
       +
       	if checkOnly {

     

       82
       82
       +
       		cmd = exec.Command("git", "-C", tmpDir, "apply", "--check", "-v", patchFile)

     

       83
       83
       +
       	} else {

     

       84
       84
       +
       		exec.Command("git", "-C", tmpDir, "config", "advice.mergeConflict", "false").Run()

     

       85
       85
       +
       		cmd = exec.Command("git", "-C", tmpDir, "am", patchFile)

     

       86
       86
       +
       	}

     

       87
       87
       +
       

     

       88
       88
       +
       	cmd.Stderr = &stderr

     

       89
       89
       +
       

     

       90
       90
       +
       	if err := cmd.Run(); err != nil {

     

       91
       91
       +
       		if checkOnly {

     

       92
       92
       +
       			conflicts := parseGitApplyErrors(stderr.String())

     

       93
       93
       +
       			return &MergeError{

     

       94
       94
       +
       				Message:     "patch cannot be applied cleanly",

     

       95
       95
       +
       				Conflicts:   conflicts,

     

       96
       96
       +
       				HasConflict: len(conflicts) > 0,

     

       97
       97
       +
       				OtherError:  err,

     

       98
       98
       +
       			}

     

       99
       99
       +
       		}

     

       100
       100
       +
       		return fmt.Errorf("patch application failed: %s", stderr.String())

     

       101
       101
       +
       	}

     

       102
       102
       +
       

     

       103
       103
       +
       	return nil

     

       104
       104
       +
       }

     

       105
       105
       +
       

     

       106
       106
       +
       func (g *GitRepo) MergeCheck(patchData []byte, targetBranch string) error {

     

       107
       107
       +
       	patchFile, err := g.createTempFileWithPatch(patchData)

     

       108
       108
       +
       	if err != nil {

     

       109
       109
       +
       		return &MergeError{

     

       110
       110
       +
       			Message:    err.Error(),

     

       111
       111
       +
       			OtherError: err,

     

       112
       112
       +
       		}

     

       113
       113
       +
       	}

     

       114
       114
       +
       	defer os.Remove(patchFile)

     

       115
       115
       +
       

     

       116
       116
       +
       	tmpDir, err := g.cloneRepository(targetBranch)

     

       117
       117
       +
       	if err != nil {

     

       118
       118
       +
       		return &MergeError{

     

       119
       119
       +
       			Message:    err.Error(),

     

       120
       120
       +
       			OtherError: err,

     

       121
       121
       +
       		}

     

       122
       122
       +
       	}

     

       123
       123
       +
       	defer os.RemoveAll(tmpDir)

     

       124
       124
       +
       

     

       125
       125
       +
       	return g.applyPatch(tmpDir, patchFile, true)

     

       126
       126
       +
       }

     

       127
       127
       +
       

     

       128
       128
       +
       func (g *GitRepo) Merge(patchData []byte, targetBranch string) error {

     

       129
       129
       +
       	patchFile, err := g.createTempFileWithPatch(patchData)

     

       130
       130
       +
       	if err != nil {

     

       131
       131
       +
       		return &MergeError{

     

       132
       132
       +
       			Message:    err.Error(),

     

       133
       133
       +
       			OtherError: err,

     

       134
       134
       +
       		}

     

       135
       135
       +
       	}

     

       136
       136
       +
       	defer os.Remove(patchFile)

     

       137
       137
       +
       

     

       138
       138
       +
       	tmpDir, err := g.cloneRepository(targetBranch)

     

       139
       139
       +
       	if err != nil {

     

       140
       140
       +
       		return &MergeError{

     

       141
       141
       +
       			Message:    err.Error(),

     

       142
       142
       +
       			OtherError: err,

     

       143
       143
       +
       		}

     

       144
       144
       +
       	}

     

       145
       145
       +
       	defer os.RemoveAll(tmpDir)

     

       146
       146
       +
       

     

       147
       147
       +
       	if err := g.applyPatch(tmpDir, patchFile, false); err != nil {

     

       148
       148
       +
       		return err

     

       149
       149
       +
       	}

     

       150
       150
       +
       

     

       151
       151
       +
       	pushCmd := exec.Command("git", "-C", tmpDir, "push")

     

       152
       152
       +
       	if err := pushCmd.Run(); err != nil {

     

       153
       153
       +
       		return &MergeError{

     

       154
       154
       +
       			Message:    "failed to push changes to bare repository",

     

       155
       155
       +
       			OtherError: err,

     

       156
       156
       +
       		}

     

       157
       157
       +
       	}

     

       158
       158
       +
       

     

       159
       159
       +
       	return nil

     

       160
       160
       +
       }

     

       161
       161
       +
       

     

       162
       162
       +
       func parseGitApplyErrors(errorOutput string) []ConflictInfo {

     

       163
       163
       +
       	var conflicts []ConflictInfo

     

       164
       164
       +
       	lines := strings.Split(errorOutput, "\n")

     

       165
       165
       +
       

     

       166
       166
       +
       	var currentFile string

     

       167
       167
       +
       

     

       168
       168
       +
       	for i := range lines {

     

       169
       169
       +
       		line := strings.TrimSpace(lines[i])

     

       170
       170
       +
       

     

       171
       171
       +
       		if strings.HasPrefix(line, "error: patch failed:") {

     

       172
       172
       +
       			parts := strings.SplitN(line, ":", 3)

     

       173
       173
       +
       			if len(parts) >= 3 {

     

       174
       174
       +
       				currentFile = strings.TrimSpace(parts[2])

     

       175
       175
       +
       			}

     

       176
       176
       +
       			continue

     

       177
       177
       +
       		}

     

       178
       178
       +
       

     

       179
       179
       +
       		if match := regexp.MustCompile(`^error: (.*):(\d+): (.*)$`).FindStringSubmatch(line); len(match) >= 4 {

     

       180
       180
       +
       			if currentFile == "" {

     

       181
       181
       +
       				currentFile = match[1]

     

       182
       182
       +
       			}

     

       183
       183
       +
       

     

       184
       184
       +
       			conflicts = append(conflicts, ConflictInfo{

     

       185
       185
       +
       				Filename: currentFile,

     

       186
       186
       +
       				Reason:   match[3],

     

       187
       187
       +
       			})

     

       188
       188
       +
       			continue

     

       189
       189
       +
       		}

     

       190
       190
       +
       

     

       191
       191
       +
       		if strings.Contains(line, "already exists in working directory") {

     

       192
       192
       +
       			conflicts = append(conflicts, ConflictInfo{

     

       193
       193
       +
       				Filename: currentFile,

     

       194
       194
       +
       				Reason:   "file already exists",

     

       195
       195
       +
       			})

     

       196
       196
       +
       		} else if strings.Contains(line, "does not exist in working tree") {

     

       197
       197
       +
       			conflicts = append(conflicts, ConflictInfo{

     

       198
       198
       +
       				Filename: currentFile,

     

       199
       199
       +
       				Reason:   "file does not exist",

     

       200
       200
       +
       			})

     

       201
       201
       +
       		} else if strings.Contains(line, "patch does not apply") {

     

       202
       202
       +
       			conflicts = append(conflicts, ConflictInfo{

     

       203
       203
       +
       				Filename: currentFile,

     

       204
       204
       +
       				Reason:   "patch does not apply",

     

       205
       205
       +
       			})

     

       206
       206
       +
       		}

     

       207
       207
       +
       	}

     

       208
       208
       +
       

     

       209
       209
       +
       	return conflicts

     

       210
       210
       +
       }

knotserver/handler.go

···

       75
       75
        
       			r.Get("/info/refs", h.InfoRefs)

     

       76
       76
        
       			r.Post("/git-upload-pack", h.UploadPack)

     

       77
       77
        
       

     

       78
       78
       +
       			r.Route("/merge", func(r chi.Router) {

     

       79
       79
       +
       				r.Post("/", h.Merge)

     

       80
       80
       +
       				r.Post("/check", h.MergeCheck)

     

       81
       81
       +
       			})

     

       82
       82
       +
       

     

       78
       83
        
       			r.Route("/tree/{ref}", func(r chi.Router) {

     

       79
       84
        
       				r.Get("/", h.RepoIndex)

     

       80
       85
        
       				r.Get("/*", h.RepoTree)

knotserver/http_util.go

···

       24
       24
        
       func writeMsg(w http.ResponseWriter, msg string) {

     

       25
       25
        
       	writeJSON(w, map[string]string{"msg": msg})

     

       26
       26
        
       }

     

       27
       27
       +
       

     

       28
       28
       +
       func writeConflict(w http.ResponseWriter, data interface{}) {

     

       29
       29
       +
       	w.Header().Set("Content-Type", "application/json")

     

       30
       30
       +
       	w.WriteHeader(http.StatusConflict)

     

       31
       31
       +
       	json.NewEncoder(w).Encode(data)

     

       32
       32
       +
       }

+98

knotserver/routes.go

···

       554
       554
        
       	}

     

       555
       555
        
       

     

       556
       556
        
       	w.WriteHeader(http.StatusNoContent)

     

       557
       557
       +
       

     

       558
       558
       +
       }

     

       559
       559
       +
       func (h *Handle) Merge(w http.ResponseWriter, r *http.Request) {

     

       560
       560
       +
       	path, _ := securejoin.SecureJoin(h.c.Repo.ScanPath, didPath(r))

     

       561
       561
       +
       

     

       562
       562
       +
       	var data struct {

     

       563
       563
       +
       		Patch  string `json:"patch"`

     

       564
       564
       +
       		Branch string `json:"branch"`

     

       565
       565
       +
       	}

     

       566
       566
       +
       

     

       567
       567
       +
       	if err := json.NewDecoder(r.Body).Decode(&data); err != nil {

     

       568
       568
       +
       		writeError(w, err.Error(), http.StatusBadRequest)

     

       569
       569
       +
       		h.l.Error("git: failed to unmarshal json patch", "handler", "Merge", "error", err)

     

       570
       570
       +
       		return

     

       571
       571
       +
       	}

     

       572
       572
       +
       

     

       573
       573
       +
       	patch := data.Patch

     

       574
       574
       +
       	branch := data.Branch

     

       575
       575
       +
       	gr, err := git.Open(path, branch)

     

       576
       576
       +
       	if err != nil {

     

       577
       577
       +
       		notFound(w)

     

       578
       578
       +
       		return

     

       579
       579
       +
       	}

     

       580
       580
       +
       

     

       581
       581
       +
       	if err := gr.Merge([]byte(patch), branch); err != nil {

     

       582
       582
       +
       		var mergeErr *git.MergeError

     

       583
       583
       +
       		if errors.As(err, &mergeErr) {

     

       584
       584
       +
       			conflictDetails := make([]map[string]interface{}, len(mergeErr.Conflicts))

     

       585
       585
       +
       			for i, conflict := range mergeErr.Conflicts {

     

       586
       586
       +
       				conflictDetails[i] = map[string]interface{}{

     

       587
       587
       +
       					"filename": conflict.Filename,

     

       588
       588
       +
       					"reason":   conflict.Reason,

     

       589
       589
       +
       				}

     

       590
       590
       +
       			}

     

       591
       591
       +
       			response := map[string]interface{}{

     

       592
       592
       +
       				"message":   mergeErr.Message,

     

       593
       593
       +
       				"conflicts": conflictDetails,

     

       594
       594
       +
       			}

     

       595
       595
       +
       			writeConflict(w, response)

     

       596
       596
       +
       			h.l.Error("git: merge conflict", "handler", "Merge", "error", mergeErr)

     

       597
       597
       +
       		} else {

     

       598
       598
       +
       			writeError(w, err.Error(), http.StatusBadRequest)

     

       599
       599
       +
       			h.l.Error("git: failed to merge", "handler", "Merge", "error", err.Error())

     

       600
       600
       +
       		}

     

       601
       601
       +
       		return

     

       602
       602
       +
       	}

     

       603
       603
       +
       

     

       604
       604
       +
       	w.WriteHeader(http.StatusOK)

     

       605
       605
       +
       }

     

       606
       606
       +
       

     

       607
       607
       +
       func (h *Handle) MergeCheck(w http.ResponseWriter, r *http.Request) {

     

       608
       608
       +
       	path, _ := securejoin.SecureJoin(h.c.Repo.ScanPath, didPath(r))

     

       609
       609
       +
       

     

       610
       610
       +
       	var data struct {

     

       611
       611
       +
       		Patch  string `json:"patch"`

     

       612
       612
       +
       		Branch string `json:"branch"`

     

       613
       613
       +
       	}

     

       614
       614
       +
       

     

       615
       615
       +
       	if err := json.NewDecoder(r.Body).Decode(&data); err != nil {

     

       616
       616
       +
       		writeError(w, err.Error(), http.StatusBadRequest)

     

       617
       617
       +
       		h.l.Error("git: failed to unmarshal json patch", "handler", "MergeCheck", "error", err)

     

       618
       618
       +
       		return

     

       619
       619
       +
       	}

     

       620
       620
       +
       

     

       621
       621
       +
       	patch := data.Patch

     

       622
       622
       +
       	branch := data.Branch

     

       623
       623
       +
       	gr, err := git.Open(path, branch)

     

       624
       624
       +
       	if err != nil {

     

       625
       625
       +
       		notFound(w)

     

       626
       626
       +
       		return

     

       627
       627
       +
       	}

     

       628
       628
       +
       

     

       629
       629
       +
       	err = gr.MergeCheck([]byte(patch), branch)

     

       630
       630
       +
       	if err == nil {

     

       631
       631
       +
       		w.WriteHeader(http.StatusOK)

     

       632
       632
       +
       		return

     

       633
       633
       +
       	}

     

       634
       634
       +
       

     

       635
       635
       +
       	var mergeErr *git.MergeError

     

       636
       636
       +
       	if errors.As(err, &mergeErr) {

     

       637
       637
       +
       		conflictDetails := make([]map[string]interface{}, len(mergeErr.Conflicts))

     

       638
       638
       +
       		for i, conflict := range mergeErr.Conflicts {

     

       639
       639
       +
       			conflictDetails[i] = map[string]interface{}{

     

       640
       640
       +
       				"filename": conflict.Filename,

     

       641
       641
       +
       				"reason":   conflict.Reason,

     

       642
       642
       +
       			}

     

       643
       643
       +
       		}

     

       644
       644
       +
       		response := map[string]interface{}{

     

       645
       645
       +
       			"message":   mergeErr.Message,

     

       646
       646
       +
       			"conflicts": conflictDetails,

     

       647
       647
       +
       		}

     

       648
       648
       +
       		writeConflict(w, response)

     

       649
       649
       +
       		h.l.Error("git: merge conflict", "handler", "MergeCheck", "error", mergeErr.Error())

     

       650
       650
       +
       		return

     

       651
       651
       +
       	}

     

       652
       652
       +
       

     

       653
       653
       +
       	writeError(w, err.Error(), http.StatusInternalServerError)

     

       654
       654
       +
       	h.l.Error("git: failed to check merge", "handler", "MergeCheck", "error", err.Error())

     

       557
       655
        
       }

     

       558
       656
        
       

     

       559
       657
        
       func (h *Handle) AddMember(w http.ResponseWriter, r *http.Request) {

types/merge.go

···

       1
       1
       +
       package types