summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2024-01-18 17:37:50 -0600
committerJeff Carr <[email protected]>2024-01-18 17:37:50 -0600
commitdb3d481c5ff527feda775d8b1d873699c9dcc2f3 (patch)
tree538c4f739408d1ccf639f2cf85a20c0deecbe91c
parent8e9e19a14f7bd1b1cf4b3c8d0220dc84640c2ffd (diff)
more git change trackingv0.12.15
Signed-off-by: Jeff Carr <[email protected]>
-rw-r--r--draw.go1
-rw-r--r--git.go4
-rw-r--r--update.go2
3 files changed, 6 insertions, 1 deletions
diff --git a/draw.go b/draw.go
index dfbe14c..7f37297 100644
--- a/draw.go
+++ b/draw.go
@@ -271,6 +271,7 @@ func (rs *RepoStatus) recommend() {
rs.incrementVersion()
rs.EnableSelectTag()
rs.setTag()
+ rs.versionMessage.SetText("TODO: set globally")
return
}
log.Warn("Is repo pushed upstream? git.wit.org or github?")
diff --git a/git.go b/git.go
index 1d6b89b..d62920a 100644
--- a/git.go
+++ b/git.go
@@ -206,6 +206,7 @@ func (rs *RepoStatus) GetUserVersion() string {
return name
}
+// TODO: make this report the error somewhere
func (rs *RepoStatus) CheckBranches() bool {
var hashCheck string
var perfect bool = true
@@ -243,7 +244,8 @@ func (rs *RepoStatus) CheckBranches() bool {
if hash == hashCheck {
log.Warn(hash, output, b)
} else {
- log.Warn(hash, output, b, "NOT THE SAME")
+ log.Warn("UNKNOWN BRANCHES IN THIS REPO")
+ rs.versionMessage.SetText("UNKNOWN BRANCHES")
perfect = false
parts := strings.Split(b, "/")
log.Warn("git push", parts)
diff --git a/update.go b/update.go
index 060f879..e51f55f 100644
--- a/update.go
+++ b/update.go
@@ -35,6 +35,7 @@ func (rs *RepoStatus) Update() {
if rs.dirtyLabel.String() != "no" {
log.Warn("dirty label != no. actual value:", rs.dirtyLabel.String())
rs.DisableEverything()
+ rs.CheckBranches()
return
}
@@ -54,6 +55,7 @@ func (rs *RepoStatus) Update() {
rs.checkoutBranch("user", user)
rs.recommend()
+ rs.CheckBranches()
})
rs.setSpeed(duration)
log.Log(WARN, "Update() END")