almost there on a first git am attemptv0.22.66

1 files changed, 39 insertions, 25 deletions

diff --git a/applyPatch.go b/applyPatch.go
index bd55cc3..3610c06 100644
--- a/applyPatch.go
+++ b/applyPatch.go
@@ -7,6 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
@@ -89,36 +90,49 @@ func applyPatchset(pset *forgepb.Patchset) error {
 			log.Info(fullname, "save failed", err)
 			continue
 		} else {
+			basedir, filename := filepath.Split(fullname)
+			cmd := []string{"git", "am", filename}
+			log.Info("Should run: at", basedir, ":", cmd)
+			log.Info(basedir, filename)
+			result := shell.PathRun(basedir, cmd)
 			/*
-				// log.Info("pset filename FILENAME IS REAL?", p.Filename, pset.Name, pset.Comment)
-				basepath, filename := filepath.Split(p.Filename)
-				fullpath := filepath.Join(me.forge.GetGoSrc(), basepath)
-				log.Info("pset filename FILENAME IS REAL? fullpath", fullpath)
-				fullTmpdir := filepath.Join(tmpdir, basepath)
-				err := os.MkdirAll(fullTmpdir, os.ModePerm)
 				if err != nil {
-					log.Info("applyPathces() MkdirAll failed for", fullTmpdir)
-					log.Info("applyPathces() MkdirAll failed err", err)
-					everythingworked = false
-					continue
-				}
-				log.Info("pset filename FILENAME IS REAL? tmp fullTmpdir", fullTmpdir)
-				tmpname := filepath.Join(fullTmpdir, filename)
-				raw, _ := os.OpenFile(tmpname, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
-				raw.Write(p.Data)
-				raw.Close()
-			*/
-			/*
-				FIX THIS
-				cmd := []string{"git", "am", fullname}
-				result := shell.PathRun(fullpath, cmd)
-				if result.Exit != 0 {
-					log.Info("cmd failed", cmd, result.Exit)
-					everythingworked = false
+					log.Info("git am failed", err)
 				}
 			*/
+			for _, line := range result.Stdout {
+				log.Warn("stdout:", line)
+			}
+			for _, line := range result.Stderr {
+				log.Warn("stderr:", line)
+			}
 		}
-		// until 'git am' works
+		/*
+			// log.Info("pset filename FILENAME IS REAL?", p.Filename, pset.Name, pset.Comment)
+			basepath, filename := filepath.Split(p.Filename)
+			fullpath := filepath.Join(me.forge.GetGoSrc(), basepath)
+			log.Info("pset filename FILENAME IS REAL? fullpath", fullpath)
+			fullTmpdir := filepath.Join(tmpdir, basepath)
+			err := os.MkdirAll(fullTmpdir, os.ModePerm)
+			if err != nil {
+				log.Info("applyPathces() MkdirAll failed for", fullTmpdir)
+				log.Info("applyPathces() MkdirAll failed err", err)
+				everythingworked = false
+				continue
+			}
+			log.Info("pset filename FILENAME IS REAL? tmp fullTmpdir", fullTmpdir)
+			tmpname := filepath.Join(fullTmpdir, filename)
+			raw, _ := os.OpenFile(tmpname, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+			raw.Write(p.Data)
+			raw.Close()
+		*/
+		/*
+			result := shell.PathRun(fullpath, cmd)
+			if result.Exit != 0 {
+				log.Info("cmd failed", cmd, result.Exit)
+				everythingworked = false
+			}
+		*/
 		everythingworked = false
 	}
 	if everythingworked {