Return error in source_control.go

Author: Crayon2000

cli/main.go

@@ -356,6 +356,7 @@ func main() {
 						app.QueueUpdateDraw(func() {
 							_, _ = outputView.Write([]byte("Repository creation failed: " + err.Error() + "\n"))
 						})
+						outputView.ScrollToEnd()
 						continue
 					}
 				}
@@ -545,7 +546,11 @@ func main() {
 			fmt.Println("Some arguments are missing for the cloneandpush command")
 			os.Exit(1)
 		}
-		CloneAndPush(*sourcerepo, *sourceusername, *sourcepassword, *destrepo, *destusername, *destpassword, *hasWiki)
+		err := CloneAndPush(*sourcerepo, *sourceusername, *sourcepassword, *destrepo, *destusername, *destpassword, *hasWiki)
+		if err != nil {
+			fmt.Fprintf(os.Stderr, "CloneAndPush failed: %v\n", err)
+			os.Exit(1)
+		}
 
 	default:
 		fmt.Fprintln(os.Stderr, "Unknown command")

cli/source_control.go

@@ -11,8 +11,7 @@ import (
 )
 
 // cloneRepository clones a repository to a local directory.
-func cloneRepository(repo, directory, username, password string) {
-	var err error
+func cloneRepository(repo, directory, username, password string) error {
 	cloneOptions := &git.CloneOptions{
 		URL: repo,
 	}
@@ -25,39 +24,35 @@ func cloneRepository(repo, directory, username, password string) {
 			Password: password,
 		}
 	}
-	_, err = git.PlainClone(directory, true, cloneOptions)
+	_, err := git.PlainClone(directory, true, cloneOptions)
 	if err != nil {
-		fmt.Printf("Error cloning repository: %v\n", err)
-		os.Exit(1)
+		return fmt.Errorf("error cloning repository: %w", err)
 	}
-	fmt.Println("Repository cloned successfully.")
+	return nil
 }
 
 // addRemote adds a new remote to the local repository.
-func addRemote(directory, repo string) {
+func addRemote(directory, repo string) error {
 	r, err := git.PlainOpen(directory)
 	if err != nil {
-		fmt.Printf("Error opening repository: %v\n", err)
-		os.Exit(1)
+		return fmt.Errorf("error opening repository: %w", err)
 	}
 
 	_, err = r.CreateRemote(&config.RemoteConfig{
 		Name: "origin2",
 		URLs: []string{repo},
 	})
 	if err != nil {
-		fmt.Printf("Error adding remote: %v\n", err)
-		os.Exit(1)
+		return fmt.Errorf("error adding remote: %w", err)
 	}
-	fmt.Println("Remote added successfully.")
+	return nil
 }
 
 // pushToRemote pushes the local repository to the specified remote.
-func pushToRemote(directory, username, password string) {
+func pushToRemote(directory, username, password string) error {
 	r, err := git.PlainOpen(directory)
 	if err != nil {
-		fmt.Printf("Error opening repository: %v\n", err)
-		os.Exit(1)
+		return fmt.Errorf("error opening repository: %w", err)
 	}
 
 	pushOptions := &git.PushOptions{
@@ -79,14 +74,13 @@ func pushToRemote(directory, username, password string) {
 
 	err = r.Push(pushOptions)
 	if err != nil {
-		fmt.Printf("Error pushing to remote: %v\n", err)
-		os.Exit(1)
+		return fmt.Errorf("error pushing to remote: %w", err)
 	}
-	fmt.Println("Pushed to remote successfully.")
+	return nil
 }
 
 // CloneAndPush clones a repository from the source URL and pushes it to the destination URL.
-func CloneAndPush(sourcerepo, sourceusername, sourcepassword, destrepo, destusername, destpassword string, hasWiki bool) {
+func CloneAndPush(sourcerepo, sourceusername, sourcepassword, destrepo, destusername, destpassword string, hasWiki bool) error {
 	cnpdirectory := "temp.git"
 
 	defer func() {
@@ -96,9 +90,18 @@ func CloneAndPush(sourcerepo, sourceusername, sourcepassword, destrepo, destuser
 		}
 	}()
 
-	cloneRepository(sourcerepo, cnpdirectory, sourceusername, sourcepassword)
-	addRemote(cnpdirectory, destrepo)
-	pushToRemote(cnpdirectory, destusername, destpassword)
+	if err := cloneRepository(sourcerepo, cnpdirectory, sourceusername, sourcepassword); err != nil {
+		return fmt.Errorf("clone source repo: %w", err)
+	}
+	fmt.Println("Repository cloned successfully.")
+	if err := addRemote(cnpdirectory, destrepo); err != nil {
+		return fmt.Errorf("add destination remote: %w", err)
+	}
+	fmt.Println("Remote added successfully.")
+	if err := pushToRemote(cnpdirectory, destusername, destpassword); err != nil {
+		return fmt.Errorf("push to destination remote: %w", err)
+	}
+	fmt.Println("Pushed to remote successfully.")
 
 	if hasWiki {
 		err := os.RemoveAll(cnpdirectory)
@@ -108,8 +111,19 @@ func CloneAndPush(sourcerepo, sourceusername, sourcepassword, destrepo, destuser
 
 		sourceWikiUrl := strings.Replace(sourcerepo, ".git", ".wiki.git", 1)
 		destWikiUrl := strings.Replace(destrepo, ".git", ".wiki.git", 1)
-		cloneRepository(sourceWikiUrl, cnpdirectory, sourceusername, sourcepassword)
-		addRemote(cnpdirectory, destWikiUrl)
-		pushToRemote(cnpdirectory, destusername, destpassword)
+		if err := cloneRepository(sourceWikiUrl, cnpdirectory, sourceusername, sourcepassword); err != nil {
+			return fmt.Errorf("clone source wiki: %w", err)
+		}
+		fmt.Println("Repository wiki cloned successfully.")
+		if err := addRemote(cnpdirectory, destWikiUrl); err != nil {
+			return fmt.Errorf("add wiki destination remote: %w", err)
+		}
+		fmt.Println("Remote wiki added successfully.")
+		if err := pushToRemote(cnpdirectory, destusername, destpassword); err != nil {
+			return fmt.Errorf("push wiki to destination remote: %w", err)
+		}
+		fmt.Println("Pushed wiki to remote successfully.")
 	}
+
+	return nil
 }