Merge pull request #5 from RohitRavindra-dev/feat/v1/revert

feat: revert now reverts overlook

Author: RohitRavindra-dev

cmd/revert.go

@@ -0,0 +1,26 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/RohitRavindra-dev/devlocal/internal/filesystem"
+	"github.com/RohitRavindra-dev/devlocal/internal/service/revert"
+	"github.com/spf13/cobra"
+)
+
+var revertCmd = &cobra.Command{
+	Use:   "revert",
+	Short: "Revert .devlocal changes that reverts overlooks and dev patches",
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		fmt.Println("[Started] to revert devlocal changes")
+
+		return filesystem.ValidateDevLocalFilesystem()
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return revert.Run()
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(revertCmd)
+}

internal/service/apply/applicator.go

@@ -2,13 +2,14 @@ package apply
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/RohitRavindra-dev/devlocal/internal/filesystem"
 	"github.com/RohitRavindra-dev/devlocal/internal/git"
 )
 
 func applyOverlook(overlookFiles []string) error {
-	fmt.Println("[Running] git skip worktree for files: ", overlookFiles)
+	fmt.Println("[Running] git skip worktree for files: ", strings.Join(overlookFiles, ", "))
 	if len(overlookFiles) == 0 {
 		fmt.Println("[Warn] No files found in overlook section of devlocal config, skipping")
 		return nil

internal/service/revert/reverter.go

@@ -0,0 +1,45 @@
+package revert
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/RohitRavindra-dev/devlocal/internal/filesystem"
+	"github.com/RohitRavindra-dev/devlocal/internal/git"
+)
+
+func revertOverlook(overlookedFiles []string) error {
+	fmt.Println("[Running] revert git skip worktree for files: ", strings.Join(overlookedFiles, ", "))
+
+	if len(overlookedFiles) == 0 {
+		fmt.Println("[Warn] No files found in overlook section of devlocal config, skipping")
+		return nil
+	}
+
+	if err := git.NoSkipWorkTree(overlookedFiles); err != nil {
+		return err
+	}
+
+	fmt.Println("[Completed] revert git skip worktree")
+
+	return nil
+
+}
+
+func Run() error {
+
+	config, err := filesystem.LoadDevlocalConfig()
+
+	if err != nil {
+		return err
+	}
+
+	// revert overlooked files
+	if overlookRevertErr := revertOverlook(config.Overlook); overlookRevertErr != nil {
+		return overlookRevertErr
+	}
+
+	//TODO: revert patches
+
+	return nil
+}