all repos — homestead @ 4c07535d9120fb999b0c008f1866972865f424f7

Code for my website

replace tozd/errors with Southclaws/fault

Alan Pearce
commit

4c07535d9120fb999b0c008f1866972865f424f7

parent

90a4ac43b915abb7a2949f4b5313b40d705b6071

1 file changed, 12 insertions(+), 4 deletions(-)

changed files
M internal/vcs/filelog.go → internal/vcs/filelog.go
@@ -1,14 +1,16 @@
 package vcs
 
 import (
+	"fmt"
 	"net/url"
 	"regexp"
 	"strings"
 	"time"
 
+	"github.com/Southclaws/fault"
+	"github.com/Southclaws/fault/fmsg"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
-	"gitlab.com/tozd/go/errors"
 )
 
 const hashLength = 7

@@ -34,7 +36,7 @@ func (r *Repository) makeCommitURL(hash string) *url.URL {
 	return r.remoteURL.JoinPath("commit", hash)
 }
 
-func (r *Repository) GetFileLog(filename string) ([]*Commit, errors.E) {
+func (r *Repository) GetFileLog(filename string) ([]*Commit, error) {
 	var fl object.CommitIter
 	var err error
 	fl, err = r.repo.Log(&git.LogOptions{

@@ -42,7 +44,10 @@ Order:    git.LogOrderCommitterTime,
 		FileName: &filename,
 	})
 	if err != nil {
-		return nil, errors.WithMessagef(err, "could not get git log for file %s", filename)
+		return nil, fault.Wrap(
+			err,
+			fmsg.With(fmt.Sprintf("could not get git log for file %s", filename)),
+		)
 	}
 
 	defer fl.Close()

@@ -67,7 +72,10 @@
 		return nil
 	})
 	if err != nil {
-		return nil, errors.WithMessagef(err, "could not iterate over commits for file %s", filename)
+		return nil, fault.Wrap(
+			err,
+			fmsg.With(fmt.Sprintf("could not iterate over commits for file %s", filename)),
+		)
 	}
 
 	return cs, nil