diff options
Diffstat (limited to 'cmd_command.go')
| -rw-r--r-- | cmd_command.go | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/cmd_command.go b/cmd_command.go index 7d65727..ff74f80 100644 --- a/cmd_command.go +++ b/cmd_command.go @@ -16,11 +16,10 @@ package libfastimport import ( - "fmt" "strconv" "strings" - "git.lukeshu.com/go/libfastimport/textproto" + "github.com/pkg/errors" ) // commit ////////////////////////////////////////////////////////////////////// @@ -36,8 +35,8 @@ import ( type CmdCommit struct { Ref string Mark int // optional; < 1 for non-use - Author *textproto.Ident - Committer textproto.Ident + Author *Ident + Committer Ident Msg string From string Merge []string @@ -81,16 +80,16 @@ func (CmdCommit) fiCmdRead(fir fiReader) (cmd Cmd, err error) { // ('author' (SP <name>)? SP LT <email> GT SP <when> LF)? if strings.HasPrefix(ez.PeekLine(), "author ") { - author, err := textproto.ParseIdent(trimLinePrefix(ez.ReadLine(), "author ")) + author, err := ParseIdent(trimLinePrefix(ez.ReadLine(), "author ")) ez.Errcheck(err) c.Author = &author } // 'committer' (SP <name>)? SP LT <email> GT SP <when> LF if !strings.HasPrefix(ez.PeekLine(), "committer ") { - ez.Errcheck(fmt.Errorf("commit: expected committer command: %v", ez.ReadLine())) + ez.Errcheck(errors.Errorf("commit: expected committer command: %v", ez.ReadLine())) } - c.Committer, err = textproto.ParseIdent(trimLinePrefix(ez.ReadLine(), "committer ")) + c.Committer, err = ParseIdent(trimLinePrefix(ez.ReadLine(), "committer ")) ez.Errcheck(err) // data @@ -133,7 +132,7 @@ func (CmdCommitEnd) fiCmdRead(fir fiReader) (Cmd, error) { panic("not reached") type CmdTag struct { RefName string CommitIsh string - Tagger textproto.Ident + Tagger Ident Data string } @@ -158,15 +157,15 @@ func (CmdTag) fiCmdRead(fir fiReader) (cmd Cmd, err error) { // 'from' SP <commit-ish> LF if !strings.HasPrefix(ez.PeekLine(), "from ") { - ez.Errcheck(fmt.Errorf("tag: expected from command: %v", ez.ReadLine())) + ez.Errcheck(errors.Errorf("tag: expected from command: %v", ez.ReadLine())) } c.CommitIsh = trimLinePrefix(ez.ReadLine(), "from ") // 'tagger' (SP <name>)? SP LT <email> GT SP <when> LF if !strings.HasPrefix(ez.PeekLine(), "tagger ") { - ez.Errcheck(fmt.Errorf("tag: expected tagger command: %v", ez.ReadLine())) + ez.Errcheck(errors.Errorf("tag: expected tagger command: %v", ez.ReadLine())) } - c.Tagger, err = textproto.ParseIdent(trimLinePrefix(ez.ReadLine(), "tagger ")) + c.Tagger, err = ParseIdent(trimLinePrefix(ez.ReadLine(), "tagger ")) ez.Errcheck(err) // data |