allow setting 'master' and 'devel' branchesv0.0.18

3 files changed, 40 insertions, 78 deletions

diff --git a/forgeConfig/Makefile b/forgeConfig/Makefile
index 89ab023..b918330 100644
--- a/forgeConfig/Makefile
+++ b/forgeConfig/Makefile
@@ -1,7 +1,7 @@
 VERSION = $(shell git describe --tags)
 BUILDTIME = $(shell date +%Y.%m.%d)
 
-build:
+build: goimports
 	GO111MODULE=off go build \
 		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 
@@ -10,7 +10,7 @@ test2:
 	FORGE_HOME=/tmp/forge ./forgeConfig
 	FORGE_HOME=/tmp/forge ./forgeConfig --list
 
-install:
+install: goimports
 	GO111MODULE=off go install \
 		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 
diff --git a/forgeConfig/argv.go b/forgeConfig/argv.go
index 635989f..a39509f 100644
--- a/forgeConfig/argv.go
+++ b/forgeConfig/argv.go
@@ -21,6 +21,9 @@ type args struct {
 	Favorite    bool   `arg:"--favorite"     default:"false"    help:"forge will always go-clone or git clone this"`
 	Private     bool   `arg:"--private"      default:"false"    help:"repo can not be published"`
 	Interesting bool   `arg:"--interesting"  default:"false"    help:"something you decided was cool"`
+	Master      string `arg:"--master"                          help:"the git 'master' or 'main' branch name"`
+	Devel       string `arg:"--devel"                           help:"the git devel branch name"`
+	User        string `arg:"--user"                            help:"the git user branch name"`
 }
 
 func (a args) Description() string {
diff --git a/forgeConfig/main.go b/forgeConfig/main.go
index 36b0b71..d6fabba 100644
--- a/forgeConfig/main.go
+++ b/forgeConfig/main.go
@@ -11,26 +11,29 @@ import (
 var VERSION string
 
 func main() {
-	f := forgepb.Init()
+	var f *forgepb.Forge
+	f = forgepb.Init()
 
 	if argv.List {
 		f.ConfigPrintTable()
-		loop := f.Config.SortByGoPath() // get the list of forge configs
-		for loop.Scan() {
-			r := loop.Next()
-			log.Info("repo:", r.GoPath)
-		}
+		/*
+			loop := f.Config.SortByGoPath() // get the list of forge configs
+			for loop.Scan() {
+				r := loop.Next()
+				log.Info("repo:", r.GoPath)
+			}
+		*/
 		os.Exit(0)
 	}
 
 	// try to delete, then save config and exit
 	if argv.Delete {
-		if f.Config.DeleteByGoPath(argv.GoPath) {
-			log.Info("deleted", argv.GoPath, "did not exist. did nothing")
+		if deleteGoPath(f, argv.GoPath) {
+			log.Info("deleted", argv.GoPath, "ok")
+			f.ConfigSave()
 			os.Exit(0)
 		}
-		log.Info("deleted", argv.GoPath, "ok")
-		f.ConfigSave()
+		log.Info("deleted", argv.GoPath, "did not exist. did nothing")
 		os.Exit(0)
 	}
 
@@ -48,14 +51,18 @@ func main() {
 	// try to add, then save config and exit
 	if argv.Add {
 		log.Info("going to add a new repo", argv.GoPath)
+		deleteGoPath(f, argv.GoPath)
 		new1 := forgepb.ForgeConfig{
-			GoPath:      argv.GoPath,
-			Writable:    argv.Writable,
-			ReadOnly:    argv.ReadOnly,
-			Private:     argv.Private,
-			Directory:   argv.Directory,
-			Favorite:    argv.Favorite,
-			Interesting: argv.Interesting,
+			GoPath:           argv.GoPath,
+			Writable:         argv.Writable,
+			ReadOnly:         argv.ReadOnly,
+			Private:          argv.Private,
+			Directory:        argv.Directory,
+			Favorite:         argv.Favorite,
+			Interesting:      argv.Interesting,
+			MasterBranchName: argv.Master,
+			DevelBranchName:  argv.Devel,
+			UserBranchName:   argv.User,
 		}
 
 		if f.Config.Append(&new1) {
@@ -68,66 +75,18 @@ func main() {
 		os.Exit(0)
 	}
 
-	// testMemoryCorruption(f)
-	f.ConfigSave()
 }
 
-/*
-// this fucks shit up
-func testMemoryCorruption(all *forgepb.Repos) *forgepb.Repos {
-	new1 := new(forgepb.Repo)
-	new1.Name = "bash1"
-	new1.Version = "5.2.21"
-	if all.Append(new1) {
-		log.Info("added", new1.Name, "ok")
-	} else {
-		log.Info("added", new1.Name, "failed")
-	}
-
-	new1 = new(forgepb.Repo)
-	new1.Name = "zookeeper1"
-	new1.Debname = "zookeeper-go"
-	if all.Append(new1) {
-		log.Info("added", new1.Name, "ok")
-	} else {
-		log.Info("added", new1.Name, "failed")
-	}
-
-	new1 = new(forgepb.Repo)
-	new1.Name = "wit-package"
-	new1.Private = true
-	if all.Append(new1) {
-		log.Info("added", new1.Name, "ok")
-	} else {
-		log.Info("added", new1.Name, "failed")
-	}
-
-	new1 = new(forgepb.Repo)
-	new1.Name = "networkQuality"
-	new1.Debname = "networkquality"
-	new1.Readonly = true
-	if all.Append(new1) {
-		log.Info("added", new1.Name, "ok")
-	} else {
-		log.Info("added", new1.Name, "failed")
-	}
-
-	new2 := new(forgepb.Repo)
-	new2.Name = "go-clone"
-	new2.Version = "0.6.8" // good version of the macos
-	if all.Append(new2) {
-		log.Info("added", new2.Name, "ok")
-	} else {
-		log.Info("added", new2.Name, "failed")
-	}
-
-	if all.Append(new2) {
-		log.Info("added", new2.Name, "ok (this is bad)")
-	} else {
-		log.Info("added", new2.Name, "failed (but ok)")
+func deleteGoPath(f *forgepb.Forge, gopath string) bool {
+	var deleted bool = false
+	for {
+		if f.Config.DeleteByGoPath(gopath) {
+			log.Info("deleted ok", gopath)
+			deleted = true
+		} else {
+			log.Info("did not delete", gopath)
+			break
+		}
 	}
-
-	fmt.Println("packages are:", len(all.Repos))
-	return all
+	return deleted
 }
-*/