fix bugs

Author: vincetiu8

migration3/README.md

@@ -3,5 +3,7 @@ git-bug 11f3991e2be17a5e0740c429f48961bfe468c23a
 
 Changes:
 - Exposed formatVersion of OperationPack
+- Removed error wrapping for bug and identity decoding
+- Added custom error message for invalid formatVersion
 
 Usage: This version is used to update the bug and identity ids to meet the new standards

migration3/before/bug/operation_pack.go

@@ -13,6 +13,8 @@ import (
 // 2: no more legacy identities
 const formatVersion = 2
 
+var ErrInvalidFormatVersion = fmt.Errorf("invalid format version")
+
 // OperationPack represent an ordered set of operation to apply
 // to a Bug. These operations are stored in a single Git commit.
 //
@@ -50,10 +52,10 @@ func (opp *OperationPack) UnmarshalJSON(data []byte) error {
 	opp.FormatVersion = aux.Version
 
 	if aux.Version < formatVersion {
-		return fmt.Errorf("outdated repository format, please use https://github.com/MichaelMure/git-bug-migration to upgrade")
+		return ErrInvalidFormatVersion
 	}
 	if aux.Version > formatVersion {
-		return fmt.Errorf("your version of git-bug is too old for this repository (version %v), please upgrade to the latest version", aux.Version)
+		return ErrInvalidFormatVersion
 	}
 
 	for _, raw := range aux.Operations {

migration3/before/identity/version.go

@@ -16,6 +16,8 @@ import (
 // 1: original format
 const formatVersion = 1
 
+var ErrInvalidFormatVersion = fmt.Errorf("invalid format version")
+
 // Version is a complete set of information about an Identity at a point in time.
 type Version struct {
 	// The lamport time at which this version become effective
@@ -103,7 +105,7 @@ func (v *Version) UnmarshalJSON(data []byte) error {
 	}
 
 	if aux.FormatVersion != formatVersion {
-		return fmt.Errorf("unknown format version %v", aux.FormatVersion)
+		return ErrInvalidFormatVersion
 	}
 
 	v.time = aux.Time

migration3/migration3.go

@@ -1,6 +1,7 @@
 package migration3
 
 import (
+	"errors"
 	"fmt"
 
 	afterbug "github.com/MichaelMure/git-bug-migration/migration3/after/bug"
@@ -41,6 +42,14 @@ func (m *Migration3) migrate(oldRepo beforerepo.ClockedRepo, newRepo afterrepo.C
 	migratedIdentities := map[beforeentity.Id]*afteridentity.Identity{}
 
 	for streamedIdentity := range identities {
+		if streamedIdentity.Err != nil {
+			if errors.Is(streamedIdentity.Err, beforeidentity.ErrInvalidFormatVersion) {
+				fmt.Print("skipping bug, already updated\n")
+				continue
+			} else {
+				return streamedIdentity.Err
+			}
+		}
 		oldIdentity := streamedIdentity.Identity
 		fmt.Printf("identity %s: ", oldIdentity.Id().Human())
 		newIdentity, err := afteridentity.NewIdentityFull(
@@ -63,11 +72,22 @@ func (m *Migration3) migrate(oldRepo beforerepo.ClockedRepo, newRepo afterrepo.C
 	}
 
 	for streamedBug := range bugs {
+		if streamedBug.Err != nil {
+			if errors.Is(streamedBug.Err, beforebug.ErrInvalidFormatVersion) {
+				fmt.Print("skipping bug, already updated\n")
+				continue
+			} else {
+				return streamedBug.Err
+			}
+		}
 		oldBug := streamedBug.Bug
 		fmt.Printf("bug %s: ", oldBug.Id().Human())
 		newBug, err := migrateBug(oldBug, migratedIdentities)
 		if err != nil {
 			return err
+		} else if newBug == nil {
+			fmt.Print("skipping bug, already updated\n")
+			return nil
 		}
 		if err := newBug.Commit(newRepo); err != nil {
 			return err