[repos] Fix revisions not populated

Author: kostorr

core/repos/repo.go

@@ -198,13 +198,16 @@ func (r *Repo) refresh() error {
 		return errors.New(err.Error() + ": " + r.GetIdentifier() + " | revision: " + r.Revision)
 	}
 
-	// git updates, gather revisions and update template cache
-	if err != git.NoErrAlreadyUpToDate || len(templatesCache) == 0 {
-		err = r.gatherRevisions()
+	// gather revisions on update or if empty
+	if err != git.NoErrAlreadyUpToDate || r.Revisions == nil {
+		err = r.gatherRevisions(ref)
 		if err != nil {
 			return err
 		}
+	}
 
+	// populate workflows on update or if empty
+	if err != git.NoErrAlreadyUpToDate || len(templatesCache) == 0 {
 		err = r.populateWorkflows(r.getDefaultRevision(), true)
 		if err != nil {
 			return err
@@ -214,11 +217,14 @@ func (r *Repo) refresh() error {
 	return nil
 }
 
-func (r *Repo) gatherRevisions() error {
+func (r *Repo) gatherRevisions(ref *git.Repository) error {
 
-	ref, err := git.PlainOpen(r.getCloneDir())
-	if err != nil {
-		return errors.New(err.Error() + ": " + r.GetIdentifier())
+	var err error
+	if ref == nil {
+		ref, err = git.PlainOpen(r.getCloneDir())
+		if err != nil {
+			return errors.New(err.Error() + ": " + r.GetIdentifier())
+		}
 	}
 
 	var revs []string

core/repos/repomanager.go

@@ -259,18 +259,17 @@ func (manager *RepoManager) AddRepo(repoPath string, defaultRevision string) (st
 			NoCheckout: true,
 		})
 
-		if err != nil {
-			if err == git.ErrRepositoryAlreadyExists {
-				// This was an existing repo, so let's make sure it's up to date
-				err = repo.refresh()
-				if err != nil {
-					return "", false, err
-				}
-			} else {
-				cleanErr := cleanCloneParentDirs(repo.getCloneParentDirs())
-				if cleanErr != nil {
-					return "", false, errors.New(err.Error() + " Failed to clean directories: " + cleanErr.Error())
-				}
+		if err != nil && err != git.ErrRepositoryAlreadyExists{
+			// Something went wrong, clean up
+			cleanErr := cleanCloneParentDirs(repo.getCloneParentDirs())
+			if cleanErr != nil {
+				return "", false, errors.New(err.Error() + " Failed to clean directories: " + cleanErr.Error())
+			}
+			return "", false, err
+		} else {
+			// Make sure the repo is up to date and its structs are populated
+			err = repo.refresh()
+			if err != nil {
 				return "", false, err
 			}
 		}