more cleanups

Makefile

@@ -11,7 +11,7 @@ info:
 	@echo "make dirty     # CheckDirty()"
 	@echo "make user      # git checkout user"
 	@echo "make master    # git checkout master"
-	forge --do-gui
+	forge
 
 vet:
 	@GO111MODULE=off go vet
@@ -32,7 +32,7 @@ goimports:
 	@# // gofmt -w -r '"go.wit.com/gui/gadgets" -> "go.wit.com/lib/gadgets"' *.go
 
 gocui: install
-	forge --gui gocui --do-gui >/tmp/forge.log 2>&1
+	forge --gui gocui  >/tmp/forge.log 2>&1
 
 redomod-all:
 	forge --do-RedoGoMod
@@ -70,9 +70,6 @@ mine: install
 all: install
 	forge --find-all
 
-gui: install
-	forge --do-gui
-
 patches: install
 	forge --do-patches
 

argv.go

@@ -40,31 +40,17 @@ case args.Push != nil:
 */
 
 type args struct {
-	Find   *FindCmd `arg:"subcommand:find"                      help:"select repos (for example, dirty or mine or read-only)"`
+	Find         *FindCmd `arg:"subcommand:find"                      help:"select repos (for example, --all or --mine)"`
 	Do           *DoCmd   `arg:"subcommand:do"                        help:"do something ('git pull', 'build', 'install', etc)"`
 	Config       bool     `arg:"--config"                             help:"show your .config/forge/ settings"`
-	//	FindAll       bool     `arg:"--find-all"                           help:"select every repo"`
+	DoPatchSet   bool     `arg:"--make-patchset"                      help:"make patch set"`
-	//	FindReadOnly  bool     `arg:"--find-readonly"                      help:"include read-only repos"`
+	ListPatchSet bool     `arg:"--list-patchset"                      help:"list patch sets"`
-	//	FindMine      bool     `arg:"--find-mine"                          help:"download private and writeable repos"`
-	//	FindFavorites bool     `arg:"--find-favorites"                     help:"download repos marked as favorites"`
-	//	FindPrivate   bool     `arg:"--find-private"                       help:"list private repos in .config/forge/"`
-	//	DoList       bool   `arg:"--do-list"                            help:"list found repos"`
-	//	DoScan       bool   `arg:"--do-scan"                            help:"rescan your repos"`
-	//	DoClone      bool   `arg:"--do-clone"                           help:"go-clone things you are missing"`
-	DoForce bool `arg:"--do-force"                           help:"force redo go-clone"`
-	//	DoGitPull    bool   `arg:"--do-git-pull"                        help:"run 'git pull' on all your repos"`
-	//	DoGitReset   bool   `arg:"--do-git-reset"                       help:"run 'git reset --hard' on all read-only repos"`
-	// DoBuild      bool   `arg:"--do-build"      default:"true"       help:"also try to build it"`
-	// DoInstall    bool   `arg:"--do-install"                         help:"try to install every binary package"`
-	// DoRedoGoMod  bool   `arg:"--do-RedoGoMod"                       help:"remake all the go.sum and go.mod files"`
-	DoGui        bool   `arg:"--do-gui"                             help:"run the gui"`
-	DoPatchSet   bool   `arg:"--do-patches"                         help:"make patch set"`
-	ListPatchSet bool   `arg:"--list-patches"                       help:"make patch set"`
 	DryRun       bool     `arg:"--dry-run"                            help:"show what would be run"`
 	Fix          bool     `arg:"--fix"                                help:"fix config, save config & exit"`
 	Delete       string   `arg:"--delete"                             help:"delete this repo"`
 	Dirty        bool     `arg:"--dirty"                              help:"git CheckDirty() on every repo"`
 	User         bool     `arg:"--user"                               help:"git checkout user"`
+	Devel        bool     `arg:"--devel"                              help:"git checkout devel"`
 	Master       bool     `arg:"--master"                             help:"git checkout master"`
 	URL          string   `arg:"--connect"                            help:"gowebd url"`
 	Register     string   `arg:"--register"                           help:"register your git URL (foo.com/mystuff) or (github.com/foo/bar)"`
@@ -80,12 +66,14 @@ forge -- in the spirit of things like sourceforge
 
 Examples:
 	forge --config                               # shows your forge config (~/.config/forge/)
-	forge  --mine                                # find your private and writable repos
+	forge find --all   do --pull                 # run 'git pull' in every repo
-	forge  --favorites                           # find configured as favorites
+	forge find --mine  do --clone                # git clone every package you have in your config file
+	forge find --all   do --build --dry-run      # build every binary package (but just show what would run)
+	forge find --all   --user                    # checkout the user branch
+	forge find --all   --devel                   # checkout the devel branch
+	forge find --all   --master                  # checkout the master branch
 
-	forge  --git-pull                            # run 'git pull' in every repo
+	# these options are intended for automation. You probably just want to use the GUI.
-	forge  --build --dry-run                     # build every binary package (but just show what would run)
-	forge  --mine --clone                        # clone every package you have in your config file
 	`
 }
 

main.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/gui"
 	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
@@ -158,13 +159,17 @@ func main() {
 		okExit("patches")
 	}
 
-	// do the gui at the very end
+	// if the user doesn't want to open the GUI and
-	if argv.DoGui {
+	// nothing else was specified to be done,
-		doGui()
+	// then just list the table to stdout
-	}
+	if gui.NoGui() {
 		if !done {
 			// if nothing was selected, print out a table of them on STDOUT
 			doCobol()
-	}
+			okExit("")
+		}
+	}
+	// open the gui
+	doGui()
 	okExit("")
 }