diff --git a/Makefile b/Makefile index 0bde9f7..69f5f59 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ VERSION = $(shell git describe --tags) all: @echo to test: 'make test' + @echo open test win: 'make tempWin' @echo @echo run this from the autotypist dir: @echo " GUIRELEASE_REASON=notsure guireleaser" @@ -67,7 +68,7 @@ redomod: curl-help: curl --silent http://localhost:9419/help -curl-tempWin: +tempWin: curl --silent http://localhost:9419/tempWin curl-rescan-All: diff --git a/hideFunction.go b/hideFunction.go index fcbbacf..65d04bd 100644 --- a/hideFunction.go +++ b/hideFunction.go @@ -8,25 +8,12 @@ import ( // like tcl/tk, use ENV variables to set display preferences func hideFunction(r *repolist.RepoRow) { - /* - if r.GoPath() == "go.wit.com/dev/alexflint/arg" { - log.Info("found autoHideReleased() =", me.autoHideReleased.Checked()) - log.Info("found alexflint/arg IsReleased() =", r.Status.IsReleased()) - } - */ - // always show dirty repos if r.Status.IsDirty() { r.Show() return } - // always show repos that have not been merged ? - // if r.GoState() == "merge to devel" { - // r.Show() - // return - // } - // hide read-only repos if os.Getenv("AUTOTYPIST_READONLY") == "hide" { if r.Status.ReadOnly() { @@ -48,34 +35,8 @@ func hideFunction(r *repolist.RepoRow) { } } - /* - if me.autoHideReleased.Checked() { - if r.Status.IsReleased() { - r.Hide() - return - } - } - */ - // show everything else. often this will be "unconforming" repos // if you what those repos ignored, add these to the config file // as read-only=true r.Show() } - -/* -func showHideRepos(repo *repolist.RepoRow) { - if repo.GoPath() == "go.wit.com/dev/alexflint/arg" { - log.Info("found autoHideReleased() =", me.autoHideReleased.Checked()) - log.Info("found alexflint/arg IsReleased() =", repo.Status.IsReleased()) - } - - if me.autoHideReleased.Checked() { - if repo.Status.IsReleased() { - repo.Hide() - return - } - } - repo.Show() -} -*/ diff --git a/mergeAll.go b/mergeAll.go deleted file mode 100644 index 7a606be..0000000 --- a/mergeAll.go +++ /dev/null @@ -1,71 +0,0 @@ -package main - -import ( - "go.wit.com/log" -) - -func mergeAllDevelToMain() bool { - log.Info("merge all here") - loop := me.repos.View.ReposSortByName() - for loop.Scan() { - repo := loop.Repo() - - if repo.ReadOnly() { - log.Info("skipping readonly", repo.Name(), repo.State()) - continue - } - if repo.State() != "merge to main" { - log.Info("skipping. not merge to main", repo.Name(), repo.State()) - continue - } - if repo.CheckDirty() { - log.Info("skipping dirty", repo.Name(), repo.State()) - continue - } - log.Info("found", repo.Name(), repo.State()) - repo.NewScan() - if repo.Status.MergeDevelToMaster() { - log.Warn("THINGS SEEM OK fullAutomation() returned true.") - } else { - log.Warn("last repo:", repo.Name()) - log.Warn("THINGS FAILED fullAutomation() returned false") - return false - } - repo.NewScan() - } - log.Warn("EVERYTHING WORKED") - return true -} - -func mergeAllUserToDevel() bool { - log.Info("merge all here") - loop := me.repos.View.ReposSortByName() - for loop.Scan() { - repo := loop.Repo() - - if repo.ReadOnly() { - log.Info("skipping readonly", repo.Name(), repo.State()) - continue - } - if repo.State() != "merge to devel" { - log.Info("skipping. not merge to devel", repo.Name(), repo.State()) - continue - } - if repo.CheckDirty() { - log.Info("skipping dirty", repo.Name(), repo.State()) - continue - } - log.Info("found", repo.Name(), repo.State()) - repo.NewScan() - if repo.Status.MergeUserToDevel() { - log.Warn("THINGS SEEM OK fullAutomation() returned true.") - } else { - log.Warn("last repo:", repo.Status.Path()) - log.Warn("THINGS FAILED fullAutomation() returned false") - return false - } - repo.NewScan() - } - log.Warn("EVERYTHING WORKED") - return true -} diff --git a/tempView.go b/tempView.go index ee357bd..eb2dae8 100644 --- a/tempView.go +++ b/tempView.go @@ -27,19 +27,17 @@ func makeTempView() *repoWindow { box2 := hbox.Box().Vertical() box2.NewButton("merge user to devel", func() { - mergeAllUserToDevel() + log.Warn("todo") }) box2.NewButton("merge devel to master", func() { - mergeAllDevelToMain() + log.Warn("todo") }) box2.NewButton("rescan values", func() { log.Warn("figure this out") r.View.ListRows() - /* - for _, repo := range r.View.AllRepos() { - log.Warn("repo:", repo.Name()) - } - */ + // for _, repo := range r.View.AllRepos() { + // log.Warn("repo:", repo.Name()) + // } }) r.View = repolist.TempWindowView(r.box)