all repos — homestead @ 4c07535d9120fb999b0c008f1866972865f424f7

Code for my website

replace tozd/errors with Southclaws/fault

Alan Pearce
commit

4c07535d9120fb999b0c008f1866972865f424f7

parent

90a4ac43b915abb7a2949f4b5313b40d705b6071

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

changed files
M internal/vcs/repository.go → internal/vcs/repository.go
@@ -1,15 +1,16 @@
 package vcs
 
 import (
+	"errors"
 	"os"
 
 	"go.alanpearce.eu/homestead/internal/config"
 	"go.alanpearce.eu/homestead/internal/file"
 	"go.alanpearce.eu/x/log"
 
+	"github.com/Southclaws/fault"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
-	"gitlab.com/tozd/go/errors"
 )
 
 type Options struct {

@@ -24,7 +25,7 @@ log       *log.Logger
 	remoteURL config.URL
 }
 
-func CloneOrOpen(cfg *Options, log *log.Logger) (*Repository, bool, errors.E) {
+func CloneOrOpen(cfg *Options, log *log.Logger) (*Repository, bool, error) {
 	var r *git.Repository
 	var err error
 	exists := file.Exists(cfg.LocalPath)

@@ -37,7 +38,7 @@ } else {
 		r, err = git.PlainOpen(cfg.LocalPath)
 	}
 	if err != nil {
-		return nil, exists, errors.WithStack(err)
+		return nil, exists, fault.Wrap(err)
 	}
 
 	return &Repository{

@@ -47,7 +48,7 @@ repo:      r,
 	}, exists, nil
 }
 
-func (r *Repository) Update(rev string) (bool, errors.E) {
+func (r *Repository) Update(rev string) (bool, error) {
 	r.log.Info("updating repository", "from", r.HeadSHA())
 	err := r.repo.Fetch(&git.FetchOptions{
 		Prune: true,

@@ -59,18 +60,18 @@
 			return true, nil
 		}
 
-		return false, errors.WithStack(err)
+		return false, fault.Wrap(err)
 	}
 
 	rem, err := r.repo.Remote("origin")
 	if err != nil {
-		return false, errors.WithStack(err)
+		return false, fault.Wrap(err)
 	}
 	refs, err := rem.List(&git.ListOptions{
 		Timeout: 5,
 	})
 	if err != nil {
-		return false, errors.WithStack(err)
+		return false, fault.Wrap(err)
 	}
 
 	var hash plumbing.Hash

@@ -88,14 +89,14 @@ }
 
 	wt, err := r.repo.Worktree()
 	if err != nil {
-		return false, errors.WithStack(err)
+		return false, fault.Wrap(err)
 	}
 	err = wt.Checkout(&git.CheckoutOptions{
 		Hash:  hash,
 		Force: true,
 	})
 	if err != nil {
-		return false, errors.WithStack(err)
+		return false, fault.Wrap(err)
 	}
 
 	r.log.Info("updated to", "rev", hash)

@@ -103,10 +104,10 @@
 	return true, r.Clean(wt)
 }
 
-func (r *Repository) Clean(wt *git.Worktree) errors.E {
+func (r *Repository) Clean(wt *git.Worktree) error {
 	st, err := wt.Status()
 	if err != nil {
-		return errors.WithStack(err)
+		return fault.Wrap(err)
 	}
 
 	if !st.IsClean() {

@@ -114,7 +115,7 @@ err = wt.Clean(&git.CleanOptions{
 			Dir: true,
 		})
 		if err != nil {
-			return errors.WithStack(err)
+			return fault.Wrap(err)
 		}
 	}