set patch NewHash

1 files changed, 18 insertions, 17 deletions

diff --git a/windowPatches.go b/windowPatches.go
index 31ed924..c2d8c4b 100644
--- a/windowPatches.go
+++ b/windowPatches.go
@@ -133,13 +133,27 @@ func (dwin *stdPatchTableWin) doPatchesTable(currentPatches *forgepb.Patches) {
 }
 
 // used by the PB table
-func funcApplyPatch(p *forgepb.Patch) string {
+func applyPatchLabel(p *forgepb.Patch) string {
 	rn := p.Namespace
 	if repo := me.forge.FindByGoPath(rn); repo == nil {
 		// log.Info("Could not figure out repo path", rn)
 		return ""
 	}
-	return "git am"
+	if p.NewHash == "na" {
+		return "git am"
+	}
+	if p.NewHash == "" {
+		return "new"
+	}
+	return "done"
+}
+
+func applyPatchClick(p *forgepb.Patch) {
+	if err := applyPatchNew(p); err != nil {
+		log.Info("git am failed on file", p.Filename, "with error", err)
+		return
+	}
+	log.Info("ran: git am", p.Filename, "ok")
 }
 
 // define what rows to have in the protobuf table
@@ -148,21 +162,8 @@ func AddPatchesPB(tbox *gui.Node, pb *forgepb.Patches) *forgepb.PatchesTable {
 	t.NewUuid()
 	t.SetParent(tbox)
 
-	gitam := t.AddButtonFunc("apply", func(p *forgepb.Patch) string {
-		rn := p.Namespace
-		if repo := me.forge.FindByGoPath(rn); repo == nil {
-			// log.Info("Could not figure out repo path", rn)
-			return ""
-		}
-		return "git am"
-	})
-	gitam.Custom = func(p *forgepb.Patch) {
-		if err := applyPatchNew(p); err != nil {
-			log.Info("git am failed on file", p.Filename, "with error", err)
-			return
-		}
-		log.Info("ran: git am", p.Filename, "ok")
-	}
+	gitam := t.AddButtonFunc("apply", applyPatchLabel)
+	gitam.Custom = applyPatchClick
 
 	t.AddCommitHash()
 	t.AddNamespace()