.gitignore

@@ -1,5 +1,4 @@
 *.swp
-*.pb
 go.mod
 go.sum
 /resources/*.so

Makefile

@@ -6,27 +6,25 @@ 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: gocui
-
+	#forge
-tag:
-	forge tag list
 
 vet:
 	@GO111MODULE=off go vet
 	@echo this go binary package builds okay
 
+verbose:
+	GO111MODULE=off go build -v -x \
+		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
+
 build: goimports vet plugin
 	GO111MODULE=off go build \
 		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 
-install: goimports plugin
+install: goimports vet plugin
 	GO111MODULE=off go install \
 		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
-	cp -f ~/go/bin/forge ~/go/bin/last.forge # this is a hack so that go-deb can build a .deb file for forge # TODO: remove this
+	cp -f ~/go/bin/forge ~/go/bin/last.forge # this is a hack so that go-deb can build a .deb file for forge
-
-install-verbose: goimports vet plugin
-	GO111MODULE=off go install -v -x \
-		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 
 install-raw: goimports vet plugin
 	go install \
@@ -36,17 +34,12 @@ plugin:
 	rm -f resources/*.so
 	# -cp ../../toolkits/gocui/gocui.so resources/
 
-GTK: clean install
+andlabs: clean install
 	forge --gui andlabs
 
-GTK-verbose: clean install
+gocui: install
-	forge --gui andlabs --gui-verbose
+	forge --gui gocui --gui-verbose --gui-file ../../toolkits/gocui/gocui.so >/tmp/forge.log 2>&1
-
+	# forge --gui gocui --gui-verbose --debugger
-CUI: install
-	forge --gui gocui
-
-CUI-verbose: install
-	forge --gui gocui --gui-verbose >/tmp/forge.log 2>&1
 
 goimports:
 	reset
@@ -57,30 +50,10 @@ goimports:
 clean:
 	-rm -f forge go.*
 	# -rm -f ~/go/src/repos.pb
-	go-mod-clean purge
+	go-mod-clean --purge
 
 identify-protobuf:
 	autogenpb --identify ~/go/src/repos.pb
 
 devel:
 	forge clean devel --force --verbose
-
-pull: install
-	FORGE_URL="https://forge.grid.wit.com/" forge pull check
-
-# cloudflare blocks POST due to captcha checks / human detection?
-# POST must be direct socket. probably for the best anyway
-submit:
-	FORGE_URL="https://forge.grid.wit.com/" forge patch submit "forge auto commit"
-
-commit:
-	FORGE_URL="https://forge.grid.wit.com/" forge commit --all
-
-check: install
-	FORGE_URL="https://forge.grid.wit.com/" forge patch check
-
-doc:
-	echo "/*" > doc.go
-	forge -h >> doc.go
-	echo "*/" >> doc.go
-	echo "package main" >> doc.go

README.md

@@ -1,31 +1,10 @@
 # forge
 
-forge is a GUI front end for 'git' designed with the
+## Design Goals
-intent of simplifying federated git development.
-
-## Install:
-
-* go install go.wit.com/apps/forge@latest
-
-## Theory
 
 * Software engineering is the art of making things work.
 * Release engineering is the art of making things perfect.
 
-## Rules
-
-1) forge is only a GUI and wrapper around 'git'
-2) forge _only_ os.Exec()'s git. Anything forge does
-    can be done on the command line using 'git' directly
-3) forge's default behavior is to use 3 branches:
-    a) The git upstream master/main branch
-    b) A "devel" branch that is published
-    c) a "user" branch that can be local only to the developer
-
-## Development Goals
-
-* have a GUI that also works on the command line
-
 ## Notes
 
 This can be used to maintain git repositories
@@ -37,6 +16,14 @@ expiremental work on federated git
 * uses a GUI or the console(console display needs work)
 * always wrap around 'git' -- it basically just types 'git' commands really fast
 
+## Development Goals
+
+* have a GUI that also works on the command line
+
+## Install:
+
+* go install go.wit.com/apps/forge@latest
+
 ## building from sources
 
 ```
@@ -62,18 +49,3 @@ make                        # this runs GO111MODULE=off go build insuring that y
 ## Debian packages:
 
 Instructions are on https://mirrors.wit.com/
-
-## possible 'git bug' integration ideas:
-
-```
-git pull origin +refs/bugs/\*:refs/bugs/\*
-git pull origin +refs/identities/\*:refs/identities/\*
-
-
-# remove the caches
-rm -rf .git/git-bug
-
-
-# rebuild the cache with any command
-git bug user
-```

applyPatch.go

@@ -3,6 +3,17 @@
 
 package main
 
+import (
+	"os"
+	"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"
+)
+
 /*
 // saves the patches in ~/.config/forge/currentpatches/
 func savePatchset(pset *forgepb.Patchset) error {
@@ -12,10 +23,42 @@ func savePatchset(pset *forgepb.Patchset) error {
 	log.Info("savePatches() GIT_AUTHOR_EMAIL", pset.GetGitAuthorEmail())
 	log.Info("savePatches() Branch Name", pset.GetStartBranchName())
 	log.Info("savePatches() Start Hash", pset.GetStartBranchHash())
+
+	var count int
+	var bad int
+	var lasterr error
+	all := pset.Patches.SortByFilename()
+	for all.Scan() {
+		p := all.Next()
+		basedir := filepath.Join(os.Getenv("FORGE_CONFIG"), "currentpatches")
+		if fullname, err := savePatchFile(p, basedir); err != nil {
+			log.Info(fullname, "save failed", err)
+			bad += 1
+			lasterr = err
+		}
+		count += 1
+	}
+	log.Info("pset has", count, "total patches, ", bad, "bad save patches")
+	if bad == 0 {
+		return lasterr
+	}
+	return nil
 }
 */
 
-/*
+// re-run git CheckDirty() on everything
+func IsAnythingDirty() bool {
+	me.found = new(gitpb.Repos)
+	findAll() // select all the repos
+	doCheckDirtyAndConfigSave()
+	found := findDirty()
+	if found.Len() == 0 {
+		return false
+	} else {
+		return true
+	}
+}
+
 // From 18ee541f89be2e9f9a91c54873da87885e8ffdf5 Mon Sep 17 00:00:00 2001
 // From: Jeff Carr <jcarr@wit.com>
 // Date: Sun, 5 Jan 2025 01:18:47 -0600
@@ -29,6 +72,84 @@ func countCurrentPatches(repo *gitpb.Repo) int {
 	return len(result.Stdout)
 }
 
+func applyPatchsetOLD(pset *forgepb.Patchset) error {
+	var everythingworked bool = true
+	tmpdir, err := os.MkdirTemp("", "forge")
+	if err != nil {
+		return err
+	}
+	// log.Info("got to applyPatches() pset", pset)
+	log.Info("applyPatches() NAME", pset.Name)
+	log.Info("applyPatches() COMMENT", pset.Comment)
+	log.Info("applyPatches() GIT_AUTHOR_NAME", pset.GetGitAuthorName())
+	log.Info("applyPatches() GIT_AUTHOR_EMAIL", pset.GetGitAuthorEmail())
+	all := pset.Patches.SortByFilename()
+	for all.Scan() {
+		p := all.Next()
+
+		basedir := me.forge.GetGoSrc()
+		if fullname, err := savePatchFile(p, basedir); err != nil {
+			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)
+			for _, line := range result.Stdout {
+				log.Warn("stdout:", line)
+			}
+			for _, line := range result.Stderr {
+				log.Warn("stderr:", line)
+			}
+		}
+		everythingworked = false
+	}
+	if everythingworked {
+		os.RemoveAll(tmpdir) // clean up
+	}
+	log.Info("THIS IS THE END MY FRIEND")
+	return nil
+}
+
+func savePatchFile(p *forgepb.Patch, basedir string) (string, error) {
+	basepath, filename := filepath.Split(p.Filename)
+	fulldir := filepath.Join(basedir, basepath)
+	err := os.MkdirAll(fulldir, os.ModePerm)
+	if err != nil {
+		log.Info("applyPathces() MkdirAll failed for", fulldir)
+		log.Info("applyPathces() MkdirAll failed err", err)
+		return "", err
+	}
+	tmpname := filepath.Join(fulldir, filename)
+	log.Info("pset filename FILENAME IS REAL?", tmpname)
+	raw, _ := os.OpenFile(tmpname, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+	raw.Write(p.Data)
+	raw.Close()
+	return tmpname, nil
+}
+
+func readPatchFile(pbfile string) (*forgepb.Patchset, error) {
+	bytes, err := os.ReadFile(pbfile)
+	if err != nil {
+		log.Info("readfile error", pbfile, err)
+		return nil, err
+	}
+	return handleBytes(bytes)
+}
+
+func handleBytes(bytes []byte) (*forgepb.Patchset, error) {
+	var pset *forgepb.Patchset
+	pset = new(forgepb.Patchset)
+	err := pset.Unmarshal(bytes)
+	if err != nil {
+		log.Info("Unmarshal failed", err)
+		return nil, err
+	}
+	return pset, nil
+}
+
 func doRegister(newurl string) error {
 	var url string
 	url = me.urlbase + "/register?url=" + newurl
@@ -39,10 +160,9 @@ func doRegister(newurl string) error {
 	}
 
 	test := strings.TrimSpace(string(body))
-	for _, line := range strings.Split(test, "\n") {
+	for line := range strings.SplitSeq(test, "\n") {
 		line = strings.TrimSpace(line)
 		log.Info("server returned:", line)
 	}
 	return nil
 }
-*/

argv.go

@@ -6,8 +6,6 @@ package main
 import (
 	"fmt"
 	"os"
-
-	"go.wit.com/lib/gui/prep"
 )
 
 /*
@@ -17,20 +15,15 @@ import (
 var argv args
 
 type args struct {
-	Help       *EmptyCmd    `arg:"subcommand:help"                      help:"New to forge? This is for you.'"`
 	Checkout   *CheckoutCmd `arg:"subcommand:checkout"                  help:"switch branches using 'git checkout'"`
 	Clean      *CleanCmd    `arg:"subcommand:clean"                     help:"start over at the beginning"`
-	Commit     *CommitCmd   `arg:"subcommand:commit"                    help:"'git commit' but errors out if on wrong branch"`
+	Commit     *EmptyCmd    `arg:"subcommand:commit"                    help:"'git commit' but errors out if on wrong branch"`
 	Config     *ConfigCmd   `arg:"subcommand:config"                    help:"show your .config/forge/ settings"`
-	Dirty      *DirtyCmd    `arg:"subcommand:dirty"                     help:"show dirty git repos"`
+	Dirty      *DirtyCmd    `arg:"subcommand:dirty"                     help:"show repos git says are dirty"`
 	GitFetch   *FindCmd     `arg:"subcommand:fetch"                     help:"run 'git fetch master'"`
-	Gui        *EmptyCmd    `arg:"subcommand:gui"                       help:"open the gui"`
 	List       *FindCmd     `arg:"subcommand:list"                      help:"print a table of the current repos"`
-	Merge      *MergeCmd    `arg:"subcommand:merge"                     help:"merge branches"`
-	Normal     *NormalCmd   `arg:"subcommand:normal"                    help:"set every repo to the default state for software development"`
 	Patch      *PatchCmd    `arg:"subcommand:patch"                     help:"make patchsets"`
-	Pull       *PullCmd     `arg:"subcommand:pull"                      help:"run 'git pull'"`
+	GitPull    *FindCmd     `arg:"subcommand:pull"                      help:"run 'git pull'"`
-	Tag        *TagCmd      `arg:"subcommand:tag"                       help:"manage git tags"`
 	URL        string       `arg:"--connect"                            help:"forge url"`
 	All        bool         `arg:"--all"                                help:"git commit --all"`
 	Build      string       `arg:"--build"                              help:"build a repo"`
@@ -38,24 +31,23 @@ type args struct {
 	BuildForge bool         `arg:"--forge-rebuild"                      help:"download and rebuild forge"`
 	Force      bool         `arg:"--force"                              help:"try to strong arm things"`
 	Verbose    bool         `arg:"--verbose"                            help:"show more output"`
+	Bash       bool         `arg:"--bash"                               help:"generate bash completion"`
+	BashAuto   []string     `arg:"--auto-complete"                      help:"todo: move this to go-arg"`
+	// Show       string       `arg:"--show"                               help:"show a repo"`
 }
 
 type EmptyCmd struct {
 }
 
-type NormalCmd struct {
-	On  *EmptyCmd `arg:"subcommand:on"        help:"turn normal mode on"`
-	Off *EmptyCmd `arg:"subcommand:off"        help:"turn normal mode off"`
-}
-
-type CommitCmd struct {
-	Submit bool `arg:"--submit"    default:"true"     help:"submit the patches to forge"`
-}
-
 type testCmd string
 
 type CleanCmd struct {
-	Verify *EmptyCmd `arg:"subcommand:verify"        help:"rescan repo"`
+	Delete   *EmptyCmd      `arg:"subcommand:delete"        help:"rescan repo"`
+	Devel    *CleanDevelCmd `arg:"subcommand:devel"         help:"clean and verify the devel branches"`
+	Force    *EmptyCmd      `arg:"subcommand:force"         help:"do destructive stuff"`
+	GitReset *EmptyCmd      `arg:"subcommand:git-reset"     help:"git reset --hard"`
+	Pub      *EmptyCmd      `arg:"subcommand:pub"           help:"clean target version numbers"`
+	User     *EmptyCmd      `arg:"subcommand:user"          help:"clean the user branches"`
 	Repo     string         `arg:"--repo"                   help:"which repo to look at"`
 }
 
@@ -64,28 +56,10 @@ type CleanDevelCmd struct {
 }
 
 type PatchCmd struct {
-	Check  *EmptyCmd  `arg:"subcommand:check"         help:"check the state of the patches"`
 	List   *EmptyCmd `arg:"subcommand:list"          help:"your downloaded patchsets"`
 	Get    *EmptyCmd `arg:"subcommand:get"           help:"get the new patchsets"`
 	Show   *EmptyCmd `arg:"subcommand:show"          help:"your pending commits to your code"`
-	Submit *SubmitCmd `arg:"subcommand:submit"        help:"submit your commits"`
+	Submit string    `arg:"--submit"                 help:"submit your commits"`
-	Repos  *SubmitCmd `arg:"subcommand:repos"         help:"show repos with patches"`
-}
-
-type SubmitCmd struct {
-	Match string `arg:"positional"`
-}
-
-type PullCmd struct {
-	Check   *EmptyCmd `arg:"subcommand:check"         help:"check repo versions"`
-	Dirty   *EmptyCmd `arg:"subcommand:dirty"         help:"only check dirty repos"`
-	Patches *EmptyCmd `arg:"subcommand:patches"       help:"only check repos with patches"`
-}
-
-type TagCmd struct {
-	List   *EmptyCmd `arg:"subcommand:list"          help:"list the tags"`
-	Clean  *EmptyCmd `arg:"subcommand:clean"         help:"clean out old and duplicate tags"`
-	Delete string    `arg:"--delete"                 help:"delete a tag"`
 }
 
 type ConfigAddCmd struct {
@@ -117,12 +91,6 @@ type CheckoutCmd struct {
 	Master *FindCmd `arg:"subcommand:master"                    help:"git checkout master"`
 }
 
-type MergeCmd struct {
-	Devel   *FindCmd  `arg:"subcommand:devel"                     help:"merge user to devel"`
-	Master  *FindCmd  `arg:"subcommand:master"                    help:"merge devel to master"`
-	Publish *EmptyCmd `arg:"subcommand:publish"                    help:"increment versions and publish master branch"`
-}
-
 type DirtyCmd struct {
 }
 
@@ -133,7 +101,6 @@ type FindCmd struct {
 	Private   bool `arg:"--private"                       help:"your private repos from your .config/forge/"`
 	Dirty     bool `arg:"--dirty"                         help:"only use dirty git repos"`
 	User      bool `arg:"--user"                          help:"show repos on the user branch"`
-	Full      bool `arg:"--full"                          help:"show full repo names"`
 	// ReadOnly  bool `arg:"--readonly"                      help:"include read-only repos"`
 }
 
@@ -143,63 +110,25 @@ func (args) Version() string {
 
 func (a args) Description() string {
 	return `
-forge -- a tool to manage lots of git repos. forge includes a GUI and TUI.
+forge -- a tool to git repos at go.wit.com
 
-	forge only executes the 'git' command. Everything it does, you can run by hand with 'git'.
+	but you can probably use it for other things
-`
+	`
 }
 
-// handles shell autocomplete
+func (args) doBashHelpDebug() {
-func DoAutoComplete(pb *prep.Auto) {
+	fmt.Fprintln(os.Stderr, "")
-	switch pb.Cmd {
+	fmt.Fprintln(os.Stderr, "hello world")
-	case "checkout":
+	var more string
-		pb.Autocomplete2("devel master user")
+	p0 := "0" + argv.BashAuto[0]
-	case "clean":
+	p1 := "1" + argv.BashAuto[1]
-		pb.Autocomplete2("")
+	p2 := "2" + argv.BashAuto[2]
-	case "commit":
+	if len(argv.BashAuto[1]) >= 0 {
-		pb.Autocomplete2("--all")
+		more = "more"
-	case "config":
-		fmt.Println("add fix list")
-	case "dirty":
-		fmt.Println("")
-	case "gui":
-		fmt.Println("")
-	case "--gui":
-		pb.Autocomplete2("andlabs gocui")
-	case "list":
-		pb.Autocomplete2("--mine --favorites --dirty")
-	case "merge":
-		pb.Autocomplete2("devel master --all")
-	case "normal":
-		pb.Autocomplete2("on off")
-	case "pull":
-		pb.Autocomplete2("--force check")
-	case "patch":
-		fmt.Println("check get list repos submit show")
-	case "tag":
-		fmt.Println("list --delete clean")
-	default:
-		if pb.Cmd == "" {
-			pb.Autocomplete2("help list checkout clean commit dirty fetch gui normal merge patch pull tag --gui")
 	} else {
-			pb.Autocomplete2("list checkout clean commit dirty normal merge tag")
+		more = "less"
 	}
-	}
+	p1a := fmt.Sprintf("1a.%s.%+v.\n", argv.BashAuto[1], len(argv.BashAuto[1]))
-	os.Exit(0)
+	fmt.Fprintln(os.Stderr, "pull something else", argv.BashAuto, len(argv.BashAuto), p0, p1, p2, p1a, "end", more)
-}
+	fmt.Fprintln(os.Stderr, "")
-
-func (args) Appname() string {
-	return ARGNAME
-}
-
-func ifBlank(arg string) bool {
-	if arg == "''" {
-		// if empty, the user has not typed something
-		return true
-	}
-	return false
-}
-
-func (a args) DoAutoComplete(autoArgv *prep.Auto) {
-	DoAutoComplete(autoArgv)
 }

argvAutoshell.go

@@ -0,0 +1,115 @@
+// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
+// Use of this source code is governed by the GPL 3.0
+
+package main
+
+import (
+	"fmt"
+	"os"
+)
+
+/*
+	handles shell autocomplete
+*/
+
+// used for shell auto completion
+// var ARGNAME string = "forge" // todo: get this from $0 ?
+
+func deleteMatch() {
+	// f := forgedb.InitSimple()
+	fmt.Println("go.wit.com/lib/gui/repostatus todo: need to do this")
+}
+
+func (args) doBashAuto() {
+	argv.doBashHelp()
+	switch argv.BashAuto[0] {
+	case "checkout":
+		fmt.Println("user devel master ")
+	case "clean":
+		// 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("devel user")
+	case "commit":
+		fmt.Println("--all")
+	case "config":
+		fmt.Println("add fix list")
+	case "delete":
+		deleteMatch()
+	case "dirty":
+		fmt.Println("")
+	case "examine":
+		fmt.Println("fix")
+	case "list":
+		fmt.Println("--all --mine --favorites --private")
+	case "pull":
+		fmt.Println("--force")
+	case "patch":
+		fmt.Println("get list --submit show")
+	case "user":
+		fmt.Println("--force")
+	case "devel":
+		fmt.Println("--force")
+	case "master":
+		fmt.Println("")
+	case "verify":
+		fmt.Println("user devel master")
+	default:
+		if argv.BashAuto[0] == ARGNAME {
+			// list the subcommands here
+			fmt.Println("--bash list checkout clean commit config dirty fetch patch pull")
+		}
+	}
+	os.Exit(0)
+}
+
+// prints help to STDERR // TODO: move everything below this to go-args
+func (args) doBashHelp() {
+	if argv.BashAuto[1] != "''" {
+		// if this is not blank, then the user has typed something
+		return
+	}
+	if argv.BashAuto[0] != ARGNAME {
+		// if this is not the name of the command, the user already started doing something
+		return
+	}
+	if argv.BashAuto[0] == ARGNAME {
+		me.pp.WriteHelp(os.Stderr)
+		return
+	}
+	fmt.Fprintln(os.Stderr, "")
+	fmt.Fprintln(os.Stderr, "hello world")
+	fmt.Fprintln(os.Stderr, "")
+}
+
+// complete -F forge --bash forge
+func (args) doBash() {
+	fmt.Println("# add this in your bashrc:")
+	fmt.Println("")
+	fmt.Println("# todo: add this to go-arg as a 'hidden' go-arg option --bash")
+	fmt.Println("#")
+	fmt.Println("# todo: can this output work/parse with:")
+	fmt.Println("# complete -C `" + ARGNAME + " --bash` " + ARGNAME)
+	fmt.Println("")
+	fmt.Println("_" + ARGNAME + "_complete()")
+	fmt.Println("{")
+	fmt.Println("	# sets local to this func vars")
+	fmt.Println("	local cur prev all")
+	fmt.Println("	cur=${COMP_WORDS[COMP_CWORD]}")
+	fmt.Println("	prev=${COMP_WORDS[COMP_CWORD-1]}")
+	fmt.Println("	all=${COMP_WORDS[@]}")
+	fmt.Println("")
+	fmt.Println("	# this is where we generate the go-arg output")
+	fmt.Println("        GOARGS=$(" + ARGNAME + " --auto-complete $prev \\'$cur\\' $all)")
+	fmt.Println("")
+	fmt.Println("	# this compares the command line input from the user")
+	fmt.Println("	# to whatever strings we output")
+	fmt.Println("        COMPREPLY=( $(compgen -W \"$GOARGS\" -- $cur) )  # THIS WORKS")
+	fmt.Println("	return 0")
+	fmt.Println("}")
+	fmt.Println("complete -F _" + ARGNAME + "_complete " + ARGNAME)
+	fmt.Println("")
+	fmt.Println("# copy and paste the above into your bash shell should work")
+	os.Exit(0)
+}

build

@@ -3,6 +3,3 @@
 # include forgeConfig
 mkdir -p  files/usr/bin/
 cp ../utils/wit-utils/forgeConfig/forgeConfig files/usr/bin/
-
-mkdir -p files/usr/share/bash-completion/completions/
-forge --bash > files/usr/share/bash-completion/completions/forge

config.go

@@ -1,36 +0,0 @@
-package main
-
-// functions to import and export the protobuf
-// data to and from config files
-
-import (
-	"fmt"
-
-	"go.wit.com/lib/config"
-	"go.wit.com/lib/protobuf/forgepb"
-	"go.wit.com/log"
-)
-
-func forgeConfigSave() error {
-	return me.forge.Config.ConfigSave()
-}
-
-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()
-}
-
-func sampleConfig(all *forgepb.ForgeConfigs) {
-	new1 := new(forgepb.ForgeConfig)
-	new1.GoPath = "go.wit.com"
-	new1.Writable = true
-	new1.Directory = true
-	all.Append(new1)
-
-	fmt.Println("first time user. adding an example config file with", len(all.ForgeConfigs), "repos")
-}

debug.go

@@ -1,88 +0,0 @@
-// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
-// Use of this source code is governed by the GPL 3.0
-
-package main
-
-// An app to submit patches for the 30 GO GUI repos
-
-import (
-	"fmt"
-	"time"
-
-	"go.wit.com/gui"
-	"go.wit.com/lib/debugger"
-	"go.wit.com/lib/gui/shell"
-	"go.wit.com/lib/protobuf/gitpb"
-	"go.wit.com/log"
-)
-
-func init() {
-	if debugger.ArgDebug() {
-		log.Info("cmd line --debugger == true")
-		go func() {
-			log.Sleep(2)
-			debugger.DebugWindow()
-		}()
-	}
-}
-
-func debug() {
-	defer func() {
-		if r := recover(); r != nil {
-			gui.Crash(r, "forge debug()")
-		}
-	}()
-	time.Sleep(2 * time.Second)
-	for {
-		now := time.Now()
-
-		if me.repoAllB != nil {
-			tmp := fmt.Sprintf("All (%d)", me.forge.Repos.Len())
-			me.repoAllB.SetLabel(tmp)
-		}
-
-		if me.repoDevelMergeB != nil {
-			found := findMergeToDevel()
-			tmp := fmt.Sprintf("needs merge to devel (%d)", found.Len())
-			me.repoDevelMergeB.SetLabel(tmp)
-		}
-
-		if me.repoWritableB != nil {
-			found := gitpb.NewRepos()
-			for repo := range me.forge.Repos.IterByFullPath() {
-				if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
-					continue
-				}
-
-				found.AppendByFullPath(repo)
-
-			}
-			tmp := fmt.Sprintf("writable (%d)", found.Len())
-			me.repoWritableB.SetLabel(tmp)
-		}
-
-		dirty := me.forge.CheckDirty()
-
-		if me.repoDirtyB != nil {
-			tmp := fmt.Sprintf("dirty (%d)", dirty.Len())
-			me.repoDirtyB.SetLabel(tmp)
-		}
-
-		if me.reposWinB != nil {
-			tmp := fmt.Sprintf("Repos (%d)", me.forge.Repos.Len())
-			if dirty.Len() > 0 {
-				tmp = fmt.Sprintf("Repos (%d) (%d dirty)", me.forge.Repos.Len(), dirty.Len())
-			}
-			me.reposWinB.SetLabel(tmp)
-		}
-
-		// check for new patches
-		log.Info("should check for packages here")
-		//		if err := me.forge.ListPatches(); err != nil {
-		//			log.Info("List Patchsets Failed", err)
-		//		}
-
-		log.Printf("finished a forge scan here in (%s)\n", shell.FormatDuration(time.Since(now)))
-		time.Sleep(90 * time.Second)
-	}
-}

doCheckout.go

@@ -5,43 +5,348 @@ package main
 
 import (
 	"fmt"
+	"path/filepath"
 	"time"
 
 	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/forgepb"
+	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
 
+var ErrorNotAllReposOnMaster error = fmt.Errorf("not all repos on are on the master branch")
+var ErrorNotAllReposOnDevel error = fmt.Errorf("not all repos on are on the devel branch")
+var ErrorNotAllReposOnUser error = fmt.Errorf("not all repos on are on the user branch")
+
+func IsEverythingOnMaster() (int, int, int, error) {
+	var total int
+	var count int
+	var nope int
+
+	// first make sure every repo is on the master branch
+	for repo := range me.forge.Repos.IterAll() {
+		total += 1
+		if repo.GetMasterBranchName() == repo.GetCurrentBranchName() {
+			count += 1
+		} else {
+			nope += 1
+		}
+	}
+	if total != count {
+		// log.Info(ErrorNotAllReposOnMaster)
+		return total, count, nope, ErrorNotAllReposOnMaster
+	}
+	return total, count, nope, nil
+}
+
+func IsEverythingOnDevel() (int, int, int, error) {
+	var total int
+	var count int
+	var nope int
+
+	// first make sure every repo is on the master branch
+	for repo := range me.forge.Repos.IterAll() {
+		total += 1
+		if repo.GetDevelBranchName() == repo.GetCurrentBranchName() {
+			count += 1
+		} else {
+			nope += 1
+		}
+	}
+	if total != count {
+		return total, count, nope, ErrorNotAllReposOnDevel
+	}
+	return total, count, nope, nil
+}
+
+func IsEverythingOnUser() (int, int, int, error) {
+	var total int
+	var count int
+	var nope int
+
+	// first make sure every repo is on the master branch
+	for repo := range me.forge.Repos.IterAll() {
+		total += 1
+		if repo.GetCurrentBranchName() == repo.GetUserBranchName() {
+			count += 1
+		} else {
+			nope += 1
+		}
+	}
+	if total != count {
+		return total, count, nope, ErrorNotAllReposOnUser
+	}
+	return total, count, nope, nil
+}
+
+func doGitReset() {
+	all := me.found.SortByFullPath()
+	for all.Scan() {
+		repo := all.Next()
+		if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
+			// log.Info("is readonly", repo.GetGoPath())
+			if repo.CheckDirty() {
+				log.Info("is readonly and dirty", repo.GetGoPath())
+				cmd := []string{"git", "reset", "--hard"}
+				repo.RunRealtime(cmd)
+			}
+		} else {
+			// log.Info("is not readonly", repo.GetGoPath())
+		}
+	}
+}
+
+func rillCheckoutUser(repo *gitpb.Repo) error {
+	if repo.IsDirty() {
+		// never do dirty repos
+		return nil
+	}
+	if repo.GetCurrentBranchName() == repo.GetMasterBranchName() {
+		// repo is already on devel branch. have to move them there first for now
+		// return repo.CheckoutDevel()
+	}
+	if repo.GetCurrentBranchName() == repo.GetUserBranchName() {
+		// repo is already on user branch
+		return nil
+	}
+	if err := repo.CheckoutUser(); err != nil {
+		log.Info(repo.GetFullPath(), err)
+		return err
+	}
+	return nil
+}
+
 // trys to figure out if there is still something to update
+func doAllCheckoutUser() error {
+	now := time.Now()
+	me.forge.RillFuncError(rillCheckoutUser)
+	count := me.forge.RillReload()
+	if count != 0 {
+		me.forge.ConfigSave()
+	}
+
+	total, count, nope, err := IsEverythingOnUser()
+	log.Printf("User branch check. %d total repos. (%d ok) (%d not on user branch) (%s)\n", total, count, nope, shell.FormatDuration(time.Since(now)))
+	if err != nil {
+		// display all repos not on user
+		me.found = new(gitpb.Repos)
+		all := me.forge.Repos.SortByFullPath()
+		for all.Scan() {
+			repo := all.Next()
+			if repo.GetCurrentBranchName() != repo.GetUserBranchName() {
+				me.found.AppendByGoPath(repo)
+			}
+		}
+		me.forge.PrintHumanTable(me.found)
+		log.Printf("There are %d repos that are NOT on the user branch\n", me.found.Len())
+		return err
+	}
+	return nil
+}
+
+func rillCheckoutDevel(repo *gitpb.Repo) error {
+	if repo.IsDirty() {
+		// never do dirty repos
+		return nil
+	}
+	if repo.GetCurrentBranchName() == repo.GetDevelBranchName() {
+		// repo is already on devel branch
+		return nil
+	}
+	repo.CheckoutDevel()
+	return nil
+}
+
+// is every repo on the devel branch?
+func doAllCheckoutDevel() error {
+	now := time.Now()
+	log.Info("going to rill:")
+	me.forge.RillFuncError(rillCheckoutDevel)
+	count := me.forge.RillReload()
+	if count != 0 {
+		me.forge.ConfigSave()
+	}
+
+	total, count, nope, err := IsEverythingOnDevel()
+	log.Printf("Devel branch check. %d total repos. (%d ok) (%d not on devel branch) (%s)\n", total, count, nope, shell.FormatDuration(time.Since(now)))
+	if err != nil {
+		// display all repos not on user
+		me.found = new(gitpb.Repos)
+		all := me.forge.Repos.SortByFullPath()
+		for all.Scan() {
+			repo := all.Next()
+			if repo.GetCurrentBranchName() != repo.GetDevelBranchName() {
+				me.found.AppendByGoPath(repo)
+			}
+		}
+		me.forge.PrintHumanTable(me.found)
+		log.Printf("There are %d repos that are NOT on the devel branch\n", me.found.Len())
+		return err
+	}
+	return nil
+}
+
+func rillCheckoutMaster(repo *gitpb.Repo) error {
+	if repo.IsDirty() {
+		// never do dirty repos
+		return nil
+	}
+	if repo.GetCurrentBranchName() == repo.GetMasterBranchName() {
+		// repo is already on master
+		return nil
+	}
+	if repo.GetUserVersion() == "uerr" {
+		repo.CheckoutMaster()
+		return nil
+	}
+	if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
+		// skip other checks for readonly repos
+		repo.CheckoutMaster()
+		return nil
+	}
+	/*
+		if repo.GetUserVersion() != repo.GetDevelVersion() {
+			// don't switch branches if the user branch has uncommitted patches
+			return nil
+		}
+		if repo.GetDevelVersion() != repo.GetMasterVersion() {
+			// don't switch braches if the devel branch does not match master (needs merge)
+			return nil
+		}
+	*/
+	repo.CheckoutMaster()
+	return nil
+}
+
+// trys to figure out if there is still something to update
+func doAllCheckoutMaster() error {
+	now := time.Now()
+	me.forge.RillFuncError(rillCheckoutMaster)
+	count := me.forge.RillReload()
+	if count != 0 {
+		me.forge.ConfigSave()
+	}
+
+	total, count, nope, err := IsEverythingOnMaster()
+	log.Printf("Master branch check. %d total repos. (%d ok) (%d not on master branch) (%s)\n", total, count, nope, shell.FormatDuration(time.Since(now)))
+	if err != nil {
+		// display all repos not on master
+		me.found = new(gitpb.Repos)
+		all := me.forge.Repos.SortByFullPath()
+		for all.Scan() {
+			repo := all.Next()
+			if repo.GetCurrentBranchName() != repo.GetMasterBranchName() {
+				me.found.AppendByGoPath(repo)
+			}
+		}
+		me.forge.PrintHumanTable(me.found)
+		log.Printf("There are %d repos that are NOT on the master branch\n", me.found.Len())
+		return err
+	}
+	return nil
+}
+
+// shared this with the GUI and the command line?
+func doCheckoutShared() error {
+	if me.argvCheckoutUser {
+		// log.Info("Starting git checkout user")
+		if argv.Force {
+			log.Info("going to force create user branches")
+			if err := makeUserBranches(); err != nil {
+				return err
+			}
+		}
+		// this uses rill and is super fast
+		doAllCheckoutUser()
+		return nil
+	}
+
+	if me.argvCheckoutDevel {
+		// log.Info("Starting git checkout devel")
+		if argv.Force {
+			log.Info("going to force create devel branches")
+			makeDevelBranches()
+		}
+		// this uses rill and is super fast
+		doAllCheckoutDevel()
+		return nil
+	}
+
+	if me.argvCheckoutMaster {
+		log.Info("Starting git checkout master")
+		doAllCheckoutMaster()
+		return nil
+	}
+	log.Info("Forge didn't know what branches to checkout")
+	return nil
+}
+
+// trys to figure out if there is still something to update
+// todo: redo this logic as it is terrible
 
 func doCheckout() error {
 	if argv.Checkout.User != nil {
-		start := time.Now()
+		me.argvCheckoutUser = true
-		err := me.forge.DoAllCheckoutUser(argv.Force)
+		me.forge.Config.Mode = forgepb.ForgeMode_USER
-		dur := time.Since(start)
+		me.forge.Config.ConfigSave()
-		log.Printf("Checked out %d user braches in %s\n", me.forge.Repos.Len(), shell.FormatDuration(dur))
-		if err != nil {
-			badExit(err)
-		}
-		okExit("")
 	}
 
 	if argv.Checkout.Devel != nil {
-		// setForgeMode(forgepb.ForgeMode_DEVEL)
+		me.argvCheckoutDevel = true
-		if err := me.forge.DoAllCheckoutDevelNew(argv.Force); err != nil {
+		me.forge.Config.Mode = forgepb.ForgeMode_DEVEL
-			badExit(err)
+		me.forge.Config.ConfigSave()
-		}
-		okExit("")
 	}
 
 	if argv.Checkout.Master != nil {
-		setForgeMode(forgepb.ForgeMode_MASTER) // disable "normal" mode if set
+		me.argvCheckoutMaster = true
-
+		me.forge.Config.Mode = forgepb.ForgeMode_MASTER
-		if err := me.forge.DoAllCheckoutMaster(); err != nil {
+		me.forge.Config.ConfigSave()
+	}
+	if err := doCheckoutShared(); err != nil {
 		badExit(err)
 	}
 	okExit("")
-	}
+	return nil
-	badExit(fmt.Errorf("did not specify what branch to checkout"))
+}
+
+func makeDevelBranches() error {
+	all := me.forge.Repos.SortByFullPath()
+	for all.Scan() {
+		repo := all.Next()
+		branch := repo.GetDevelBranchName()
+		if repo.Exists(filepath.Join(".git/refs/heads", branch)) {
+			continue
+		}
+		if repo.Exists(filepath.Join(".git/refs/remotes/origin", branch)) {
+			cmd := []string{"git", "checkout", branch}
+			repo.RunVerbose(cmd)
+			continue
+		}
+		cmd := []string{"git", "branch", branch}
+		repo.RunVerbose(cmd)
+		cmd = []string{"git", "checkout", branch}
+		repo.RunVerbose(cmd)
+	}
+	return nil
+}
+
+func makeUserBranches() error {
+	all := me.forge.Repos.SortByFullPath()
+	for all.Scan() {
+		repo := all.Next()
+		branch := repo.GetUserBranchName()
+		if repo.Exists(filepath.Join(".git/refs/heads", branch)) {
+			continue
+		}
+		if repo.Exists(filepath.Join(".git/refs/remotes/origin", branch)) {
+			cmd := []string{"git", "checkout", branch}
+			repo.RunVerbose(cmd)
+			continue
+		}
+		cmd := []string{"git", "branch", branch}
+		repo.RunVerbose(cmd)
+		cmd = []string{"git", "checkout", branch}
+		repo.RunVerbose(cmd)
+	}
 	return nil
 }

doClean.go

@@ -6,160 +6,101 @@ package main
 import (
 	"fmt"
 	"path/filepath"
-	"time"
 
-	"go.wit.com/lib/gui/shell"
-	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
 
-func checkRemoteBranches(repo *gitpb.Repo) error {
+var ErrorReposHasLocalBranches error = fmt.Errorf("repo still has local branches")
-	if err := repo.ReloadCheck(); err != nil {
+var ErrorMergeBranch error = fmt.Errorf("trunk has things not in the branch")
-		log.Info("need to reload", repo.FullPath)
+var ErrorMergeTrunk error = fmt.Errorf("branch has things not in trunk")
+
+func doClean() error {
+	if argv.Clean.Pub != nil {
+		if err := doCleanPub(); err != nil {
+			badExit(err)
 		}
-	if repo.VerifyRemoteAndLocalBranches(repo.GetDevelBranchName()) {
+		log.Info("finished attempt at cleaning devel branches")
-	} else {
+		return nil
-		return log.Errorf("remote devel is out of sync with local: todo: git pull or git fetch")
 	}
-	if repo.VerifyRemoteAndLocalBranches(repo.GetMasterBranchName()) {
+	if argv.Clean.Devel != nil {
-	} else {
+		if err := doCleanDevel(); err != nil {
-		return log.Errorf("remote master is out of sync with local: todo: git pull or git fetch")
+			badExit(err)
+		}
+		log.Info("finished attempt at cleaning devel branches")
+		return nil
+	}
+	if argv.Clean.User != nil {
+		if err := doCleanUser(); err != nil {
+			log.Info(err)
+			okExit("")
+		}
+		return nil
 	}
 	return nil
 }
 
-// reverts all repos back to the original master branches
+func doCleanUser() error {
-// automatically deletes local devel and user branches
+	if _, count, _, err := IsEverythingOnMaster(); err != nil {
-func doClean() error {
+		if count == 0 {
-	setForgeMode(forgepb.ForgeMode_CLEAN)
+			log.Info("No repos are on the master branch")
-
-	if argv.Clean.Verify != nil {
-		stats := me.forge.RillRepos(checkRemoteBranches)
-		for path, stat := range stats {
-			if stat.Err == nil {
-				continue
-			}
-			dur := stat.End.Sub(stat.Start)
-			if dur > time.Second {
-				log.Infof("%s checkRemoteBranches() took a long time (%s) (err=%v)\n", path, shell.FormatDuration(dur), stat.Err)
-			}
-		}
-		// log.Infof("%-60s, %-60s %v %s\n", stat.Start, stat.End.String(), dur, path)
-		// log.Infof("%-30v %s %v\n", dur, path, stat.Err)
 			return nil
 		}
-
+		log.Info("Not all repos are on the master branch")
-	// fix this to work, then delete all the other options for "forge clean'
+		// return err
-	if err := me.forge.DoAllCheckoutMaster(); err != nil {
-		// badExit(err)
 	}
 
+	var anyerr error
+
 	all := me.forge.Repos.SortByFullPath()
 	for all.Scan() {
 		repo := all.Next()
-		if repo.GetCurrentBranchName() != repo.GetMasterBranchName() {
+		if err := doCleanUserRepo(repo); err != nil {
-			continue
-		}
-		if repo.IsDirty() {
-			continue
-		}
-
-		// when publishing, clean out the details of that if it's still there
-		if repo.GetTargetVersion() != "" {
-			repo.SetTargetVersion("")
-			configSave = true
-		}
-
-		// try to delete user
-		if err := doRepoCleanUser(repo); err != nil {
 			log.Info(repo.GetGoPath(), err)
-		}
+			anyerr = err
-
-		// try to delete devel
-		doRepoCleanDevel(repo)
-	}
-
-	found := gitpb.NewRepos()
-
-	total := 0
-	// find all repos that aren't "clean"
-	all = me.forge.Repos.SortByFullPath()
-	for all.Scan() {
-		repo := all.Next()
-		total += 1
-
-		// find repos not on master branch
-		if repo.GetCurrentBranchName() != repo.GetMasterBranchName() {
-			found.AppendByFullPath(repo)
-			continue
-		}
-
-		// find dirty repos
-		if repo.IsDirty() {
-			found.AppendByFullPath(repo)
-			continue
-		}
-
-		// find repos that still have a local user branch
-		if repo.IsLocalBranch(repo.GetUserBranchName()) {
-			found.AppendByFullPath(repo)
-			continue
-		}
-
-		// find repos that still have a local devel branch
-		if repo.IsLocalBranch(repo.GetDevelBranchName()) {
-			found.AppendByFullPath(repo)
-			continue
 		}
 	}
-
+	return anyerr
-	// display all the repos that aren't clean to the user
-	log.Printf("\n") // padding for now
-	if argv.Verbose {
-		me.forge.PrintHumanTableDirty(found)
-	} else {
-		me.forge.PrintHumanTable(found)
-	}
-	log.Printf("\n") // padding for now
-
-	var hmm int
-	hmm = found.Len()
-	if hmm == 0 {
-		log.Printf("%d repos are not clean\n", hmm)
-	} else {
-		log.Info("All repos are clean", total, hmm)
-	}
-	return nil
 }
 
 /*
-	func doesLocalBranchExist(repo *gitpb.Repo, branch string) bool {
+func doesLocalBranchExist(repo *gitpb.Repo, branch string) bool {
 	return repo.Exists(filepath.Join(".git/refs/heads", branch))
-	}
+}
 */
-func doRepoCleanDevel(repo *gitpb.Repo) error {
+
+func doCleanDevel() error {
+	var total int
+	var count int
+	all := me.forge.Repos.SortByFullPath()
+	for all.Scan() {
+		repo := all.Next()
+		total += 1
 		if !repo.IsLocalBranch(repo.GetDevelBranchName()) {
 			// there is no local branch named 'devel'
-		return nil
+			continue
 		}
 
 		if repo.GetCurrentBranchName() != repo.GetMasterBranchName() {
-		return log.Errorf("%s not on master branch:", repo.GetFullPath())
+			log.Info("Repo not on master branch:", repo.GetGoPath())
+			continue
 		}
 		if repo.IsDirty() {
-		return log.Errorf("%s is dirty:", repo.GetFullPath())
+			log.Info("Repo is dirty:", repo.GetGoPath())
+			continue
 		}
+		count += 1
 		if err := justDeleteTheDevelBranchAlready(repo); err != nil {
 			log.Info("justDeleteTheDevel() err", repo.GetGoPath(), err)
-		configSave = true
-		return err
 		}
+	}
+	log.Info("")
+	log.Printf("attempted cleaning %d devel branches of %d total branches\n", count, total)
 	return nil
 }
 
-// removes all local user branches
+// removes all local branches
-func doRepoCleanUser(repo *gitpb.Repo) error {
+func doCleanUserRepo(repo *gitpb.Repo) error {
 	if repo.IsDirty() {
 		return nil
 	}
@@ -177,38 +118,33 @@ func doRepoCleanUser(repo *gitpb.Repo) error {
 		return nil
 	}
 
-	// will you loose work if you delete your user branch?
+	log.Info("trying to delete", bruser, repo.GetUserVersion())
-	// if DevelBranchExists()
-	//	then if UserBranchCommits exist in DevelBranch
-	//		DeleteUserBranch is safe
-	if repo.IsLocalBranch(brdevel) {
-		b1 := repo.CountDiffObjects(bruser, "refs/heads/"+brdevel) // should be zero
-		if b1 == 0 {
-			// every user branch exists in devel. delete user branch
-			cmd := []string{"git", "branch", "-D", bruser}
-			// log.Info("USER IS IN DEVEL", repo.GetGoPath(), cmd)
-			_, err := repo.RunVerboseOnError(cmd)
-			return err
-		}
-	}
 
-	brmaster := repo.GetMasterBranchName()
+	b1 := repo.CountDiffObjects(bruser, brdevel) // should be zero
-
-	// will you loose work if you delete your user branch?
-	// if master branch exists()
-	//	then if all user commits exist in master
-	//		delete user branch is safe
-	if repo.IsLocalBranch(brmaster) {
-		b1 := repo.CountDiffObjects(bruser, "refs/heads/"+brmaster) // should be zero
 	if b1 == 0 {
 		cmd := []string{"git", "branch", "-D", bruser}
-			// log.Info("USER IS IN DEVEL", repo.GetGoPath(), cmd)
+		log.Info("USER IS IN DEVEL", repo.GetGoPath(), cmd)
-			_, err := repo.RunVerboseOnError(cmd)
+		err := repo.RunVerbose(cmd)
 		return err
 	}
-	}
 
-	return fmt.Errorf("%s branch has unique commits", bruser)
+	return fmt.Errorf("%s branch has things not in %s count=%d", bruser, brdevel, b1)
+}
+
+// hack to cleanup release versioning info
+func doCleanPub() error {
+	total := 0
+	all := me.forge.Repos.SortByFullPath()
+	for all.Scan() {
+		repo := all.Next()
+		if repo.GetTargetVersion() != "" {
+			repo.SetTargetVersion("")
+			configSave = true
+			total += 1
+		}
+	}
+	log.Printf("clearing %d total repos\n", total)
+	return nil
 }
 
 // if you call this, there is no going back. no checks anymore. nothing
@@ -229,8 +165,8 @@ func justDeleteTheDevelBranchAlready(repo *gitpb.Repo) error {
 		b1 := repo.CountDiffObjects(branch, remote) // should be zero
 		if b1 == 0 {
 			cmd := []string{"git", "branch", "-D", repo.GetDevelBranchName()}
-			// log.Info("DEVEL IS IN REMOTE", repo.GetGoPath(), cmd)
+			log.Info("DEVEL IS IN REMOTE", repo.GetGoPath(), cmd)
-			_, err := repo.RunVerboseOnError(cmd)
+			err := repo.RunVerbose(cmd)
 			return err
 		}
 		cmd := []string{"git", "push"}
@@ -241,32 +177,15 @@ func justDeleteTheDevelBranchAlready(repo *gitpb.Repo) error {
 
 	// remote doesn't exist, check against master
 	master := repo.GetMasterBranchName()
-	b1 := repo.CountDiffObjects(branch, "refs/heads/"+master) // should be zero
+	b1 := repo.CountDiffObjects(branch, master) // should be zero
 	if b1 == 0 {
 		cmd := []string{"git", "branch", "-D", repo.GetDevelBranchName()}
-		// log.Info("DEVEL IS IN REMOTE", repo.GetGoPath(), cmd)
+		log.Info("DEVEL IS IN REMOTE", repo.GetGoPath(), cmd)
-		_, err := repo.RunVerboseOnError(cmd)
+		err := repo.RunVerbose(cmd)
 		return err
 	}
 	cmd := []string{"git", "merge something somehow"}
-	log.Info("devel local, remote and master branches are wrong", repo.GetGoPath(), cmd, b1)
+	log.Info("DEVEL LOCAL NEEDS GIT MERGE TO MASTER", repo.GetGoPath(), cmd, b1)
 	// _, err := repo.RunVerbose(cmd)
 	return nil
 }
-
-func doGitReset() {
-	all := me.forge.Repos.SortByFullPath()
-	for all.Scan() {
-		repo := all.Next()
-		if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
-			// log.Info("is readonly", repo.GetGoPath())
-			if repo.CheckDirty() {
-				log.Info("is readonly and dirty", repo.GetGoPath())
-				cmd := []string{"git", "reset", "--hard"}
-				repo.RunRealtime(cmd)
-			}
-		} else {
-			// log.Info("is not readonly", repo.GetGoPath())
-		}
-	}
-}

doCommit.go

@@ -6,15 +6,16 @@ package main
 import (
 	"os"
 
-	"go.wit.com/lib/config"
 	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
 
-func doCommit() error {
+func doCommit() {
 	if argv.All {
-		found := me.forge.CheckDirty()
+		log.Info("do a commit everywhere")
+		doCheckDirtyAndConfigSave()
+		found := findDirty()
 		var newpatches bool
 		for repo := range found.IterAll() {
 			log.Info("do a commit on repo", repo.GetGoPath())
@@ -22,27 +23,27 @@ func doCommit() error {
 				badExit(err)
 			}
 			newpatches = true
-			repo.CheckDirty()
 		}
 		if newpatches {
-			config.SetChanged("repos", true)
+			// if there are enw patches, autocommit them
-			return doPatchSubmit()
+			_, err := me.forge.SubmitDevelPatchSet("forge auto commit")
+			if err != nil {
+				badExit(err)
+			}
 		}
 		okExit("")
 	}
 
-	repo := findCurrentPwdRepoOrDie()
+	pwd, _ := os.Getwd()
-
+	repo := me.forge.Repos.FindByFullPath(pwd)
-	if !repo.CheckDirty() {
+	if repo == nil {
-		okExit(log.Sprintf("this repo %s is not dirty.\n\n--all    # commit all changes in all repos", repo.GetFullPath()))
+		log.Info("todo: forge doesn't know how to work here yet")
-	} else {
+		okExit("")
-		log.Info("repo is dirty", repo.GetFullPath())
 	}
 
 	if repo.GetCurrentBranchName() != repo.GetUserBranchName() {
-		found := new(gitpb.Repos)
+		me.found.Append(repo)
-		found.Append(repo)
+		me.forge.PrintHumanTable(me.found)
-		me.forge.PrintHumanTable(found)
 		log.Info("")
 		log.Info("wrong branch. Can not commit on", repo.GetCurrentBranchName())
 		log.Info("")
@@ -63,15 +64,13 @@ func doCommit() error {
 	if err := shell.ExecCheck([]string{"git", "commit", "--all"}); err != nil {
 		badExit(err)
 	}
-
+	log.Info("git commit ok. forge done")
-	return doPatchSubmit()
 }
 
 func doCommitRepo(repo *gitpb.Repo) error {
 	if repo.GetCurrentBranchName() != repo.GetUserBranchName() {
-		found := new(gitpb.Repos)
+		me.found.Append(repo)
-		found.Append(repo)
+		me.forge.PrintHumanTable(me.found)
-		me.forge.PrintHumanTable(found)
 		log.Info("")
 		log.Info("wrong branch. Can not commit on", repo.GetCurrentBranchName())
 		log.Info("")
@@ -91,7 +90,6 @@ func doCommitRepo(repo *gitpb.Repo) error {
 	}
 
 	if err := shell.ExecCheck([]string{"git", "commit", "--all"}); err != nil {
-		shell.ExecCheck([]string{"git", "reset"})
 		return err
 	}
 	log.Info("git commit ok. forge done")

doConfig.go

@@ -21,8 +21,6 @@ func doConfig() {
 		log.Info("todo")
 		okExit("")
 	}
-
-	/*
 	if argv.Config.Register != "" {
 		if err := doRegister(argv.Config.Register); err == nil {
 			okExit("attempting to register " + argv.Config.Register)
@@ -30,7 +28,6 @@ func doConfig() {
 			badExit(err)
 		}
 	}
-	*/
 
 	// try to add, then save config and exit
 	if argv.Config.Add != nil {
@@ -54,8 +51,6 @@ func doConfig() {
 		os.Exit(0)
 	}
 
-	log.Info("config.PathLock =", me.forge.Config.PathLock)
-
 	me.forge.ConfigPrintTable()
 	okExit("")
 }

doDirty.go

@@ -3,14 +3,60 @@
 
 package main
 
+import (
+	"time"
+
+	"go.wit.com/lib/gui/shell"
+	"go.wit.com/lib/protobuf/gitpb"
+	"go.wit.com/log"
+)
+
 func doDirty() {
-	found := me.forge.CheckDirty()
+	findAll() // select all the repos
-	if found.Len() == 0 {
+	doCheckDirtyAndConfigSave()
-		return
+	found := findDirty()
-	}
 	if argv.Verbose {
 		me.forge.PrintHumanTableDirty(found)
 	} else {
 		me.forge.PrintHumanTable(found)
 	}
 }
+
+func straightCheckDirty() int {
+	var count int
+	// var total int
+	// now := time.Now()
+	for repo := range me.found.IterAll() {
+		// total += 1
+		if repo.IsDirty() {
+			count += 1
+		}
+	}
+	// log.Printf("rill dirty check (%d dirty repos) (%d total repos) took:%s\n", count, total, shell.FormatDuration(time.Since(now)))
+	return count
+}
+
+func doCheckDirty(repo *gitpb.Repo) error {
+	repo.CheckDirty()
+	// reset these in here for now
+	if repo.GetTargetVersion() != "" {
+		repo.TargetVersion = ""
+		me.forge.SetConfigSave(true)
+	}
+	return nil
+}
+
+func doCheckDirtyAndConfigSave() {
+	start := straightCheckDirty()
+
+	now := time.Now()
+	me.forge.RillFuncError(doCheckDirty)
+	end := straightCheckDirty()
+	log.Printf("dirty check (%d dirty repos) (%d total repos) took:%s\n", end, me.found.Len(), shell.FormatDuration(time.Since(now)))
+
+	if start != end {
+		// todo: use internal forgepb configsave flag. should work?
+		me.forge.SetConfigSave(true)
+		me.forge.ConfigSave()
+	}
+}

doGui.go

@@ -18,39 +18,104 @@ import (
 	"go.wit.com/log"
 )
 
+func debug() {
+	time.Sleep(2 * time.Second)
+	for {
+		now := time.Now()
+
+		if me.repoAllB != nil {
+			tmp := fmt.Sprintf("All (%d)", me.forge.Repos.Len())
+			me.repoAllB.SetLabel(tmp)
+		}
+
+		if me.repoDevelMergeB != nil {
+			found := findMergeToDevel()
+			tmp := fmt.Sprintf("needs merge to devel (%d)", found.Len())
+			me.repoDevelMergeB.SetLabel(tmp)
+		}
+
+		if me.repoWritableB != nil {
+			found := gitpb.NewRepos()
+			for repo := range me.forge.Repos.IterByFullPath() {
+				if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
+					continue
+				}
+
+				found.AppendByGoPath(repo)
+
+			}
+			tmp := fmt.Sprintf("writable (%d)", found.Len())
+			me.repoWritableB.SetLabel(tmp)
+		}
+
+		doCheckDirtyAndConfigSave()
+		found := findDirty()
+		dirty := found.Len()
+
+		if me.repoDirtyB != nil {
+			tmp := fmt.Sprintf("dirty (%d)", dirty)
+			me.repoDirtyB.SetLabel(tmp)
+		}
+
+		if me.reposWinB != nil {
+			tmp := fmt.Sprintf("Repos (%d)", me.forge.Repos.Len())
+			if dirty > 0 {
+				tmp = fmt.Sprintf("Repos (%d) (%d dirty)", me.forge.Repos.Len(), dirty)
+			}
+			me.reposWinB.SetLabel(tmp)
+		}
+
+		log.Printf("finished a forge scan here in (%s)\n", shell.FormatDuration(time.Since(now)))
+		time.Sleep(90 * time.Second)
+	}
+}
+
 func doGui() {
-	win := gadgets.NewGenericWindow("Forge: A federated git development tool by WIT.COM", "Current Settings")
+	if me.forge.Config.GetDefaultGui() == "" {
-	win.Custom = func() {
+		me.forge.Config.DefaultGui = "gocui"
+		me.forge.ConfigSave()
+	}
+	me.myGui = gui.New()
+	me.myGui.InitEmbed(resources)
+	me.myGui.SetAppDefaultPlugin(me.forge.Config.DefaultGui) // sets the default GUI plugin to use
+	me.myGui.Default()
+
+	mainWindow := gadgets.NewGenericWindow("Forge: (this kinda works sometimes)", "Current Settings")
+	mainWindow.Custom = func() {
 		log.Warn("MAIN WINDOW CLOSE")
-		okExit("")
+		now := time.Now()
+		count := me.forge.RillReload()
+		log.Info("Repo Reload count =", count)
+		if count != 0 {
+			me.forge.ConfigSave()
+		}
+		log.Printf("rill repos.Reload() took (%s)\n", shell.FormatDuration(time.Since(now)))
+		os.Exit(0)
 	}
 
+	drawWindow(mainWindow)
+
+	// sits here forever
+	debug()
+
+}
+
+func drawWindow(win *gadgets.GenericWindow) {
 	grid := win.Group.RawGrid()
-	if me.forge.Config.GetPathLock() {
+	me.goSrcPwd = gadgets.NewOneLiner(grid, "repo src home")
-		me.goSrcPwd = gadgets.NewOneLiner(grid, "Working Directory")
+	grid.NewLabel("")
-		me.goSrcPwd.SetText(me.forge.Config.ReposDir)
+	var howtoWin *gadgets.GenericWindow
-	} else {
+	me.demoB = grid.NewButton("Howto", func() {
-		me.goSrcEdit = gadgets.NewBasicEntry(grid, "Working Directory")
+		if howtoWin != nil {
-		me.goSrcEdit.SetText(me.forge.Config.ReposDir)
+			howtoWin.Toggle()
-		me.goSrcEdit.Custom = func() {
+			return
-			log.Info("updating text to", me.goSrcEdit.String())
 		}
-	}
+		howtoWin = makeHowtoWin()
-	lockpath := grid.NewCheckbox("Lock").SetChecked(me.forge.Config.PathLock)
+	})
-	lockpath.Custom = func() {
-		if lockpath.IsChecked() {
-			log.Info("lock working directory")
-			me.forge.Config.PathLock = true
-		} else {
-			log.Info("unlock working directory")
-			me.forge.Config.PathLock = false
-		}
-		me.forge.Config.ConfigSave()
-		okExit("you must restart forge after changing the Path Lock")
-	}
-
 	grid.NextRow()
 
+	me.goSrcPwd.SetText(me.forge.GetGoSrc())
+
 	// use ENV GIT_AUTHOR
 	me.gitAuthor = gadgets.NewOneLiner(grid, "Git Author")
 	grid.NextRow()
@@ -63,82 +128,178 @@ func doGui() {
 		me.gitAuthor.SetText(author)
 	}
 
+	group1 := win.Stack.NewGroup("Forge Mode")
+	grid = group1.RawGrid()
+	me.forgeMode = grid.NewLabel("")
+	me.forgeMode.SetText(me.forge.GetMode())
+
+	me.newBranch = grid.NewDropdown()
+	me.newBranch.AddText("master")
+	me.newBranch.AddText("devel")
+	me.newBranch.AddText(me.forge.Config.GetUsername())
+	me.newBranch.Custom = func() {
+		me.setBranchB.Disable()
+		// toggle global values shared by the command line and the gui for doCheckout()
+		switch me.newBranch.String() {
+		case "master":
+			if me.forge.Config.Mode != forgepb.ForgeMode_MASTER {
+				me.setBranchB.Enable()
+			}
+		case "devel":
+			if me.forge.Config.Mode != forgepb.ForgeMode_DEVEL {
+				me.setBranchB.Enable()
+			}
+		default:
+			if me.forge.Config.Mode != forgepb.ForgeMode_USER {
+				me.setBranchB.Enable()
+			}
+		}
+	}
+
+	// select the branch you want to test, build and develop against
+	// this lets you select your user branch, but, when you are happy
+	// you can merge everything into the devel branch and make sure it actually
+	// works. Then, when that is good, merge and version everything in master
+	me.setBranchB = grid.NewButton("Switch mode", func() {
+		win.Disable()
+		defer win.Enable()
+
+		switch me.newBranch.String() {
+		case "master":
+			forgeSwitchMode(forgepb.ForgeMode_MASTER)
+		case "devel":
+			forgeSwitchMode(forgepb.ForgeMode_DEVEL)
+		default:
+			forgeSwitchMode(forgepb.ForgeMode_USER)
+		}
+
+		me.setBranchB.Disable()
+	})
+	me.setBranchB.Disable()
+
 	grid.NextRow()
 
-	gridM := win.Stack.RawGrid()
+	groupM := win.Stack.NewGroup("Mode Windows")
+	gridM := groupM.RawGrid()
 
-	var insertWin *gadgets.GenericWindow
+	var releaseWin *gadgets.GenericWindow
-	s := fmt.Sprintf("Repos (%d)", me.forge.Repos.Len())
+	gridM.NewButton("Release Window", func() {
-	me.reposWinB = gridM.NewButton(s, func() {
+		log.Info("todo: move releaser here")
-		// if the window exists, just toggle it open or closed
+		log.Info("for now, run guireleaser")
-		if insertWin != nil {
+		if releaseWin != nil {
-			insertWin.Toggle()
+			releaseWin.Toggle()
 			return
 		}
-
+		releaseWin = makeModeMasterWin()
-		insertWin = makeReposWinNew()
 	})
 
-	var patchesWin *stdPatchTableWin
+	/*
-	var patchButton *gui.Node
+		// the Devel / Patch mode window
-	patchButton = gridM.NewButton("Your patches", func() {
+		var patchWin *patchesWindow
-		if patchesWin != nil {
+		gridM.NewButton("Patch Window", func() {
-			patchesWin.Toggle()
+			if patchWin != nil {
+				patchWin.Toggle()
 				return
 			}
-		if !isPatchingSafe() {
+			patchWin = new(patchesWindow)
-			patchButton.SetLabel("not safe yet")
+			patchWin.initWindow()
+			patchWin.Show()
+		})
+	*/
+	var patches *stdPatchsetTableWin
+	gridM.NewButton("Patch Window", func() {
+		if patches != nil {
+			patches.Toggle()
 			return
 		}
-		// patchesWin = makePatchesWin(me.forge.Patchsets)
+		patches = makePatchsetsWin()
-		notdone := new(forgepb.Patches)
-
-		all := me.forge.Patchsets.All()
-		for all.Scan() {
-			pset := all.Next()
-			if pset.State == "DONE" {
-				// skip old patchsets
-				continue
-			}
-			AddAllPatches(notdone, pset, false)
-			// AddNotDonePatches(notdone, pset, false)
-		}
-		notdone.PrintTable()
-
-		patchesWin = makePatchesWin(notdone)
 	})
 
-	var pubWin *gadgets.GenericWindow
+	// the user mode "hack Window"
-	gridM.NewButton("Publish", func() {
+	var hackWin *gadgets.GenericWindow
-		if pubWin != nil {
+	gridM.NewButton("Hack Window", func() {
-			pubWin.Toggle()
+		if hackWin != nil {
+			hackWin.Toggle()
 			return
 		}
-		pubWin = makePublishWindow()
+		hackWin = makeHackModeWindow()
 	})
 
-	var oldWin *gadgets.GenericWindow
+	var reposWin *gadgets.GenericWindow
-	gridM.NewButton("old", func() {
+	me.reposWinB = gridM.NewButton("Repos", func() {
-		if oldWin != nil {
+		if reposWin != nil {
-			oldWin.Toggle()
+			reposWin.Toggle()
 			return
 		}
-		oldWin = makeOldStuff()
+		reposWin = makeReposWin()
 	})
+
+	// set the initial button state based on the last
+	// forge mode the user saved in the config file
+	switch me.forge.Config.Mode {
+	case forgepb.ForgeMode_MASTER:
+		me.newBranch.SetText("master")
+	case forgepb.ForgeMode_DEVEL:
+		me.newBranch.SetText("devel")
+	case forgepb.ForgeMode_USER:
+		me.newBranch.SetText(me.forge.Config.GetUsername())
+	default:
+		me.newBranch.SetText(me.forge.Config.GetUsername())
+	}
+
+	forgeSwitchMode(me.forge.Config.Mode)
+}
+
+// verify the GUI button disable/enable settings
+func forgeVerifyGuiState() {
+	me.forgeMode.SetText(me.forge.GetMode())
+
+	me.argvCheckoutUser = false
+	me.argvCheckoutDevel = false
+	me.argvCheckoutMaster = false
+
+	switch me.forge.Config.Mode {
+	case forgepb.ForgeMode_MASTER:
+		me.argvCheckoutMaster = true
+		me.newBranch.SetText("master")
+	case forgepb.ForgeMode_DEVEL:
+		me.argvCheckoutDevel = true
+		me.newBranch.SetText("devel")
+	case forgepb.ForgeMode_USER:
+		me.newBranch.SetText(me.forge.Config.GetUsername())
+		me.argvCheckoutUser = true
+	default:
+		me.newBranch.SetText(me.forge.Config.GetUsername())
+		me.argvCheckoutUser = true
+	}
+}
+
+// sets the text in the labels in the window
+// and hides and shows the buttons
+func forgeSwitchMode(newMode forgepb.ForgeMode) {
+	if newMode == me.forge.Config.Mode {
+		log.Info("you are already on", newMode.String())
+		forgeVerifyGuiState() // doing this here initializes the button state
+		return
+	}
+
+	me.forge.Config.Mode = newMode
+	forgeVerifyGuiState() // update the button states
+
+	me.forge.Config.ConfigSave()
 }
 
 // this is the magic that generates a window directly from the protocol buffer
 func makeStandardReposGrid(pb *gitpb.Repos) *gitpb.ReposTable {
 	t := pb.NewTable("testDirty")
-	t.NewUuid()
 	sf := t.AddStringFunc("repo", func(r *gitpb.Repo) string {
-		return r.GetNamespace()
+		return r.GetGoPath()
 	})
 	// t.Custom = func() {
 	// 	log.Info("close grid?")
 	// }
 	sf.Custom = func(r *gitpb.Repo) {
-		log.Info("do button click on", r.GetNamespace())
+		log.Info("do button click on", r.GetGoPath())
 	}
 	t.AddTimeFunc("age", func(repo *gitpb.Repo) time.Time {
 		return repo.NewestTime()
@@ -172,9 +333,10 @@ func findMergeToDevel() *gitpb.Repos {
 	found := gitpb.NewRepos()
 
 	for repo := range me.forge.Repos.IterByFullPath() {
-		// this sees if user has patches for devel. If it does, add it to found
+
+		// this sees if user has patches for devel. If it does, add it to me.found
 		if repo.CountDiffObjects(repo.GetUserBranchName(), repo.GetDevelBranchName()) > 0 {
-			found.AppendByFullPath(repo)
+			found.AppendByGoPath(repo)
 		}
 	}
 	now := time.Now()
@@ -185,19 +347,18 @@ func findMergeToDevel() *gitpb.Repos {
 	// me.forge.PrintHumanTable(found)
 
 	// check for merges from devel
-	total, count, nope, _ := me.forge.IsEverythingOnDevel()
+	total, count, nope, _ := IsEverythingOnDevel()
 	log.Printf("devel branch check. %d total repos. (%d ok) (%d not on devel branch) (%s)\n", total, count, nope, shell.FormatDuration(time.Since(now)))
 	return found
 }
-
+func findMergeToMaster() {
-func findMergeToMaster() *gitpb.Repos {
+	me.found = new(gitpb.Repos)
-	found := new(gitpb.Repos)
 
 	all := me.forge.Repos.SortByFullPath()
 	for all.Scan() {
 		repo := all.Next()
 
-		if me.forge.Config.IsReadOnly(repo.GetNamespace()) {
+		if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
 			continue
 		}
 		/*
@@ -205,7 +366,7 @@ func findMergeToMaster() *gitpb.Repos {
 				continue
 			}
 			if repo.GetMasterVersion() != repo.GetDevelVersion() {
-				me.found.AppendByFullPath(repo)
+				me.found.AppendByGoPath(repo)
 				continue
 			}
 		*/
@@ -215,39 +376,38 @@ func findMergeToMaster() *gitpb.Repos {
 			// everything is normal
 		} else {
 			repo.State = "DEVEL < MASTER"
-			log.Info("SERIOUS ERROR. DEVEL BRANCH IS BEHIND MASTER", repo.GetNamespace())
+			log.Info("SERIOUS ERROR. DEVEL BRANCH IS BEHIND MASTER", repo.GetGoPath())
 		}
 
 		// this sees if devel has patches for master. If it does, add it to me.found
 		if repo.CountDiffObjects(repo.GetDevelBranchName(), repo.GetMasterBranchName()) > 0 {
-			found.AppendByFullPath(repo)
+			me.found.AppendByGoPath(repo)
 		}
 	}
 	now := time.Now()
-	if found.Len() == 0 {
+	if me.found.Len() == 0 {
 		log.Info("nothing to merge with master")
-		return found
+		return
 	}
-	me.forge.PrintHumanTable(found)
+	me.forge.PrintHumanTable(me.found)
 
 	// check for merges from devel
-	total, count, nope, _ := me.forge.IsEverythingOnMaster()
+	total, count, nope, _ := IsEverythingOnMaster()
 	log.Printf("Master branch check. %d total repos. (%d ok) (%d not on master branch) (%s)\n", total, count, nope, shell.FormatDuration(time.Since(now)))
 
-	return found
 }
 
 func mergeDevelToMaster(doit bool) {
-	found := findMergeToMaster()
+	findMergeToMaster()
 
 	if !doit {
 		return
 	}
 
-	all := found.SortByFullPath()
+	all := me.found.SortByFullPath()
 	for all.Scan() {
 		repo := all.Next()
-		log.Info("repo:", repo.GetNamespace())
+		log.Info("repo:", repo.GetGoPath())
 		if result, err := repo.MergeToMaster(); err == nil {
 			log.Warn("THINGS SEEM OK", repo.GetFullPath())
 			for _, line := range result.Stdout {
@@ -298,10 +458,10 @@ func mergeUserToDevel(doit bool) {
 
 		b1 := repo.CountDiffObjects(bruser, brdevel) // should be zero
 		if b1 == 0 {
-			// log.Info("User is already merged into Devel", repo.GetNamespace(), cmd)
+			// log.Info("User is already merged into Devel", repo.GetGoPath(), cmd)
 			return
 		}
-		log.Info("merging user into devel repo:", repo.GetNamespace())
+		log.Info("merging user into devel repo:", repo.GetGoPath())
 		if result, err := repo.MergeToDevel(); err == nil {
 			log.Warn("THINGS SEEM OK", repo.GetFullPath())
 			for _, line := range result.Stdout {
@@ -329,34 +489,3 @@ func mergeUserToDevel(doit bool) {
 	}
 	me.forge.ConfigSave()
 }
-
-// old things before they are removed, deprecated, fixed, etc
-func makeOldStuff() *gadgets.GenericWindow {
-	oldWin := gadgets.NewGenericWindow("old code", "old code on it's way out")
-
-	grid := oldWin.Group.RawGrid()
-
-	// var reposWin *gadgets.GenericWindow
-	var reposWin *stdReposTableWin
-	grid.NewButton("Fix Repos", func() {
-		if reposWin != nil {
-			reposWin.Toggle()
-			return
-		}
-		reposWin = makeReposWin()
-	})
-
-	var howtoWin *gadgets.GenericWindow
-	grid.NewButton("Tutorial", func() {
-		if howtoWin != nil {
-			howtoWin.Toggle()
-			return
-		}
-		howtoWin = makeHowtoWin()
-	})
-
-	grid.NextRow()
-	grid.NewLabel("")
-
-	return oldWin
-}

doMerge.go

@@ -1,168 +0,0 @@
-// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
-// Use of this source code is governed by the GPL 3.0
-
-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() {
-		if repo.GetDevelVersion() == repo.GetMasterVersion() {
-			continue
-		}
-		tmp := log.Sprintf("%s..%s", repo.GetMasterVersion(), repo.GetDevelVersion())
-		r, err := repo.RunStrict([]string{"git", "log", "--pretty=format:%H", tmp})
-		_ = err
-		for i, line := range r.Stdout {
-			log.Info(i, line, repo.FullPath)
-		}
-	}
-	return found
-}
-
-func doMergeDevel() (*gitpb.Repos, error) {
-	var err error
-	done := gitpb.NewRepos()
-	found := findMergeToDevel()
-	for repo := range found.IterAll() {
-		if repo.CheckDirty() {
-			log.Info("repo is dirty", repo.GetFullPath())
-			continue
-		}
-		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)
-		}
-		done.Append(repo)
-		config.SetChanged("repos", true)
-	}
-	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)
-
-	done := gitpb.NewRepos()
-	found := findMergeToMaster()
-	for repo := range found.IterAll() {
-		if repo.CheckDirty() {
-			log.Info("repo is dirty", repo.GetGoPath())
-			continue
-		}
-
-		log.Info("Starting merge on", repo.GetGoPath())
-		if repo.CheckoutMaster() {
-			log.Info("checkout devel failed", repo.GetGoPath())
-			err = log.Errorf("checkout devel failed")
-			badExit(err)
-		}
-
-		if _, err := repo.MergeToMaster(); 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)
-		}
-
-		done.Append(repo)
-		config.SetChanged("repos", true)
-	}
-	return done, err
-}

doNormal.go

@@ -1,112 +0,0 @@
-// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
-// Use of this source code is governed by the GPL 3.0
-
-package main
-
-// checks that repos are in a "normal" state
-
-import (
-	"path/filepath"
-	"strings"
-	"time"
-
-	"go.wit.com/lib/config"
-	"go.wit.com/lib/gui/shell"
-	"go.wit.com/lib/protobuf/gitpb"
-	"go.wit.com/log"
-)
-
-func doNormal() bool {
-	me.forge.CheckDirtyQuiet()
-
-	var count int
-	stats := me.forge.RillRepos(checkNormalRepoState)
-	for path, stat := range stats {
-		dur := stat.End.Sub(stat.Start)
-		if dur > 10*time.Second {
-			log.Infof("%s checkNormalRepoState() took a long time (%s)\n", path, shell.FormatDuration(dur))
-		}
-		if stat.Err == nil {
-			continue
-		}
-		// log.Infof("%-60s, %-60s %v %s\n", stat.Start, stat.End.String(), dur, path)
-		// log.Infof("%-30v %s %v\n", dur, path, stat.Err)
-		// log.Info("got path", path, stat.Err)
-		count += 1
-	}
-	if count > 0 {
-		log.Info("Some repos are not in a 'normal' state. error count =", count)
-		log.Info("TODO: list the repos here. forge patch repos?")
-		dumpWorkRepos()
-		config.SetChanged("repos", true)
-		return false
-	}
-	return true
-}
-
-// 99% of the time, the repos during development should be on your user branch.
-// error out if it's not
-// this checks to see if a devel and user branch exist
-// this needs to run each time in case repos were added manually by the user
-// this also verifies that
-func checkNormalRepoState(repo *gitpb.Repo) error {
-	var err error
-	tmp := filepath.Join(me.forge.Config.ReposDir, repo.GetNamespace())
-	if tmp != repo.FullPath {
-		log.Infof("%s != %s\n", repo.FullPath, tmp)
-		if strings.HasPrefix(repo.FullPath, me.forge.Config.ReposDir) {
-			tmp = strings.TrimPrefix(repo.FullPath, me.forge.Config.ReposDir)
-			tmp = strings.Trim(tmp, "/")
-			repo.Namespace = tmp
-			err = log.Errorf("namespace set to filepath")
-		}
-	} else {
-		// log.Infof("%s == %s\n", repo.FullPath, tmp)
-	}
-
-	tmp = strings.Trim(repo.Namespace, "/")
-	if tmp != repo.Namespace {
-		err = log.Errorf("junk in ns %s", repo.Namespace)
-		repo.Namespace = tmp
-	}
-
-	if repo.GetMasterBranchName() == "" {
-		me.forge.VerifyBranchNames(repo)
-		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() {
-		// log.Info(repo.FullPath, "gopath == namespace", repo.GetGoPath(), repo.GetNamespace())
-	} else {
-		log.Info(repo.FullPath, "gopath != namespace", repo.GetGoPath(), repo.GetNamespace())
-	}
-	repo.MakeLocalDevelBranch()
-
-	repo.VerifyRemoteAndLocalBranches(repo.GetDevelBranchName())
-	repo.VerifyRemoteAndLocalBranches(repo.GetMasterBranchName())
-
-	if repo.GetCurrentBranchName() != repo.GetUserBranchName() {
-		log.Infof("changing to user(%s) branch: %s\n", repo.GetUserBranchName(), repo.FullPath)
-		repo.CheckoutUser()
-		repo.ReloadCheck()
-		err = log.Errorf("now on user branch")
-	}
-
-	if me.forge.Config.IsReadOnly(repo.GetGoPath()) != repo.GetReadOnly() {
-		repo.ReadOnly = me.forge.Config.IsReadOnly(repo.GetGoPath())
-		log.Info("damnit", repo.FullPath)
-		err = log.Errorf("readonly bit wrong")
-	}
-	return err
-}

doPatch.go

@@ -4,210 +4,100 @@
 package main
 
 import (
+	"fmt"
+	"os"
 	"path/filepath"
 
-	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/log"
 )
 
-func doPatchInit() {
+func doPatch() error {
-	if me.forge.Patchsets != nil {
+	if argv.Patch.Submit != "" {
-		if me.forge.Patchsets.Len() == 0 {
+		_, err := me.forge.SubmitDevelPatchSet(argv.Patch.Submit)
-			// log.Info("IGNORE: patches are empty")
-		} else {
-			log.Info("IGNORE: patches already initalized len =", me.forge.Patchsets.Len())
-		}
-	}
-	if err := me.forge.LoadPatchsets(); err != nil {
-		log.Info("patches failed to open", err)
-		if err := me.forge.SavePatchsets(); err != nil {
-			log.Warn("savePatchsets() failed", err)
-		}
-	}
-}
-
-func isPatchingSafe() bool {
-	if me.forge.Config.Mode == forgepb.ForgeMode_NORMAL {
-		return true
-	}
-	log.Info("This patch command is not safe to run now")
-	log.Info("you must reset the state of your git repositories. Run:")
-	log.Info("")
-	log.Info("forge normal")
-	log.Info("")
-	return false
-}
-
-// submit's current working patches
-func doPatchSubmit() error {
-	pset, err := me.forge.MakeDevelPatchSet("testing")
 		if err != nil {
 			return err
 		}
-	if pset.Patches == nil {
-		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
-}
-
-func doPatch() error {
-	if argv.Patch.Repos != nil {
-		dumpWorkRepos()
-		return nil
-	}
-
-	if argv.Patch.Submit != nil {
-		return doPatchSubmit()
-	}
-
-	if !isPatchingSafe() {
-		return log.Errorf("not safe to work on patches")
-	}
 
 	if argv.Patch.Get != nil {
-		psets := forgepb.NewSets()
+		return doPatchGet()
-		newpb, _, _ := psets.HttpPostVerbose(myServer(), "get")
-		newpb.PrintTable()
-		me.forge.Patchsets = newpb
-		me.forge.SavePatchsets()
-		return nil
-	}
-
-	if argv.Patch.Check != nil {
-		/*
-			old := findExpired()
-			// old.PrintTable()
-			for p := range old.IterAll() {
-				log.Info("patch", p.Filename, p.Namespace)
-			}
-			newpb, err := old.HttpPostVerbose(myServer(), "check")
-			if err != nil {
-				return err
-			}
-			newpb.PrintTable()
-		*/
-		log.Info("do something here to find patches merged to devel")
-		doMergeReport()
-		return nil
 	}
 
 	if argv.Patch.List != nil {
-		var changed bool
+		return doPatchList()
-		newpatches := new(forgepb.Set)
-		newpatches.Patches = forgepb.NewPatches()
-		for pset := range me.forge.Patchsets.IterAll() {
-			pset.PrintTable()
-			for patch := range pset.Patches.IterAll() {
-				changed = true
-				if patch.NewHash == "" || patch.NewHash == "na" {
-					if newpatches.Patches.AppendByPatchId(patch) {
-						log.Info("patchId added here", patch.PatchId)
-					} else {
-						log.Info("patchId already here", patch.PatchId)
 	}
-				} 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)
-				}
-			}
-		}
-		if changed {
-			if err := me.forge.SavePatchsets(); err != nil {
-				log.Warn("savePatchsets() failed", err)
-			}
-		}
-		log.Info("NEW PATCHES TABLE")
-		newpatches.PrintTable()
-		for patch := range newpatches.Patches.IterAll() {
-			if err := setNewCommitHash(patch); err == nil {
-				log.Info("newhash set already here", patch.PatchId, patch.NewHash)
-				continue
-			}
-			log.Infof("%s is new\n", patch.Filename)
-			repo := me.forge.FindByGoPath(patch.Namespace)
-			if repo == nil {
-				log.Info("\tCould not find namespace:", patch.Namespace)
-				continue
-			}
-			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 doPatchList()
-			applied := findApplied()
-			if applied == nil || applied.Len() == 0 {
-				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
-		*/
-	}
-
-	// if nothing, show patches & dirty repos
-	me.forge.Patchsets.PrintTable()
-	dumpWorkRepos()
-	return nil
-}
-
-// Shows repos that are:
-//   - git dirty repos
-//   - repos with 'user' branch patches not in 'devel' branch
-//   - repos with awaiting master branch verions
-//
-// return true if any are found
-func dumpWorkRepos() bool {
-	// always run dirty first
-	me.forge.CheckDirtyQuiet()
 
 	// if no option is given to patch, list out the
 	// repos that have patches ready in them
-	found := findReposWithPatches()
+	findReposWithPatches()
-	if found.Len() == 0 {
+	if me.found.Len() == 0 {
-		log.Info("you currently have no repos with patches")
+		log.Info("you currently have no patches in your user branches")
-		return false
+		return nil
-	} else {
-		me.forge.PrintHumanTable(found)
 	}
-	return true
+	me.forge.PrintHumanTable(me.found)
+	return nil
+}
+
+func doPatchList() error {
+	openPatchsets()
+	if me.psets == nil {
+		return fmt.Errorf("Open Patchsets failed")
+	}
+	log.Info("got psets len", len(me.psets.Patchsets))
+	all := me.psets.SortByName()
+	for all.Scan() {
+		pset := all.Next()
+		// log.Info("pset name =", pset.Name)
+		dumpPatchset(pset)
+	}
+	return nil
+}
+
+func savePatchsets() error {
+	if me.psets == nil {
+		return fmt.Errorf("savePatchesets() can't save nil")
+	}
+	log.Info("savePatchsets() len =", me.psets.Len())
+	data, err := me.psets.Marshal()
+	if err != nil {
+		log.Info("protobuf.Marshal() failed:", err)
+		return err
+	}
+	fullpath := filepath.Join(me.forge.GetConfigDir(), "patchsets.pb")
+	var pfile *os.File
+	pfile, err = os.OpenFile(fullpath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+	if err != nil {
+		log.Info("Patchsets save failed:", err, fullpath)
+		return err
+	}
+	pfile.Write(data)
+	pfile.Close()
+	return nil
+}
+
+func openPatchsets() {
+	fullpath := filepath.Join(me.forge.GetConfigDir(), "patchsets.pb")
+	data, err := os.ReadFile(fullpath)
+	if err != nil {
+		log.Info("Patchsets open failed:", err, fullpath)
+		return
+	}
+
+	psets := new(forgepb.Patchsets)
+	err = psets.Unmarshal(data)
+	if err != nil {
+		log.Info("Unmarshal patchsets failed", err)
+		return
+	}
+	me.psets = psets
 }
 
 // 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())
@@ -216,6 +106,13 @@ func dumpPatchset(pset *forgepb.Set) bool {
 		log.Printf("Patchset Name: %-24s Author: %s <%s> IS GOOD\n", pset.Name, pset.GetGitAuthorName(), pset.GetGitAuthorEmail())
 	}
 
+	/*
+		log.Info("applyPatches() State", pset.State)
+		log.Info("applyPatches() COMMENT", pset.Comment)
+		log.Info("applyPatches() Branch Name", pset.GetStartBranchName())
+		log.Info("applyPatches() Start Hash", pset.GetStartBranchHash())
+	*/
+
 	var count int
 	var bad int
 	all := pset.Patches.SortByFilename()
@@ -246,12 +143,12 @@ func IsValidPatch(p *forgepb.Patch) bool {
 		log.Info("can not apply patch! repo not found", basepath, filename)
 		return false
 	}
-	if repo.ActualDevelHash() != p.StartHash {
+	if repo.DevelHash() != p.StartHash {
 		log.Info("can not apply patch! devel hash mismatch", basepath, filename)
 		return false
 	}
-	if repo.ActualDevelHash() == p.StartHash {
+	if repo.DevelHash() == p.StartHash {
-		log.Info("local devel hash:", repo.ActualDevelHash(), "matches patch hash", p.StartHash, "and can be applied")
+		log.Info("local devel hash:", repo.DevelHash(), "matches patch hash", p.StartHash, "and can be applied")
 	}
 	log.Info("start:", p.StartHash, "end:", p.CommitHash, "file:", basepath, filename, "devel version", repo.GetDevelVersion())
 	for _, line := range p.Files {
@@ -259,3 +156,24 @@ func IsValidPatch(p *forgepb.Patch) bool {
 	}
 	return true
 }
+
+func doPatchGet() error {
+	psets, err := me.forge.GetPatchesets()
+	if err != nil {
+		log.Info("Get Patchsets failed", err)
+		return err
+	}
+	log.Info("Got Patchsets ok", psets.Uuid)
+
+	log.Info("got psets len", len(psets.Patchsets))
+	all := psets.SortByName()
+	for all.Scan() {
+		pset := all.Next()
+		// log.Info("pset name =", pset.Name)
+		dumpPatchset(pset)
+	}
+
+	log.Info("FIXME: can't save these yet. must merge with on disk psets here")
+	// savePatchsets()
+	return nil
+}

doPull.go

@@ -7,58 +7,10 @@ import (
 	"time"
 
 	"go.wit.com/lib/gui/shell"
-	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
 
-// is every repo on the devel branch?
-func doPull() error {
-	if argv.Pull.Check != nil {
-		// stats := me.forge.RillFuncError(rillPull)
-		log.Info("TODO: actually git pull here? this is a bad idea. stopping.")
-		submit := gitpb.NewRepos()
-		for repo := range me.forge.Repos.IterByFullPath() {
-			newrepo := new(gitpb.Repo)
-			newrepo.MasterHash = repo.MasterHash
-			newrepo.DevelHash = repo.DevelHash
-			newrepo.Namespace = repo.Namespace
-			newrepo.URL = repo.URL
-			submit.Append(newrepo)
-		}
-		updatepb, regPB, err := submit.HttpPost(myServer(), "check")
-		if regPB == nil || err != nil {
-			log.Info("regPB==nil or err:", err)
-			return nil
-		}
-		log.Infof("pull check %s pb.Len()=%d client.Len()=%d server.Len()=%d err=%v\n", regPB.URL, updatepb.Len(), regPB.ClientDataLen, regPB.ServerDataLen, err)
-		return nil
-	}
-
-	// below this, you must not be in 'normal' mode
-	if me.forge.Config.Mode == forgepb.ForgeMode_NORMAL {
-		log.Info("you must check out the devel or master branches")
-		return nil
-	}
-
-	if argv.Force == true {
-		now := time.Now()
-		stats := me.forge.RillFuncError(rillPull)
-		count := me.forge.RillReload()
-		if count != 0 {
-			me.forge.ConfigSave()
-		}
-
-		total, count, nope, _ := me.forge.IsEverythingOnMaster()
-		log.Printf("Master branch check. %d total repos. (%d git pulled) (%d not on master branch) (%s) git pull total=FIXME%d\n", total, count, nope, shell.FormatDuration(time.Since(now)), len(stats))
-		return nil
-	}
-
-	log.Info("do a pull check here?")
-	return nil
-
-}
-
 func rillPull(repo *gitpb.Repo) error {
 	if repo.IsDirty() {
 		// never do dirty repos
@@ -88,7 +40,47 @@ func rillPull(repo *gitpb.Repo) error {
 	return nil
 }
 
+// is every repo on the devel branch?
+
+func doGitPullNew() {
+	now := time.Now()
+	pullcount := me.forge.RillFuncError(rillPull)
+	count := me.forge.RillReload()
+	if count != 0 {
+		me.forge.ConfigSave()
+	}
+
+	total, count, nope, _ := IsEverythingOnMaster()
+	log.Printf("Master branch check. %d total repos. (%d git pulled) (%d not on master branch) (%s) git pull total=%d\n", total, count, nope, shell.FormatDuration(time.Since(now)), pullcount)
+}
+
 /*
+func doGitPull() {
+	allerr := me.found.RillGitPull(40, 5)
+
+	all := me.found.SortByFullPath()
+	for all.Scan() {
+		repo := all.Next()
+		result := allerr[repo]
+		if result.Error == gitpb.ErrorGitPullOnDirty {
+			log.Info("skip git pull. repo is dirty", repo.GetGoPath())
+			continue
+		}
+		if result.Error == gitpb.ErrorGitPullOnLocal {
+			log.Info("skip git pull. local branch ", repo.GetGoPath())
+			continue
+		}
+		if result.Exit == 0 {
+			continue
+		}
+
+		log.Info("git pull error:", repo.GetGoPath(), result.Error)
+		log.Info("git pull error:", repo.GetGoPath(), result.Stdout)
+	}
+
+}
+*/
+
 // git fetch origin master:master
 func rillFetchMaster(repo *gitpb.Repo) error {
 	if repo.GetCurrentBranchName() != repo.GetUserBranchName() {
@@ -108,4 +100,3 @@ func doGitFetch() {
 		me.forge.ConfigSave()
 	}
 }
-*/

doSync.go

@@ -1,79 +0,0 @@
-// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
-// Use of this source code is governed by the GPL 3.0
-
-package main
-
-// trys to figure out if there is still something to update
-
-/*
-func doSync() error {
-	if argv.Pull.Sync.Clean != nil {
-		return doSyncClean()
-	}
-	if argv.Pull.Sync.User != nil {
-		return doSyncUser()
-	}
-
-	return fmt.Errorf("nothing to do")
-}
-
-func doSyncClean() error {
-	log.Printf("todo: fix this?")
-	return nil
-}
-
-func doSyncUser() error {
-	me.forge.ConfigRill(10, 20)
-	if allerr := me.forge.RillRepos(syncDevelBranch); len(allerr) != 0 {
-		log.Info("RillFunc() failed", allerr)
-		return fmt.Errorf("Rill doSyncUser() error count = %d", len(allerr))
-	} else {
-		log.Info("Rill syncDevelBranch() ok count =", len(allerr))
-	}
-
-	argv.Force = true
-	if err := doAllCheckoutUser(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func syncDevelBranch(repo *gitpb.Repo) error {
-	branch := repo.GetDevelBranchName()
-	if repo.Exists(filepath.Join(".git/refs/heads", branch)) {
-		return nil
-	}
-	if repo.Exists(filepath.Join(".git/refs/remotes/origin", branch)) {
-		cmd := []string{"git", "checkout", branch}
-		err := repo.RunVerbose(cmd)
-		return err
-	}
-	cmd := []string{"git", "branch", branch}
-	repo.RunVerbose(cmd)
-	cmd = []string{"git", "checkout", branch}
-	err := repo.RunVerbose(cmd)
-	return err
-}
-
-func syncDevelBranches() error {
-	all := me.forge.Repos.SortByFullPath()
-	for all.Scan() {
-		repo := all.Next()
-		branch := repo.GetDevelBranchName()
-		if repo.Exists(filepath.Join(".git/refs/heads", branch)) {
-			continue
-		}
-		if repo.Exists(filepath.Join(".git/refs/remotes/origin", branch)) {
-			cmd := []string{"git", "checkout", branch}
-			repo.RunVerbose(cmd)
-			continue
-		}
-		cmd := []string{"git", "branch", branch}
-		repo.RunVerbose(cmd)
-		cmd = []string{"git", "checkout", branch}
-		repo.RunVerbose(cmd)
-	}
-	return nil
-}
-*/

doTag.go

@@ -1,125 +0,0 @@
-// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
-// Use of this source code is governed by the GPL 3.0
-
-package main
-
-// checks that repos are in a "normal" state
-
-import (
-	"os"
-	"path/filepath"
-	"time"
-
-	"go.wit.com/lib/fhelp"
-	"go.wit.com/lib/protobuf/gitpb"
-	"go.wit.com/log"
-)
-
-func FindRepoByFullPath(wd string) *gitpb.Repo {
-	for repo := range me.forge.Repos.IterAll() {
-		if repo.FullPath == wd {
-			return 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()
-
-		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 != "" {
-		repo := FindRepoByFullPath(wd)
-		if repo == nil {
-			log.Info("Could not find repo:", wd)
-			return nil
-		}
-
-		// 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 !argv.Force {
-			if !fhelp.QuestionUser(log.Sprintf("delete tag '%s'?", testtag)) {
-				return nil
-			}
-		}
-		log.Info("Delete tag here", testtag)
-
-		// delete local and remote tag
-		repo.RunVerbose([]string{"git", "tag", "--delete", testtag})
-		repo.RunVerbose([]string{"git", "push", "--delete", "origin", testtag})
-		return nil
-	}
-
-	log.Info("do other tag stuff here")
-	return nil
-}
-
-func makeTagTablePB(repo *gitpb.Repo, pb *gitpb.GitTags) *gitpb.GitTagsTable {
-	t := pb.NewTable("tagList")
-	t.NewUuid()
-
-	col := t.AddHash()
-	col.Width = 12
-
-	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
-
-	col = t.AddTimeFunc("ctime", func(tag *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
-
-	col = t.AddStringFunc("Ref Name", func(r *gitpb.GitTag) string {
-		_, ref := filepath.Split(r.GetRefname())
-		return ref
-	})
-	col.Width = 16
-
-	col = t.AddSubject()
-	col.Width = -1
-
-	return t
-}

doc.go

@@ -1,41 +0,0 @@
-/*
-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'.
-
-Options:
-
-	--debugger             open the debugger window
-	--logger               open the log.* control window
-	--gui GUI              select the plugin (andlabs,gocui,etc)
-	--gui-verbose          enable all logging
-	--bash                 generate bash completion
-	--bash                 generate bash completion
-	--connect CONNECT      forge url
-	--all                  git commit --all
-	--build BUILD          build a repo
-	--install INSTALL      install a repo
-	--forge-rebuild        download and rebuild forge
-	--force                try to strong arm things
-	--verbose              show more output
-	--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
-	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

@@ -6,28 +6,27 @@ package main
 import (
 	"os"
 
-	"go.wit.com/gui"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
 
 func okExit(thing string) {
-	gui.UnloadToolkits()
-	if configSave {
-		me.forge.SetConfigSave(configSave)
-	}
 	if thing != "" {
 		log.Info("forge exit:", thing, "ok")
 	}
+	if configSave {
+		me.forge.SetConfigSave(configSave)
+	}
+	// log.Info("Finished go-clean on", check.GetGoPath(), "ok")
 	me.forge.Exit()
 }
 
 func badExit(err error) {
-	log.Info("forge failed: ", err, me.forge.Config.ReposDir)
+	log.Info("forge failed: ", err, me.forge.GetGoSrc())
 	os.Exit(-1)
 }
 
 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.GetGoPath(), err)
 	os.Exit(-1)
 }

find.go

@@ -8,155 +8,125 @@ import (
 )
 
 // this populates a slice of protobuf records representing each git repo
-// var found []*gitpb.Repo
+// var me.found []*gitpb.Repo
 //
 // so, it makes a subset of repos that are then used performing actions on
 //
 // by default, it adds every repo
 
-func doFind() *gitpb.Repos {
-	if argv.List == nil {
-		return findAll()
-	}
-
-	if argv.List.Mine {
-		return findMine()
-	}
-
-	if argv.List.Dirty {
-		return me.forge.FindDirty()
-	}
-
-	return findAll()
-}
-
 func (f *FindCmd) findRepos() *gitpb.Repos {
 	if f == nil {
-		return findMine()
+		findMine()
+		return me.found
 	}
 
 	if f.All {
-		return findAll()
+		findAll()
+		return me.found
 	}
 
 	if f.Private {
-		return findPrivate()
+		findPrivate()
+		return me.found
 	}
 
 	if f.Mine {
-		return findMine()
+		findMine()
+		return me.found
 	}
 
 	if f.Favorites {
-		return findFavorites()
+		findFavorites()
+		return me.found
 	}
 
 	if f.Dirty {
-		return me.forge.FindDirty()
+		return findDirty()
 	}
 
 	if f.User {
-		return findUser()
+		findUser()
+		return me.found
 	}
 
-	return findAll()
+	findAll()
+	return me.found
 }
 
-func findPrivate() *gitpb.Repos {
+func findPrivate() {
-	found := gitpb.NewRepos()
 	for repo := range me.forge.Repos.IterByFullPath() {
 		if me.forge.Config.IsPrivate(repo.GetGoPath()) {
-			found.AppendByFullPath(repo)
+			me.found.AppendByGoPath(repo)
 		}
 	}
-
-	return found
 }
 
 // finds repos that are writable
-func findMine() *gitpb.Repos {
+func findMine() {
-	found := gitpb.NewRepos()
-
 	// log.Printf("get mine %s\n", me.forge.GetGoSrc())
 	for repo := range me.forge.Repos.IterByFullPath() {
 
 		if me.forge.Config.IsWritable(repo.GetGoPath()) {
-			found.AppendByFullPath(repo)
+			me.found.AppendByGoPath(repo)
 		}
 	}
-	return found
 }
 
 // finds repos the user has marked as favorites in the forge .config
-func findFavorites() *gitpb.Repos {
+func findFavorites() {
-	found := gitpb.NewRepos()
-
 	// log.Printf("get favorites %s\n", me.forge.GetGoSrc())
 	for repo := range me.forge.Repos.IterByFullPath() {
 
 		if me.forge.Config.IsFavorite(repo.GetGoPath()) {
-			found.AppendByFullPath(repo)
+			me.found.AppendByGoPath(repo)
 		}
 	}
-	return found
 }
 
-func findAll() *gitpb.Repos {
+// finds repos that git is reporting as dirty
+func findDirty() *gitpb.Repos {
 	found := gitpb.NewRepos()
 	for repo := range me.forge.Repos.IterByFullPath() {
-		found.AppendByFullPath(repo)
+		if repo.IsDirty() {
+			found.AppendByGoPath(repo)
+		}
 	}
 	return found
 }
 
-func find50() *gitpb.Repos {
+func findAll() {
-	count := 0
-	found := gitpb.NewRepos()
 	for repo := range me.forge.Repos.IterByFullPath() {
-		found.AppendByFullPath(repo)
+		me.found.AppendByGoPath(repo)
-		if count > 50 {
-			return found
 	}
-		count += 1
-	}
-	return found
 }
 
-func findUser() *gitpb.Repos {
+func findUser() {
-	found := gitpb.NewRepos()
-
 	for repo := range me.forge.Repos.IterByFullPath() {
 		if repo.GetCurrentBranchName() == repo.GetUserBranchName() {
-			found.AppendByFullPath(repo)
+			me.found.AppendByGoPath(repo)
 		}
 	}
-	return found
 }
 
-func findPublishable() *gitpb.Repos {
+func findPublishable() {
-	found := gitpb.NewRepos()
-
 	for repo := range me.forge.Repos.IterByFullPath() {
 		if repo.GetTargetVersion() == "" {
 			continue
 		}
-		found.AppendByFullPath(repo)
+		me.found.AppendByGoPath(repo)
 	}
-	return found
 }
 
-func findReposWithPatches() *gitpb.Repos {
+func findReposWithPatches() {
-	found := gitpb.NewRepos()
-
 	for repo := range me.forge.Repos.IterByFullPath() {
 		if repo.GetTargetVersion() != "" {
 			// add everything that has a target version set
-			found.AppendByFullPath(repo)
+			me.found.AppendByGoPath(repo)
 			continue
 		}
 		if repo.IsDirty() {
 			// always add dirty branches
-			found.AppendByFullPath(repo)
+			me.found.AppendByGoPath(repo)
 			continue
 		}
 		if repo.GetUserVersion() == "" || repo.GetUserVersion() == "uerr" {
@@ -164,35 +134,18 @@ func findReposWithPatches() *gitpb.Repos {
 			continue
 		}
 		if repo.GetUserVersion() != repo.GetDevelVersion() {
-			found.AppendByFullPath(repo)
+			me.found.AppendByGoPath(repo)
-			continue
-		}
-
-		// show anything that differs between 'devel' & 'master' branches
-		if repo.GetDevelVersion() != repo.GetMasterVersion() {
-			// this repo.State code isn't great, but it got me here quickly
-			// I'll defend my code by saying it's faster for me if I do dumb things
-			// sometimes and fix them later. Probably some employee will have to
-			// fix this. if that is the case I owe you lunch. or stock options
-			if repo.State == "DEVEL behind MASTER" {
-				// log.Info("repo state", repo.FullPath, repo.State)
-				continue
-			}
-			found.AppendByFullPath(repo)
-			continue
-		}
-
-		// ignore read-only repos for checks below here
-		if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
 			continue
 		}
 
 		// this is an old test to see if the current 'last tag' is accurate and should be removed
+		if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
+			continue
+		}
 		if repo.GetLastTag() != repo.GetMasterVersion() {
-			found.AppendByFullPath(repo)
+			me.found.AppendByGoPath(repo)
 			repo.FindLastTag()
 			continue
 		}
 	}
-	return found
 }

helperPatches.go

@@ -1,340 +0,0 @@
-// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
-// Use of this source code is governed by the GPL 3.0
-
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"os/exec"
-	"regexp"
-	"strings"
-
-	"go.wit.com/lib/protobuf/forgepb"
-	"go.wit.com/lib/protobuf/gitpb"
-	"go.wit.com/log"
-)
-
-func makeReposTablePB(pb *gitpb.Repos) *gitpb.ReposTable {
-	t := pb.NewTable("quickListRepos")
-	t.NewUuid()
-
-	sf := t.AddStringFunc("Namespace", func(r *gitpb.Repo) string {
-		return r.GetNamespace()
-	})
-	sf.Width = 16
-
-	userVer := t.AddStringFunc("user", func(repo *gitpb.Repo) string {
-		ver := repo.GetUserVersion()
-		return ver
-	})
-	userVer.Width = 4
-	return t
-}
-
-/*
-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
-	update bool                    // if the window should be updated
-}
-
-func (w *stdPatchsetTableWin) Toggle() {
-	if w == nil {
-		return
-	}
-	if w.win == nil {
-		return
-	}
-	w.win.Toggle()
-}
-*/
-
-/*
-	etimef := func(e *forgepb.Set) string {
-		etime := e.Etime.AsTime()
-		s := etime.Format("2006/01/02 15:04")
-		if strings.HasPrefix(s, "1970/") {
-			// just show a blank if it's not set
-			return ""
-		}
-		return s
-	}
-	t.AddStringFunc("etime", etimef)
-*/
-
-/*
-	ctimef := func(p *forgepb.Set) string {
-		ctime := p.Ctime.AsTime()
-		return ctime.Format("2006/01/02 15:04")
-	}
-}
-*/
-
-func setPatchsetState(p *forgepb.Set) {
-	var bad bool
-	var good bool
-	var done bool = true
-
-	all := p.Patches.All()
-	for all.Scan() {
-		patch := all.Next()
-		// log.Info("patch:", patch.StartHash, patch.CommitHash, patch.Namespace, patch.Filename)
-		repo := me.forge.FindByGoPath(patch.Namespace)
-		if repo == nil {
-			log.Info("could not find repo", patch.Namespace)
-			bad = true
-			continue
-		}
-		if _, err := repo.GetHashName(patch.CommitHash); err == nil {
-			// this patch has been applied
-			patch.Applied = true
-			done = true
-			continue
-		}
-		if name, err := repo.GetHashName(patch.StartHash); err == nil {
-			// it might be possible to apply this patch
-			log.Info("patch may be good:", patch.Namespace, name, patch.CommitHash, patch.Filename)
-			good = true
-		} else {
-			// probably screwed up git trees
-			log.Info("patch with unknown origin:", patch.Namespace, name, err, patch.CommitHash, patch.Filename)
-			bad = true
-		}
-	}
-	if bad {
-		p.State = "BAD"
-		return
-	}
-	if good {
-		p.State = "TRY"
-		return
-	}
-	if done {
-		p.State = "DONE"
-		return
-	}
-}
-
-func cleanSubject(line string) string {
-	// Regular expression to remove "Subject:" and "[PATCH...]" patterns
-	re := regexp.MustCompile(`(?i)^Subject:\s*(\[\s*PATCH[^\]]*\]\s*)?`)
-	cleaned := re.ReplaceAllString(line, "")
-	return strings.TrimSpace(cleaned)
-}
-
-// jcarr@framebook:~/go/src/go.wit.com/lib/protobuf/forgepb$ git branch --contains 4a27e7702b9b975b066ec9d2ee7ac932d86552e3
-// * jcarr
-// jcarr@framebook:~/go/src/go.wit.com/lib/protobuf/forgepb$ git merge-base --is-ancestor "4a27e7702b9b975b066ec9d2ee7ac932d86552e3" "devel" ; echo $?
-// 1
-// jcarr@framebook:~/go/src/go.wit.com/lib/protobuf/forgepb$ git merge-base --is-ancestor "4a27e7702b9b975b066ec9d2ee7ac932d86552e3" "jcarr" ; echo $?
-// 0
-
-func findCommitByHash(hash string, subject string) (string, error) {
-	cmd := exec.Command("git", "log", "--pretty=format:%H %s")
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	err := cmd.Run()
-	if err != nil {
-		return "", err
-	}
-
-	lines := strings.Split(out.String(), "\n")
-	for _, line := range lines {
-		if strings.Contains(strings.ToLower(line), strings.ToLower(subject)) {
-			return strings.Fields(line)[0], nil // return the commit hash
-		}
-		if strings.Fields(line)[0] == hash {
-			return "", fmt.Errorf("start commit found: %s", hash)
-		}
-	}
-	return "", fmt.Errorf("no commit found for subject: %s", subject)
-}
-
-func findCommitBySubject(subject string) (string, error) {
-	cmd := exec.Command("git", "log", "--pretty=format:%H %s", "--grep="+subject, "-i")
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	err := cmd.Run()
-	if err != nil {
-		return "", err
-	}
-
-	lines := strings.Split(out.String(), "\n")
-	for _, line := range lines {
-		if strings.Contains(strings.ToLower(line), strings.ToLower(subject)) {
-			return strings.Fields(line)[0], nil // return the commit hash
-		}
-	}
-	return "", fmt.Errorf("no commit found for subject: %s", subject)
-}
-
-// returns true if PB changed
-func setNewCommitHash(patch *forgepb.Patch) error {
-	repo := me.forge.FindByGoPath(patch.Namespace)
-	if repo == nil {
-		return log.Errorf("could not find repo %s", patch.Namespace)
-	}
-
-	comment := cleanSubject(patch.Comment)
-
-	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)
-	}
-
-	patchId, err := repo.FindPatchId(newhash)
-	if err != nil {
-		return err
-	}
-
-	patch.PatchId = patchId
-	patch.NewHash = newhash
-
-	log.Info("patch: found hash:", patch.CommitHash, newhash, patch.Namespace, comment)
-	return nil
-}
-
-func AddAllPatches(notdone *forgepb.Patches, pset *forgepb.Set, full bool) {
-	for patch := range pset.Patches.IterAll() {
-		comment := cleanSubject(patch.Comment)
-
-		if found := notdone.FindByCommitHash(patch.CommitHash); found != nil {
-			log.Info("duplicate commit hash", patch.Namespace, "patch:", patch.NewHash, "commithash:", patch.CommitHash, comment)
-			// continue
-		}
-
-		// log.Info("adding patch:", patch.Namespace, patch.CommitHash, comment, newhash)
-		notdone.AppendByCommitHash(patch) // double check to ensure the commit hash isn't added twice
-	}
-}
-
-func AddNotDonePatches(notdone *forgepb.Patches, pset *forgepb.Set, full bool) {
-	for patch := range pset.Patches.IterAll() {
-		comment := cleanSubject(patch.Comment)
-
-		if found := notdone.FindByCommitHash(patch.CommitHash); found != nil {
-			log.Info("duplicate notdone", patch.Namespace, "patch:", patch.NewHash, "commithash:", patch.CommitHash, comment)
-			continue
-		}
-
-		repo := me.forge.FindByGoPath(patch.Namespace)
-		if repo == nil {
-			log.Info("could not find repo", patch.Namespace)
-			if full {
-				notdone.AppendByCommitHash(patch) // double check to ensure the commit hash isn't added twice
-			}
-			continue
-		}
-
-		if patch.NewHash != "" {
-			log.Info("already applied patch", patch.Namespace, ": newhash:", patch.NewHash, "commithash:", patch.CommitHash, comment)
-			continue
-		}
-		os.Chdir(repo.GetFullPath())
-		newhash, err := findCommitByHash(patch.StartHash, comment)
-		if err != nil {
-			// this patch has not been applied yet
-			log.Info("patch: not found hash:", patch.Namespace, patch.CommitHash, comment, err)
-			notdone.AppendByCommitHash(patch) // double check to ensure the commit hash isn't added twice
-			continue
-		}
-
-		newhash, err = findCommitBySubject(comment)
-		if err == nil {
-			patch.NewHash = newhash
-			log.Info("patch: found hash:", patch.Namespace, "commit patch", patch.CommitHash, "new hash", newhash, "start hash", patch.StartHash, comment)
-			continue
-		}
-
-		// this patch has not been applied yet
-		log.Info("patch: not found hash:", patch.Namespace, patch.CommitHash, comment, newhash, err)
-		notdone.AppendByCommitHash(patch) // double check to ensure the commit hash isn't added twice
-	}
-}
-
-func findExpired() *forgepb.Patches {
-	var pset *forgepb.Patches
-	for found := range me.forge.Patchsets.IterAll() {
-		if found.Name == "forge auto commit" {
-			pset = found.Patches
-		}
-	}
-
-	if pset == nil {
-		log.Info("failed to find 'forge auto commit'")
-		return forgepb.NewPatches()
-	}
-
-	found := forgepb.NewPatches()
-
-	for patch := range pset.IterAll() {
-		comment := cleanSubject(patch.Comment)
-
-		repo := me.forge.FindByGoPath(patch.Namespace)
-		if repo == nil {
-			log.Info("could not find repo", patch.Namespace)
-			continue
-		}
-
-		if patch.NewHash != "" {
-			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
-		}
-		os.Chdir(repo.GetFullPath())
-		_, err := findCommitByHash(patch.StartHash, comment)
-		if err == nil {
-			log.Info("found   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
-		}
-		/*
-
-			newhash, err = findCommitBySubject(comment)
-			if err == nil {
-				patch.NewHash = newhash
-				log.Info("patch: found hash:", patch.Namespace, "commit patch", patch.CommitHash, "new hash", newhash, "start hash", patch.StartHash, comment)
-				found.AppendByCommitHash(patch) // double check to ensure the commit hash isn't added twice
-				continue
-			}
-		*/
-	}
-
-	return found
-}
-
-func findApplied() *forgepb.Patches {
-	var pset *forgepb.Patches
-	for found := range me.forge.Patchsets.IterAll() {
-		if found.Name == "forge auto commit" {
-			pset = found.Patches
-		}
-	}
-
-	if pset == nil {
-		log.Info("failed to find 'forge auto commit'")
-		return pset
-	}
-
-	found := forgepb.NewPatches()
-
-	for patch := range pset.IterAll() {
-		cmd := []string{"git", "merge-base", "--is-ancestor", patch.NewHash, "devel"}
-		repo := me.forge.Repos.FindByNamespace(patch.Namespace)
-		_, err := repo.RunStrict(cmd)
-		if err != nil {
-			// log.Info("NOT APPLIED", patch.Namespace, result, err)
-			// log.Info("NOT APPLIED newhash:", patch.NewHash, "commithash:", patch.CommitHash, "patch", patch.Namespace)
-		} else {
-			// log.Info("APPLIED newhash:", patch.NewHash, "commithash:", patch.CommitHash, "patch", patch.Namespace)
-			found.Append(patch)
-		}
-	}
-
-	return found
-}

main.go

@@ -7,9 +7,11 @@ package main
 
 import (
 	"embed"
+	"os"
 	"strings"
 
-	"go.wit.com/lib/gui/prep"
+	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/gui"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
@@ -41,18 +43,30 @@ func getVersion(repo *gitpb.Repo, name string) string {
 
 func main() {
 	me = new(mainType)
-	me.myGui = prep.Gui()       // prepares the GUI package for go-args
+	gui.InitArg()
-	me.auto = prep.Bash3(&argv) // this line should be:  prep.Bash(&argv)
+	me.pp = arg.MustParse(&argv)
 
-	// me.auto = prep.Bash3(argv.DoAutoComplete, &argv) // this line should be:  prep.Bash(&argv)
+	if argv.Bash {
-	// arg.MustParse(&argv)                                      // these three lines are becoming terrible syntax
+		argv.doBash()
-	// me.auto = prep.MustParse(&argv)          // try to make this work?
+		os.Exit(0)
+	}
+	if len(argv.BashAuto) != 0 {
+		argv.doBashAuto()
+		os.Exit(0)
+	}
+	me.urlbase = argv.URL
+	if me.urlbase == "" {
+		me.urlbase = "https://go.wit.com/"
+	}
+	if os.Getenv("FORGE_URL") != "" {
+		me.urlbase = os.Getenv("FORGE_URL")
+		log.Info("got forge url", me.urlbase)
+	}
+	me.urlbase = strings.Trim(me.urlbase, "/") // track down why trailing '/' makes http POST not work
 
-	me.forge = forgepb.Init() // init forge.pb
+	// load the ~/.config/forge/ config
-	me.forge.ScanRepoDir()    // looks for new dirs, checks existing repos for changes
+	me.forge = forgepb.Init()
-
+	me.found = new(gitpb.Repos)
-	// initialize patches
-	doPatchInit()
 
 	// first find the repos or gopaths to operate on
 	if argv.Config != nil {
@@ -92,6 +106,17 @@ func main() {
 	}
 
 	if argv.Clean != nil {
+		if argv.Clean.Repo != "" {
+			log.Info("only looking at repo:", argv.Clean.Repo)
+			okExit("")
+		}
+
+		if argv.Clean.GitReset != nil {
+			findAll() // select all the repos
+			doGitReset()
+			okExit("reset")
+		}
+
 		if err := doClean(); err != nil {
 			badExit(err)
 		}
@@ -99,81 +124,25 @@ func main() {
 		okExit("")
 	}
 
-	if argv.Help != nil {
-		doHelp()
-		okExit("")
-	}
-
 	if argv.Dirty != nil {
 		doDirty()
 		okExit("")
 	}
 
-	if argv.Tag != nil {
+	if argv.GitFetch != nil {
-		doTag()
+		doGitFetch()
 		okExit("")
 	}
 
-	if argv.Normal != nil {
+	if argv.GitPull != nil {
-		if argv.Normal.On != nil {
+		doGitPullNew()
-			if me.forge.Config.Mode == forgepb.ForgeMode_NORMAL {
-				log.Info("you are already in the normal state")
-				okExit("")
-			}
-			setForgeMode(forgepb.ForgeMode_NORMAL)
-			log.Info("normal mode on")
-			okExit("")
-		}
-
-		if argv.Normal.Off != nil {
-			if me.forge.Config.Mode != forgepb.ForgeMode_NORMAL {
-				log.Info("you were aleady not in the normal state")
-				okExit("")
-			}
-			setForgeMode(forgepb.ForgeMode_DEVEL)
-			log.Info("normal mode off")
-			okExit("")
-		}
-
-		if doNormal() {
-			log.Infof("all %d repos are on your user branch. It is safe to write code now.\n", me.forge.Repos.Len())
-			if me.forge.Config.Mode != forgepb.ForgeMode_NORMAL {
-				log.Infof("Forge has set the mode to 'Normal'\n")
-				setForgeMode(forgepb.ForgeMode_NORMAL)
-			}
-			okExit("")
-		}
-		okExit("")
-	}
-
-	// if you are in "normal" mode, always run normal every time to catch accidental errors
-	// for example, if you accidentally changed branches from your user branch
-	if me.forge.Config.Mode == forgepb.ForgeMode_NORMAL {
-		if doNormal() {
-			log.Infof("all your %d repos are in a normal stete for development\n", me.forge.Repos.Len())
-		}
-	}
-
-	if argv.Merge != nil {
-		if err := doMerge(); err != nil {
-			badExit(err)
-		}
-		okExit("")
-	}
-
-	if argv.Pull != nil {
-		doPull()
 		okExit("")
 	}
 
 	if argv.List != nil {
 		found := argv.List.findRepos()
 		// print out the repos
-		if argv.List.Full {
-			me.forge.PrintHumanTableFull(found)
-		} else {
 		me.forge.PrintHumanTable(found)
-		}
 		okExit("")
 	}
 
@@ -181,50 +150,29 @@ func main() {
 		if err := doPatch(); err != nil {
 			badExit(err)
 		}
+		okExit("patch list")
+	}
+
+	// todo: redo this logic using forgepb
+	if configSave {
+		me.forge.ConfigSave()
+		configSave = false
+	}
+
+	// if the user doesn't want to open the GUI and
+	// nothing else was specified to be done,
+	// then just list the table to stdout
+	if gui.NoGui() {
+		me.forge.PrintHumanTable(me.found)
 		okExit("")
 	}
 
 	// open the gui unless the user performed some other
 	// basically, if you run just 'forge' it should open the GUI
 
-	if argv.Gui != nil {
 	// if opening the GUI, always check git for dirty repos
-		me.forge.CheckDirty()
+	findAll() // select all the repos
-
+	doCheckDirtyAndConfigSave()
-		me.myGui.Start() // loads the GUI toolkit
+	doGui()
-		doGui()          // start making our forge GUI
-		debug()          // sits here forever
-	}
-	// got to the end with nothing to do (?)
-	if dumpWorkRepos() {
-		// found some repos at least
-	} else {
-		// every repo is in a really clean state. no extra files anywhere
-		// no dirty repos, no repos that need to be published
-		// nothing different between user and master branch version. not common
-		log.Info("All of your git repositories appear to be in perfect shape")
-	}
-	okExit("")
-}
-
-// keep this small
-func doHelp() {
-	log.Info("")
-	log.Info("forge -h       : to see the available options")
-	log.Info("forge --bash   : will create a bash autocomplete file")
-	log.Info("forge          : with no arguements, forge tries to load a GO GUI plugin")
-	log.Info("               : there are two GUI plugins. terminal & GTK")
-	log.Info("")
-	log.Info("forge list     : shows a table of all your repos")
-	log.Info("forge checkout : checks out all your repos to the same branch")
-	log.Info("               : the default is your user branch")
-	log.Info("forge clean    : reverts all repos to the master branch")
-	log.Info("forge dirty    : show all repos git reports as dirty")
-	log.Info("")
-	okExit("")
-}
-
-func doHelpPatches() {
-	log.Info("TODO: ?")
 	okExit("")
 }

structs.go

@@ -4,10 +4,11 @@
 package main
 
 import (
+	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/gui"
 	"go.wit.com/lib/gadgets"
-	"go.wit.com/lib/gui/prep"
 	"go.wit.com/lib/protobuf/forgepb"
+	"go.wit.com/lib/protobuf/gitpb"
 )
 
 var me *mainType
@@ -20,32 +21,58 @@ func (b *mainType) Enable() {
 	b.mainbox.Enable()
 }
 
-// returns the server to connect to
-func myServer() string {
-	return me.forge.GetForgeURL()
-}
-
 // 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
+	myGui      *gui.Node          // the gui toolkit handle
+	found      *gitpb.Repos       // stores the list of repos to process things on
+	psets      *forgepb.Patchsets // the locally stored on disk patchsets
 	foundPaths []string           // stores gopaths to act on (when doing go-clone)
 	configSave bool               // if the config file should be saved after finishing
 	urlbase    string             // base URL
 
-	mainWindow *gadgets.BasicWindow
+	// our view of the repositories
-	mainbox    *gui.Node           // the main box. enable/disable this
+	// patchWin *patchesWindow
-	autoDryRun *gui.Node           // checkbox for --dry-run
-	goSrcPwd   *gadgets.OneLiner   // what is being used as primary directory for your work
-	goSrcEdit  *gadgets.BasicEntry // what is being used as primary directory for your work
-	gitAuthor  *gadgets.OneLiner   // ENV GIT_AUTHOR NAME and EMAIL
 
-	// these hold the branches that the user can switch all the repositories to them
+	mainWindow *gadgets.BasicWindow
+
+	// the main box. enable/disable this
+	mainbox *gui.Node
+
+	// the window from the /lib/gui/gowit package
+	// lw *gadgets.BasicWindow
+
+	// #### Sorting options for the repolist
+	// autoHidePerfect  *gui.Node
+	// autoHideReadOnly *gui.Node
+
+	// checkbox for --dry-run
+	autoDryRun *gui.Node
+
+	// checkbox to enable intermittent scanning
+	// if checked, it will check all your repos for changes
+	autoScanReposCB *gui.Node
+
+	goSrcPwd  *gadgets.OneLiner // what is being used as primary directory for your work
+	gitAuthor *gadgets.OneLiner // ENV GIT_AUTHOR NAME and EMAIL
+	forgeMode *gui.Node         // is the user in 'master', 'devel' or 'user' branches
+
+	// these hold the branches that the user can switch all
+	// the repositories to them
+	newBranch       *gui.Node // deprecate?
+	setBranchB      *gui.Node // deprecate?
 	reposWinB       *gui.Node // button that opens the repos window
 	repoAllB        *gui.Node // "all" repos button
 	repoDirtyB      *gui.Node // "dirty" repos button
 	repoDevelMergeB *gui.Node // "merge to devel" repos button
 	repoWritableB   *gui.Node // "what repos are writable" repos button
+	demoB           *gui.Node // opens the demo
+	//	modeReleaseW    *gui.Node // opens the release window
+	//	modePatchW      *gui.Node // opens the patch window
+	//	modeUserW       *gui.Node // opens the user/hack window
+
+	argvCheckoutUser   bool // shared between the GUI and the command line tools
+	argvCheckoutDevel  bool // shared between the GUI and the command line tools
+	argvCheckoutMaster bool // shared between the GUI and the command line tools
 }

windowForgePatchsets.go

@@ -0,0 +1,164 @@
+// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
+// Use of this source code is governed by the GPL 3.0
+
+package main
+
+// this is the "main" patch window. The first one
+// then you can dig down and examine the patchsets and the files
+
+import (
+	"fmt"
+	"strconv"
+
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/log"
+
+	"go.wit.com/gui"
+)
+
+type patchesWindow struct {
+	win        *gadgets.BasicWindow // the patches window
+	stack      *gui.Node            // the top box set as vertical
+	grid       *gui.Node            // the list of available patches
+	reason     *gadgets.BasicEntry  // the name of the patchset
+	submitB    *gui.Node            // the submit patchet button
+	psetgrid   *gui.Node            // the list of each patchset
+	totalOL    *gadgets.OneLiner
+	dirtyOL    *gadgets.OneLiner
+	readonlyOL *gadgets.OneLiner
+	rw         *gadgets.OneLiner
+	// checkB     *gui.Node
+}
+
+func (r *patchesWindow) Hidden() bool {
+	return r.win.Hidden()
+}
+
+func (r *patchesWindow) Toggle() {
+	if r.Hidden() {
+		r.Show()
+	} else {
+		r.Hide()
+	}
+}
+
+func (r *patchesWindow) Show() {
+	r.win.Show()
+}
+
+func (r *patchesWindow) Hide() {
+	r.win.Hide()
+}
+
+// you can only have one of these
+func (r *patchesWindow) initWindow() {
+	r.win = gadgets.RawBasicWindow("Forge Patchesets")
+	r.win.Make()
+
+	r.stack = r.win.Box().NewBox("bw vbox", false)
+	// me.reposwin.Draw()
+	r.win.Custom = func() {
+		log.Warn("Patchset Window close. setting hidden=true")
+		// sets the hidden flag to false so Toggle() works
+		r.win.Hide()
+	}
+
+	r.grid = r.stack.RawGrid()
+	r.submitPatchesBox()
+
+	// update the stats about the repos and patches
+	r.Update()
+}
+
+func (r *patchesWindow) submitPatchesBox() {
+	// s := new(patchSummary)
+	group1 := r.stack.NewGroup("Repo Summary")
+	grid := group1.RawGrid()
+
+	// make the header table for repo stats
+	r.totalOL = gadgets.NewOneLiner(grid, "Total")
+
+	grid.NextRow()
+	r.dirtyOL = gadgets.NewOneLiner(grid, "dirty")
+	grid.NextRow()
+	r.readonlyOL = gadgets.NewOneLiner(grid, "read-only")
+	grid.NextRow()
+	r.rw = gadgets.NewOneLiner(grid, "r/w")
+	grid.NextRow()
+
+	// now, make the 'widget group' and the buttons at the bottom of the window
+	group1 = r.stack.NewGroup("Patchset Create")
+	grid = group1.RawGrid()
+
+	grid.NewButton("show current patches", func() {
+		r.Update()
+		pset, err := me.forge.MakeDevelPatchSet("current patches")
+		if err != nil {
+			log.Info("patchset creation failed", err)
+			return
+		}
+		if pset == nil {
+			log.Info("you have no current patches")
+			return
+		}
+		/*
+			win := makePatchWindow(pset)
+			win.Show()
+		*/
+	})
+
+	r.reason = gadgets.NewBasicEntry(grid, "Patchset name:")
+	r.reason.Custom = func() {
+		if r.reason.String() != "" {
+			log.Info("Forge: enable submit")
+			r.submitB.Enable()
+		} else {
+			log.Info("Forge: disable submit")
+			r.submitB.Disable()
+		}
+	}
+	r.submitB = grid.NewButton("Submit", func() {
+		if r.submitB.IsEnabled() {
+			log.Info("submit button is enabled")
+		} else {
+			log.Info("submit button is disabled. BAD GUI TOOLKIT ERROR")
+			return
+		}
+		// pset, err := me.forge.SubmitDevelPatchSet(r.reason.String())
+		// if err != nil {
+		// 	log.Info(err)
+		// 	return
+		// }
+		// r.addPatchsetNew(pset)
+	})
+
+	// disables the submit button until the user enters a name
+	r.submitB.Disable()
+	grid.NextRow()
+}
+
+// will update this from the current state of the protobuf
+func (r *patchesWindow) Update() {
+	var total, dirty, readonly, rw int
+
+	// figure out the totals
+	all := me.forge.Repos.SortByFullPath()
+	for all.Scan() {
+		repo := all.Next()
+		total += 1
+		if repo.IsDirty() {
+			dirty += 1
+		}
+		if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
+			readonly += 1
+		} else {
+			rw += 1
+		}
+	}
+
+	// send the values to the GUI toolkit
+	r.totalOL.SetText(strconv.Itoa(total) + " repos")
+	r.dirtyOL.SetText(strconv.Itoa(dirty) + " repos")
+	r.readonlyOL.SetText(strconv.Itoa(readonly) + " repos")
+	r.rw.SetText(fmt.Sprintf("%d repos", rw))
+}

windowFound.go

@@ -0,0 +1,101 @@
+// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
+// Use of this source code is governed by the GPL 3.0
+
+package main
+
+// shows a window of the 'found' repos
+
+import (
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/lib/protobuf/gitpb"
+	"go.wit.com/log"
+
+	"go.wit.com/gui"
+)
+
+type foundWindow struct {
+	win        *gadgets.BasicWindow // the patches window
+	stack      *gui.Node            // the top box set as vertical
+	grid       *gui.Node            // the list of available patches
+	reason     *gadgets.BasicEntry  // the name of the patchset
+	submitB    *gui.Node            // the submit patchet button
+	psetgrid   *gui.Node            // the list of each patchset
+	totalOL    *gadgets.OneLiner
+	dirtyOL    *gadgets.OneLiner
+	readonlyOL *gadgets.OneLiner
+	rw         *gadgets.OneLiner
+	// checkB     *gui.Node
+}
+
+func (r *foundWindow) Hidden() bool {
+	return r.win.Hidden()
+}
+
+func (r *foundWindow) Toggle() {
+	if r.Hidden() {
+		r.Show()
+	} else {
+		r.Hide()
+	}
+}
+
+func (r *foundWindow) Show() {
+	r.win.Show()
+}
+
+func (r *foundWindow) Hide() {
+	r.win.Hide()
+}
+
+// you can only have one of these
+func (r *foundWindow) initWindow() {
+	r.win = gadgets.RawBasicWindow("Found Repos")
+	r.win.Make()
+
+	r.stack = r.win.Box().NewBox("bw vbox", false)
+	// me.reposwin.Draw()
+	r.win.Custom = func() {
+		log.Warn("Found Window close. setting hidden=true")
+		// sets the hidden flag to false so Toggle() works
+		r.win.Hide()
+	}
+	group1 := r.stack.NewGroup("Repo Summary")
+	group1.NewButton("dirty", func() {
+		log.Info("find dirty here")
+		found := findDirty()
+		me.forge.PrintHumanTable(found)
+	})
+	group1.NewButton("all", func() {
+		log.Info("find all here")
+		me.found = new(gitpb.Repos)
+		findAll()
+		me.forge.PrintHumanTable(me.found)
+	})
+
+	r.grid = r.stack.RawGrid()
+
+	group1.NewButton("show", func() {
+		r.listRepos()
+	})
+}
+
+func (r *foundWindow) listRepos() {
+	for repo := range me.found.IterAll() {
+		r.addRepo(repo)
+	}
+}
+
+func (r *foundWindow) addRepo(repo *gitpb.Repo) {
+	r.grid.NewButton("View", func() {
+	})
+	r.grid.NewLabel(repo.GetGoPath())
+	r.grid.NewLabel(repo.GetMasterVersion())
+	r.grid.NewLabel(repo.GetDevelVersion())
+	r.grid.NewLabel(repo.GetUserVersion())
+	r.grid.NewLabel(repo.GetCurrentBranchName())
+	r.grid.NextRow()
+}
+
+// will update this from the current state of the protobuf
+func (r *foundWindow) Update() {
+}

windowHackMode.go

@@ -0,0 +1,115 @@
+// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
+// Use of this source code is governed by the GPL 3.0
+
+package main
+
+// An app to submit patches for the 30 GO GUI repos
+
+import (
+	"go.wit.com/lib/debugger"
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/log"
+)
+
+func makeHackModeWindow() *gadgets.GenericWindow {
+	win := gadgets.NewGenericWindow("git user branch / Hack Mode Window", "This is a work in progress")
+	grid := win.Group.RawGrid()
+	grid.NewButton("git pull", func() {
+		log.Info("todo: run git pull on each repo")
+	})
+
+	me.repoDevelMergeB = grid.NewButton("merge", func() {
+		found := findMergeToDevel()
+		_, box := makeStandardReposWindow("repos to merge from user to devel", found)
+		hbox := box.Box().Horizontal()
+		hbox.NewButton("merge all", func() {
+			win.Disable()
+			defer win.Enable()
+			all := found.SortByFullPath()
+			for all.Scan() {
+				repo := all.Next()
+				if repo.CheckDirty() {
+					log.Info("repo is dirty", repo.GetGoPath())
+					continue
+				}
+				log.Info("Starting merge on", repo.GetGoPath())
+				if repo.CheckoutDevel() {
+					log.Info("checkout devel failed", repo.GetGoPath())
+					return
+				}
+				if _, err := repo.MergeToDevel(); err != nil {
+					log.Info("merge from user failed", repo.GetGoPath(), err)
+					// log.Info(strings.Join(r.Stdout, "\n"))
+					// log.Info(strings.Join(r.Stderr, "\n"))
+					return
+				}
+				if repo.CheckoutMaster() {
+					log.Info("checkout master failed", repo.GetGoPath())
+					return
+				}
+				if _, err := repo.MergeToMaster(); err != nil {
+					log.Info("merge from devel failed", repo.GetGoPath(), err)
+					return
+				}
+
+			}
+		})
+	})
+	grid.NextRow()
+
+	group2 := win.Stack.NewGroup("Merge")
+	grid = group2.RawGrid()
+
+	grid.NewButton("merge to devel", func() {
+		win.Disable()
+		defer win.Enable()
+
+		mergeUserToDevel(true)
+	})
+
+	grid.NewButton("merge to master", func() {
+		win.Disable()
+		defer win.Enable()
+
+		mergeDevelToMaster(true)
+	})
+
+	grid.NewButton("merge all", func() {
+		win.Disable()
+		defer win.Enable()
+
+		me.argvCheckoutUser = false
+		me.argvCheckoutDevel = true
+		me.argvCheckoutMaster = false
+		if err := doCheckoutShared(); err != nil {
+			log.Info("checkout error:", err)
+		} else {
+			log.Info("checkout was ok")
+		}
+
+		mergeUserToDevel(true)
+
+		me.argvCheckoutUser = false
+		me.argvCheckoutDevel = false
+		me.argvCheckoutMaster = true
+		if err := doCheckoutShared(); err != nil {
+			log.Info("checkout error:", err)
+		} else {
+			log.Info("checkout was ok")
+		}
+
+		mergeDevelToMaster(true)
+	})
+
+	group3 := win.Stack.NewGroup("work in progress")
+	grid = group3.RawGrid()
+
+	grid.NewButton("forge ConfigSave()", func() {
+		me.forge.ConfigSave()
+	})
+
+	grid.NewButton("debugger()", func() {
+		debugger.DebugWindow()
+	})
+	return win
+}

windowHowto.go

@@ -41,15 +41,14 @@ func makeHowtoWin() *gadgets.GenericWindow {
 	grid.NewLabel("") // a stupid way to add padding
 	grid.NextRow()
 
-	// howtoWin.Group.NewLabel("Working dir: " + me.forge.Config.ReposDir)
+	howtoWin.Group.NewLabel("Working dir: " + me.forge.GetGoSrc())
-
 	grid = howtoWin.Group.RawGrid()
-	grid.NewButton("Download into "+me.forge.Config.ReposDir, func() {
+	grid.NewButton("Download", func() {
 		howtoWin.Disable()
 		defer howtoWin.Enable()
 		downloadForge()
 	})
-	grid.NewButton("Build forge & GUI GO plugins", func() {
+	grid.NewButton("Build", func() {
 		howtoWin.Disable()
 		defer howtoWin.Enable()
 		buildForge()

windowModeMaster.go

@@ -0,0 +1,148 @@
+// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
+// Use of this source code is governed by the GPL 3.0
+
+package main
+
+import (
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/lib/protobuf/gitpb"
+	"go.wit.com/log"
+)
+
+// An app to submit patches for the 30 GO GUI repos
+
+func makeModeMasterWin() *gadgets.GenericWindow {
+	win := gadgets.NewGenericWindow("Release", "tools")
+	grid := win.Group.RawGrid()
+
+	checkout := grid.NewButton("git checkout master", func() {
+		win.Disable()
+		defer win.Enable()
+	})
+	gitpull := grid.NewButton("git pull", func() {
+		win.Disable()
+		defer win.Enable()
+	})
+	grid.NextRow()
+
+	cleanUser := grid.NewButton("Clean user branches", func() {
+		win.Disable()
+		defer win.Enable()
+		if err := doCleanUser(); err != nil {
+			log.Info("Clean user branches failed", err)
+		}
+	})
+
+	cleanDevel := grid.NewButton("Clean devel branches", func() {
+		win.Disable()
+		defer win.Enable()
+		if err := doCleanDevel(); err != nil {
+			log.Info("Clean devel branches failed", err)
+		}
+	})
+	grid.NextRow()
+
+	f := func() {
+		total, count, nope, err := IsEverythingOnMaster()
+		if nope == 0 {
+			checkout.Disable()
+			gitpull.Enable()
+		} else {
+			log.Printf("Master branch check. %d total repos. (%d ok) (%d not on master branch) err=%v\n", total, count, nope, err)
+			checkout.Enable()
+		}
+
+		var localuser bool  // are there still local user branches
+		var localdevel bool // are there still local devel branches
+
+		all := me.forge.Repos.SortByFullPath()
+		for all.Scan() {
+			repo := all.Next()
+			if repo.IsLocalBranch(repo.GetUserBranchName()) {
+				localuser = true
+			}
+			if repo.IsLocalBranch(repo.GetDevelBranchName()) {
+				localdevel = true
+			}
+		}
+		if localuser {
+			cleanUser.Enable()
+		} else {
+			cleanUser.Disable()
+		}
+		if localdevel {
+			cleanDevel.Enable()
+		} else {
+			cleanDevel.Disable()
+		}
+	}
+
+	grid.NewButton("check repo state", func() {
+		win.Disable()
+		defer win.Enable()
+
+		f()
+	})
+
+	grid.NewButton("reset user branches (?)", func() {
+		resetUserBranchesWindow()
+	})
+	return win
+}
+
+func resetUserBranchesWindow() {
+	found := gitpb.NewRepos()
+	all := me.forge.Repos.SortByFullPath()
+	for all.Scan() {
+		repo := all.Next()
+		uname := repo.GetUserBranchName()
+		dname := repo.GetDevelBranchName()
+		if repo.GetCurrentBranchName() == uname {
+			log.Info("Repo is on the user branch. Can't delete it.", repo.GetGoPath())
+			continue
+		}
+		b1 := repo.CountDiffObjects(uname, dname)
+		b2 := repo.CountDiffObjects(dname, uname)
+		log.Info("user vs devel count", b1, b2)
+		if b1 == 0 && b2 == 0 {
+			cmd := []string{"git", "branch", "-D", uname}
+			log.Info(repo.GetGoPath(), cmd)
+			repo.RunVerbose(cmd)
+			repo.Reload()
+			continue
+		}
+		found.Append(repo)
+
+	}
+
+	win := gadgets.RawBasicWindow("reset user branches")
+	win.Make()
+	win.Show()
+	win.Custom = func() {
+		// sets the hidden flag to false so Toggle() works
+		win.Hide()
+	}
+	box := win.Box().NewBox("bw vbox", false)
+
+	group := box.NewGroup("test buttons")
+	hbox := group.Box().Horizontal()
+	hbox.NewButton("force delete user branch", func() {
+		win.Disable()
+		defer win.Enable()
+		all := found.SortByFullPath()
+		for all.Scan() {
+			repo := all.Next()
+			brname := repo.GetUserBranchName()
+			cmd := []string{"git", "branch", "-D", brname}
+			log.Info(repo.GetGoPath(), cmd)
+			repo.RunVerbose(cmd)
+			repo.Reload()
+		}
+		me.forge.SetConfigSave(true)
+		me.forge.ConfigSave()
+	})
+
+	t := makeStandardReposGrid(found)
+	t.SetParent(box)
+	t.ShowTable()
+}

windowNewPatchsets.go

@@ -0,0 +1,242 @@
+// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
+// Use of this source code is governed by the GPL 3.0
+
+package main
+
+import (
+	"fmt"
+	"sync"
+
+	"go.wit.com/gui"
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/lib/protobuf/forgepb"
+	"go.wit.com/log"
+)
+
+type stdPatchsetTableWin struct {
+	sync.Mutex
+	win    *gadgets.GenericWindow  // the machines gui window
+	box    *gui.Node               // the machines gui parent box widget
+	TB     *forgepb.PatchsetsTable // the gui table buffer
+	update bool                    // if the window should be updated
+}
+
+func (w *stdPatchsetTableWin) Toggle() {
+	if w == nil {
+		return
+	}
+	if w.win == nil {
+		return
+	}
+	w.win.Toggle()
+}
+
+func makePatchsetsWin() *stdPatchsetTableWin {
+	dwin := new(stdPatchsetTableWin)
+	dwin.win = gadgets.NewGenericWindow("forge current patchsets", "patchset options")
+	dwin.win.Custom = func() {
+		log.Info("test delete window here")
+	}
+	grid := dwin.win.Group.RawGrid()
+
+	grid.NewButton("ondisk", func() {
+		openPatchsets()
+		if me.psets == nil {
+			log.Info("No Patchsets loaded")
+			return
+		}
+		dwin.doPatchsetsTable(me.psets)
+	})
+
+	grid.NewButton("upstream", func() {
+		psets, err := me.forge.GetPatchesets()
+		if err != nil {
+			log.Info("Get Patchsets failed", err)
+			return
+		}
+
+		var foundnew bool
+		all := psets.All()
+		for all.Scan() {
+			pset := all.Next()
+			found := me.psets.FindByUuid(pset.Uuid)
+			if found == nil {
+				log.Info("new patchset", pset.Name, pset.Uuid)
+				pset.State = "new"
+				foundnew = true
+			} else {
+				log.Info("patchset already on disk", found.Name, found.State)
+				pset.State = found.State
+				if pset.State == "" {
+					pset.State = "new"
+				}
+			}
+		}
+		dwin.doPatchsetsTable(psets)
+		if foundnew {
+			log.Info("should save these here")
+			me.psets = psets
+			savePatchsets()
+		}
+	})
+
+	grid.NewButton("save", func() {
+		if me.psets == nil {
+			log.Info("No Patchsets loaded")
+			return
+		}
+		savePatchsets()
+	})
+
+	grid.NewButton("analyse and save patchsets", func() {
+		if me.psets == nil {
+			log.Info("No Patchsets loaded")
+			return
+		}
+		all := me.psets.All()
+		for all.Scan() {
+			pset := all.Next()
+			if pset.State == "" {
+				log.Info("What is up with?", pset.Name)
+				setPatchsetState(pset)
+			} else {
+				log.Info("patchset already had state", pset.Name, pset.State)
+			}
+		}
+		savePatchsets()
+	})
+
+	// make a box at the bottom of the window for the protobuf table
+	dwin.box = dwin.win.Bottom.Box().SetProgName("TBOX")
+
+	// load and show the current patch sets
+	openPatchsets()
+	if me.psets == nil {
+		log.Info("Open Patchsets failed")
+		return dwin
+	}
+	dwin.doPatchsetsTable(me.psets)
+
+	return dwin
+}
+
+func (dwin *stdPatchsetTableWin) doPatchsetsTable(currentPatchsets *forgepb.Patchsets) {
+	dwin.Lock()
+	defer dwin.Unlock()
+	if dwin.TB != nil {
+		dwin.TB.Delete()
+		dwin.TB = nil
+	}
+
+	// display the protobuf
+	dwin.TB = AddPatchsetsPB(dwin.box, currentPatchsets)
+	f := func(pset *forgepb.Patchset) {
+		log.Info("Triggered. do something here", pset.Name)
+		/*
+			win := makePatchWindow(pset)
+			win.Show()
+		*/
+	}
+	dwin.TB.Custom(f)
+}
+
+func AddPatchsetsPB(tbox *gui.Node, pb *forgepb.Patchsets) *forgepb.PatchsetsTable {
+	t := pb.NewTable("PatchsetsPB")
+	t.NewUuid()
+	t.SetParent(tbox)
+
+	t.AddStringFunc("#", func(p *forgepb.Patchset) string {
+		return fmt.Sprintf("%d", p.Patches.Len())
+	})
+
+	vp := t.AddButtonFunc("View Patchset", func(p *forgepb.Patchset) string {
+		return p.Name
+	})
+	vp.Custom = func(pset *forgepb.Patchset) {
+		log.Info("show patches here", pset.Name)
+		makePatchesWin(pset.Patches)
+		// patchwin := makePatchesWin()
+		// patchwin.doPatchesTable(pset.Patches)
+		/*
+			win := makePatchWindow(pset)
+			win.Show()
+		*/
+	}
+
+	t.AddComment()
+	t.AddState()
+	t.AddHostname()
+
+	ctimef := func(p *forgepb.Patchset) string {
+		ctime := p.Ctime.AsTime()
+		return ctime.Format("2006/01/02 15:04")
+	}
+	t.AddStringFunc("ctime", ctimef)
+
+	/*
+		etimef := func(e *forgepb.Patchset) string {
+			etime := e.Etime.AsTime()
+			s := etime.Format("2006/01/02 15:04")
+			if strings.HasPrefix(s, "1970/") {
+				// just show a blank if it's not set
+				return ""
+			}
+			return s
+		}
+		t.AddStringFunc("etime", etimef)
+	*/
+
+	t.AddStringFunc("Author", func(p *forgepb.Patchset) string {
+		return fmt.Sprintf("%s <%s>", p.GitAuthorName, p.GitAuthorEmail)
+	})
+
+	t.AddUuid()
+
+	t.ShowTable()
+	return t
+}
+
+func setPatchsetState(p *forgepb.Patchset) {
+	var bad bool
+	var good bool
+	var done bool = true
+
+	all := p.Patches.All()
+	for all.Scan() {
+		patch := all.Next()
+		// log.Info("patch:", patch.StartHash, patch.CommitHash, patch.RepoNamespace, patch.Filename)
+		repo := me.forge.FindByGoPath(patch.RepoNamespace)
+		if repo == nil {
+			log.Info("couldn't find repo", patch.RepoNamespace)
+			bad = true
+			continue
+		}
+		if _, err := repo.GetHashName(patch.CommitHash); err == nil {
+			// this patch has been applied
+			patch.Applied = true
+			done = true
+			continue
+		}
+		if name, err := repo.GetHashName(patch.StartHash); err == nil {
+			// it might be possible to apply this patch
+			log.Info("patch may be good:", patch.RepoNamespace, name, patch.CommitHash, patch.Filename)
+			good = true
+		} else {
+			// probably screwed up git trees
+			log.Info("patch with unknown origin:", patch.RepoNamespace, name, err, patch.CommitHash, patch.Filename)
+			bad = true
+		}
+	}
+	if bad {
+		p.State = "BAD"
+		return
+	}
+	if good {
+		p.State = "TRY"
+		return
+	}
+	if done {
+		p.State = "DONE"
+		return
+	}
+}

windowPatches.go

@@ -39,7 +39,6 @@ func makePatchesWin(patches *forgepb.Patches) *stdPatchTableWin {
 	dwin.win = gadgets.NewGenericWindow("current patches", "patching options")
 	dwin.win.Custom = func() {
 		log.Info("test delete window here")
-		dwin.win.Hide()
 		// dwin = nil
 	}
 	grid := dwin.win.Group.RawGrid()
@@ -52,18 +51,35 @@ func makePatchesWin(patches *forgepb.Patches) *stdPatchTableWin {
 	all := patches.All()
 	for all.Scan() {
 		patch := all.Next()
-		repomap[patch.Namespace] += 1
+		repomap[patch.RepoNamespace] += 1
 	}
 	grid.NewLabel(fmt.Sprintf("%d", len(repomap)))
 	grid.NewLabel(fmt.Sprintf("total repos"))
 	grid.NextRow()
 
+	grid.NewButton("reload", func() {
+	})
 	grid.NewButton("Apply All", func() {
 		var count int
 		all := patches.SortByFilename()
 		for all.Scan() {
 			p := all.Next()
-			applyPatchNew(p)
+			rn := p.RepoNamespace
+			repo := me.forge.FindByGoPath(rn)
+			if repo == nil {
+				log.Info("Could not figure out repo path", rn)
+				return
+			}
+			filename, err := savePatch(p)
+			if err != nil {
+				log.Info("savePatch() failed", err)
+				return
+			}
+			count += 1
+			if err := applyPatch(repo, filename); err != nil {
+				log.Info("warn user of git am error", err)
+				return
+			}
 		}
 		log.Info("ALL PATCHES WORKED! count =", count)
 	})
@@ -79,15 +95,17 @@ func makePatchesWin(patches *forgepb.Patches) *stdPatchTableWin {
 }
 
 func applyPatchNew(p *forgepb.Patch) error {
-	rn := p.Namespace
+	rn := p.RepoNamespace
 	repo := me.forge.FindByGoPath(rn)
 	if repo == nil {
-		log.Info("Could not figure out repo path", rn)
+		return fmt.Errorf("Could not figure out repo path %s", rn)
-		return log.Errorf("%s namespace?\n", rn)
 	}
-	if _, err := applyAndTrackPatch(repo, p); err != nil {
+	filename, err := savePatch(p)
-		cmd := []string{"git", "am", "--abort"}
+	if err != nil {
-		err := repo.RunVerbose(cmd)
+		log.Info("savePatch() failed", err)
+		return err
+	}
+	if err := applyPatch(repo, filename); err != nil {
 		log.Info("warn user of git am error", err)
 		return err
 	}
@@ -110,38 +128,25 @@ func (dwin *stdPatchTableWin) doPatchesTable(currentPatches *forgepb.Patches) {
 	dwin.TB.Custom(f)
 }
 
-// used by the PB table
-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 ""
-	}
-	if p.NewHash == "" {
-		return "git am"
-	}
-	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
 func AddPatchesPB(tbox *gui.Node, pb *forgepb.Patches) *forgepb.PatchesTable {
 	t := pb.NewTable("PatchesPB")
 	t.NewUuid()
 	t.SetParent(tbox)
 
-	gitam := t.AddButtonFunc("apply", applyPatchLabel)
+	gitam := t.AddButtonFunc("apply", func(p *forgepb.Patch) string {
-	gitam.Custom = applyPatchClick
+		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")
+	}
 
 	t.AddCommitHash()
-	t.AddNamespace()
+	t.AddRepoNamespace()
 	// t.AddFilename()
 	t.AddStringFunc("file", func(p *forgepb.Patch) string {
 		_, fname := filepath.Split(p.Filename)
@@ -172,46 +177,3 @@ func savePatch(p *forgepb.Patch) (string, error) {
 
 	return tmpname, nil
 }
-
-func applyAndTrackPatch(repo *gitpb.Repo, p *forgepb.Patch) (string, error) {
-	_, filen := filepath.Split(p.Filename)
-	tmpname := filepath.Join("/tmp", filen)
-	log.Info("saving as", tmpname, p.Filename)
-	raw, err := os.OpenFile(tmpname, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
-	if err != nil {
-		return "", err
-	}
-	raw.Write(p.Data)
-	raw.Close()
-
-	cmd := []string{"git", "am", tmpname}
-	err = repo.RunVerbose(cmd)
-	if err != nil {
-		log.Info("git am failed. run 'git am --abort' here")
-		return "", log.Errorf("git am failed")
-	}
-
-	log.Info("Try to find hash value now")
-
-	p.NewHash = "fixme applyAndTrack"
-	if setNewHash(p, p.NewHash) {
-		log.Info("setting NewHash worked", p.NewHash)
-	}
-	me.forge.SavePatchsets()
-
-	return p.NewHash, log.Errorf("did not lookup new hash")
-}
-
-func setNewHash(p *forgepb.Patch, hash string) bool {
-	for pset := range me.forge.Patchsets.IterAll() {
-		for patch := range pset.Patches.IterAll() {
-			if patch.CommitHash == hash {
-				patch.NewHash = hash
-				log.Info("found patch in repo")
-				me.forge.SavePatchsets()
-				return true
-			}
-		}
-	}
-	return false
-}

windowPublish.go

@@ -1,42 +0,0 @@
-// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
-// Use of this source code is governed by the GPL 3.0
-
-package main
-
-// An app to submit patches for the 30 GO GUI repos
-
-import (
-	"go.wit.com/lib/gadgets"
-)
-
-// Publish Window
-func makePublishWindow() *gadgets.GenericWindow {
-	pubWin := gadgets.NewGenericWindow("publish code", "tasks for merging, versioning and publishing code")
-
-	grid := pubWin.Group.RawGrid()
-
-	grid.NewButton("merge all patches to master", func() {
-		/*
-			pubWin.Disable()
-			defer pubWin.Enable()
-
-			if err := doAllCheckoutDevel(); err != nil {
-				log.Info("checkout error:", err)
-			} else {
-				log.Info("checkout was ok")
-			}
-
-			mergeUserToDevel(true)
-
-			if err := doAllCheckoutMaster(); err != nil {
-				log.Info("checkout error:", err)
-			} else {
-				log.Info("checkout was ok")
-			}
-
-			mergeDevelToMaster(true)
-		*/
-	})
-
-	return pubWin
-}

windowRepos.go

@@ -10,22 +10,160 @@ import (
 	"os"
 	"time"
 
-	"go.wit.com/lib/debugger"
 	"go.wit.com/lib/gadgets"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
 
-func makeReposWin() *stdReposTableWin {
+func makeReposWin() *gadgets.GenericWindow {
-	rwin := new(stdReposTableWin)
+	win := gadgets.NewGenericWindow("git repos", "All about git repos")
-	win := gadgets.NewGenericWindow("find errors and try to fix them", "types of errors of some sort or another")
-	rwin.win = win
 	grid := win.Group.RawGrid()
 
-	// win.Top.NewGroup("misc (works in progress)")
+	me.repoDirtyB = grid.NewButton("dirty", func() {
+		doCheckDirtyAndConfigSave()
+		found := findDirty()
+		tb, box := makeStandardReposWindow("dirty repos", found)
+		hbox := box.Box().Horizontal()
+		hbox.NewButton("commit all", func() {
+			for repo := range found.IterByFullPath() {
+				log.Info("do commit here on", repo.GetGoPath())
+			}
+			log.Info("TODO: fix this")
+			log.Info("run 'forge commit --all'")
+		})
+		hbox.NewButton("update table", func() {
+			me.forge.PrintHumanTable(found)
+			found2 := findDirty()
+			me.forge.PrintHumanTable(found2)
+			// tb.Update()
+			// tb.UpdateTable(found2)
+		})
+		hbox.NewButton("delete table", func() {
+			tb.Delete()
+		})
+	})
 
-	// grid = win.Top.RawGrid()
+	var writeWin *gadgets.GenericWindow
-	grid = win.Group.RawGrid()
+	me.repoWritableB = grid.NewButton("writable", func() {
+		// if the window exists, just toggle it open or closed
+		if writeWin != nil {
+			writeWin.Toggle()
+			return
+		}
+
+		// make the window for the first time
+		found := new(gitpb.Repos)
+		for repo := range me.forge.Repos.IterByFullPath() {
+			if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
+				continue
+			}
+
+			found.AppendByGoPath(repo)
+
+		}
+		writeWin, _ = makeWritableWindow(found)
+		writeWin.Win.Custom = func() {
+			log.Info("closing window. could do somethine here")
+		}
+	})
+
+	me.repoAllB = grid.NewButton("All", func() {
+		me.found = new(gitpb.Repos)
+		all := me.forge.Repos.SortByFullPath()
+		for all.Scan() {
+			repo := all.Next()
+			me.found.AppendByGoPath(repo)
+
+		}
+		makeStandardReposWindow("All repos", me.found)
+	})
+
+	var insertWin *gadgets.GenericWindow
+	me.repoWritableB = grid.NewButton("insert test", func() {
+		// if the window exists, just toggle it open or closed
+		if insertWin != nil {
+			insertWin.Toggle()
+			return
+		}
+
+		insertWin = makeWindowForPB()
+		insertWin.Win.Custom = func() {
+			log.Info("test delete window here")
+		}
+		grid := insertWin.Group.RawGrid()
+
+		var t *gitpb.ReposTable
+		grid.NewButton("dirty", func() {
+			if t != nil {
+				t.Delete()
+				t = nil
+			}
+			found := findDirty()
+
+			// display the protobuf
+			t = addWindowPB(insertWin, found)
+			f := func(repo *gitpb.Repo) {
+				log.Info("got to ReposTable.Custom() id =", repo.GetGoPath(), repo.GetCurrentVersion())
+			}
+			t.Custom(f)
+			log.Info("table has uuid", t.GetUuid())
+		})
+
+		grid.NewButton("all", func() {
+			if t != nil {
+				t.Delete()
+				t = nil
+			}
+			found := new(gitpb.Repos)
+			all := me.forge.Repos.SortByFullPath()
+			for all.Scan() {
+				repo := all.Next()
+				found.AppendByGoPath(repo)
+
+			}
+			// display the protobuf
+			t = addWindowPB(insertWin, found)
+			f := func(repo *gitpb.Repo) {
+				log.Info("got to ReposTable.Custom() id =", repo.GetGoPath(), repo.GetCurrentVersion())
+			}
+			t.Custom(f)
+			log.Info("table has uuid", t.GetUuid())
+		})
+
+		grid.NewButton("writeable", func() {
+			if t != nil {
+				t.Delete()
+				t = nil
+			}
+			found := new(gitpb.Repos)
+			all := me.forge.Repos.SortByFullPath()
+			for all.Scan() {
+				repo := all.Next()
+				if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
+					continue
+				}
+
+				found.AppendByGoPath(repo)
+
+			}
+
+			// make the window for the first time
+			t = addWindowPB(insertWin, found)
+			f := func(repo *gitpb.Repo) {
+				log.Info("got to ReposTable.Custom() id =", repo.GetGoPath(), repo.GetCurrentVersion())
+			}
+			t.Custom(f)
+			log.Info("table has uuid", t.GetUuid())
+		})
+	})
+
+	grid.NewButton("Configure", func() {
+		log.Info("add a forge config window here")
+	})
+
+	win.Stack.NewGroup("misc (works in progress)")
+
+	grid = win.Stack.RawGrid()
 	var found *gitpb.Repos
 	var txt string
 
@@ -61,7 +199,7 @@ func makeReposWin() *stdReposTableWin {
 		hbox.NewButton("test", func() {
 		})
 
-		t := makeDevelBehindMaster(found)
+		t := makeStandardReposGrid(found)
 		t.SetParent(box)
 		t.ShowTable()
 	})
@@ -99,7 +237,7 @@ func makeReposWin() *stdReposTableWin {
 				cmd = []string{"git", "branch", "--delete", "--remote", "origin/" + brname}
 				log.Info(repo.GetGoPath(), cmd)
 				repo.RunVerbose(cmd)
-				repo.ReloadCheck()
+				repo.Reload()
 			}
 			me.forge.SetConfigSave(true)
 			me.forge.ConfigSave()
@@ -110,8 +248,9 @@ func makeReposWin() *stdReposTableWin {
 		t.ShowTable()
 	})
 
-	rwin.boxTB = win.Bottom.Box()
+	grid.NewButton("unknown branches", func() {
-
+		log.Info("unknown branches not done yet")
+	})
 	grid.NextRow()
 
 	found = develRemoteProblem()
@@ -129,148 +268,7 @@ func makeReposWin() *stdReposTableWin {
 	})
 	grid.NextRow()
 
-	makeHackModeWindow(rwin)
+	return win
-	return rwin
-}
-
-// table of devel errors behind master
-func makeDevelBehindMaster(pb *gitpb.Repos) *gitpb.ReposTable {
-	t := pb.NewTable("testDirty")
-	t.NewUuid()
-	sf := t.AddStringFunc("repo", func(r *gitpb.Repo) string {
-		return r.GetGoPath()
-	})
-	sf.Custom = func(r *gitpb.Repo) {
-		log.Info("merge master into devel here", r.GetGoPath())
-	}
-	t.AddTimeFunc("age", func(repo *gitpb.Repo) time.Time {
-		return repo.NewestTime()
-	})
-	t.AddMasterVersion()
-	t.AddDevelVersion()
-	t.AddState()
-	return t
-}
-
-// default window for active running droplets
-func (rwin *stdReposTableWin) doReposTable(pb *gitpb.Repos) {
-	rwin.Lock()
-	defer rwin.Unlock()
-	if rwin.TB != nil {
-		rwin.TB.Delete()
-		rwin.TB = nil
-	}
-
-	rwin.pb = pb
-
-	t := makeStandardReposGrid(pb)
-	t.SetParent(rwin.boxTB)
-	t.ShowTable()
-	rwin.TB = t
-}
-
-func makeHackModeWindow(stdwin *stdReposTableWin) {
-	group := stdwin.win.Top.NewGroup("This is a work in progress")
-	grid := group.RawGrid()
-	grid.NewButton("git pull", func() {
-		log.Info("todo: run git pull on each repo")
-	})
-
-	me.repoDevelMergeB = grid.NewButton("merge", func() {
-		found := findMergeToDevel()
-		_, box := makeStandardReposWindow("repos to merge from user to devel", found)
-		hbox := box.Box().Horizontal()
-		hbox.NewButton("merge all", func() {
-			stdwin.win.Disable()
-			defer stdwin.win.Enable()
-			all := found.SortByFullPath()
-			for all.Scan() {
-				repo := all.Next()
-				if repo.CheckDirty() {
-					log.Info("repo is dirty", repo.GetGoPath())
-					continue
-				}
-				log.Info("Starting merge on", repo.GetGoPath())
-				if repo.CheckoutDevel() {
-					log.Info("checkout devel failed", repo.GetGoPath())
-					return
-				}
-				if _, err := repo.MergeToDevel(); err != nil {
-					log.Info("merge from user failed", repo.GetGoPath(), err)
-					// log.Info(strings.Join(r.Stdout, "\n"))
-					// log.Info(strings.Join(r.Stderr, "\n"))
-					return
-				}
-				if repo.CheckoutMaster() {
-					log.Info("checkout master failed", repo.GetGoPath())
-					return
-				}
-				if _, err := repo.MergeToMaster(); err != nil {
-					log.Info("merge from devel failed", repo.GetGoPath(), err)
-					return
-				}
-
-			}
-		})
-	})
-	grid.NextRow()
-
-	group2 := stdwin.win.Top.NewGroup("Merge")
-	grid = group2.RawGrid()
-
-	/*
-		grid.NewButton("merge to devel", func() {
-			stdwin.win.Disable()
-			defer stdwin.win.Enable()
-
-			mergeUserToDevel(true)
-		})
-
-		grid.NewButton("merge to master", func() {
-			stdwin.win.Disable()
-			defer stdwin.win.Enable()
-
-			mergeDevelToMaster(true)
-		})
-
-		grid.NewButton("merge all", func() {
-			stdwin.win.Disable()
-			defer stdwin.win.Enable()
-
-			if err := doAllCheckoutDevel(); err != nil {
-				log.Info("checkout error:", err)
-			} else {
-				log.Info("checkout was ok")
-			}
-
-			mergeUserToDevel(true)
-
-			if err := doAllCheckoutMaster(); err != nil {
-				log.Info("checkout error:", err)
-			} else {
-				log.Info("checkout was ok")
-			}
-
-			mergeDevelToMaster(true)
-		})
-	*/
-
-	grid.NewButton("show dirty repos on win.Bottom", func() {
-		log.Info("try to show dirty repos on bottom")
-		found := me.forge.FindDirty()
-		stdwin.doReposTable(found)
-	})
-
-	group3 := stdwin.win.Top.NewGroup("work in progress")
-	grid = group3.RawGrid()
-
-	grid.NewButton("forge ConfigSave()", func() {
-		me.forge.ConfigSave()
-	})
-
-	grid.NewButton("debugger()", func() {
-		debugger.DebugWindow()
-	})
 }
 
 func develBehindMasterProblem() *gitpb.Repos {
@@ -281,7 +279,7 @@ func develBehindMasterProblem() *gitpb.Repos {
 		if repo.GetDevelVersion() == repo.GetMasterVersion() {
 			continue
 		}
-		found.AppendByFullPath(repo)
+		found.AppendByGoPath(repo)
 
 	}
 	return found
@@ -294,7 +292,7 @@ func remoteUserBranchProblem() *gitpb.Repos {
 		repo := all.Next()
 		username := repo.GetUserBranchName()
 		if repo.IsBranchRemote(username) {
-			found.AppendByFullPath(repo)
+			found.AppendByGoPath(repo)
 		}
 
 	}
@@ -316,13 +314,13 @@ func develRemoteProblem() *gitpb.Repos {
 		// log.Info(lhash, rhash, repo.GetGoPath())
 		if lhash == "" || rhash == "" {
 			// something is wrong if either of these are blank
-			found.AppendByFullPath(repo)
+			found.AppendByGoPath(repo)
 			continue
 		}
 		if lhash == rhash {
 			continue
 		}
-		found.AppendByFullPath(repo)
+		found.AppendByGoPath(repo)
 
 	}
 	return found
@@ -343,13 +341,13 @@ func masterRemoteProblem() *gitpb.Repos {
 		// log.Info(lhash, rhash, repo.GetGoPath())
 		if lhash == "" || rhash == "" {
 			// something is wrong if either of these are blank
-			found.AppendByFullPath(repo)
+			found.AppendByGoPath(repo)
 			continue
 		}
 		if lhash == rhash {
 			continue
 		}
-		found.AppendByFullPath(repo)
+		found.AppendByGoPath(repo)
 
 	}
 	return found
@@ -391,3 +389,38 @@ func makeWritableWindow(pb *gitpb.Repos) (*gadgets.GenericWindow, *gitpb.ReposTa
 	t.ShowTable()
 	return win, t
 }
+
+func makeWindowForPB() *gadgets.GenericWindow {
+	win := gadgets.NewGenericWindow("Raw PB View", "Configure")
+
+	return win
+}
+
+func addWindowPB(win *gadgets.GenericWindow, pb *gitpb.Repos) *gitpb.ReposTable {
+	t := pb.NewTable("testForgeRepos")
+	t.NewUuid()
+	tbox := win.Bottom.Box().SetProgName("TBOX")
+	t.SetParent(tbox)
+
+	sf := t.AddStringFunc("repo", func(r *gitpb.Repo) string {
+		return r.GetGoPath()
+	})
+	sf.Custom = func(r *gitpb.Repo) {
+		log.Info("do button click on", r.GetGoPath())
+	}
+	t.AddTimeFunc("age", func(repo *gitpb.Repo) time.Time {
+		return repo.NewestTime()
+	})
+	t.AddMasterVersion()
+	t.AddDevelVersion()
+	t.AddUserVersion()
+	t.AddCurrentBranchName()
+	t.AddState()
+	f := func(repo *gitpb.Repo) string {
+		log.Info("repo =", repo.GetGoPath(), repo.GetCurrentVersion())
+		return repo.GetGoPath()
+	}
+	t.AddButtonFunc("cur version", f)
+	t.ShowTable()
+	return t
+}

windowReposNew.go

@@ -1,185 +0,0 @@
-// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
-// Use of this source code is governed by the GPL 3.0
-
-package main
-
-// An app to submit patches for the 30 GO GUI repos
-
-import (
-	"sync"
-	"time"
-
-	"go.wit.com/gui"
-	"go.wit.com/lib/gadgets"
-	"go.wit.com/lib/protobuf/gitpb"
-	"go.wit.com/log"
-)
-
-type stdReposTableWin struct {
-	sync.Mutex
-	win    *gadgets.GenericWindow // the machines gui window
-	boxTB  *gui.Node              // the machines gui parent box widget
-	TB     *gitpb.ReposTable      // the gui table buffer
-	pb     *gitpb.Repos           // the current repos protobuf
-	update bool                   // if the window should be updated
-}
-
-func (w *stdReposTableWin) Toggle() {
-	if w == nil {
-		return
-	}
-	if w.win == nil {
-		return
-	}
-	w.win.Toggle()
-}
-
-func makeWindowForPB() *gadgets.GenericWindow {
-	win := gadgets.NewGenericWindow("Forge Repos Protobuf View", "Display Git Repositories")
-
-	return win
-}
-
-func makeReposWinNew() *gadgets.GenericWindow {
-	insertWin := makeWindowForPB()
-	insertWin.Win.Custom = func() {
-		log.Info("test delete window here")
-	}
-	grid := insertWin.Group.RawGrid()
-
-	var t *gitpb.ReposTable
-	grid.NewButton("dirty", func() {
-		if t != nil {
-			t.Delete()
-			t = nil
-		}
-		found := me.forge.FindDirty()
-
-		// display the protobuf
-		t = addWindowPB(insertWin, found)
-		f := func(repo *gitpb.Repo) {
-			log.Info("got to ReposTable.Custom() id =", repo.GetGoPath(), repo.GetCurrentVersion())
-		}
-		t.Custom(f)
-		log.Info("table has uuid", t.GetUuid())
-	})
-
-	grid.NewButton("to publish", func() {
-		if t != nil {
-			t.Delete()
-			t = nil
-		}
-		found := findReposWithPatches()
-		me.forge.PrintHumanTable(found)
-
-		// make the window for the first time
-		t = addWindowPB(insertWin, found)
-		f := func(repo *gitpb.Repo) {
-			log.Info("got to ReposTable.Custom() id =", repo.GetGoPath(), repo.GetCurrentVersion())
-		}
-		t.Custom(f)
-		log.Info("table has uuid", t.GetUuid())
-	})
-
-	grid.NewButton("favorites", func() {
-		if t != nil {
-			t.Delete()
-			t = nil
-		}
-		found := new(gitpb.Repos)
-		all := me.forge.Repos.SortByFullPath()
-		for all.Scan() {
-			repo := all.Next()
-			if !me.forge.Config.IsFavorite(repo.GetGoPath()) {
-				continue
-			}
-			found.AppendByFullPath(repo)
-		}
-
-		// make the window for the first time
-		t = addWindowPB(insertWin, found)
-		f := func(repo *gitpb.Repo) {
-			log.Info("got to ReposTable.Custom() id =", repo.GetGoPath(), repo.GetCurrentVersion())
-		}
-		t.Custom(f)
-		log.Info("table has uuid", t.GetUuid())
-	})
-
-	grid.NewButton("writeable", func() {
-		if t != nil {
-			t.Delete()
-			t = nil
-		}
-		found := new(gitpb.Repos)
-		all := me.forge.Repos.SortByFullPath()
-		for all.Scan() {
-			repo := all.Next()
-			if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
-				continue
-			}
-			found.AppendByFullPath(repo)
-		}
-
-		// make the window for the first time
-		t = addWindowPB(insertWin, found)
-		f := func(repo *gitpb.Repo) {
-			log.Info("got to ReposTable.Custom() id =", repo.GetGoPath(), repo.GetCurrentVersion())
-		}
-		t.Custom(f)
-		log.Info("table has uuid", t.GetUuid())
-	})
-
-	grid.NewButton("all", func() {
-		if t != nil {
-			t.Delete()
-			t = nil
-		}
-		found := new(gitpb.Repos)
-		all := me.forge.Repos.SortByFullPath()
-		for all.Scan() {
-			repo := all.Next()
-			found.AppendByFullPath(repo)
-
-		}
-		// display the protobuf
-		t = addWindowPB(insertWin, found)
-		f := func(repo *gitpb.Repo) {
-			log.Info("got to ReposTable.Custom() id =", repo.GetGoPath(), repo.GetCurrentVersion())
-		}
-		t.Custom(f)
-		log.Info("table has uuid", t.GetUuid())
-	})
-
-	return insertWin
-}
-
-func addWindowPB(win *gadgets.GenericWindow, pb *gitpb.Repos) *gitpb.ReposTable {
-	t := pb.NewTable("testForgeRepos")
-	t.NewUuid()
-	tbox := win.Bottom.Box().SetProgName("TBOX")
-	t.SetParent(tbox)
-
-	sf := t.AddStringFunc("repo", func(r *gitpb.Repo) string {
-		return r.GetGoPath()
-	})
-	sf.Custom = func(r *gitpb.Repo) {
-		log.Info("do button click on", r.GetGoPath())
-	}
-	t.AddTimeFunc("age", func(repo *gitpb.Repo) time.Time {
-		return repo.NewestTime()
-	})
-	t.AddMasterVersion()
-	// hmm := t.AddMasterVersion()
-	// hmm.SetTitle("Master")
-	t.AddDevelVersion()
-	t.AddUserVersion()
-	t.AddCurrentBranchName()
-	t.AddState()
-	f := func(repo *gitpb.Repo) string {
-		log.Info("repo =", repo.GetGoPath(), repo.GetCurrentVersion())
-		return repo.GetGoPath()
-	}
-	t.AddButtonFunc("cur version", f)
-	t.ShowTable()
-	return t
-}

windowViewRepoPatches.go

@@ -22,7 +22,7 @@ type repoPatchWindow struct {
 	grid  *gui.Node            // the list of available patches
 	// summary *patchSummary        // summary of current patches
 	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)
 
@@ -117,7 +117,7 @@ func (r *repoPatchWindow) addPatchset(grid *gui.Node, pset *forgepb.Set) {
 	all := pset.Patches.SortByFilename()
 	for all.Scan() {
 		p := all.Next()
-		s := p.Namespace
+		s := p.RepoNamespace
 		repo := me.forge.FindByGoPath(s)
 		if repo == nil {
 			log.Info("COULD NOT FIND", s)