migration3: minor cleanups

Author: MichaelMure

migration3/migration3.go

@@ -17,16 +17,16 @@ import (
 type Migration3 struct{}
 
 func (m *Migration3) Description() string {
-	return "Migrate bridge credentials from the global git config to a keyring"
+	return "Make bug and identities independent from the storage by making the ID generation self-contained"
 }
 
 func (m *Migration3) Run(repoPath string) error {
-	oldRepo, err := beforerepo.NewGitRepo(repoPath, nil)
+	oldRepo, err := beforerepo.NewGoGitRepo(repoPath, nil)
 	if err != nil {
 		return err
 	}
 
-	newRepo, err := afterrepo.NewGitRepo(repoPath, nil)
+	newRepo, err := afterrepo.NewGoGitRepo(repoPath, nil)
 	if err != nil {
 		return err
 	}
@@ -42,7 +42,7 @@ func (m *Migration3) migrate(oldRepo beforerepo.ClockedRepo, newRepo afterrepo.C
 
 	for streamedIdentity := range identities {
 		oldIdentity := streamedIdentity.Identity
-		fmt.Printf("identity %s:\n", oldIdentity.Id().Human())
+		fmt.Printf("identity %s: ", oldIdentity.Id().Human())
 		newIdentity, err := afteridentity.NewIdentityFull(
 			newRepo,
 			oldIdentity.Name(),
@@ -64,12 +64,11 @@ func (m *Migration3) migrate(oldRepo beforerepo.ClockedRepo, newRepo afterrepo.C
 
 	for streamedBug := range bugs {
 		oldBug := streamedBug.Bug
-		fmt.Printf("bug %s:\n", oldBug.Id().Human())
+		fmt.Printf("bug %s: ", oldBug.Id().Human())
 		newBug, err := migrateBug(oldBug, migratedIdentities)
 		if err != nil {
 			return err
 		}
-		fmt.Println(newBug)
 		if err := newBug.Commit(newRepo); err != nil {
 			return err
 		}

migration3/migration3_test.go

@@ -36,9 +36,9 @@ func TestMigrate23(t *testing.T) {
 	err = os.Chdir(dir)
 	require.Nil(t, err, "got error when opening temporary repository folder")
 
-	oldRepo, err := beforerepo.InitGitRepo(dir)
+	oldRepo, err := beforerepo.InitGoGitRepo(dir)
 	require.Nil(t, err, "got error when initializing old repository")
-	newRepo, err := afterrepo.InitGitRepo(dir)
+	newRepo, err := afterrepo.NewGoGitRepo(dir, nil)
 	require.Nil(t, err, "got error when initializing new repository")
 
 	oldVinc := beforeidentity.NewIdentityFull(