diff options
Diffstat (limited to 'merge.go')
| -rw-r--r-- | merge.go | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -187,7 +187,7 @@ func (rs *RepoStatus) setTag() bool { return true } -func (rs *RepoStatus) incrementVersion() { +func (rs *RepoStatus) incrementRevision() { lasttag := rs.lasttag.String() var major, minor, revision string if rs.targetReleaseVersion.String() == "" { @@ -215,9 +215,10 @@ func (rs *RepoStatus) incrementVersion() { rs.minor.SetText(widget.GetString(b)) // rs.c := strconv.Atoi(revision) - rs.revision.AddText(widget.GetString(c + 1)) - rs.revision.AddText(widget.GetString(c + 2)) - rs.setRevision(widget.GetString(c + 1)) + 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)) } func (rs *RepoStatus) recommend() { @@ -246,7 +247,7 @@ func (rs *RepoStatus) recommend() { } if rs.lasttag.String() != rs.GetMasterVersion() { log.Log(INFO, "master does not equal last tag") - rs.incrementVersion() + rs.incrementRevision() rs.EnableSelectTag() rs.setTag() return @@ -280,7 +281,7 @@ func (rs *RepoStatus) generateCmd() bool { } else { rs.versionMessage.SetLabel("tag message") } - rs.releaseVersion.SetLabel("Release!") + rs.releaseVersion.SetLabel("Release Tag!") rs.releaseVersion.Enable() return true } |