rm more old code

This commit is contained in:
Jeff Carr 2024-11-13 18:24:58 -06:00
parent 2007be922c
commit 5fcdd19170
4 changed files with 7 additions and 118 deletions

View File

@ -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:

View File

@ -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()
}
*/

View File

@ -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
}

View File

@ -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)