diff options
| -rw-r--r-- | argv.go | 2 | ||||
| -rw-r--r-- | config.go | 20 | ||||
| -rw-r--r-- | doCheckout.go | 6 | ||||
| -rw-r--r-- | doClean.go | 36 | ||||
| -rw-r--r-- | doFix.deleteuser.go | 2 | ||||
| -rw-r--r-- | doMerge.go | 2 | ||||
| -rw-r--r-- | doMode.go | 6 | ||||
| -rw-r--r-- | doNormal.go | 4 |
8 files changed, 12 insertions, 66 deletions
@@ -116,8 +116,6 @@ type DevCmd struct { type CleanCmd struct { List *EmptyCmd `arg:"subcommand:list" help:"list not clean repos"` - Fix *EmptyCmd `arg:"subcommand:fix" help:"try to fix problems"` - Repo string `arg:"--repo" help:"work on one specific git repository"` } // matches diff --git a/config.go b/config.go deleted file mode 100644 index 861efc7..0000000 --- a/config.go +++ /dev/null @@ -1,20 +0,0 @@ -package main - -// functions to import and export the protobuf -// data to and from config files - -import ( - "go.wit.com/lib/config" - "go.wit.com/lib/protobuf/forgepb" - "go.wit.com/log" -) - -func setForgeMode(fmode forgepb.ForgeMode) { - if me.forge.Config.Mode == fmode { - return - } - log.Infof("forced save. changed Mode state from %s to %s\n", me.forge.Config.Mode, fmode) - me.forge.Config.Mode = fmode - config.SetChanged("forge", true) - me.forge.Config.ConfigSave() -} diff --git a/doCheckout.go b/doCheckout.go index aec1da2..a661b90 100644 --- a/doCheckout.go +++ b/doCheckout.go @@ -21,7 +21,7 @@ func didRepoChangeDir(repo *gitpb.Repo) error { func doCheckout() error { if argv.Checkout.User != nil { - setForgeMode(forgepb.ForgeMode_USER) + me.forge.SetMode(forgepb.ForgeMode_USER) start := time.Now() err := me.forge.DoAllCheckoutUser(argv.Force) dur := time.Since(start) @@ -35,7 +35,7 @@ func doCheckout() error { } if argv.Checkout.Devel != nil { - setForgeMode(forgepb.ForgeMode_DEVEL) + me.forge.SetMode(forgepb.ForgeMode_DEVEL) if err := me.forge.DoAllCheckoutDevelNew(argv.Force); err != nil { badExit(err) } @@ -43,7 +43,7 @@ func doCheckout() error { } if argv.Checkout.Master != nil { - setForgeMode(forgepb.ForgeMode_MASTER) + me.forge.SetMode(forgepb.ForgeMode_MASTER) err := me.forge.DoAllCheckoutMaster() me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes @@ -29,19 +29,7 @@ func doResetRepo(repo *gitpb.Repo) error { // try to delete user if err := doRepoCleanUser(repo); err != nil { - if err == ErrorBranchUnique { - if argv.Clean.Fix != nil { - bname := repo.GetUserBranchName() - checkPatchIds(repo, repo.GetUserBranchName(), repo.GetMasterBranchName()) - s := fmt.Sprintf("delete this odd user (%s) branch %s?", bname, repo.FullPath) - if fhelp.QuestionUser(s) { - repo.RunVerbose([]string{"git", "branch", "-D", bname}) - // repo.RunVerbose([]string{"git", "checkout", bname}) - } - } - } else { - log.Info(repo.Namespace, err) - } + return err } // try to delete devel @@ -52,17 +40,6 @@ func doResetRepo(repo *gitpb.Repo) error { // reverts all repos back to the original master branches // automatically deletes local devel and user branches func doClean() (string, error) { - if argv.Clean.Repo != "" { - setForgeMode(forgepb.ForgeMode_CLEAN) - s := log.Sprintf("only reset repo: %s", argv.Clean.Repo) - if found := me.forge.Repos.FindByNamespace(argv.Clean.Repo); found != nil { - return s, doResetRepo(found) - } - if found := me.forge.Repos.FindByFullPath(argv.Clean.Repo); found != nil { - return s, doResetRepo(found) - } - return "cleaned working dir", log.Errorf("repo not found: %s", argv.Clean.Repo) - } if argv.Clean.List != nil { s, err := doCleanList() return s, err @@ -74,7 +51,7 @@ func doClean() (string, error) { log.Info("Run: 'forge checkout master'") } } - setForgeMode(forgepb.ForgeMode_CLEAN) + me.forge.SetMode(forgepb.ForgeMode_CLEAN) // fix this to work, then delete all the other options for "forge clean' if err := me.forge.DoAllCheckoutMaster(); err != nil { @@ -150,15 +127,6 @@ func doRepoCleanDevel(repo *gitpb.Repo) error { } if err := justDeleteTheDevelBranchAlready(repo); err != nil { log.Info("justDeleteTheDevel() err", repo.Namespace, err) - if argv.Clean.Fix != nil { - bname := repo.GetDevelBranchName() - checkPatchIds(repo, repo.GetDevelBranchName(), repo.GetMasterBranchName()) - s := fmt.Sprintf("delete this odd devel (%s) branch %s?", bname, repo.FullPath) - if fhelp.QuestionUser(s) { - repo.RunVerbose([]string{"git", "branch", "-D", bname}) - // repo.RunVerbose([]string{"git", "checkout", bname}) - } - } return err } return nil diff --git a/doFix.deleteuser.go b/doFix.deleteuser.go index 9d62a3c..41692d3 100644 --- a/doFix.deleteuser.go +++ b/doFix.deleteuser.go @@ -14,7 +14,7 @@ import ( func doDeleteUser() (string, error) { found := gitpb.NewRepos() - setForgeMode(forgepb.ForgeMode_MASTER) + me.forge.SetMode(forgepb.ForgeMode_MASTER) for repo := range me.forge.Repos.IterByNamespace() { uremoteref := repo.GetRemoteTag(repo.GetUserBranchName()) if uremoteref == nil { @@ -201,7 +201,7 @@ func repoMergeToDevel(repo *gitpb.Repo) error { func doMergeMaster() (*gitpb.Repos, error) { var err error - setForgeMode(forgepb.ForgeMode_MASTER) + me.forge.SetMode(forgepb.ForgeMode_MASTER) done := gitpb.NewRepos() found := findMergeToMaster() @@ -15,15 +15,15 @@ func doMode() (string, error) { } if argv.Mode.User != nil { - setForgeMode(forgepb.ForgeMode_USER) + me.forge.SetMode(forgepb.ForgeMode_USER) return "user mode on", nil } if argv.Mode.Devel != nil { - setForgeMode(forgepb.ForgeMode_DEVEL) + me.forge.SetMode(forgepb.ForgeMode_DEVEL) return "devel mode on", nil } if argv.Mode.Master != nil { - setForgeMode(forgepb.ForgeMode_MASTER) + me.forge.SetMode(forgepb.ForgeMode_MASTER) return "master mode on", nil } return "nothing done", nil diff --git a/doNormal.go b/doNormal.go index e31e015..d182a82 100644 --- a/doNormal.go +++ b/doNormal.go @@ -26,7 +26,7 @@ import ( func doNormal() (string, error) { if doNormalOld() { if me.forge.Config.Mode != forgepb.ForgeMode_NORMAL { - setForgeMode(forgepb.ForgeMode_NORMAL) + me.forge.SetMode(forgepb.ForgeMode_NORMAL) me.forge.Config.Save() } s := fmt.Sprintf("all your %d repos are in a normal stete for development", me.forge.Repos.Len()) @@ -41,7 +41,7 @@ func doNormal() (string, error) { if err != nil { return "not everything is 'normal' yet", err } - setForgeMode(forgepb.ForgeMode_NORMAL) + me.forge.SetMode(forgepb.ForgeMode_NORMAL) me.forge.Config.Save() log.Info("normal mode on") return "normal mode on", nil |