fixed basic entry display

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2024-02-05 15:06:02 -06:00
parent 2719ad4275
commit 7f0f36a886
4 changed files with 11 additions and 9 deletions

View File

@ -30,6 +30,8 @@ func main() {
repoworld() repoworld()
me.releaseReasonS = "better Malinae"
for _, repo := range me.allrepos { for _, repo := range me.allrepos {
repo.status.UpdateCurrent() repo.status.UpdateCurrent()
repo.newScan() repo.newScan()

View File

@ -30,7 +30,7 @@ type releaseStruct struct {
releaseVersionB *gui.Node releaseVersionB *gui.Node
unreleaseB *gui.Node unreleaseB *gui.Node
reason *gadgets.BasicEntry reason *gadgets.BasicEntry
reasonS string // reasonS string
openrepo *gui.Node openrepo *gui.Node
@ -60,8 +60,6 @@ func (w *autoType) Enable() {
} }
func createReleaseBox(box *gui.Node) { func createReleaseBox(box *gui.Node) {
release.reasonS = "gocui dropdown select"
initWhitelist() initWhitelist()
release.box = box release.box = box
@ -136,7 +134,7 @@ func createReleaseBox(box *gui.Node) {
return return
} }
log.Info("\ttag and push", curName, release.version.String(), release.reasonS) log.Info("\ttag and push", curName, release.version.String(), me.releaseReasonS)
var all [][]string var all [][]string
all = append(all, []string{"git", "add", "-f", "go.mod"}) all = append(all, []string{"git", "add", "-f", "go.mod"})
@ -145,9 +143,9 @@ func createReleaseBox(box *gui.Node) {
} else { } else {
all = append(all, []string{"git", "add", "-f", "go.sum"}) all = append(all, []string{"git", "add", "-f", "go.sum"})
} }
all = append(all, []string{"git", "commit", "-m", release.reasonS}) all = append(all, []string{"git", "commit", "-m", me.releaseReasonS})
all = append(all, []string{"git", "push"}) all = append(all, []string{"git", "push"})
all = append(all, []string{"git", "tag", "-m", release.reasonS, release.version.String()}) all = append(all, []string{"git", "tag", "-m", me.releaseReasonS, release.version.String()})
all = append(all, []string{"git", "push", "origin", release.version.String()}) all = append(all, []string{"git", "push", "origin", release.version.String()})
if doAll(release.current, all) { if doAll(release.current, all) {
@ -242,7 +240,7 @@ func createReleaseBox(box *gui.Node) {
release.version = gadgets.NewOneLiner(release.grid, "version") release.version = gadgets.NewOneLiner(release.grid, "version")
release.reason = gadgets.NewBasicEntry(release.grid, "release reason") release.reason = gadgets.NewBasicEntry(release.grid, "release reason")
release.reason.SetText(release.reasonS) release.reason.SetText(me.releaseReasonS)
me.autoWorkingPwd = gadgets.NewOneLiner(release.grid, "working directory (pwd)") me.autoWorkingPwd = gadgets.NewOneLiner(release.grid, "working directory (pwd)")
me.userHomePwd = gadgets.NewOneLiner(release.grid, "user home") me.userHomePwd = gadgets.NewOneLiner(release.grid, "user home")

View File

@ -19,6 +19,8 @@ type autoType struct {
allrepos map[string]*repo allrepos map[string]*repo
myGui *gui.Node myGui *gui.Node
releaseReasonS string // = "gocui dropdown select"
// autotypistWindow *gadgets.BasicWindow // autotypistWindow *gadgets.BasicWindow
mainWindow *gui.Node mainWindow *gui.Node
mainBox *gui.Node mainBox *gui.Node

View File

@ -115,7 +115,7 @@ func rerelease() bool {
return false return false
} }
log.Info("\treset to devel", curName, release.version.String(), release.reasonS) log.Info("\treset to devel", curName, release.version.String(), me.releaseReasonS)
var all [][]string var all [][]string
all = append(all, []string{"git", "checkout", "devel"}) all = append(all, []string{"git", "checkout", "devel"})
@ -126,7 +126,7 @@ func rerelease() bool {
all = append(all, []string{"git", "tag", "--delete", release.version.String()}) all = append(all, []string{"git", "tag", "--delete", release.version.String()})
all = append(all, []string{"git", "push", "--delete", "origin", release.version.String()}) all = append(all, []string{"git", "push", "--delete", "origin", release.version.String()})
all = append(all, []string{"git", "tag", "-m", release.reasonS, release.version.String()}) all = append(all, []string{"git", "tag", "-m", me.releaseReasonS, release.version.String()})
all = append(all, []string{"git", "push", "origin", release.version.String()}) all = append(all, []string{"git", "push", "origin", release.version.String()})
if doAll(release.current, all) { if doAll(release.current, all) {