still has oneliner display bug

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2024-01-23 15:39:53 -06:00
parent dae15b5931
commit edf74e160e
3 changed files with 8 additions and 5 deletions

View File

@ -94,7 +94,7 @@ func (rs *RepoStatus) drawGitBranches() {
newgrid.NewButton("show .git/config", func() { newgrid.NewButton("show .git/config", func() {
if rs.gitConfig == nil { if rs.gitConfig == nil {
log.Log(WARN, "Nonexistant or damaged .git/config", rs.GetPath()) log.Log(WARN, "Nonexistant or damaged .git/config", rs.String())
return return
} }
log.Log(WARN, ".git/config:", rs.realPath.String()) log.Log(WARN, ".git/config:", rs.realPath.String())

8
git.go
View File

@ -10,12 +10,14 @@ import (
) )
func (rs *RepoStatus) String() string { func (rs *RepoStatus) String() string {
return rs.goSrcPath.String() return rs.path.String()
} }
/*
func (rs *RepoStatus) GetPath() string { func (rs *RepoStatus) GetPath() string {
return rs.goSrcPath.String() return rs.path.String()
} }
*/
func (rs *RepoStatus) GetCurrentBranchName() string { func (rs *RepoStatus) GetCurrentBranchName() string {
return rs.currentBranch.String() return rs.currentBranch.String()
@ -238,7 +240,7 @@ func (rs *RepoStatus) GetStatus() string {
log.Log(INFO, "Branches are Perfect") log.Log(INFO, "Branches are Perfect")
return "PERFECT" return "PERFECT"
} }
log.Log(INFO, rs.GetPath(), "Branches are not Perfect") log.Log(INFO, rs.String(), "Branches are not Perfect")
return "unknown branches" return "unknown branches"
} }

View File

@ -217,7 +217,8 @@ func (rs *RepoStatus) ReadGoMod() bool {
currentversion, ok := deps[godep] currentversion, ok := deps[godep]
if ok { if ok {
if currentversion != version { if currentversion != version {
log.Log(WARN, "versions do not match!!!", deps[godep], version, currentversion) log.Log(WARN, "REPO:", rs.String(), rs.realPath.String())
log.Log(WARN, " version mismatch:", godep, version, currentversion)
} }
} else { } else {
deps[godep] = version deps[godep] = version