From c61482694db89cb8b5d7de1ca04636478382a0bb Mon Sep 17 00:00:00 2001
From: Mark <git@happybeing.com>
Date: Tue, 1 Dec 2020 16:34:02 +0000
Subject: [PATCH] Move new RepoStorage interface to GoGitRepo, revert repoTest

---
 repository/gogit.go |  7 +++++++
 repository/repo.go  | 13 -------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/repository/gogit.go b/repository/gogit.go
index c59409d493214d7a6e6379edbe48769cef03dd99..45906ea4f9aa4bf095bb8aad1ecb9d022dfe59ab 100644
--- a/repository/gogit.go
+++ b/repository/gogit.go
@@ -13,6 +13,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/go-git/go-billy"
 	gogit "github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/config"
 	"github.com/go-git/go-git/v5/plumbing"
@@ -32,6 +33,12 @@ type GoGitRepo struct {
 	clocks      map[string]lamport.Clock
 
 	keyring Keyring
+	RepoStorage
+}
+
+type RepoStorage interface {
+	// Storage returns a billy.Filesystem giving access to $RepoPath/.git/git-bug
+	Storage() billy.Filesystem
 }
 
 func NewGoGitRepo(path string, clockLoaders []ClockLoader) (*GoGitRepo, error) {
diff --git a/repository/repo.go b/repository/repo.go
index 93069d61537f97fc1fe2704209630c5b3610f2eb..4b45a1c5c77c47b57dce2a3c7c2d8417a6f0fea7 100644
--- a/repository/repo.go
+++ b/repository/repo.go
@@ -5,7 +5,6 @@ import (
 	"errors"
 
 	"github.com/MichaelMure/git-bug/util/lamport"
-	"github.com/go-git/go-billy/v5"
 )
 
 var (
@@ -21,7 +20,6 @@ type Repo interface {
 	RepoKeyring
 	RepoCommon
 	RepoData
-	RepoStorage
 }
 
 // ClockedRepo is a Repo that also has Lamport clocks
@@ -66,11 +64,6 @@ type RepoCommon interface {
 	GetRemotes() (map[string]string, error)
 }
 
-type RepoStorage interface {
-	// Storage returns a billy.Filesystem giving access to $RepoPath/.git/git-bug
-	Storage() billy.Filesystem
-}
-
 // RepoData give access to the git data storage
 type RepoData interface {
 	// FetchRefs fetch git refs from a remote
@@ -152,10 +145,4 @@ type TestedRepo interface {
 type repoTest interface {
 	// AddRemote add a new remote to the repository
 	AddRemote(name string, url string) error
-
-	// GetLocalRemote return the URL to use to add this repo as a local remote
-	GetLocalRemote() string
-
-	// EraseFromDisk delete this repository entirely from the disk
-	EraseFromDisk() error
 }