summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--draw.go65
-rw-r--r--git.go42
-rw-r--r--gitConfig.go55
-rw-r--r--go.mod5
-rw-r--r--go.sum39
-rw-r--r--structs.go6
-rw-r--r--unix.go4
-rw-r--r--update.go6
8 files changed, 135 insertions, 87 deletions
diff --git a/draw.go b/draw.go
index 2ac0963..5a39e51 100644
--- a/draw.go
+++ b/draw.go
@@ -30,25 +30,6 @@ func (rs *RepoStatus) drawGitBranches() {
rs.gitBranchesGroup = rs.window.Box().NewGroup("branches")
newgrid := rs.gitBranchesGroup.NewGrid("gridnuts", 2, 2)
- rs.masterDrop = gadgets.NewBasicDropdown(newgrid, "main branch")
- rs.masterDrop.Custom = func() {
- log.Log(WARN, "Switching main branch to:", rs.masterDrop.String())
- rs.masterBranchVersion.SetLabel(rs.masterDrop.String())
- rs.mainWorkingName.SetValue(rs.masterDrop.String())
- }
- rs.develDrop = gadgets.NewBasicDropdown(newgrid, "devel branch")
- rs.develDrop.Custom = func() {
- log.Log(WARN, "Switching devel branch to:", rs.develDrop.String())
- rs.develBranchVersion.SetLabel(rs.develDrop.String())
- rs.develWorkingName.SetValue(rs.develDrop.String())
- }
- rs.userDrop = gadgets.NewBasicDropdown(newgrid, "user branch")
- rs.userDrop.Custom = func() {
- log.Log(WARN, "Switching user branch to:", rs.userDrop.String())
- rs.userBranchVersion.SetLabel(rs.userDrop.String())
- rs.userWorkingName.SetValue(rs.userDrop.String())
- }
-
rs.lasttag = gadgets.NewOneLiner(newgrid, "last tag")
rs.masterBranchVersion = gadgets.NewOneLiner(newgrid, "master")
@@ -58,26 +39,6 @@ func (rs *RepoStatus) drawGitBranches() {
rs.currentBranch = gadgets.NewOneLiner(newgrid, "current branch")
rs.currentVersion = gadgets.NewOneLiner(newgrid, "current version")
- /*
- var master = ""
- all := rs.getBranches()
- for _, branch := range all {
- log.Log(INFO, "getBranches()", branch)
- rs.masterDrop.AddText(branch)
- rs.develDrop.AddText(branch)
- rs.userDrop.AddText(branch)
- if branch == "master" {
- master = "master"
- }
- if branch == "main" {
- master = "main"
- }
- }
- */
-
- // relabel the various gadgets with the right branch name
- // rs.masterBranchVersion.SetLabel(master)
-
rs.showBranchesButton = newgrid.NewButton("getBranches()", func() {
all := rs.getBranches()
i := len(all)
@@ -116,10 +77,10 @@ func (rs *RepoStatus) drawGitBranches() {
}
})
newgrid.NewButton("CheckGoSum()", func() {
- if rs.CheckGoSum() {
+ if ok, missing := rs.CheckGoSum(); ok {
log.Log(WARN, "CheckGoSum() is ok")
} else {
- log.Log(WARN, "CheckGoSum() is not ok")
+ log.Log(WARN, "CheckGoSum() is not ok. missing:", missing)
}
})
newgrid.NewButton("CheckPrimativeGoMod()", func() {
@@ -207,16 +168,18 @@ func (rs *RepoStatus) drawGitCommands() {
}
rs.versionCmdOutput = gadgets.NewOneLiner(newgrid, "tag cmd")
- label := "merge " + rs.masterDrop.String() + " to devel"
+ label := "merge " + rs.mainWorkingName.String() + " to devel"
rs.develMerge = newgrid.NewButton(label, func() {
rs.Disable()
- master := rs.masterDrop.String()
+ master := rs.mainWorkingName.String()
+ log.Warn("develMerge() checking out master branch", master)
rs.checkoutBranch("master", master)
if rs.getCurrentBranchName() != master {
log.Warn("something went wrong switching to the master branch. full stop!")
return
}
- if !rs.runGitCommands() {
+ log.Warn("develMerge() running runGitCommands()")
+ if !rs.runGitCommands(true) {
log.Warn("SOMETHING WENT WRONG")
return
}
@@ -226,16 +189,18 @@ func (rs *RepoStatus) drawGitCommands() {
})
rs.releaseVersion = newgrid.NewButton("tag and release new version", func() {
+ rs.Disable()
if !rs.generateCmd() {
log.Warn("something is wrong. fix the errors first")
return
}
rs.releaseVersion.Disable()
- log.Warn("COMMIT IT HERE")
- if !rs.runGitCommands() {
+ log.Warn("MAKING A RELEASE AND VERSION")
+ if !rs.runGitCommands(true) {
log.Warn("SOMETHING WENT WRONG")
}
rs.Update()
+ rs.Enable()
log.Warn("THINGS SEEM OK")
})
@@ -400,10 +365,12 @@ func (rs *RepoStatus) generateCmd() bool {
return true
}
-func (rs *RepoStatus) runGitCommands() bool {
+func (rs *RepoStatus) runGitCommands(verbose bool) bool {
for _, line := range rs.versionCmds {
s := strings.Join(line, " ")
- log.Log(INFO, "NEED TO RUN:", s)
+ if verbose {
+ log.Log(WARN, "RUNNING:", s)
+ }
rs.develMerge.SetText(s)
err, b, output := runCmd(rs.realPath.String(), line)
if err != nil {
@@ -476,7 +443,7 @@ func (rs *RepoStatus) setMergeUserCommands() {
var all [][]string
devel := rs.GetDevelBranchName()
- user := rs.GetUserBranchName()
+ user := rs.userWorkingName.String()
line1 = append(line1, "git", "checkout", devel)
all = append(all, line1)
diff --git a/git.go b/git.go
index d0acd78..67def68 100644
--- a/git.go
+++ b/git.go
@@ -153,35 +153,59 @@ func (rs *RepoStatus) checkoutBranch(level string, branch string) {
}
func (rs *RepoStatus) SetMainWorkingName(s string) {
+ _, ok := rs.gitConfig.branches[s]
+ if ok {
+ log.Info("git branch", s, "seems to exist")
+ rs.mainWorkingName.SetValue(s)
+ return
+ }
+ s = "master"
+ _, ok = rs.gitConfig.branches[s]
+ if ok {
+ log.Info("git branch", s, "seems to exist")
+ rs.mainWorkingName.SetValue(s)
+ return
+ }
+
+ s = "main"
+ _, ok = rs.gitConfig.branches[s]
+ if ok {
+ log.Info("git branch", s, "seems to exist")
+ rs.mainWorkingName.SetValue(s)
+ return
+ }
+
+ s = "notsure"
+ log.Warn("git branch", s, "does not seem to exist. TODO: figure out the server default")
+ for name, _ := range rs.gitConfig.branches {
+ log.Warn("git branch found. use this?", name)
+ }
rs.mainWorkingName.SetValue(s)
- rs.masterDrop.SetLabel(s)
- rs.masterDrop.SetText("guimaster")
}
func (rs *RepoStatus) SetDevelWorkingName(s string) {
rs.develWorkingName.SetValue(s)
rs.develBranchVersion.SetLabel(s)
- rs.develDrop.SetLabel(s)
- rs.develDrop.SetText(s)
}
func (rs *RepoStatus) SetUserWorkingName(s string) {
rs.userWorkingName.SetValue(s)
rs.userBranchVersion.SetLabel(s)
- rs.userDrop.SetText(s)
+ // rs.userDrop.SetText(s)
}
// returns "master", "devel", os.Username, etc
func (rs *RepoStatus) GetMasterBranchName() string {
- name := rs.masterDrop.String()
+ name := rs.mainWorkingName.String()
return name
}
func (rs *RepoStatus) GetDevelBranchName() string {
- name := rs.develDrop.String()
+ name := rs.develWorkingName.String()
return name
}
+
func (rs *RepoStatus) GetUserBranchName() string {
- name := rs.userDrop.String()
+ name := rs.userWorkingName.String()
return name
}
@@ -223,7 +247,7 @@ func (rs *RepoStatus) SetUserVersion(s string) {
}
rs.changed = true
rs.userBranchVersion.SetValue(s)
- log.Verbose("git", rs.GetUserBranchName(), "is now version =", s)
+ // log.Verbose("git", rs.GetUserBranchName(), "is now version =", s)
}
func (rs *RepoStatus) GetStatus() string {
diff --git a/gitConfig.go b/gitConfig.go
index 183479d..d15b291 100644
--- a/gitConfig.go
+++ b/gitConfig.go
@@ -32,7 +32,7 @@ type GitConfig struct {
type GoConfig map[string]string
-func listGitDirectories() []string {
+func ListGitDirectories() []string {
var all []string
homeDir, err := os.UserHomeDir()
if err != nil {
@@ -308,42 +308,53 @@ func (rs *RepoStatus) ScanGoSrc() {
}
}
-func (rs *RepoStatus) CheckGoSum() bool {
+func (rs *RepoStatus) CheckGoSum() (bool, string) {
if rs.ReadGoMod() {
log.Log(INFO, "parsed go.mod", rs.realPath.String())
} else {
log.Log(WARN, "Something went wrong parsing go.mod", rs.realPath.String())
- return false
+ return false, ""
}
log.Log(WARN, "go.sum:", rs.realPath.String())
for depname, version := range rs.goConfig {
+ if strings.HasSuffix(depname, "/v2") {
+ log.Log(WARN, " FOUND /v2 wierd golang stuff. instead, look for:", depname)
+ depname = strings.TrimSuffix(depname, "/v2")
+ }
log.Log(WARN, " ", depname, version)
newrs, ok := windowMap[depname]
if ok {
if newrs.CheckDirty() {
log.Log(WARN, " IS DIRTY", newrs.String())
- return false
+ return false, ""
}
- log.Log(WARN, " FOUND", newrs.String())
- username := newrs.userWorkingName.String()
- userhash, _ := newrs.gitConfig.hashes[username]
- userversion, _ := newrs.gitConfig.versions[userhash]
- log.Log(WARN, " username :"+username, userhash)
- log.Log(WARN, " username :"+username, userversion)
- if version == userversion {
- log.Log(WARN, " USER VERSIONS MATCH", version, userversion)
+ if newrs.readOnly.String() == "true" {
+ log.Log(WARN, " SKIPPING Read Only", newrs.String())
} else {
- log.Log(WARN, " USER VERSIONS MISMATCH", version, userversion)
- return false
+ log.Log(WARN, " FOUND", newrs.String())
+ username := newrs.userWorkingName.String()
+ userhash, _ := newrs.gitConfig.hashes[username]
+ userversion, _ := newrs.gitConfig.versions[userhash]
+ log.Log(WARN, " username :"+username, userhash)
+ log.Log(WARN, " username :"+username, userversion)
+ if version == userversion {
+ log.Log(WARN, " USER VERSIONS MATCH", version, userversion)
+ } else {
+ log.Log(WARN, " USER VERSIONS MISMATCH", version, userversion)
+ return false, ""
+ }
}
} else {
log.Log(WARN, " NOT FOUND", depname)
- log.Log(WARN, " go get -v", depname)
- rs.RunCmd([]string{"go", "get", "-v", depname})
- return false
+ if strings.HasSuffix(depname, "/v2") {
+ log.Log(WARN, " FOUND /v2 wierd golang stuff. instead, look for:", depname)
+ }
+ // log.Log(WARN, " go get -v", depname)
+ // rs.RunCmd([]string{"go", "get", "-v", depname})
+ return false, depname
}
}
- return true
+ return true, ""
}
func (rs *RepoStatus) MakeRedomod() {
@@ -376,6 +387,14 @@ func (rs *RepoStatus) MakeRedomod() {
}
}
+func (rs *RepoStatus) ReadOnly() bool {
+ if rs.readOnly.String() == "true" {
+ return true
+ } else {
+ return false
+ }
+}
+
func (rs *RepoStatus) processBranch(branch string) {
fullpath := rs.realPath.String()
log.Log(WARN, " ", branch)
diff --git a/go.mod b/go.mod
index a33f956..4e6e439 100644
--- a/go.mod
+++ b/go.mod
@@ -4,13 +4,16 @@ go 1.21.4
require (
go.wit.com/gui v0.13.11
- go.wit.com/lib/gadgets v0.12.16
+ go.wit.com/lib/gadgets v0.13.0
go.wit.com/log v0.5.6
go.wit.com/widget v1.1.6
)
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 458a8de..9342120 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,8 @@
+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=
@@ -6,9 +11,39 @@ go.wit.com/dev/davecgh/spew v1.1.4 h1:C9hj/rjlUpdK+E6aroyLjCbS5MFcyNUOuP1ICLWdNe
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.12.16 h1:xHz8zZiTe8xiGvfWs3s9drYUbePTT/Te58u7WXHjx0s=
-go.wit.com/lib/gadgets v0.12.16/go.mod h1:9779QoRZlk+G3/MCcX4Io1eH3HTLImE0AXdAMMdw+0U=
+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/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=
diff --git a/structs.go b/structs.go
index 360f903..ffc38df 100644
--- a/structs.go
+++ b/structs.go
@@ -55,9 +55,9 @@ type RepoStatus struct {
gitStatusGroup *gui.Node
gitCommandsGroup *gui.Node
- masterDrop *gadgets.BasicDropdown
- develDrop *gadgets.BasicDropdown
- userDrop *gadgets.BasicDropdown
+ // masterDrop *gadgets.BasicDropdown
+ // develDrop *gadgets.BasicDropdown
+ // userDrop *gadgets.BasicDropdown
showBranchesButton *gui.Node
checkBranchesButton *gui.Node
diff --git a/unix.go b/unix.go
index a1030dc..8c12ed8 100644
--- a/unix.go
+++ b/unix.go
@@ -216,14 +216,14 @@ func VerifyLocalGoRepo(gorepo string) bool {
// Get current user
usr, err := user.Current()
if err != nil {
- log.Error(err, "VerifyLocalGoRepo() thinks you should switch to Ultrix")
+ log.Error(err, "VerifyLocalGoRepo() are you really POSIX compliant?")
return false
}
// Form the path to the home Git directory
gitDir := filepath.Join(usr.HomeDir, "go/src/", gorepo, ".git")
- log.Log(INFO, "go directory:", gitDir)
+ log.Log(WARN, "VerifyLocalGoRepo() checking directory:", gitDir)
return IsDirectory(gitDir)
}
diff --git a/update.go b/update.go
index d686a0a..9c2ee77 100644
--- a/update.go
+++ b/update.go
@@ -32,9 +32,9 @@ func (rs *RepoStatus) Update() {
return
}
- master := rs.masterDrop.String()
- devel := rs.develDrop.String()
- user := rs.userDrop.String()
+ master := rs.mainWorkingName.String()
+ devel := rs.develWorkingName.String()
+ user := rs.userWorkingName.String()
// rs.CheckDirty() this runs
log.Log(INFO, "checkoutBranch", master)
generated by cgit v1.2.3 (git 2.51.0) at 2025-11-04 23:21:40 +0000