From 2b090019a9149bf89f883c46786476ef8a827069 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 13 Dec 2024 16:17:36 -0600 Subject: [PATCH] make devel and user branches locally --- doCommon.go | 27 ++++++++++++++++++++++++--- main.go | 3 +++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/doCommon.go b/doCommon.go index 85beb01..296f1cb 100644 --- a/doCommon.go +++ b/doCommon.go @@ -35,22 +35,43 @@ func doGitPull() { } func doFix() { - var fixed bool = false all := me.found.SortByGoPath() for all.Scan() { repo := all.Next() if !repo.IsValid() { log.Printf("%10s %-50s", "old?\n", repo.GoPath) me.forge.Repos.DeleteByGoPath(repo.GoPath) - fixed = true + configSave = true continue } log.Printf("running on: %-50s\n", repo.GetGoPath()) cmd := []string{"ls"} repo.Run(cmd) + if err := checkoutBranches(repo); err != nil { + badExit(err) + } } - if fixed { + if configSave { me.forge.Repos.ConfigSave() okExit("config saved") } } + +func checkoutBranches(repo *gitpb.Repo) error { + dname := repo.GetDevelBranchName() + if dname == "" { + if err := me.forge.MakeDevelBranch(repo); err != nil { + log.Info("verify() no devel branch name", repo.GoPath) + return err + } + configSave = true + } + if repo.GetUserBranchName() == "" { + if err := me.forge.MakeUserBranch(repo); err != nil { + log.Info("verify() no devel branch name", repo.GoPath) + return err + } + configSave = true + } + return nil +} diff --git a/main.go b/main.go index 35f0473..c6d2683 100644 --- a/main.go +++ b/main.go @@ -15,6 +15,9 @@ import ( var VERSION string var BUILDTIME string +// using this for now. triggers config save +var configSave bool + func main() { me = new(mainType) me.pp = arg.MustParse(&argv)