From 386125826f5e8fb9e2dd9ba2f4880fe0d181d29f Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 26 Jan 2024 11:53:22 -0600 Subject: [PATCH] more work on release versioning Signed-off-by: Jeff Carr --- draw.go | 18 ++++++++++++++---- git.go | 41 +++++++++++++++++++++++++++++++++++------ gitConfig.go | 13 ++++++++++--- go.mod | 9 +++------ go.sum | 47 ++++++----------------------------------------- 5 files changed, 68 insertions(+), 60 deletions(-) diff --git a/draw.go b/draw.go index 03dfaa9..a8c21d1 100644 --- a/draw.go +++ b/draw.go @@ -222,10 +222,20 @@ func (rs *RepoStatus) drawGitCommands() { newgrid.Pad() } +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) - rs.revision.SetText(c) + releaseRevision = c + rs.setRevision(c) rs.versionMessage.SetLabel(reason) rs.versionMessage.SetText(reason) @@ -255,7 +265,7 @@ func (rs *RepoStatus) setTag() bool { if newa > olda { log.Log(INFO, "new version ok", newver, "vs old version", lasttag) rs.minor.SetText("0") - rs.revision.SetText("0") + rs.setRevision("0") newver := strconv.Itoa(newa) + ".0.0" rs.newversion.SetLabel(newver) return true @@ -273,7 +283,7 @@ func (rs *RepoStatus) setTag() bool { log.Log(INFO, "new version ok", newver, "vs old version", lasttag) newver = strconv.Itoa(newa) + "." + strconv.Itoa(newb) + ".0" rs.newversion.SetLabel(newver) - rs.revision.SetText("0") + rs.setRevision("0") return true } @@ -311,7 +321,7 @@ func (rs *RepoStatus) incrementVersion() { // rs.c := strconv.Atoi(revision) rs.revision.AddText(widget.GetString(c + 1)) rs.revision.AddText(widget.GetString(c + 2)) - rs.revision.SetText(widget.GetString(c + 1)) + rs.setRevision(widget.GetString(c + 1)) } func (rs *RepoStatus) recommend() { diff --git a/git.go b/git.go index 19281c8..03218ce 100644 --- a/git.go +++ b/git.go @@ -109,12 +109,41 @@ func (rs *RepoStatus) CheckDirty() bool { rs.dirtyLabel.SetValue("no") return false } - log.Log(INFO, "CheckDirty() true", rs.realPath.String()) - log.Log(INFO, "CheckDirty() cmd =", cmd) - log.Log(INFO, "CheckDirty() b =", b) - log.Log(INFO, "CheckDirty() path =", path) - log.Log(INFO, "CheckDirty() out =", out) - log.Log(INFO, "CheckDirty() err =", err) + // sometimes b gets exit status 1 when there isn't anything that has changed + // run git status fixes that for some reason. + log.Log(WARN, "CheckDirty() true", rs.realPath.String()) + log.Log(WARN, "CheckDirty() cmd =", cmd) + log.Log(WARN, "CheckDirty() b =", b) + log.Log(WARN, "CheckDirty() path =", path) + log.Log(WARN, "CheckDirty() out =", out) + log.Log(WARN, "CheckDirty() err =", err) + + cmd = []string{"git", "status"} + err, b, out = RunCmd(path, cmd) + + log.Log(WARN, "CheckDirty() true", rs.realPath.String()) + log.Log(WARN, "CheckDirty() cmd =", cmd) + log.Log(WARN, "CheckDirty() b =", b) + log.Log(WARN, "CheckDirty() path =", path) + log.Log(WARN, "CheckDirty() out =", out) + log.Log(WARN, "CheckDirty() err =", err) + + cmd = []string{"git", "diff-index", "--quiet", "HEAD"} + err, b, out = RunCmd(path, cmd) + + log.Log(WARN, "CheckDirty() true", rs.realPath.String()) + log.Log(WARN, "CheckDirty() cmd =", cmd) + log.Log(WARN, "CheckDirty() b =", b) + log.Log(WARN, "CheckDirty() path =", path) + log.Log(WARN, "CheckDirty() out =", out) + log.Log(WARN, "CheckDirty() err =", err) + + if b { + log.Log(INFO, "CheckDirty() IS ACTUALLY CLEAN") + rs.dirtyLabel.SetValue("no") + return false + } + rs.dirtyLabel.SetValue("dirty") return true diff --git a/gitConfig.go b/gitConfig.go index 5509ccf..52a055b 100644 --- a/gitConfig.go +++ b/gitConfig.go @@ -209,11 +209,11 @@ func (rs *RepoStatus) CheckPrimativeGoMod() bool { line := strings.TrimSpace(scanner.Text()) parts := strings.Split(line, " ") - log.Log(WARN, " gomod:", parts) + log.Log(INFO, " gomod:", parts) if len(parts) >= 1 { - log.Log(WARN, " gomod: part[0] =", parts[0]) + log.Log(INFO, " gomod: part[0] =", parts[0]) if parts[0] == "require" { - log.Log(WARN, " should return false here") + log.Log(INFO, " should return false here") return false } @@ -354,6 +354,9 @@ func (rs *RepoStatus) CheckSafeGoSumRemake() (bool, []string) { } } else { switch goSumS { + case "SAFE": + log.Log(WARN, " USER VERSIONS MISMATCH", version, userversion) + log.Log(WARN, " IGNORE SAFE REPO") case "CLEAN": log.Log(WARN, " USER VERSIONS MISMATCH", version, userversion) log.Log(WARN, " IGNORE CLEAN REPO") @@ -454,6 +457,10 @@ func (rs *RepoStatus) MakeRedomod() { var b bool var output string var worked bool = true + if rs.ReadOnly() { + log.Log(WARN, "will not go mod redo read only repos", rs.String()) + return + } os.Unsetenv("GO111MODULE") path := rs.realPath.String() diff --git a/go.mod b/go.mod index 4e6e439..2726c75 100644 --- a/go.mod +++ b/go.mod @@ -3,17 +3,14 @@ module go.wit.com/lib/gui/repostatus go 1.21.4 require ( - go.wit.com/gui v0.13.11 - go.wit.com/lib/gadgets v0.13.0 + go.wit.com/gui v0.13.13 + go.wit.com/lib/gadgets v0.13.13 go.wit.com/log v0.5.6 - go.wit.com/widget v1.1.6 + go.wit.com/widget v1.1.7 ) require ( - github.com/golang/protobuf v1.5.2 // indirect go.wit.com/dev/alexflint/arg v1.4.5 // indirect go.wit.com/dev/alexflint/scalar v1.2.1 // indirect go.wit.com/dev/davecgh/spew v1.1.4 // indirect - google.golang.org/appengine v1.6.8 // indirect - google.golang.org/protobuf v1.32.0 // indirect ) diff --git a/go.sum b/go.sum index 9342120..2f423f6 100644 --- a/go.sum +++ b/go.sum @@ -1,49 +1,14 @@ -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.wit.com/dev/alexflint/arg v1.4.5 h1:asDx5f9IlfpknKjPBqqb2qndE91Pbo7ZDkWUgddfMhY= go.wit.com/dev/alexflint/arg v1.4.5/go.mod h1:wnWc+c6z8kSdDKYriMf6RpM+FiXmo5RYp/t4FNi0MU0= go.wit.com/dev/alexflint/scalar v1.2.1 h1:loXOcbVnd+8YeJRLey+XXidecBiedMDO00zQ26TvKNs= go.wit.com/dev/alexflint/scalar v1.2.1/go.mod h1:+rYsfxqdI2cwA8kJ7GCMwWbNJvfvWUurOCXLiwdTtSs= go.wit.com/dev/davecgh/spew v1.1.4 h1:C9hj/rjlUpdK+E6aroyLjCbS5MFcyNUOuP1ICLWdNek= go.wit.com/dev/davecgh/spew v1.1.4/go.mod h1:sihvWmnQ/09FWplnEmozt90CCVqBtGuPXM811tgfhFA= -go.wit.com/gui v0.13.11 h1:d74Ko/XFZYR25P/AZfCQaVO2CuGh1BSjdUp1wjktdDg= -go.wit.com/gui v0.13.11/go.mod h1:v2VgnOL3dlZ13KclYeedZ1cd20nQdvwjyJTNKvFX3DA= -go.wit.com/lib/gadgets v0.13.0 h1:jtsEnf4DHqAxBxuYsaDlHti73rgaxYf/ffAXNB1PJAk= -go.wit.com/lib/gadgets v0.13.0/go.mod h1:xidaHAL6Nk9+M9FkySVU1AG5i39v7T3PuFphUos6LxE= +go.wit.com/gui v0.13.13 h1:rIaEIYol92gHbP/JkJCmFdzo7u5Bc3WoqBA3hwttL6o= +go.wit.com/gui v0.13.13/go.mod h1:xdCB1u4UqyaijwZnDdO9510nBlbf4Cdgfsd+R7VtUDo= +go.wit.com/lib/gadgets v0.13.13 h1:pyAvyPKHuLJt4QW8+D3SfNpSF7YR8i0sBQPtLwSvZlc= +go.wit.com/lib/gadgets v0.13.13/go.mod h1:6uIhec8M5XAzaoHhNBaGpglY/bFJC5PY9KIqZ1R/LJ0= go.wit.com/log v0.5.6 h1:rDC3ju95zfEads4f1Zm+QMkqjZ39CsYAT/UmQQs7VP4= go.wit.com/log v0.5.6/go.mod h1:BaJBfHFqcJSJLXGQ9RHi3XVhPgsStxSMZRlaRxW4kAo= -go.wit.com/widget v1.1.6 h1:av2miF5vlohMfARA/QGPTPfgW/ADup1c+oeAOKgroPY= -go.wit.com/widget v1.1.6/go.mod h1:I8tnD3x3ECbB/CRNnLCdC+uoyk7rK0AEkzK1bQYSqoQ= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +go.wit.com/widget v1.1.7 h1:Gy84I2bD8CMna7NcKBX4sRLR8do6x6mVYX0Ui43f3is= +go.wit.com/widget v1.1.7/go.mod h1:I8tnD3x3ECbB/CRNnLCdC+uoyk7rK0AEkzK1bQYSqoQ=