implement pull/merge

1 files changed, 25 insertions, 1 deletions

diff --git a/repository/mock_repo.go b/repository/mock_repo.go
index f526c3dc..1ac2c6e7 100644
--- a/repository/mock_repo.go
+++ b/repository/mock_repo.go
@@ -53,7 +53,7 @@ func (r *mockRepoForTest) PushRefs(remote string, refPattern string) error {
 	return nil
 }
 
-func (r *mockRepoForTest) PullRefs(remote string, refPattern string, remoteRefPattern string) error {
+func (r *mockRepoForTest) FetchRefs(remote string, refPattern string, remoteRefPattern string) error {
 	return nil
 }
 
@@ -107,6 +107,22 @@ func (r *mockRepoForTest) UpdateRef(ref string, hash util.Hash) error {
 	return nil
 }
 
+func (r *mockRepoForTest) RefExist(ref string) (bool, error) {
+	_, exist := r.refs[ref]
+	return exist, nil
+}
+
+func (r *mockRepoForTest) CopyRef(source string, dest string) error {
+	hash, exist := r.refs[source]
+
+	if !exist {
+		return errors.New("Unknown ref")
+	}
+
+	r.refs[dest] = hash
+	return nil
+}
+
 func (r *mockRepoForTest) ListRefs(refspec string) ([]string, error) {
 	keys := make([]string, len(r.refs))
 
@@ -160,3 +176,11 @@ func (r *mockRepoForTest) ListEntries(hash util.Hash) ([]TreeEntry, error) {
 
 	return readTreeEntries(data)
 }
+
+func (r *mockRepoForTest) FindCommonAncestor(hash1 util.Hash, hash2 util.Hash) (util.Hash, error) {
+	panic("implement me")
+}
+
+func (r *mockRepoForTest) GetTreeHash(commit util.Hash) (util.Hash, error) {
+	panic("implement me")
+}