2024-02-16 20:36:31 -06:00
|
|
|
package repostatus
|
|
|
|
|
|
|
|
import (
|
|
|
|
"strconv"
|
|
|
|
"strings"
|
|
|
|
|
|
|
|
"go.wit.com/log"
|
|
|
|
"go.wit.com/widget"
|
|
|
|
)
|
|
|
|
|
2024-02-16 21:20:52 -06:00
|
|
|
func (rs *RepoStatus) MergeUserToDevel() bool {
|
2024-02-16 20:36:31 -06:00
|
|
|
startbranch := rs.GetCurrentBranchName()
|
2024-02-16 21:20:52 -06:00
|
|
|
devel := rs.GetDevelBranchName()
|
|
|
|
user := rs.GetUserBranchName()
|
|
|
|
|
|
|
|
log.Info("MergeUserToDevel() checking out", devel, "started on", startbranch, "merge", user)
|
|
|
|
|
|
|
|
var all [][]string
|
|
|
|
all = append(all, []string{"git", "checkout", devel})
|
|
|
|
all = append(all, []string{"git", "merge", user})
|
|
|
|
all = append(all, []string{"git", "push"})
|
|
|
|
|
|
|
|
if rs.DoAll(all) {
|
|
|
|
log.Log(WARN, "MergeUserToDevel() failed", rs.Path())
|
2024-02-20 14:45:43 -06:00
|
|
|
rs.updateNew()
|
2024-02-16 21:20:52 -06:00
|
|
|
return true
|
|
|
|
}
|
|
|
|
// DoAll failed
|
2024-02-20 14:45:43 -06:00
|
|
|
rs.updateNew()
|
2024-02-16 21:20:52 -06:00
|
|
|
return false
|
2024-02-16 20:36:31 -06:00
|
|
|
}
|
|
|
|
|
2024-02-16 21:28:22 -06:00
|
|
|
func (rs *RepoStatus) MergeDevelToMaster() bool {
|
|
|
|
startbranch := rs.GetCurrentBranchName()
|
|
|
|
devel := rs.GetDevelBranchName()
|
|
|
|
main := rs.GetMasterBranchName()
|
|
|
|
|
|
|
|
log.Info("MergeDevelToMaster() checking out", main, "started on", startbranch, "merge", devel)
|
|
|
|
|
|
|
|
var all [][]string
|
|
|
|
all = append(all, []string{"git", "checkout", main})
|
|
|
|
all = append(all, []string{"git", "merge", devel})
|
|
|
|
all = append(all, []string{"git", "push"})
|
|
|
|
|
|
|
|
if rs.DoAll(all) {
|
|
|
|
log.Log(WARN, "MergeDevelToMaster() failed", rs.Path())
|
2024-02-20 14:45:43 -06:00
|
|
|
rs.updateNew()
|
2024-02-16 21:28:22 -06:00
|
|
|
return true
|
|
|
|
}
|
|
|
|
// DoAll failed
|
2024-02-20 14:45:43 -06:00
|
|
|
rs.updateNew()
|
2024-02-16 21:28:22 -06:00
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2024-02-16 20:36:31 -06:00
|
|
|
func (rs *RepoStatus) runReleaseVersionB() bool {
|
|
|
|
if !rs.generateCmd() {
|
|
|
|
log.Warn("something is wrong. fix the errors first")
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
rs.releaseVersion.Disable()
|
|
|
|
log.Warn("MAKING A RELEASE AND VERSION")
|
|
|
|
if !rs.runGitCommands(true) {
|
|
|
|
log.Warn("SOMETHING WENT WRONG")
|
|
|
|
rs.UpdateNew()
|
|
|
|
rs.Enable()
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
log.Warn("THINGS SEEM OK. runReleaseVersionB worked. Release is finished. restart autotypist()")
|
|
|
|
rs.Hide()
|
|
|
|
return true
|
|
|
|
}
|
2024-02-16 21:28:22 -06:00
|
|
|
*/
|
2024-02-16 20:36:31 -06:00
|
|
|
|
|
|
|
func (rs *RepoStatus) runFullAutomation() bool {
|
2024-02-16 21:20:52 -06:00
|
|
|
if !rs.MergeUserToDevel() {
|
2024-02-16 20:36:31 -06:00
|
|
|
log.Warn("THINGS FAILED returned false")
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
log.Warn("THINGS SEEM OK returned true. can run this again?")
|
2024-02-16 21:20:52 -06:00
|
|
|
/*
|
2024-02-19 14:42:59 -06:00
|
|
|
log.Warn("develMerge =", rs.develMergeB.String())
|
|
|
|
label := "merge devel into " + rs.GetMasterBranchName()
|
|
|
|
if label == rs.develMergeB.String() {
|
|
|
|
log.Warn("LABELS MATCH", label, rs.develMergeB.String())
|
|
|
|
if !rs.RunDevelMergeB() {
|
|
|
|
log.Warn("THINGS FAILED returned false")
|
|
|
|
return false
|
|
|
|
}
|
2024-02-16 20:36:31 -06:00
|
|
|
}
|
2024-02-19 14:42:59 -06:00
|
|
|
if rs.develMergeB.String() == "ready to release" {
|
|
|
|
log.Warn("THINGS SEEM OK ready to release")
|
|
|
|
if rs.releaseVersion.String() == "Release!" {
|
|
|
|
log.Warn("releaseVersion == 'Release!'. safe to do release version HERE?")
|
|
|
|
log.Warn("rs.newversion =", rs.newversion.String())
|
|
|
|
log.Warn("rs.targetReleaseVersion =", rs.targetReleaseVersion.String())
|
|
|
|
log.Warn("Are these equal?")
|
|
|
|
if rs.newversion.String() == rs.targetReleaseVersion.String() {
|
|
|
|
log.Warn("THEY ARE EQUAL!")
|
|
|
|
rs.runReleaseVersionB()
|
|
|
|
} else {
|
|
|
|
log.Warn("THEY ARE NOT EQUAL")
|
|
|
|
}
|
2024-02-16 20:36:31 -06:00
|
|
|
}
|
|
|
|
}
|
2024-02-16 21:28:22 -06:00
|
|
|
*/
|
2024-02-16 20:36:31 -06:00
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
var releaseRevision string = ""
|
|
|
|
|
|
|
|
// over ride the computation of this if a release is being created
|
|
|
|
func (rs *RepoStatus) setRevision(c string) {
|
|
|
|
if releaseRevision == "" {
|
|
|
|
rs.revision.SetText(c)
|
|
|
|
}
|
|
|
|
rs.revision.SetText(releaseRevision)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (rs *RepoStatus) SetVersion(a, b, c string, reason string) {
|
|
|
|
rs.major.SetText(a)
|
|
|
|
rs.minor.SetText(b)
|
|
|
|
releaseRevision = c
|
|
|
|
rs.setRevision(c)
|
|
|
|
|
2024-02-23 12:47:05 -06:00
|
|
|
rs.targetReleaseVersion.SetText("v" + a + "." + b + "." + c)
|
2024-02-16 20:36:31 -06:00
|
|
|
|
|
|
|
rs.versionMessage.SetLabel(reason)
|
|
|
|
rs.versionMessage.SetText(reason)
|
|
|
|
// rs.versionMessage.SetValue(reason)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (rs *RepoStatus) setTag() bool {
|
|
|
|
lasttag := rs.lasttag.String()
|
|
|
|
var major, minor, revision string
|
|
|
|
major, minor, revision = splitVersion(lasttag)
|
|
|
|
|
|
|
|
olda, _ := strconv.Atoi(major)
|
|
|
|
oldb, _ := strconv.Atoi(minor)
|
|
|
|
oldc, _ := strconv.Atoi(revision)
|
|
|
|
|
|
|
|
log.Log(INFO, "current version here", lasttag)
|
|
|
|
log.Log(INFO, "current release a,b,c =", major, minor, revision)
|
|
|
|
|
|
|
|
newa, _ := strconv.Atoi(rs.major.String())
|
|
|
|
|
|
|
|
newver := strconv.Itoa(newa)
|
|
|
|
if newa < olda {
|
|
|
|
log.Warn("new version bad", newver, "vs old version", lasttag, "newa =", newa, "olda =", olda)
|
|
|
|
rs.newversion.SetLabel("bad")
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
if newa > olda {
|
|
|
|
log.Log(INFO, "new version ok", newver, "vs old version", lasttag)
|
|
|
|
rs.minor.SetText("0")
|
|
|
|
rs.setRevision("0")
|
|
|
|
newver := strconv.Itoa(newa) + ".0.0"
|
|
|
|
rs.newversion.SetLabel(newver)
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
newb, _ := strconv.Atoi(rs.minor.String())
|
|
|
|
newver = strconv.Itoa(newa) + "." + strconv.Itoa(newb)
|
|
|
|
if newb < oldb {
|
|
|
|
log.Warn("new version bad", newver, "vs old version", lasttag, "newb =", newb, "oldb =", oldb)
|
|
|
|
rs.newversion.SetLabel("bad")
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
if newb > oldb {
|
|
|
|
log.Log(INFO, "new version ok", newver, "vs old version", lasttag)
|
|
|
|
newver = strconv.Itoa(newa) + "." + strconv.Itoa(newb) + ".0"
|
|
|
|
rs.newversion.SetLabel(newver)
|
|
|
|
rs.setRevision("0")
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
newc, _ := strconv.Atoi(rs.revision.String())
|
|
|
|
newver = strconv.Itoa(newa) + "." + strconv.Itoa(newb) + "." + strconv.Itoa(newc)
|
|
|
|
if newc <= oldc {
|
|
|
|
log.Warn("new version bad", newver, "vs old version", lasttag)
|
|
|
|
rs.newversion.SetLabel("bad")
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
log.Log(INFO, "new version ok", newver, "vs old version", lasttag)
|
|
|
|
rs.newversion.SetLabel(newver)
|
|
|
|
return true
|
|
|
|
}
|
2024-02-23 11:00:33 -06:00
|
|
|
|
2024-02-23 07:28:15 -06:00
|
|
|
// the newversion field goes through some sanity checking
|
|
|
|
// to make sure it's greater than the existing tag and
|
|
|
|
// valid according to golang -- it must be format 'v1.2.3'
|
|
|
|
func (rs *RepoStatus) GetNewVersionTag() string {
|
|
|
|
return rs.newversion.String()
|
|
|
|
}
|
2024-02-16 20:36:31 -06:00
|
|
|
|
2024-02-23 00:10:30 -06:00
|
|
|
func (rs *RepoStatus) incrementRevision() {
|
2024-02-16 20:36:31 -06:00
|
|
|
lasttag := rs.lasttag.String()
|
|
|
|
var major, minor, revision string
|
|
|
|
if rs.targetReleaseVersion.String() == "" {
|
|
|
|
major, minor, revision = splitVersion(lasttag)
|
|
|
|
log.Warn("Should release version here", lasttag)
|
|
|
|
log.Log(INFO, "Should release a,b,c", major, minor, revision)
|
|
|
|
} else {
|
|
|
|
// this means there is a specific release version trying to be done
|
|
|
|
// use the target release version instead
|
|
|
|
major, minor, revision = splitVersion(rs.targetReleaseVersion.String())
|
|
|
|
log.Warn("Should release version here", lasttag)
|
|
|
|
log.Log(INFO, "Should release a,b,c", major, minor, revision)
|
|
|
|
}
|
|
|
|
|
|
|
|
a, _ := strconv.Atoi(major)
|
|
|
|
b, _ := strconv.Atoi(minor)
|
|
|
|
c, _ := strconv.Atoi(revision)
|
|
|
|
|
|
|
|
rs.major.AddText(widget.GetString(a))
|
|
|
|
rs.major.AddText(widget.GetString(a + 1))
|
|
|
|
rs.major.SetText(widget.GetString(a))
|
|
|
|
|
|
|
|
rs.minor.AddText(widget.GetString(b))
|
|
|
|
rs.minor.AddText(widget.GetString(b + 1))
|
|
|
|
rs.minor.SetText(widget.GetString(b))
|
|
|
|
|
|
|
|
// rs.c := strconv.Atoi(revision)
|
2024-02-23 00:10:30 -06:00
|
|
|
rs.revision.AddText(strconv.Itoa(c + 1))
|
|
|
|
rs.revision.AddText(strconv.Itoa(c + 2))
|
|
|
|
rs.revision.SetText(strconv.Itoa(c + 1))
|
|
|
|
// rs.setRevision(widget.GetString(c + 1))
|
2024-02-16 20:36:31 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
func (rs *RepoStatus) recommend() {
|
|
|
|
log.Log(INFO, "Is repo dirty?", rs.dirtyLabel.String())
|
|
|
|
log.Log(INFO, "list the known tags")
|
|
|
|
rs.DisableEverything()
|
|
|
|
rs.populateTags()
|
|
|
|
log.Log(INFO, "Does devel == user?", rs.develBranchVersion.String(), rs.userBranchVersion.String())
|
|
|
|
if rs.develBranchVersion.String() != rs.userBranchVersion.String() {
|
|
|
|
log.Log(INFO, "devel does not equal user")
|
|
|
|
log.Log(INFO, "merge or squash?")
|
|
|
|
rs.EnableMergeDevel()
|
|
|
|
rs.setMergeUserCommands()
|
|
|
|
label := "merge user into " + rs.GetDevelBranchName()
|
|
|
|
rs.develMergeB.SetLabel(label)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
log.Log(INFO, "Does master == devel? ", rs.GetMasterVersion(), rs.GetDevelVersion())
|
|
|
|
if rs.GetMasterVersion() != rs.GetDevelVersion() {
|
|
|
|
log.Log(INFO, "master does not equal devel. merge devel into master")
|
|
|
|
rs.EnableMergeDevel()
|
|
|
|
rs.setMergeDevelCommands()
|
|
|
|
label := "merge devel into " + rs.GetMasterBranchName()
|
|
|
|
rs.develMergeB.SetLabel(label)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if rs.lasttag.String() != rs.GetMasterVersion() {
|
|
|
|
log.Log(INFO, "master does not equal last tag")
|
2024-02-23 00:10:30 -06:00
|
|
|
rs.incrementRevision()
|
2024-02-16 20:36:31 -06:00
|
|
|
rs.EnableSelectTag()
|
|
|
|
rs.setTag()
|
|
|
|
return
|
|
|
|
}
|
|
|
|
log.Log(INFO, "Is repo pushed upstream? git.wit.org or github?")
|
|
|
|
}
|
|
|
|
|
|
|
|
func (rs *RepoStatus) generateCmd() bool {
|
|
|
|
// the length of 24 is arbitrary, but should be short
|
|
|
|
// they should be things like perhaps, major release names
|
|
|
|
// or something the users might see.
|
|
|
|
// aka: "Topsy", "Picasso", "Buzz", etc
|
|
|
|
|
|
|
|
if !rs.setTag() {
|
|
|
|
log.Log(INFO, "tag sucked. fix your tag version")
|
|
|
|
rs.versionMessage.SetLabel("tag message (bad version)")
|
|
|
|
rs.releaseVersion.Disable()
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
|
|
|
|
log.Log(INFO, "tag is valid!!!!")
|
|
|
|
rs.setGitCommands()
|
|
|
|
|
|
|
|
if rs.versionMessage.String() == "" {
|
|
|
|
log.Log(INFO, "tag message is empty!!!!")
|
|
|
|
rs.releaseVersion.Disable()
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
if len(rs.versionMessage.String()) > 24 {
|
|
|
|
rs.versionMessage.SetLabel("tag message (too long)")
|
|
|
|
} else {
|
|
|
|
rs.versionMessage.SetLabel("tag message")
|
|
|
|
}
|
2024-02-23 00:10:30 -06:00
|
|
|
rs.releaseVersion.SetLabel("Release Tag!")
|
2024-02-16 20:36:31 -06:00
|
|
|
rs.releaseVersion.Enable()
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
func (rs *RepoStatus) runGitCommands(verbose bool) bool {
|
|
|
|
for _, line := range rs.versionCmds {
|
|
|
|
s := strings.Join(line, " ")
|
|
|
|
if verbose {
|
|
|
|
log.Log(WARN, "RUNNING:", s)
|
|
|
|
}
|
|
|
|
rs.develMergeB.SetText(s)
|
|
|
|
err, b, output := runCmd(rs.realPath.String(), line)
|
|
|
|
if err != nil {
|
|
|
|
log.Warn("ABEND EXECUTION")
|
|
|
|
log.Warn("error =", err)
|
|
|
|
log.Warn("output =", output)
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
log.Log(INFO, "Returned with b =", b)
|
|
|
|
log.Log(INFO, "output was =", output)
|
|
|
|
log.Log(INFO, "RUN DONE")
|
|
|
|
}
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
|
|
|
|
func (rs *RepoStatus) setGitCommands() {
|
|
|
|
var line1, line2, line3 []string
|
|
|
|
var all [][]string
|
|
|
|
|
|
|
|
newTag := rs.newversion.String()
|
|
|
|
line1 = append(line1, "git", "tag", "v"+newTag, "-m", rs.versionMessage.String())
|
|
|
|
all = append(all, line1)
|
|
|
|
line2 = append(line2, "git", "push", "--tags")
|
|
|
|
all = append(all, line2)
|
|
|
|
line3 = append(line3, "git", "push", "--prune", "--tags")
|
|
|
|
all = append(all, line3)
|
|
|
|
|
|
|
|
rs.versionCmds = all
|
|
|
|
|
|
|
|
var tmp []string
|
|
|
|
// convert to displayable to the user text
|
|
|
|
for _, line := range all {
|
|
|
|
s := strings.Join(line, " ")
|
|
|
|
log.Log(INFO, "s =", s)
|
|
|
|
tmp = append(tmp, s)
|
|
|
|
}
|
|
|
|
|
|
|
|
rs.versionCmdOutput.SetValue(strings.Join(tmp, "\n"))
|
|
|
|
}
|
|
|
|
|
|
|
|
func (rs *RepoStatus) setMergeDevelCommands() {
|
|
|
|
var line1, line2, line3 []string
|
|
|
|
var all [][]string
|
|
|
|
|
|
|
|
master := rs.GetMasterBranchName()
|
|
|
|
devel := rs.GetDevelBranchName()
|
|
|
|
|
|
|
|
line1 = append(line1, "git", "checkout", master)
|
|
|
|
all = append(all, line1)
|
|
|
|
line2 = append(line2, "git", "merge", devel)
|
|
|
|
all = append(all, line2)
|
|
|
|
line3 = append(line3, "git", "push")
|
|
|
|
all = append(all, line3)
|
|
|
|
|
|
|
|
rs.versionCmds = all
|
|
|
|
|
|
|
|
var tmp []string
|
|
|
|
// convert to displayable to the user text
|
|
|
|
for _, line := range all {
|
|
|
|
s := strings.Join(line, " ")
|
|
|
|
log.Log(INFO, "s =", s)
|
|
|
|
tmp = append(tmp, s)
|
|
|
|
}
|
|
|
|
|
|
|
|
rs.versionCmdOutput.SetValue(strings.Join(tmp, "\n"))
|
|
|
|
}
|
|
|
|
|
|
|
|
func (rs *RepoStatus) setMergeUserCommands() {
|
|
|
|
var line1, line2, line3 []string
|
|
|
|
var all [][]string
|
|
|
|
|
|
|
|
devel := rs.GetDevelBranchName()
|
|
|
|
user := rs.userWorkingName.String()
|
|
|
|
|
|
|
|
line1 = append(line1, "git", "checkout", devel)
|
|
|
|
all = append(all, line1)
|
|
|
|
line2 = append(line2, "git", "merge", user)
|
|
|
|
all = append(all, line2)
|
|
|
|
line3 = append(line3, "git", "push")
|
|
|
|
all = append(all, line3)
|
|
|
|
|
|
|
|
rs.versionCmds = all
|
|
|
|
|
|
|
|
var tmp []string
|
|
|
|
// convert to displayable to the user text
|
|
|
|
for _, line := range all {
|
|
|
|
s := strings.Join(line, " ")
|
|
|
|
log.Log(INFO, "s =", s)
|
|
|
|
tmp = append(tmp, s)
|
|
|
|
}
|
|
|
|
|
|
|
|
rs.versionCmdOutput.SetValue(strings.Join(tmp, "\n"))
|
|
|
|
}
|