summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2024-01-23 15:39:53 -0600
committerJeff Carr <[email protected]>2024-01-23 15:39:53 -0600
commitedf74e160e047e3bad86f7cf52032c12cf0813f0 (patch)
treeba6fd864eb71f0c455b9c0a6509e918cdf600a11
parentdae15b593174ed82ac0f5f8c7250cb765a2b7f64 (diff)
still has oneliner display bug
Signed-off-by: Jeff Carr <[email protected]>
-rw-r--r--draw.go2
-rw-r--r--git.go8
-rw-r--r--gitConfig.go3
3 files changed, 8 insertions, 5 deletions
diff --git a/draw.go b/draw.go
index 789df45..9700520 100644
--- a/draw.go
+++ b/draw.go
@@ -94,7 +94,7 @@ func (rs *RepoStatus) drawGitBranches() {
newgrid.NewButton("show .git/config", func() {
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
}
log.Log(WARN, ".git/config:", rs.realPath.String())
diff --git a/git.go b/git.go
index 48d2e5f..a3b4023 100644
--- a/git.go
+++ b/git.go
@@ -10,12 +10,14 @@ import (
)
func (rs *RepoStatus) String() string {
- return rs.goSrcPath.String()
+ return rs.path.String()
}
+/*
func (rs *RepoStatus) GetPath() string {
- return rs.goSrcPath.String()
+ return rs.path.String()
}
+*/
func (rs *RepoStatus) GetCurrentBranchName() string {
return rs.currentBranch.String()
@@ -238,7 +240,7 @@ func (rs *RepoStatus) GetStatus() string {
log.Log(INFO, "Branches are Perfect")
return "PERFECT"
}
- log.Log(INFO, rs.GetPath(), "Branches are not Perfect")
+ log.Log(INFO, rs.String(), "Branches are not Perfect")
return "unknown branches"
}
diff --git a/gitConfig.go b/gitConfig.go
index fcdb7ec..67e6179 100644
--- a/gitConfig.go
+++ b/gitConfig.go
@@ -217,7 +217,8 @@ func (rs *RepoStatus) ReadGoMod() bool {
currentversion, ok := deps[godep]
if ok {
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 {
deps[godep] = version