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

blocks double clicking on processing git commands 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2024-01-14 15:43:47 -06:00
parent 069e2421c8
commit 09362840e9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
draw.go
View File

@ -101,6 +101,7 @@ func (rs *RepoStatus) drawGitCommands() {
label := "merge devel to " + rs.masterDrop.Get()
rs.develMerge = newgrid.NewButton(label, func() {
rs.develMerge.Disable()
master := rs.masterDrop.Get()
rs.checkoutBranch("master", master)
if rs.getCurrentBranchName() != master {
@ -111,7 +112,6 @@ func (rs *RepoStatus) drawGitCommands() {
log.Warn("SOMETHING WENT WRONG")
return
}
rs.develMerge.Disable() // don't let this run twice for now
rs.Update()
log.Warn("THINGS SEEM OK")
})
@ -306,6 +306,7 @@ func (rs *RepoStatus) runGitCommands() bool {
for _, line := range rs.versionCmds {
s := strings.Join(line, " ")
log.Warn("NEED TO RUN:", s)
rs.develMerge.SetText(s)
err, b, output := runCmd(rs.repopath, line)
if err != nil {
log.Warn("ABEND EXECUTION")