move Hash in /util/

Michael Muré created

Change summary

bug/comment.go     | 3 +++
bug/person.go      | 3 ++-
repository/git.go  | 5 +++--
repository/repo.go | 4 ++--
util/hash.go       | 3 +++
5 files changed, 13 insertions(+), 5 deletions(-)

Detailed changes

bug/comment.go 🔗 

@@ -1,6 +1,9 @@
 package bug
 
+import "github.com/MichaelMure/git-bug/util"
+
 type Comment struct {
 	Author  Person
 	Message string
+	Media   []util.Hash
 }

bug/person.go 🔗 

@@ -3,6 +3,7 @@ package bug
 import (
 	"encoding/json"
 	"github.com/MichaelMure/git-bug/repository"
+	"github.com/MichaelMure/git-bug/util"
 	"github.com/pkg/errors"
 )
 
@@ -34,7 +35,7 @@ func GetUser(repo repository.Repo) (Person, error) {
 
 // Store will convert the Person to JSON and store it in the internal git datastore
 // Return the git hash handle of the data
-func (person *Person) Store(repo repository.Repo) (repository.Hash, error) {
+func (person *Person) Store(repo repository.Repo) (util.Hash, error) {
 
 	data, err := json.Marshal(person)

repository/git.go 🔗 

@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"crypto/sha1"
 	"fmt"
+	"github.com/MichaelMure/git-bug/util"
 	"io"
 	"os"
 	"os/exec"
@@ -115,14 +116,14 @@ func (repo *GitRepo) PushRefs(remote string, refPattern string) error {
 }
 
 // StoreData will store arbitrary data and return the corresponding hash
-func (repo *GitRepo) StoreData(data []byte) (Hash, error) {
+func (repo *GitRepo) StoreData(data []byte) (util.Hash, error) {
 	var stdin = bytes.NewReader(data)
 	var stdout bytes.Buffer
 	var stderr bytes.Buffer
 
 	err := repo.runGitCommandWithIO(stdin, &stdout, &stderr, "hash-object", "--stdin", "-w")
 
-	return Hash(stdout.String()), err
+	return util.Hash(stdout.String()), err
 }
 
 /*

repository/repo.go 🔗 

@@ -1,7 +1,7 @@
 // Package repository contains helper methods for working with a Git repo.
 package repository
 
-type Hash string
+import "github.com/MichaelMure/git-bug/util"
 
 // Repo represents a source code repository.
 type Repo interface {
@@ -24,5 +24,5 @@ type Repo interface {
 	PushRefs(remote string, refPattern string) error
 
 	// StoreData will store arbitrary data and return the corresponding hash
-	StoreData([]byte) (Hash, error)
+	StoreData([]byte) (util.Hash, error)
 }