diff --git a/draw.go b/draw.go index 6991c4f..3a20702 100644 --- a/draw.go +++ b/draw.go @@ -228,6 +228,28 @@ func (rs *RepoStatus) drawGitCommands() { log.Warn("Did git pull here", err, b, output) }) + label := "merge " + rs.userWorkingName.String() + " to " + rs.develWorkingName.String() + rs.develMerge = newgrid.NewButton(label, func() { + rs.Disable() + if rs.runDevelMergeB() { + log.Warn("THINGS SEEM OK fullAutomation() returned true.") + } else { + log.Warn("THINGS FAILED fullAutomation() returned false") + } + rs.Enable() + }) + + label = "merge " + rs.develWorkingName.String() + " to " + rs.mainWorkingName.String() + rs.develMerge = newgrid.NewButton(label, func() { + rs.Disable() + if rs.runDevelMergeB() { + log.Warn("THINGS SEEM OK fullAutomation() returned true.") + } else { + log.Warn("THINGS FAILED fullAutomation() returned false") + } + rs.Enable() + }) + rs.major = gadgets.NewBasicCombobox(newgrid, "major") rs.major.Custom = func() { rs.setTag() @@ -247,7 +269,7 @@ func (rs *RepoStatus) drawGitCommands() { } rs.revision.Hide() - newgrid.NewLabel("new tag version") + // newgrid.NewLabel("new tag version") rs.newversion = newgrid.NewLabel("0.0.1") rs.newversion.Hide() @@ -256,24 +278,15 @@ func (rs *RepoStatus) drawGitCommands() { rs.generateCmd() } rs.versionMessage.Hide() + rs.versionCmdOutput = gadgets.NewOneLiner(newgrid, "tag cmd") rs.versionCmdOutput.Hide() - label := "merge " + rs.mainWorkingName.String() + " to devel" - rs.develMerge = newgrid.NewButton(label, func() { - rs.Disable() - if rs.runFullAutomation() { - log.Warn("THINGS SEEM OK fullAutomation() returned true.") - } else { - log.Warn("THINGS FAILED fullAutomation() returned false") - } - rs.Enable() - }) - rs.releaseVersion = newgrid.NewButton("tag and release new version", func() { rs.Disable() rs.runReleaseVersionB() }) + rs.releaseVersion.Hide() newgrid.Margin() newgrid.Pad()