Makefile

@@ -6,10 +6,8 @@ BUILDTIME = $(shell date +%Y.%m.%d_%H%M)
 # make gocui     # try the ncurses gui plugin
 # make andlabs   # try the andlabs gui plugin (uses GTK)
 
-default: install-verbose tag
+default: install-verbose
-
+	forge
-tag:
-	forge tag list
 
 vet:
 	@GO111MODULE=off go vet

argv.go

@@ -6,8 +6,6 @@ package main
 import (
 	"fmt"
 	"os"
-
-	"go.wit.com/lib/gui/prep"
 )
 
 /*
@@ -149,49 +147,63 @@ forge -- a tool to manage lots of git repos. forge includes a GUI and TUI.
 `
 }
 
-// handles shell autocomplete
+//
-func DoAutoComplete(pb *prep.Auto) {
+//	handles shell autocomplete
-	switch pb.Cmd {
+//
+
+func DoAutoComplete(argv []string) {
+	switch argv[0] {
 	case "checkout":
-		pb.Autocomplete2("devel master user")
+		fmt.Println("devel master user")
 	case "clean":
-		pb.Autocomplete2("")
+		// me.pp.WriteHelp(os.Stderr)
+		// me.pp.WriteUsageForSubcommand(os.Stderr, me.pp.SubcommandNames()...)
+		// me.pp.WriteHelpForSubcommand(os.Stderr, me.pp.SubcommandNames()...)
+		// me.pp.WriteHelpForSubcommand(os.Stderr, "clean")
+		fmt.Println("--force verify --repo")
 	case "commit":
-		pb.Autocomplete2("--all")
+		fmt.Println("--all")
 	case "config":
 		fmt.Println("add fix list")
 	case "dirty":
 		fmt.Println("")
 	case "gui":
-		fmt.Println("")
+		if ifBlank(argv[1]) {
-	case "--gui":
+			fmt.Fprintln(os.Stderr, "")
-		pb.Autocomplete2("andlabs gocui")
+			fmt.Fprintln(os.Stderr, "CUI: terminal interface using 'gocui'")
+			fmt.Fprintln(os.Stderr, "GUI: linux and macos GUI using GTK")
+		} else {
+			fmt.Println("CUI GUI")
+		}
 	case "list":
-		pb.Autocomplete2("--mine --favorites --dirty")
+		fmt.Println("--mine --favorites --dirty")
 	case "merge":
-		pb.Autocomplete2("devel master --all")
+		fmt.Println("devel master")
 	case "normal":
-		pb.Autocomplete2("on off")
+		fmt.Println("on off")
 	case "pull":
-		pb.Autocomplete2("--force check")
+		fmt.Println("--force check")
 	case "patch":
 		fmt.Println("check get list repos submit show")
+	case "user":
+		fmt.Println("--force")
+	case "devel":
+		fmt.Println("--force")
+	case "master":
+		fmt.Println("")
+	case "verify":
+		fmt.Println("user devel master")
 	case "tag":
 		fmt.Println("list --delete clean")
 	default:
-		if pb.Cmd == "" {
+		if argv[0] == ARGNAME {
-			pb.Autocomplete2("help list checkout clean commit dirty fetch gui normal merge patch pull tag --gui")
+			// list the subcommands here
-		} else {
+			fmt.Println("help list checkout clean commit dirty fetch gui normal merge patch pull tag")
-			pb.Autocomplete2("list checkout clean commit dirty normal merge tag")
 		}
 	}
 	os.Exit(0)
 }
 
-func (args) Appname() string {
-	return ARGNAME
-}
-
 func ifBlank(arg string) bool {
 	if arg == "''" {
 		// if empty, the user has not typed something
@@ -200,6 +212,6 @@ func ifBlank(arg string) bool {
 	return false
 }
 
-func (a args) DoAutoComplete(autoArgv *prep.Auto) {
+func (a args) DoAutoComplete(argv []string) {
-	DoAutoComplete(autoArgv)
+	DoAutoComplete(argv)
 }

config.go

@@ -8,7 +8,6 @@ import (
 
 	"go.wit.com/lib/config"
 	"go.wit.com/lib/protobuf/forgepb"
-	"go.wit.com/log"
 )
 
 func forgeConfigSave() error {
@@ -19,7 +18,6 @@ func setForgeMode(fmode forgepb.ForgeMode) {
 	if me.forge.Config.Mode == fmode {
 		return
 	}
-	log.Info("changing mode", me.forge.Config.Mode, fmode)
 	me.forge.Config.Mode = fmode
 	config.SetChanged("forge", true)
 	me.forge.Config.ConfigSave()

doCheckout.go

@@ -27,7 +27,6 @@ func doCheckout() error {
 	}
 
 	if argv.Checkout.Devel != nil {
-		// setForgeMode(forgepb.ForgeMode_DEVEL)
 		if err := me.forge.DoAllCheckoutDevelNew(argv.Force); err != nil {
 			badExit(err)
 		}
@@ -35,7 +34,7 @@ func doCheckout() error {
 	}
 
 	if argv.Checkout.Master != nil {
-		setForgeMode(forgepb.ForgeMode_MASTER) // disable "normal" mode if set
+		setForgeMode(forgepb.ForgeMode_CLEAN) // disable "normal" mode if set
 
 		if err := me.forge.DoAllCheckoutMaster(); err != nil {
 			badExit(err)

doCommit.go

@@ -31,7 +31,12 @@ func doCommit() error {
 		okExit("")
 	}
 
-	repo := findCurrentPwdRepoOrDie()
+	pwd, _ := os.Getwd()
+	repo := me.forge.Repos.FindByFullPath(pwd)
+	if repo == nil {
+		log.Info("todo: forge doesn't know how to work here yet")
+		okExit("")
+	}
 
 	if !repo.CheckDirty() {
 		okExit(log.Sprintf("this repo %s is not dirty.\n\n--all    # commit all changes in all repos", repo.GetFullPath()))

doConfig.go

@@ -55,6 +55,7 @@ func doConfig() {
 	}
 
 	log.Info("config.PathLock =", me.forge.Config.PathLock)
+	log.Info("config.GoSrc =", me.forge.Config.GoSrc)
 
 	me.forge.ConfigPrintTable()
 	okExit("")

doMerge.go

@@ -4,61 +4,12 @@
 package main
 
 import (
-	"time"
-
 	"go.wit.com/lib/config"
-	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
 
-func doMerge() error {
-	if argv.All == true {
-		start := time.Now()
-		repos, err := doMergeDevel()
-		dur := time.Since(start)
-		if err != nil {
-			badExit(err)
-		}
-		log.Printf("Merged %d devel branches in %s\n", repos.Len(), shell.FormatDuration(dur))
-
-		start = time.Now()
-		repos, err = doMergeMaster()
-		dur = time.Since(start)
-		if err != nil {
-			badExit(err)
-		}
-		log.Printf("Merged %d master branches in %s\n", repos.Len(), shell.FormatDuration(dur))
-		okExit("")
-	}
-	if argv.Merge.Devel != nil {
-		start := time.Now()
-		repos, err := doMergeDevel()
-		dur := time.Since(start)
-		if err != nil {
-			badExit(err)
-		}
-		log.Printf("Merged %d devel branches in %s\n", repos.Len(), shell.FormatDuration(dur))
-		okExit("")
-	}
-	if argv.Merge.Master != nil {
-		start := time.Now()
-		repos, err := doMergeMaster()
-		dur := time.Since(start)
-		if err != nil {
-			badExit(err)
-		}
-		log.Printf("Merged %d master branches in %s\n", repos.Len(), shell.FormatDuration(dur))
-		okExit("")
-	}
-	repo := findCurrentPwdRepoOrDie()
-	if err := repoMergeToDevel(repo); err != nil {
-		badRepoExit(repo, err)
-	}
-	return nil
-}
-
 func doMergeReport() *forgepb.Patches {
 	found := forgepb.NewPatches()
 	for repo := range me.forge.Repos.IterAll() {
@@ -81,7 +32,7 @@ func doMergeDevel() (*gitpb.Repos, error) {
 	found := findMergeToDevel()
 	for repo := range found.IterAll() {
 		if repo.CheckDirty() {
-			log.Info("repo is dirty", repo.GetFullPath())
+			log.Info("repo is dirty", repo.GetGoPath())
 			continue
 		}
 		log.Infof("%s starting git merge\n", repo.FullPath)
@@ -108,32 +59,6 @@ func doMergeDevel() (*gitpb.Repos, error) {
 	return done, err
 }
 
-func repoMergeToDevel(repo *gitpb.Repo) error {
-	if repo.CheckDirty() {
-		return log.Errorf("can not merge. repo is dirty")
-	}
-	log.Infof("%s starting git merge\n", repo.FullPath)
-	if repo.CheckoutDevel() {
-		log.Info("checkout devel failed", repo.GetGoPath())
-		err := log.Errorf("checkout devel failed")
-		badExit(err)
-	}
-	// hash differences when merging user into devel branch
-	out := repo.GetBranchDifferences(repo.GetDevelBranchName(), repo.GetUserBranchName())
-	for i, hash := range out {
-		log.Info("MERGE HASH FROM USER TO DEVEL", i, hash)
-	}
-	if _, err := repo.MergeToDevel(); err != nil {
-		log.Info("merge from user failed", repo.GetGoPath(), err)
-		// err := log.Errorf("merge from user failed")
-		// log.Info(strings.Join(r.Stdout, "\n"))
-		// log.Info(strings.Join(r.Stderr, "\n"))
-		badExit(err)
-	}
-	config.SetChanged("repos", true)
-	return nil
-}
-
 func doMergeMaster() (*gitpb.Repos, error) {
 	var err error
 	setForgeMode(forgepb.ForgeMode_MASTER)

doNormal.go

@@ -75,15 +75,12 @@ func checkNormalRepoState(repo *gitpb.Repo) error {
 		log.Info("ABNORMAL: master branch name was blank in", repo.GetFullPath())
 	}
 	if repo.GetMasterBranchName() == "" {
-		me.forge.VerifyBranchNames(repo)
 		err = log.Errorf("master branch name blank")
 	}
 	if repo.GetDevelBranchName() == "" {
-		me.forge.VerifyBranchNames(repo)
 		err = log.Errorf("devel branch name blank")
 	}
 	if repo.GetUserBranchName() == "" {
-		me.forge.VerifyBranchNames(repo)
 		err = log.Errorf("user branch name blank")
 	}
 	if repo.GetGoPath() == repo.GetNamespace() {
@@ -97,7 +94,7 @@ func checkNormalRepoState(repo *gitpb.Repo) error {
 	repo.VerifyRemoteAndLocalBranches(repo.GetMasterBranchName())
 
 	if repo.GetCurrentBranchName() != repo.GetUserBranchName() {
-		log.Infof("changing to user(%s) branch: %s\n", repo.GetUserBranchName(), repo.FullPath)
+		log.Info("changing to user branch", repo.FullPath)
 		repo.CheckoutUser()
 		repo.ReloadCheck()
 		err = log.Errorf("now on user branch")

doPatch.go

@@ -45,16 +45,7 @@ func doPatchSubmit() error {
 	if err != nil {
 		return err
 	}
-	if pset.Patches == nil {
+	_, _, err = pset.Patches.HttpPostVerbose(myServer(), "new")
-		log.Info("pset.Patches == nil")
-		return err
-	}
-	if pset.Patches.Len() == 0 {
-		log.Info("did not find any patches")
-		return nil
-	}
-	pset.PrintTable()
-	_, _, err = pset.HttpPost(myServer(), "new")
 	return err
 }
 
@@ -73,7 +64,7 @@ func doPatch() error {
 	}
 
 	if argv.Patch.Get != nil {
-		psets := forgepb.NewSets()
+		psets := forgepb.NewPatchsets()
 		newpb, _, _ := psets.HttpPostVerbose(myServer(), "get")
 		newpb.PrintTable()
 		me.forge.Patchsets = newpb
@@ -101,80 +92,66 @@ func doPatch() error {
 
 	if argv.Patch.List != nil {
 		var changed bool
-		newpatches := new(forgepb.Set)
+		newpatches := forgepb.NewPatches()
-		newpatches.Patches = forgepb.NewPatches()
 		for pset := range me.forge.Patchsets.IterAll() {
-			pset.PrintTable()
+			log.Info(pset.Uuid)
 			for patch := range pset.Patches.IterAll() {
-				changed = true
+				if setNewCommitHash(patch) {
-				if patch.NewHash == "" || patch.NewHash == "na" {
+					changed = true
-					if newpatches.Patches.AppendByPatchId(patch) {
+				}
-						log.Info("patchId added here", patch.PatchId)
+				if patch.NewHash == "na" {
-					} else {
+					newpatches.Append(patch)
-						log.Info("patchId already here", patch.PatchId)
+					log.Info("apply this patch?")
-					}
-				} else {
-					if err := setNewCommitHash(patch); err != nil {
-						log.Infof("%s bad check on patch failure %v\n", patch.Filename, err)
-						return err
-					}
-					log.Info("newhash set already here", patch.PatchId, patch.NewHash)
 				}
 			}
+
+			/*
+				for patch := range pset.Patches.IterAll() {
+					if repo, ok := me.forge.IsPatchApplied(patch); ok {
+						log.Info("\tfound patch in repo", repo.Namespace, patch.Filename)
+					} else {
+						log.Info("\tdid not find patch", patch.CommitHash, patch.NewHash, patch.Filename)
+					}
+				}
+			*/
 		}
 		if changed {
 			if err := me.forge.SavePatchsets(); err != nil {
 				log.Warn("savePatchsets() failed", err)
 			}
 		}
-		log.Info("NEW PATCHES TABLE")
+		me.forge.Patchsets.PrintTable()
-		newpatches.PrintTable()
+		if newpatches.Len() != 0 {
-		for patch := range newpatches.Patches.IterAll() {
+			for patch := range newpatches.IterAll() {
-			if err := setNewCommitHash(patch); err == nil {
+				log.Info("new patch:", patch.CommitHash, patch.NewHash, patch.Filename)
-				log.Info("newhash set already here", patch.PatchId, patch.NewHash)
+				repo := me.forge.FindByGoPath(patch.Namespace)
-				continue
+				if repo == nil {
-			}
+					log.Info("\tCould not find namespace:", patch.Namespace)
-			log.Infof("%s is new\n", patch.Filename)
+					continue
-			repo := me.forge.FindByGoPath(patch.Namespace)
+				}
-			if repo == nil {
+				if fhelp.QuestionUser("apply this patch?") {
-				log.Info("\tCould not find namespace:", patch.Namespace)
+					newhash, err := applyAndTrackPatch(repo, patch)
-				continue
+					log.Info("apply results:", newhash, err)
-			}
-			if fhelp.QuestionUser("apply this patch?") {
-				newhash, err := applyAndTrackPatch(repo, patch)
-				log.Info("apply results:", newhash, err)
-			}
-		}
-		return nil
-		/*
-			if newpatches.Len() != 0 {
-				for patch := range newpatches.IterAll() {
-					log.Info("new patch:", patch.CommitHash, patch.NewHash, patch.Filename)
-					repo := me.forge.FindByGoPath(patch.Namespace)
-					if repo == nil {
-						log.Info("\tCould not find namespace:", patch.Namespace)
-						continue
-					}
 				}
-				return log.Errorf("patches need to be applied")
 			}
+			return log.Errorf("patches need to be applied")
+		}
 
-			// return doPatchList()
+		// return doPatchList()
-			applied := findApplied()
+		applied := findApplied()
-			if applied == nil || applied.Len() == 0 {
+		if applied == nil || applied.Len() == 0 {
-				log.Info("no patches have been appled to the devel branch yet")
+			log.Info("no patches have been appled to the devel branch yet")
-				return nil
-			}
-			// for patch := range applied.IterAll() {
-			// 	log.Info("SEND APPLIED: newhash:", patch.NewHash, "commithash:", patch.CommitHash, "patch", patch.Namespace)
-			// }
-			newpb, _, err := applied.HttpPostVerbose(myServer(), "applied")
-			if err != nil {
-				return err
-			}
-			newpb.PrintTable()
 			return nil
-		*/
+		}
+		// for patch := range applied.IterAll() {
+		// 	log.Info("SEND APPLIED: newhash:", patch.NewHash, "commithash:", patch.CommitHash, "patch", patch.Namespace)
+		// }
+		newpb, _, err := applied.HttpPostVerbose(myServer(), "applied")
+		if err != nil {
+			return err
+		}
+		newpb.PrintTable()
+		return nil
 	}
 
 	// if nothing, show patches & dirty repos
@@ -207,7 +184,7 @@ func dumpWorkRepos() bool {
 
 // returns bad if patches can not be applied
 // logic is not great here but it was a first pass
-func dumpPatchset(pset *forgepb.Set) bool {
+func dumpPatchset(pset *forgepb.Patchset) bool {
 	// don't even bother to continue if we already know it's broken
 	if pset.State == "BROKEN" {
 		log.Printf("Patchset Name: %-24s Author: %s <%s> IS BAD\n", pset.Name, pset.GetGitAuthorName(), pset.GetGitAuthorEmail())

doTag.go

@@ -7,7 +7,6 @@ package main
 
 import (
 	"os"
-	"path/filepath"
 	"time"
 
 	"go.wit.com/lib/fhelp"
@@ -24,31 +23,15 @@ func FindRepoByFullPath(wd string) *gitpb.Repo {
 	return nil
 }
 
-func findCurrentPwdRepoOrDie() *gitpb.Repo {
-	wd, err := os.Getwd()
-	repo := FindRepoByFullPath(wd)
-	if repo == nil {
-		log.Info("Could not find repo:", wd)
-		badExit(err)
-	}
-	return repo
-}
-
 func doTag() error {
-	wd, _ := os.Getwd()
 	if argv.Tag.List != nil {
-		repo := findCurrentPwdRepoOrDie()
+		log.Info("list tags here")
-
-		tagTablePB := makeTagTablePB(repo, repo.Tags)
-		// tbox := win.Bottom.Box().SetProgName("TBOX")
-		// t.SetParent(tbox)
-		tagTablePB.MakeTable()
-		tagTablePB.PrintTable()
-		log.Info("list tags here", repo.Namespace)
 		return nil
 	}
 
 	if argv.Tag.Delete != "" {
+		wd, _ := os.Getwd()
+
 		repo := FindRepoByFullPath(wd)
 		if repo == nil {
 			log.Info("Could not find repo:", wd)
@@ -56,15 +39,13 @@ func doTag() error {
 		}
 
 		// check if the git tag already exists somehow
-		/*
-			if !repo.LocalTagExists(testtag) {
-				log.Info("Tag", testtag, "does not exist")
-				return log.Errorf("%s TAG DOES NOT EXIST %s", repo.FullPath, testtag)
-			}
-		*/
 		testtag := argv.Tag.Delete
+		if !repo.LocalTagExists(testtag) {
+			log.Info("Tag", testtag, "does not exist")
+			return log.Errorf("%s TAG DOES NOT EXIST %s", repo.FullPath, testtag)
+		}
 		if !argv.Force {
-			if !fhelp.QuestionUser(log.Sprintf("delete tag '%s'?", testtag)) {
+			if !fhelp.QuestionUser("delete this tag?") {
 				return nil
 			}
 		}
@@ -76,50 +57,37 @@ func doTag() error {
 		return nil
 	}
 
+	ns := "go.wit.com/apps/forge"
+	repo := me.forge.Repos.FindByNamespace(ns)
+	if repo == nil {
+		return log.Errorf("could not find %s", ns)
+	}
+
+	tagTablePB := makeTagTablePB(repo.Tags)
+	// tbox := win.Bottom.Box().SetProgName("TBOX")
+	// t.SetParent(tbox)
+	tagTablePB.MakeTable()
+	tagTablePB.PrintTable()
+
 	log.Info("do other tag stuff here")
 	return nil
 }
 
-func makeTagTablePB(repo *gitpb.Repo, pb *gitpb.GitTags) *gitpb.GitTagsTable {
+func makeTagTablePB(pb *gitpb.GitTags) *gitpb.GitTagsTable {
 	t := pb.NewTable("tagList")
 	t.NewUuid()
 
-	col := t.AddHash()
+	sf := t.AddStringFunc("Ref Name", func(r *gitpb.GitTag) string {
-	col.Width = 12
+		return r.GetRefname()
-
-	col = t.AddStringFunc("bashash", func(tag *gitpb.GitTag) string {
-		_, base := filepath.Split(tag.Refname)
-		cmd, err := repo.RunStrict([]string{"git", "log", "-1", base, "--format=%H"})
-		if err != nil {
-			return "err"
-		}
-		if len(cmd.Stdout) == 0 {
-			return ""
-		}
-		return cmd.Stdout[0]
 	})
-	col.Width = 12
+	sf.Width = 16
 
-	col = t.AddTimeFunc("ctime", func(tag *gitpb.GitTag) time.Time {
+	colAge := t.AddTimeFunc("age", func(repo *gitpb.GitTag) time.Time {
-		// todo
-		return tag.Creatordate.AsTime()
-	})
-	col.Width = 4
-
-	col = t.AddTimeFunc("age", func(repo *gitpb.GitTag) time.Time {
 		// todo
 		return time.Now()
 	})
-	col.Width = 4
+	t.AddHash()
-
+	t.AddSubject()
-	col = t.AddStringFunc("Ref Name", func(r *gitpb.GitTag) string {
+	colAge.Width = 4
-		_, ref := filepath.Split(r.GetRefname())
-		return ref
-	})
-	col.Width = 16
-
-	col = t.AddSubject()
-	col.Width = -1
-
 	return t
 }

doc.go

@@ -3,14 +3,20 @@ forge -- a tool to manage lots of git repos. forge includes a GUI and TUI.
 
 	forge only executes the 'git' command. Everything it does, you can run by hand with 'git'.
 
+forge v0.22.138-6-gaea7f16    Built on 2025.09.03_1935
+Usage: forge [--debugger] [--logger] [--no-gui] [--gui GUI] [--gui-file GUI-FILE] [--gui-build] [--gui-verbose] [--gui-check-plugin GUI-CHECK-PLUGIN] [--connect CONNECT] [--all] [--build BUILD] [--install INSTALL] [--forge-rebuild] [--force] [--verbose] [--bash] [--auto-complete AUTO-COMPLETE] <command> [<args>]
+
 Options:
 
 	--debugger             open the debugger window
 	--logger               open the log.* control window
-	--gui GUI              select the plugin (andlabs,gocui,etc)
+	--no-gui               ignore all these gui problems
+	--gui GUI              Use this gui toolkit [andlabs,gocui,nocui,stdin]
+	--gui-file GUI-FILE    Use a specific plugin.so file
+	--gui-build            attempt to build the GUI plugins
 	--gui-verbose          enable all logging
-	--bash                 generate bash completion
+	--gui-check-plugin GUI-CHECK-PLUGIN
-	--bash                 generate bash completion
+	                       hack to verify GO plugins load
 	--connect CONNECT      forge url
 	--all                  git commit --all
 	--build BUILD          build a repo
@@ -18,24 +24,25 @@ Options:
 	--forge-rebuild        download and rebuild forge
 	--force                try to strong arm things
 	--verbose              show more output
+	--bash                 generate bash completion
+	--auto-complete AUTO-COMPLETE
+	                       todo: move this to go-arg
 	--help, -h             display this help and exit
 	--version              display version and exit
 
 Commands:
 
-	help                   New to forge? This is for you.'
 	checkout               switch branches using 'git checkout'
 	clean                  start over at the beginning
 	commit                 'git commit' but errors out if on wrong branch
 	config                 show your .config/forge/ settings
+	debug                  debug forge
 	dirty                  show dirty git repos
 	fetch                  run 'git fetch master'
-	gui                    open the gui
 	list                   print a table of the current repos
 	merge                  merge branches
 	normal                 set every repo to the default state for software development
 	patch                  make patchsets
 	pull                   run 'git pull'
-	tag                    manage git tags
 */
 package main

exit.go

@@ -28,6 +28,6 @@ func badExit(err error) {
 }
 
 func badRepoExit(repo *gitpb.Repo, err error) {
-	log.Printf("%s FAILED: %v\n", repo.GetNamespace(), err)
+	log.Printf("forge failed on %s with %v\n", repo.GetNamespace(), err)
 	os.Exit(-1)
 }

helperPatches.go

@@ -38,7 +38,7 @@ type stdPatchsetTableWin struct {
 	sync.Mutex
 	win    *gadgets.GenericWindow  // the machines gui window
 	box    *gui.Node               // the machines gui parent box widget
-	TB     *forgepb.SetsTable // the gui table buffer
+	TB     *forgepb.PatchsetsTable // the gui table buffer
 	update bool                    // if the window should be updated
 }
 
@@ -54,7 +54,7 @@ func (w *stdPatchsetTableWin) Toggle() {
 */
 
 /*
-	etimef := func(e *forgepb.Set) string {
+	etimef := func(e *forgepb.Patchset) string {
 		etime := e.Etime.AsTime()
 		s := etime.Format("2006/01/02 15:04")
 		if strings.HasPrefix(s, "1970/") {
@@ -67,14 +67,14 @@ func (w *stdPatchsetTableWin) Toggle() {
 */
 
 /*
-	ctimef := func(p *forgepb.Set) string {
+	ctimef := func(p *forgepb.Patchset) string {
 		ctime := p.Ctime.AsTime()
 		return ctime.Format("2006/01/02 15:04")
 	}
 }
 */
 
-func setPatchsetState(p *forgepb.Set) {
+func setPatchsetState(p *forgepb.Patchset) {
 	var bad bool
 	var good bool
 	var done bool = true
@@ -173,33 +173,53 @@ func findCommitBySubject(subject string) (string, error) {
 }
 
 // returns true if PB changed
-func setNewCommitHash(patch *forgepb.Patch) error {
+func setNewCommitHash(patch *forgepb.Patch) bool {
+	// parts := strings.Fields(patch.Comment)
+
 	repo := me.forge.FindByGoPath(patch.Namespace)
 	if repo == nil {
-		return log.Errorf("could not find repo %s", patch.Namespace)
+		log.Info("could not find repo", patch.Namespace)
+		return false
 	}
 
 	comment := cleanSubject(patch.Comment)
 
+	if patch.NewHash == "" {
+		log.Info("init() new patch to 'na' ", patch.NewHash, "commithash:", patch.CommitHash, patch.Namespace, comment)
+		patch.NewHash = "na"
+		return true
+	}
 	os.Chdir(repo.GetFullPath())
 	newhash, err := findCommitBySubject(comment)
 	if err != nil {
-		return log.Errorf("patch: not found hash: %s %s %s %s %v", patch.CommitHash, patch.Namespace, comment, newhash, err)
+		log.Info("patch: not found hash:", patch.CommitHash, patch.Namespace, comment, newhash, err)
+		return false
 	}
-
+	if patch.NewHash == newhash {
-	patchId, err := repo.FindPatchId(newhash)
+		// patch was already set
-	if err != nil {
+		return false
-		return err
+	}
+	if patch.NewHash != "na" {
+		log.Infof("patch: hash MISMATCH %s old=%s new=%s name=%s\n", patch.Namespace, patch.NewHash, newhash, comment)
+		return false
 	}
-
-	patch.PatchId = patchId
 	patch.NewHash = newhash
-
 	log.Info("patch: found hash:", patch.CommitHash, newhash, patch.Namespace, comment)
-	return nil
+	return true
 }
 
-func AddAllPatches(notdone *forgepb.Patches, pset *forgepb.Set, full bool) {
+/*
+func setNewCommitHashLoop(p *forgepb.Patchset) bool {
+	var done bool = true
+	for patch := range p.Patches.IterAll() {
+		setNewCommitHashLoop(patch)
+	}
+
+	return done
+}
+*/
+
+func AddAllPatches(notdone *forgepb.Patches, pset *forgepb.Patchset, full bool) {
 	for patch := range pset.Patches.IterAll() {
 		comment := cleanSubject(patch.Comment)
 
@@ -213,7 +233,7 @@ func AddAllPatches(notdone *forgepb.Patches, pset *forgepb.Set, full bool) {
 	}
 }
 
-func AddNotDonePatches(notdone *forgepb.Patches, pset *forgepb.Set, full bool) {
+func AddNotDonePatches(notdone *forgepb.Patches, pset *forgepb.Patchset, full bool) {
 	for patch := range pset.Patches.IterAll() {
 		comment := cleanSubject(patch.Comment)
 
@@ -231,7 +251,7 @@ func AddNotDonePatches(notdone *forgepb.Patches, pset *forgepb.Set, full bool) {
 			continue
 		}
 
-		if patch.NewHash != "" {
+		if patch.NewHash != "na" {
 			log.Info("already applied patch", patch.Namespace, ": newhash:", patch.NewHash, "commithash:", patch.CommitHash, comment)
 			continue
 		}
@@ -281,7 +301,7 @@ func findExpired() *forgepb.Patches {
 			continue
 		}
 
-		if patch.NewHash != "" {
+		if patch.NewHash != "na" {
 			log.Info("already applied patch", patch.Namespace, ": newhash:", patch.NewHash, "commithash:", patch.CommitHash, comment)
 			found.AppendByCommitHash(patch) // double check to ensure the commit hash isn't added twice
 			continue

main.go

@@ -7,9 +7,13 @@ package main
 
 import (
 	"embed"
+	"fmt"
 	"strings"
+	"time"
 
+	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/lib/gui/prep"
+	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
@@ -41,15 +45,13 @@ func getVersion(repo *gitpb.Repo, name string) string {
 
 func main() {
 	me = new(mainType)
-	me.myGui = prep.Gui()       // prepares the GUI package for go-args
+	prep.Bash(ARGNAME, argv.DoAutoComplete) // this line should be:  prep.Bash(argv)
-	me.auto = prep.Bash3(&argv) // this line should be:  prep.Bash(&argv)
+	me.myGui = prep.Gui()                   // prepares the GUI package for go-args
+	me.pp = arg.MustParse(&argv)
 
-	// me.auto = prep.Bash3(argv.DoAutoComplete, &argv) // this line should be:  prep.Bash(&argv)
+	me.forge = forgepb.Init()
-	// arg.MustParse(&argv)                                      // these three lines are becoming terrible syntax
-	// me.auto = prep.MustParse(&argv)          // try to make this work?
 
-	me.forge = forgepb.Init() // init forge.pb
+	me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes
-	me.forge.ScanRepoDir()    // looks for new dirs, checks existing repos for changes
 
 	// initialize patches
 	doPatchInit()
@@ -71,6 +73,7 @@ func main() {
 	}
 
 	if argv.Checkout != nil {
+		setForgeMode(forgepb.ForgeMode_DEVEL)
 		if err := doCheckout(); err != nil {
 			badExit(err)
 		}
@@ -155,10 +158,28 @@ func main() {
 	}
 
 	if argv.Merge != nil {
-		if err := doMerge(); err != nil {
+		if argv.Merge.Devel != nil {
-			badExit(err)
+			start := time.Now()
+			repos, err := doMergeDevel()
+			dur := time.Since(start)
+			if err != nil {
+				badExit(err)
+			}
+			log.Printf("Merged %d devel branches in %s\n", repos.Len(), shell.FormatDuration(dur))
+			okExit("")
 		}
-		okExit("")
+
+		if argv.Merge.Master != nil {
+			start := time.Now()
+			repos, err := doMergeMaster()
+			dur := time.Since(start)
+			if err != nil {
+				badExit(err)
+			}
+			log.Printf("Merged %d master branches in %s\n", repos.Len(), shell.FormatDuration(dur))
+			okExit("")
+		}
+		badExit(fmt.Errorf("You must choose which branch to merge to (devel or master)"))
 	}
 
 	if argv.Pull != nil {

structs.go

@@ -4,6 +4,7 @@
 package main
 
 import (
+	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/gui"
 	"go.wit.com/lib/gadgets"
 	"go.wit.com/lib/gui/prep"
@@ -27,8 +28,7 @@ func myServer() string {
 
 // this app's variables
 type mainType struct {
-	// pp         *arg.Parser    // for parsing the command line args.  Yay to alexflint!
+	pp         *arg.Parser    // for parsing the command line args.  Yay to alexf lint!
-	auto       *prep.Auto     // more experiments for bash handling
 	forge      *forgepb.Forge // for holding the forge protobuf files
 	myGui      *prep.GuiPrep  // for initializing the GUI toolkits
 	foundPaths []string       // stores gopaths to act on (when doing go-clone)

windowPatches.go

@@ -117,9 +117,12 @@ func applyPatchLabel(p *forgepb.Patch) string {
 		// log.Info("Could not figure out repo path", rn)
 		return ""
 	}
-	if p.NewHash == "" {
+	if p.NewHash == "na" {
 		return "git am"
 	}
+	if p.NewHash == "" {
+		return "new"
+	}
 	return "done"
 }
 

windowViewRepoPatches.go

@@ -21,8 +21,8 @@ type repoPatchWindow struct {
 	shelf *gui.Node            // the first box in the stack, set as horizontal
 	grid  *gui.Node            // the list of available patches
 	// summary *patchSummary        // summary of current patches
-	setgrid *gui.Node    // the list of each patchset
+	setgrid *gui.Node         // the list of each patchset
-	pset    *forgepb.Set // the patchset in question
+	pset    *forgepb.Patchset // the patchset in question
 }
 
 // todo: autogenerate these or make them standared 'gui' package functions
@@ -109,7 +109,7 @@ func makeRepoPatchWindow(repo *gitpb.Repo, fset []*forgepb.Patch) *repoPatchWind
 	return pw
 }
 
-func (r *repoPatchWindow) addPatchset(grid *gui.Node, pset *forgepb.Set) {
+func (r *repoPatchWindow) addPatchset(grid *gui.Node, pset *forgepb.Patchset) {
 	repomap := make(map[*gitpb.Repo][]*forgepb.Patch)
 	repohash := make(map[*gitpb.Repo]string)