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 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245
|
package conflict
// This file is a direct port of Ruby source previously hosted at
// ruby/lib/gitlab/git/conflict/parser.rb (git show fb5717dd5567082)
// ruby/lib/gitlab/git/conflict/file.rb (git show 6f787458251b5f)
import (
"bufio"
"bytes"
"crypto/sha1"
"errors"
"fmt"
"io"
"strings"
)
// Errors that can occur during parsing of a merge conflict file
var (
ErrUnmergeableFile = errors.New("merging is not supported for file")
ErrUnexpectedDelimiter = errors.New("unexpected conflict delimiter")
ErrMissingEndDelimiter = errors.New("missing last delimiter")
)
type section uint
const (
sectionNone = section(iota)
sectionOld
sectionNew
sectionNoNewline
)
const fileLimit = 200 * (1 << 10) // 200k
type line struct {
objIndex uint // where are we in the object?
oldIndex uint // where are we in the old file?
newIndex uint // where are we in the new file?
payload string // actual line contents (minus the newline)
section section
}
// File contains an ordered list of lines with metadata about potential
// conflicts.
type File struct {
path string
lines []line
ancestor, our, their *Entry
}
func (f File) sectionID(l line) string {
pathSHA1 := sha1.Sum([]byte(f.path))
return fmt.Sprintf("%x_%d_%d", pathSHA1, l.oldIndex, l.newIndex)
}
// Resolution indicates how to resolve a conflict
type Resolution struct {
OldPath string `json:"old_path"`
NewPath string `json:"new_path"`
// key is a sectionID, value is "head" or "origin"
Sections map[string]string `json:"sections"`
// Content is used when no sections are defined
Content string `json:"content"`
}
const (
head = "head"
origin = "origin"
)
// Resolve will iterate through each conflict line and replace it with the
// specified resolution
func (f File) Resolve(resolution Resolution) ([]byte, error) {
var sectionID string
if len(resolution.Sections) == 0 {
return []byte(resolution.Content), nil
}
resolvedLines := make([]string, 0, len(f.lines))
for _, l := range f.lines {
if l.section == sectionNone {
sectionID = ""
resolvedLines = append(resolvedLines, l.payload)
continue
}
if sectionID == "" {
sectionID = f.sectionID(l)
}
r, ok := resolution.Sections[sectionID]
if !ok {
return nil, fmt.Errorf("Missing resolution for section ID: %s", sectionID) //nolint
}
switch r {
case head:
if l.section != sectionNew {
continue
}
case origin:
if l.section != sectionOld {
continue
}
default:
return nil, fmt.Errorf("Missing resolution for section ID: %s", sectionID) //nolint
}
resolvedLines = append(resolvedLines, l.payload)
}
resolvedContents := strings.Join(resolvedLines, "\n")
if bytes.HasSuffix(f.our.Contents, []byte{'\n'}) {
resolvedContents += "\n"
}
return []byte(resolvedContents), nil
}
// Entry is a conflict entry with a path and its original preimage contents.
type Entry struct {
Path string
Mode uint
Contents []byte
}
// Parse will read each line and maintain which conflict section it belongs to
func Parse(src io.Reader, ancestor, our, their *Entry) (File, error) {
parentPath := our.Path
if ancestor != nil {
parentPath = ancestor.Path
}
var (
// conflict markers
start = "<<<<<<< " + our.Path
middle = "======="
end = ">>>>>>> " + their.Path
f = File{
path: parentPath,
ancestor: ancestor,
our: our,
their: their,
}
objIndex, oldIndex, newIndex uint = 0, 1, 1
currentSection section
bytesRead int
s = bufio.NewScanner(src)
)
s.Buffer(make([]byte, 4096), fileLimit) // allow for line scanning up to the file limit
s.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
defer func() { bytesRead += advance }()
if bytesRead >= fileLimit {
return 0, nil, ErrUnmergeableFile
}
// The remaining function is a modified version of
// bufio.ScanLines that does not consume carriage returns
if atEOF && len(data) == 0 {
return 0, nil, nil
}
if i := bytes.IndexByte(data, '\n'); i >= 0 {
// We have a full newline-terminated line.
return i + 1, data[0:i], nil
}
if atEOF {
return len(data), data, nil
}
return 0, nil, nil
})
for s.Scan() {
switch l := s.Text(); l {
case start:
if currentSection != sectionNone {
return File{}, ErrUnexpectedDelimiter
}
currentSection = sectionNew
case middle:
if currentSection != sectionNew {
return File{}, ErrUnexpectedDelimiter
}
currentSection = sectionOld
case end:
if currentSection != sectionOld {
return File{}, ErrUnexpectedDelimiter
}
currentSection = sectionNone
default:
if len(l) > 0 && l[0] == '\\' {
currentSection = sectionNoNewline
f.lines = append(f.lines, line{
objIndex: objIndex,
oldIndex: oldIndex,
newIndex: newIndex,
payload: l,
section: currentSection,
})
continue
}
f.lines = append(f.lines, line{
objIndex: objIndex,
oldIndex: oldIndex,
newIndex: newIndex,
payload: l,
section: currentSection,
})
objIndex++
if currentSection != sectionNew {
oldIndex++
}
if currentSection != sectionOld {
newIndex++
}
}
}
if err := s.Err(); err != nil {
if errors.Is(err, bufio.ErrTooLong) {
return File{}, ErrUnmergeableFile
}
return File{}, err
}
if currentSection == sectionOld || currentSection == sectionNew {
return File{}, ErrMissingEndDelimiter
}
if bytesRead == 0 {
return File{}, ErrUnmergeableFile // typically a binary file
}
return f, nil
}
|