bug: refactor to limit abstraction leak and to have a more reusable code for the UIs

1 files changed, 6 insertions, 49 deletions

diff --git a/commands/pull.go b/commands/pull.go
index 83c2101a..ac6a3732 100644
--- a/commands/pull.go
+++ b/commands/pull.go
@@ -19,62 +19,19 @@ func runPull(cmd *cobra.Command, args []string) error {
 
 	fmt.Printf("Fetching remote ...\n\n")
 
-	if err := repo.FetchRefs(remote, bug.BugsRefPattern+"*", bug.BugsRemoteRefPattern+"*"); err != nil {
+	if err := bug.Fetch(repo, remote); err != nil {
 		return err
 	}
 
 	fmt.Printf("\nMerging data ...\n\n")
 
-	remoteRefSpec := fmt.Sprintf(bug.BugsRemoteRefPattern, remote)
-	remoteRefs, err := repo.ListRefs(remoteRefSpec)
-
-	if err != nil {
-		return err
-	}
-
-	for _, ref := range remoteRefs {
-		remoteRef := fmt.Sprintf(bug.BugsRemoteRefPattern, remote) + ref
-		remoteBug, err := bug.ReadBug(repo, remoteRef)
-
-		if err != nil {
-			return err
-		}
-
-		// Check for error in remote data
-		if !remoteBug.IsValid() {
-			fmt.Printf("%s: %s\n", remoteBug.HumanId(), "invalid remote data")
-			continue
-		}
-
-		localRef := bug.BugsRefPattern + remoteBug.Id()
-		localExist, err := repo.RefExist(localRef)
-
-		// the bug is not local yet, simply create the reference
-		if !localExist {
-			err := repo.CopyRef(remoteRef, localRef)
-
-			if err != nil {
-				return err
-			}
-
-			fmt.Printf("%s: %s\n", remoteBug.HumanId(), "new")
-			continue
-		}
-
-		localBug, err := bug.ReadBug(repo, localRef)
-
-		if err != nil {
-			return err
-		}
-
-		updated, err := localBug.Merge(repo, remoteBug)
-
-		if err != nil {
-			return err
+	for merge := range bug.MergeAll(repo, remote) {
+		if merge.Err != nil {
+			return merge.Err
 		}
 
-		if updated {
-			fmt.Printf("%s: %s\n", remoteBug.HumanId(), "updated")
+		if merge.Status != bug.MsgNothing {
+			fmt.Printf("%s: %s\n", merge.HumanId, merge.Status)
 		}
 	}