feat: basic reversal for patches

Author: RohitRavindra-dev

internal/filesystem/initialization.go

@@ -121,7 +121,7 @@ func ValidatePatchesSetup() error {
 
 	if pderr != nil || !pdinfo.IsDir() {
 		return fmt.Errorf("%s directory has gone missing from inside your devlocal setup!!\n"+
-			"\tIf you think something is wrong run `devlocal cleanup` and reinit.\n\t\t[Note] this will remove the configs in %s so best backitup\n", config.PATCHES_DIR, config.CONFIG_FILE_NAME)
+			"\tIf you think something is wrong run `devlocal cleanup` and reinit.\n\t\t[Note] this will remove the configs in %s so best backitup", config.PATCHES_DIR, config.CONFIG_FILE_NAME)
 	}
 
 	return nil

internal/git/patches.go

@@ -14,6 +14,19 @@ func checkPatchValidity(filePath string) error {
 	return executeGitCommand(checkApplyArgs)
 }
 
+func checkRevertPatchValidity(filePath string) error {
+	checkApplyArgs := append(
+		[]string{
+			"apply",
+			"--check",
+			"--reverse",
+		},
+		filePath,
+	)
+
+	return executeGitCommand(checkApplyArgs)
+}
+
 func patchFile(filePath string) error {
 	patchFileArgs := append(
 		[]string{
@@ -25,6 +38,18 @@ func patchFile(filePath string) error {
 	return executeGitCommand(patchFileArgs)
 }
 
+func unpatchFile(filePath string) error {
+	patchFileArgs := append(
+		[]string{
+			"apply",
+			"--reverse",
+		},
+		filePath,
+	)
+
+	return executeGitCommand(patchFileArgs)
+}
+
 func ApplyPatches(filesToPatch []string) error {
 	for _, filePath := range filesToPatch {
 		if err := checkPatchValidity(filePath); err != nil {
@@ -38,3 +63,17 @@ func ApplyPatches(filesToPatch []string) error {
 
 	return nil
 }
+
+func RevertPatches(filesToUnpatch []string) error {
+	for _, filePath := range filesToUnpatch {
+		if err := checkRevertPatchValidity(filePath); err != nil {
+			fmt.Printf("\t[Error] while trying to unpatch file %s : %s\n", filePath, err.Error())
+			continue
+		}
+		if err := unpatchFile(filePath); err != nil {
+			fmt.Printf("\t[Error] while trying to unpatch file %s : %s\n", filePath, err.Error())
+		}
+	}
+
+	return nil
+}

internal/service/apply/applicator.go

@@ -16,7 +16,7 @@ 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")
+		fmt.Println("[Warn] No patch files found in patches section of devlocal config, skipping")
 		return nil
 	}
 

internal/service/revert/reverter.go

@@ -8,6 +8,26 @@ import (
 	"github.com/RohitRavindra-dev/devlocal/internal/git"
 )
 
+func revertPatches(patchedfiles []string) error {
+	if err := filesystem.ValidatePatchesSetup(); err != nil {
+		return err
+	}
+
+	fmt.Println("[Running] revert patches for files: ", strings.Join(patchedfiles, ", "))
+
+	if len(patchedfiles) == 0 {
+		fmt.Println("[Warn] No patch files found in patches section of devlocal config, skipping")
+		return nil
+	}
+
+	if err := git.RevertPatches(patchedfiles); err != nil {
+		return err
+	}
+
+	fmt.Println("[Completed] reverting patches")
+	return nil
+}
+
 func revertOverlook(overlookedFiles []string) error {
 	fmt.Println("[Running] revert git skip worktree for files: ", strings.Join(overlookedFiles, ", "))
 
@@ -34,12 +54,16 @@ func Run() error {
 		return err
 	}
 
+	//revert patches applied
+	if patchesRevertErr := revertPatches(config.Patches); patchesRevertErr != nil {
+		return patchesRevertErr
+	}
+
 	// revert overlooked files
 	if overlookRevertErr := revertOverlook(config.Overlook); overlookRevertErr != nil {
 		return overlookRevertErr
 	}
 
-	//TODO: revert patches
-
+	fmt.Println("[Completed] reverting devlocal changes")
 	return nil
 }

todos.md

@@ -0,0 +1,8 @@
+# todos
+
+1. Apply:
+- revert
+- status
+- conflicts
+- overlook
+- config