more removal of old stuff

This commit is contained in:
Jeff Carr 2024-12-03 18:00:42 -06:00
parent 9b2e99ac6b
commit 9b9df05f33
5 changed files with 37 additions and 27 deletions

View File

@ -62,7 +62,7 @@ func doRelease() bool {
var all [][]string var all [][]string
all = append(all, []string{"git", "add", "-f", "go.mod"}) all = append(all, []string{"git", "add", "-f", "go.mod"})
if me.current.Status.IsPrimitive() { if ok, _ := check.IsPrimitive(); ok {
// don't add go.sum here. TODO: check for go.sum file and fail // don't add go.sum here. TODO: check for go.sum file and fail
} else { } else {
all = append(all, []string{"git", "add", "-f", "go.sum"}) all = append(all, []string{"git", "add", "-f", "go.sum"})

View File

@ -4,6 +4,7 @@ package main
import ( import (
"go.wit.com/log" "go.wit.com/log"
"go.wit.com/lib/gui/repolist"
"go.wit.com/lib/protobuf/gitpb" "go.wit.com/lib/protobuf/gitpb"
) )
@ -24,11 +25,8 @@ func findNext() bool {
log.Info("boo, you didn't git clone", repo.GoPath()) log.Info("boo, you didn't git clone", repo.GoPath())
return false return false
} }
log.Info("findNext() STARTING", check.GoPath)
log.Info("findNext() STARTING", check.GoPath)
log.Info("findNext() STARTING", check.GoPath)
if check.GetTargetVersion() == check.GetCurrentBranchVersion() { if check.GetTargetVersion() == check.GetCurrentBranchVersion() {
log.Info("findNext() no update needed", check.GoPath, check.GetTargetVersion(), "vs", check.GetCurrentBranchVersion()) // log.Info("findNext() no update needed", check.GoPath, check.GetTargetVersion(), "vs", check.GetCurrentBranchVersion())
continue continue
} else { } else {
log.Info("findNext() update needed", check.GoPath, check.GetTargetVersion(), "vs", check.GetCurrentBranchVersion()) log.Info("findNext() update needed", check.GoPath, check.GetTargetVersion(), "vs", check.GetCurrentBranchVersion())
@ -126,3 +124,21 @@ func fixGodeps(check *gitpb.Repo) bool {
} }
return good return good
} }
func setCurrentRepo(repo *repolist.RepoRow, s string, note string) bool {
check := me.forge.Repos.FindByGoPath(repo.GoPath())
if check == nil {
log.Info("boo, you didn't git clone", repo.GoPath())
return false
}
me.release.repo.SetText(check.GoPath)
me.release.status.SetText(s)
me.release.notes.SetText(note)
me.current = repo
me.release.version.SetText(check.GetTargetVersion())
me.release.releaseVersionB.SetText("release version " + check.GetTargetVersion())
me.release.openrepo.Enable()
return true
}

16
http.go
View File

@ -259,22 +259,28 @@ func showNext() {
return return
} }
check := me.forge.Repos.FindByGoPath(me.current.GoPath())
if check == nil {
log.Info("forge: how was this not found?", me.current.GoPath())
return
}
if me.current.Status.IsReleased() { if me.current.Status.IsReleased() {
log.Info("IsReleased() == true SHOULD NOT RELEASE THIS") log.Info("IsReleased() == true. do not release this a second time")
} else { } else {
log.Info("IsReleased() == false") log.Info("IsReleased() == false")
} }
if me.current.Status.CheckDirty() { if check.CheckDirty() {
log.Info("CheckDirty() == true. SHOULD NOT RELEASE THIS") log.Info("CheckDirty() == true. do not release dirty repos")
} else { } else {
log.Info("CheckDirty() == false") log.Info("CheckDirty() == false")
} }
if me.current.Status.IsPrimitive() { if ok, _ := check.IsPrimitive(); ok {
log.Info("IsPrimitive() == true") log.Info("IsPrimitive() == true")
} else { } else {
log.Info("IsPrimitive() == false") log.Info("IsPrimitive() == false")
} }
if me.current.Status.IsPrivate() { if me.forge.IsPrivate(check.GoPath) {
log.Info("IsPrivate() == true") log.Info("IsPrivate() == true")
} else { } else {
log.Info("IsPrivate() == false") log.Info("IsPrivate() == false")

View File

@ -74,7 +74,11 @@ func PrintReleaseReport(readonly string, perfect string) {
log.Info("boo, you didn't git clone", check.GoPath) log.Info("boo, you didn't git clone", check.GoPath)
continue continue
} }
log.Info(me.forge.StandardReleaseHeader(check, "")) var state string
if check.CheckDirty() {
state = "(dirty)"
}
log.Info(me.forge.StandardReleaseHeader(check, state))
} }
log.Info(fmt.Sprintf("total repo count = %d", count)) log.Info(fmt.Sprintf("total repo count = %d", count))
} }

View File

@ -238,19 +238,3 @@ func buttonDisable() {
func buttonEnable() { func buttonEnable() {
me.Enable() me.Enable()
} }
func setCurrentRepo(newcur *repolist.RepoRow, s string, note string) bool {
if newcur.ReadOnly() {
return false
}
me.release.repo.SetText(newcur.GoPath())
me.release.status.SetText(s)
me.release.notes.SetText(note)
me.current = newcur
me.release.version.SetText(me.current.Status.GetTargetVersion())
me.release.releaseVersionB.SetText("release version " + me.current.Status.GetTargetVersion())
me.release.openrepo.Enable()
return true
}