Files
bluekeyes-go-gitdiff/gitdiff/parser.go
T
Billy Keyes cf2f946a66 Implement traditional file header parsing
While I think this works, this is mostly for completeness. I (and I
expect most other users, if any) intend to use this with git patches.
2019-03-21 22:47:52 -07:00

277 lines
6.5 KiB
Go

package gitdiff
import (
"bufio"
"fmt"
"io"
"regexp"
"strconv"
"strings"
)
// Parse parses a patch with changes for one or more files. Any content
// preceding the first file header is ignored. If an error occurs while
// parsing, files will contain all files parsed before the error.
func Parse(r io.Reader) (files []*File, err error) {
p := &parser{r: bufio.NewReader(r)}
var file *File
for {
file, err = p.ParseNextFileHeader()
if err != nil {
return
}
if file == nil {
break
}
err = p.ParseFileChanges(file)
if err != nil {
return
}
files = append(files, file)
}
return files, nil
}
// TODO(bkeyes): consider exporting the parser type with configuration
// this would enable OID validation, p-value guessing, and prefix stripping
// by allowing users to set or override defaults
type parser struct {
r *bufio.Reader
lineno int64
nextLine string
}
const (
fragmentHeaderPrefix = "@@ -"
fileHeaderPrefix = "diff --git "
oldFilePrefix = "--- "
newFilePrefix = "+++ "
devNull = "/dev/null"
)
var (
// TODO(bkeyes): are the boundary conditions necessary?
fragmentHeaderRegexp = regexp.MustCompile(`^@@ -(\d+),(\d+) \+(\d+)(?:,(\d+))? @@.*\n`)
)
// ParseNextFileHeader finds and parses the next file header in the stream. It
// returns nil if no headers are found before the end of the stream.
func (p *parser) ParseNextFileHeader() (file *File, err error) {
// based on find_header() in git/apply.c
defer func() {
if err == io.EOF && file == nil {
err = nil
}
}()
for {
line, err := p.Line()
if err != io.EOF {
return nil, err
}
// check for disconnected fragment headers (corrupt patch)
if isMaybeFragmentHeader(line) {
var frag Fragment
if err := parseFragmentHeader(&frag, line); err != nil {
// not a valid header, nothing to worry about
continue
}
return nil, p.Errorf("patch fragment without header: %s", line)
}
// check for a git-generated patch
if strings.HasPrefix(line, fileHeaderPrefix) {
file = new(File)
if err := p.ParseGitFileHeader(file, line); err != nil {
return nil, err
}
return file, nil
}
next, err := p.PeekLine()
if err != nil {
return nil, err
}
// check for a "traditional" patch
if strings.HasPrefix(line, oldFilePrefix) && strings.HasPrefix(next, newFilePrefix) {
oldFileLine := line
newFileLine, _ := p.Line()
next, err := p.PeekLine()
if err != nil {
return nil, err
}
// only a file header if followed by a (probable) unified fragment header
if !isMaybeFragmentHeader(next) {
continue
}
file = new(File)
if err := p.ParseTraditionalFileHeader(file, oldFileLine, newFileLine); err != nil {
return nil, err
}
return file, nil
}
}
}
// ParseFileChanges parses file changes until the next file header or the end
// of the stream and attaches them to the given file.
func (p *parser) ParseFileChanges(f *File) error {
panic("TODO(bkeyes): unimplemented")
}
func (p *parser) ParseGitFileHeader(f *File, header string) error {
header = strings.TrimPrefix(header, fileHeaderPrefix)
defaultName, err := parseGitHeaderName(header)
if err != nil {
return p.Errorf("git file header: %v", err)
}
for {
line, err := p.PeekLine()
if err == io.EOF {
break
} else if err != nil {
return err
}
end, err := parseGitHeaderData(f, line, defaultName)
if err != nil {
return p.Errorf("git file header: %v", err)
}
if end {
break
}
p.Line()
}
if f.OldName == "" && f.NewName == "" {
if defaultName == "" {
return p.Errorf("git file header: missing filename information")
}
f.OldName = defaultName
f.NewName = defaultName
}
if (f.NewName == "" && !f.IsDelete) || (f.OldName == "" && !f.IsNew) {
return p.Errorf("git file header: missing filename information")
}
return nil
}
func (p *parser) ParseTraditionalFileHeader(f *File, oldLine, newLine string) error {
oldName, _, err := parseName(strings.TrimPrefix(oldLine, oldFilePrefix), '\t', 0)
if err != nil {
return p.Errorf("file header: %v", err)
}
newName, _, err := parseName(strings.TrimPrefix(newLine, newFilePrefix), '\t', 0)
if err != nil {
return p.Errorf("file header: %v", err)
}
switch {
case oldName == devNull || hasEpochTimestamp(oldLine):
f.IsNew = true
f.NewName = newName
case newName == devNull || hasEpochTimestamp(newLine):
f.IsDelete = true
f.OldName = oldName
default:
// if old name is a prefix of new name, use that instead
// this avoids picking variants like "file.bak" or "file~"
if strings.HasPrefix(newName, oldName) {
f.OldName = oldName
f.NewName = oldName
} else {
f.OldName = newName
f.NewName = newName
}
}
return nil
}
// Line reads and returns the next line. The first call to Line after a call to
// PeekLine will never retrun an error.
func (p *parser) Line() (line string, err error) {
if p.nextLine != "" {
line = p.nextLine
p.nextLine = ""
} else {
line, err = p.r.ReadString('\n')
}
p.lineno++
return
}
// PeekLine reads and returns the next line without advancing the parser.
func (p *parser) PeekLine() (line string, err error) {
if p.nextLine != "" {
line = p.nextLine
} else {
line, err = p.r.ReadString('\n')
}
p.nextLine = line
return
}
// Errorf generates an error and appends the current line information.
// TODO(bkeyes): add linedelta to allow changing lineno per-error
func (p *parser) Errorf(msg string, args ...interface{}) error {
return fmt.Errorf("gitdiff: line %d: %s", p.lineno, fmt.Sprintf(msg, args...))
}
func isMaybeFragmentHeader(line string) bool {
const shortestValidHeader = "@@ -0,0 +1 @@\n"
return len(line) >= len(shortestValidHeader) && strings.HasPrefix(line, fragmentHeaderPrefix)
}
func parseFragmentHeader(f *Fragment, header string) error {
// TODO(bkeyes): use strings.FieldsFunc instead of regexp
match := fragmentHeaderRegexp.FindStringSubmatch(header)
if len(match) < 5 {
return fmt.Errorf("invalid fragment header")
}
parseInt := func(s string, v *int64) (err error) {
if *v, err = strconv.ParseInt(s, 10, 64); err != nil {
nerr := err.(*strconv.NumError)
return fmt.Errorf("invalid fragment header value: %s: %v", s, nerr.Err)
}
return
}
if err := parseInt(match[1], &f.OldPosition); err != nil {
return err
}
if err := parseInt(match[2], &f.OldLines); err != nil {
return err
}
if err := parseInt(match[3], &f.NewPosition); err != nil {
return err
}
f.NewLines = 1
if match[4] != "" {
if err := parseInt(match[4], &f.NewLines); err != nil {
return err
}
}
return nil
}