update auto complete. merge is smarter

1 files changed, 27 insertions, 13 deletions

diff --git a/doMerge.go b/doMerge.go
index be34b8f..3362c9d 100644
--- a/doMerge.go
+++ b/doMerge.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/google/uuid"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/log"
 	"google.golang.org/protobuf/proto"
@@ -12,7 +13,11 @@ import (
 
 func doMerge() error {
 	if err := loadConfigfile(); err != nil {
-		return err
+		if argv.Force == true {
+			me.all = forgepb.NewPatchsets()
+		} else {
+			return err
+		}
 	}
 
 	mergePatchsets()
@@ -24,30 +29,39 @@ func doMerge() error {
 	return nil
 }
 
-// adds submitted patches not specifically assigned to a patchset
-// to the generic patchset called "forge auto commit"
-func addRandomPatch(patch *forgepb.Patch) error {
-	var fauto *forgepb.Patchset
+func findAutoPatchset() *forgepb.Patchset {
 
-	// ignore patch if it's already here
-	if findPatch(patch) {
-		log.Info("already found patch", patch.CommitHash, patch.Namespace)
-		return nil
-	}
 	for pset := range me.all.IterAll() {
 		if pset.Name == "forge auto commit" {
-			fauto = pset
+			return pset
 			break
 		}
 	}
 
+	var fauto *forgepb.Patchset
+	log.Warn("findAutoPatchset() had to create 'forge auto commit'")
 	if fauto == nil {
 		fauto = new(forgepb.Patchset)
 		fauto.Name = "forge auto commit"
 		fauto.Patches = forgepb.NewPatches()
+		fauto.Uuid = uuid.New().String()
 		me.all.Patchsets = append(me.all.Patchsets, fauto)
-		log.Warn("had to create 'forge auto commit' patchset")
-		// return log.Errorf("no default place yet")
+	}
+	return fauto
+}
+
+// adds submitted patches not specifically assigned to a patchset
+// to the generic patchset called "forge auto commit"
+func addRandomPatch(patch *forgepb.Patch) error {
+
+	// ignore patch if it's already here
+	if findPatch(patch) {
+		log.Info("already found patch", patch.CommitHash, patch.Namespace)
+		return nil
+	}
+	fauto := findAutoPatchset()
+	if fauto == nil {
+		return log.Errorf("no default place yet")
 	}
 	newpb := proto.Clone(patch).(*forgepb.Patch)
 	if newpb == nil {