feat: patching now runs git apply

Author: RohitRavindra-dev

cmd/apply.go

@@ -17,7 +17,6 @@ var applyCmd = &cobra.Command{
 		// check for setup
 		return filesystem.ValidateDevLocalFilesystem()
 	},
-
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return apply.Run()
 	},

internal/git/patches.go

@@ -2,12 +2,23 @@ package git
 
 import "fmt"
 
-func Generate(files []string) error {
+func checkPatchValidity(patchFile string) error {
+	checkApplyArgs := append(
+		[]string{
+			"apply",
+			"--check",
+		},
+		patchFile,
+	)
 
-	filesToDiff := sanitizeToTrackedFiles(files)
+	return executeGitCommand(checkApplyArgs)
+}
 
-	if len(filesToDiff) == 0 {
-		return fmt.Errorf("[Error] No files provided to generate patches that are being tracked by git")
+func ApplyPatches(filesToPatch []string) error {
+	for _, filePath := range filesToPatch {
+		if err := checkPatchValidity(filePath); err != nil {
+			fmt.Printf("\t[Error] while trying to patch file %s : %s\n", filePath, err.Error())
+		}
 	}
 
 	return nil

internal/git/utils.go

@@ -11,7 +11,7 @@ func executeGitCommand(args []string) error {
 	out, err := cmd.CombinedOutput()
 
 	if err != nil {
-		return fmt.Errorf("[Error] Failed to run Skip Worktree: %s", out)
+		return fmt.Errorf("Failed to run git command: %s", out)
 	}
 
 	return nil

internal/service/apply/applicator.go

@@ -15,7 +15,16 @@ func applyPatches(patchFiles []string) error {
 	}
 
 	fmt.Println("[Running] patch for files: ", strings.Join(patchFiles, ", "))
+	if len(patchFiles) == 0 {
+		fmt.Println("[Warn] No patche files found in patches section of devloca config, skipping")
+		return nil
+	}
+
+	if err := git.ApplyPatches(patchFiles); err != nil {
+		return err
+	}
 
+	fmt.Println("[Completed] applying patches")
 	return nil
 }
 
@@ -53,5 +62,6 @@ func Run() error {
 		return overlookErr
 	}
 
+	fmt.Println("[Completed] applying devlocal changes")
 	return nil
 }