From 3e9a55b2acedb3bb872bcf3d21f142cffeb2ca6d Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 31 Jan 2024 05:04:18 -0600 Subject: [PATCH] unrelease Signed-off-by: Jeff Carr --- globalDisplayOptions.go | 8 ++++---- main.go | 4 +++- unreleaseWindow.go | 44 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 unreleaseWindow.go diff --git a/globalDisplayOptions.go b/globalDisplayOptions.go index b35ac29..e0506a1 100644 --- a/globalDisplayOptions.go +++ b/globalDisplayOptions.go @@ -9,7 +9,7 @@ import ( // "go.wit.com/gui/gadgets" ) -func globalDisplaySetRepoState() { +func showHideRepos() { for _, repo := range me.allrepos { if me.autoHideReadOnly.Checked() { if repo.status.ReadOnly() { @@ -49,14 +49,14 @@ func globalDisplayOptions(box *gui.Node) { group1 := vbox.NewGroup("Global Display Options") group1.NewButton("Show Repository Window", func() { - globalDisplaySetRepoState() + showHideRepos() reposwin.Toggle() }) me.autoHideReadOnly = group1.NewCheckbox("Hide read-only repos").SetChecked(true) me.autoHideReadOnly.Custom = func() { if me.autoHideReadOnly.Checked() { - globalDisplaySetRepoState() + showHideRepos() } else { globalDisplayShow() } @@ -65,7 +65,7 @@ func globalDisplayOptions(box *gui.Node) { me.autoHidePerfect = group1.NewCheckbox("Hide Perfectly clean repos").SetChecked(true) me.autoHidePerfect.Custom = func() { if me.autoHidePerfect.Checked() { - globalDisplaySetRepoState() + showHideRepos() } else { globalDisplayShow() } diff --git a/main.go b/main.go index b53d7c6..d0bfaec 100644 --- a/main.go +++ b/main.go @@ -36,7 +36,9 @@ func main() { log.Info("Creating the Release Window") createReleaseBox(me.mainBox) - globalDisplaySetRepoState() + createUnreleaseBox(me.mainBox) + + showHideRepos() release.openrepo.Disable() diff --git a/unreleaseWindow.go b/unreleaseWindow.go new file mode 100644 index 0000000..8cf20dc --- /dev/null +++ b/unreleaseWindow.go @@ -0,0 +1,44 @@ +// This is a simple example +package main + +import ( + "go.wit.com/gui" + "go.wit.com/log" +) + +func createUnreleaseBox(box *gui.Node) { + group := release.box.NewGroup("undo and redo things") + + group.NewButton("punk the zip", func() { + me.Disable() + defer me.Enable() + }) + group.NewButton("re-release"+release.versionS, func() { + me.Disable() + defer me.Enable() + + if release.current.status.CheckDirty() { + log.Info("sorry, it's still dirty") + return + } + + curName := release.current.status.GetCurrentBranchName() + mName := release.current.status.GetMasterBranchName() + if curName != mName { + log.Info("\trepo is not working from main branch", curName, "!=", mName) + return + } + + log.Info("\treset to devel", curName, release.versionS, release.reasonS) + + release.current.status.RunCmd([]string{"git", "checkout", "devel"}) + release.current.status.RunCmd([]string{"git", "branch", "-d", mName}) + /* + release.current.status.RunCmd([]string{"git", "add", "-f", "go.sum"}) + release.current.status.RunCmd([]string{"git", "commit", "-m", release.reasonS}) + release.current.status.RunCmd([]string{"git", "push"}) + release.current.status.RunCmd([]string{"git", "tag", "-m", release.reasonS, "v" + release.versionS}) + release.current.status.RunCmd([]string{"git", "push", "origin", "v" + release.versionS}) + */ + }) +}