jcarr
/
repostatus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

report dirty state change 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2024-02-24 05:27:58 -06:00
parent ddd95e9afc
commit ccee573364
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
git.go
View File

@ -2,6 +2,7 @@ package repostatus
import ( import (
"errors" "errors"
"fmt"
"os/user" "os/user"
"strings" "strings"
"time" "time"
@ -54,7 +55,7 @@ func (rs *RepoStatus) GitPull() error {
found = true found = true
} }
} }
if ! found { if !found {
return errors.New("git config error") return errors.New("git config error")
} }
var cmd []string var cmd []string
@ -195,6 +196,7 @@ func (rs *RepoStatus) IsDirty() bool {
} }
func (rs *RepoStatus) CheckDirty() bool { func (rs *RepoStatus) CheckDirty() bool {
var start string = rs.dirtyLabel.String()
cmd := []string{"git", "status"} cmd := []string{"git", "status"}
path := rs.realPath.String() path := rs.realPath.String()
err, b, out := RunCmd(path, cmd) err, b, out := RunCmd(path, cmd)
@ -206,6 +208,9 @@ func (rs *RepoStatus) CheckDirty() bool {
log.Warn("CheckDirty() status err =", err) log.Warn("CheckDirty() status err =", err)
log.Error(err, "CheckDirty() git status error") log.Error(err, "CheckDirty() git status error")
rs.dirtyLabel.SetValue("error") rs.dirtyLabel.SetValue("error")
if start != "error" {
rs.NoteChange("repo git status is in error " + fmt.Sprint(err))
}
rs.dirty = true rs.dirty = true
return true return true
} }
@ -216,6 +221,9 @@ func (rs *RepoStatus) CheckDirty() bool {
log.Log(INFO, "CheckDirty() b =", b, "path =", path, "out =", out) log.Log(INFO, "CheckDirty() b =", b, "path =", path, "out =", out)
log.Log(INFO, "CheckDirty() no", rs.realPath.String()) log.Log(INFO, "CheckDirty() no", rs.realPath.String())
rs.dirtyLabel.SetValue("no") rs.dirtyLabel.SetValue("no")
if start != "no" {
rs.NoteChange("repo is no longer dirty")
}
rs.dirty = false rs.dirty = false
return false return false
} }
@ -229,6 +237,9 @@ func (rs *RepoStatus) CheckDirty() bool {
log.Log(INFO, "CheckDirty() is normal err =", err) log.Log(INFO, "CheckDirty() is normal err =", err)
rs.dirtyLabel.SetValue("dirty") rs.dirtyLabel.SetValue("dirty")
if start != "dirty" {
rs.NoteChange("repo is now dirty")
}
rs.dirty = true rs.dirty = true
return true return true

10
merge.go
View File

@ -16,6 +16,16 @@ func (rs *RepoStatus) IsUserBranch() bool {
return false return false
} }
func (rs *RepoStatus) DeleteUserBranch(force bool) bool {
log.Log(REPOWARN, "figure out what to do here")
return false
}
func (rs *RepoStatus) ResetBranches() bool {
log.Log(REPOWARN, "figure out what to do here")
return false
}
func (rs *RepoStatus) MergeUserToDevel() bool { func (rs *RepoStatus) MergeUserToDevel() bool {
startbranch := rs.GetCurrentBranchName() startbranch := rs.GetCurrentBranchName()
devel := rs.GetDevelBranchName() devel := rs.GetDevelBranchName()