temp changes

Author: vincetiu8

migration1/after/identity/version.go

@@ -15,6 +15,8 @@ import (
 
 const formatVersion = 1
 
+var ErrIncorrectIdentityFormatVersion = fmt.Errorf("unknown 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
@@ -102,7 +104,7 @@ func (v *Version) UnmarshalJSON(data []byte) error {
 	}
 
 	if aux.FormatVersion != formatVersion {
-		return fmt.Errorf("unknown format version %v", aux.FormatVersion)
+		return ErrIncorrectIdentityFormatVersion
 	}
 
 	v.time = aux.Time

migration1/migration1.go

@@ -3,6 +3,8 @@ package migration1
 import (
 	"fmt"
 
+	"github.com/pkg/errors"
+
 	afterbug "github.com/MichaelMure/git-bug-migration/migration1/after/bug"
 	afteridentity "github.com/MichaelMure/git-bug-migration/migration1/after/identity"
 	afterrepo "github.com/MichaelMure/git-bug-migration/migration1/after/repository"
@@ -28,7 +30,7 @@ func (m *Migration1) Run(repoPath string) error {
 func (m *Migration1) migrate(repo afterrepo.ClockedRepo) error {
 	err := m.readIdentities(repo)
 	if err != nil {
-		fmt.Printf("Error while applying migration")
+		fmt.Printf("Error while applying migration\n")
 		// stop the migration
 		return nil
 	}
@@ -37,7 +39,7 @@ func (m *Migration1) migrate(repo afterrepo.ClockedRepo) error {
 	for streamedBug := range afterbug.ReadAllLocal(repo) {
 		if streamedBug.Err != nil {
 			if streamedBug.Err != afterbug.ErrInvalidFormatVersion {
-				fmt.Printf("Got error when reading bug: %q\n", streamedBug.Err)
+				fmt.Printf("got error when reading bug, assuming data is already migrated: %q\n", streamedBug.Err)
 			} else {
 				fmt.Printf("skipping bug, already updated\n")
 			}
@@ -77,9 +79,14 @@ func (m *Migration1) migrate(repo afterrepo.ClockedRepo) error {
 
 func (m *Migration1) readIdentities(repo afterrepo.ClockedRepo) error {
 	for streamedIdentity := range afteridentity.ReadAllLocal(repo) {
-		if streamedIdentity.Err != nil {
-			fmt.Printf("Got error when reading identity: %q", streamedIdentity.Err)
-			return streamedIdentity.Err
+		if err := streamedIdentity.Err; err != nil {
+			if errors.Is(err, afteridentity.ErrIncorrectIdentityFormatVersion) {
+				fmt.Print("skipping identity, already updated\n")
+				continue
+			} else {
+				fmt.Printf("Got error when reading identity: %q", streamedIdentity.Err)
+				return streamedIdentity.Err
+			}
 		}
 		m.allIdentities = append(m.allIdentities, streamedIdentity.Identity)
 	}

migration3/migration3.go

@@ -47,7 +47,7 @@ func (m *Migration3) migrate(oldRepo beforerepo.ClockedRepo, newRepo afterrepo.C
 				fmt.Print("skipping bug, already updated\n")
 				continue
 			} else {
-				return streamedIdentity.Err
+				fmt.Printf("got error, assuming identity already migrated: %q", streamedIdentity.Err)
 			}
 		}
 		oldIdentity := streamedIdentity.Identity
@@ -73,21 +73,19 @@ 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
+			if streamedBug.Err != beforebug.ErrInvalidFormatVersion {
+				fmt.Printf("got error when reading bug, assuming data is already migrated: %q\n", streamedBug.Err)
 			} else {
-				return streamedBug.Err
+				fmt.Printf("skipping bug, already updated\n")
 			}
+			continue
 		}
+
 		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
@@ -108,10 +106,6 @@ func (m *Migration3) migrate(oldRepo beforerepo.ClockedRepo, newRepo afterrepo.C
 }
 
 func migrateBug(oldBug *beforebug.Bug, migratedIdentities map[beforeentity.Id]*afteridentity.Identity) (*afterbug.Bug, error) {
-	if oldBug.Packs[0].FormatVersion != 2 {
-		return nil, nil
-	}
-
 	// Making a new bug
 	newBug := afterbug.NewBug()