From ae7e9ba42c44687db038cacf7e0ae845e497f6e0 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 19 Feb 2024 16:29:10 -0600 Subject: allow more fields to be mirrored --- git.go | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'git.go') diff --git a/git.go b/git.go index 690412f..0bd8c1b 100644 --- a/git.go +++ b/git.go @@ -408,28 +408,46 @@ func (rs *RepoStatus) setUserVersion(s string) { rs.userBranchVersion.SetValue(s) } +func (rs *RepoStatus) GitState() string { + return rs.gitState.String() +} + +func (rs *RepoStatus) CheckGitState() string { + rs.setState() + return rs.gitState.String() +} + func (rs *RepoStatus) GetStatus() string { + return rs.gitState.String() +} + +func (rs *RepoStatus) setState() { rs.changed = false if rs.CheckDirty() { log.Log(INFO, "CheckDirty() true") - return "dirty" + rs.gitState.SetText("dirty") + return } if rs.GetUserVersion() != rs.GetDevelVersion() { - return "merge to devel" + rs.gitState.SetText("merge to devel") + return } if rs.GetDevelVersion() != rs.GetMasterVersion() { - return "merge to main" + rs.gitState.SetText("merge to main") + return } if rs.lasttag.String() != rs.GetMasterVersion() { - return "unchanged" + rs.gitState.SetText("unchanged") + return } if rs.CheckBranches() { log.Log(INFO, "Branches are Perfect") - return "PERFECT" + rs.gitState.SetText("PERFECT") + return } log.Log(INFO, rs.String(), "Branches are not Perfect") - return "unknown branches" + rs.gitState.SetText("unknown branches") } // TODO: make this report the error somewhere -- cgit v1.2.3