trying to create branches

This commit is contained in:
Jeff Carr 2024-02-16 20:37:23 -06:00
parent c253a30fb6
commit 63a79121e3
8 changed files with 24 additions and 19 deletions

View File

@ -103,7 +103,6 @@ func addRepo(grid *gui.Node, path string, master string, devel string, user stri
// commit was not done, restore diff // commit was not done, restore diff
newRepo.status.RunCmd([]string{"git", "restore", "--staged", "."}) newRepo.status.RunCmd([]string{"git", "restore", "--staged", "."})
} else { } else {
newRepo.status.UpdateNew()
newRepo.newScan() newRepo.newScan()
} }
me.reposwin.Enable() me.reposwin.Enable()

View File

@ -9,6 +9,7 @@ package main
import ( import (
"go.wit.com/dev/alexflint/arg" "go.wit.com/dev/alexflint/arg"
"go.wit.com/lib/debugger" "go.wit.com/lib/debugger"
"go.wit.com/lib/gui/logsettings"
"go.wit.com/log" "go.wit.com/log"
) )
@ -30,4 +31,12 @@ func init() {
debugger.DebugWindow() debugger.DebugWindow()
}() }()
} }
if debugger.ArgLogger() {
log.Info("cmd line --loggger == true")
go func() {
log.Sleep(4)
logsettings.LogWindow()
logsettings.LogWindow()
}()
}
} }

View File

@ -83,7 +83,6 @@ func globalBuildOptions(vbox *gui.Node) {
log.Warn("setting all branches to", targetName) log.Warn("setting all branches to", targetName)
for _, repo := range me.allrepos { for _, repo := range me.allrepos {
repo.status.CheckoutBranch(targetName) repo.status.CheckoutBranch(targetName)
repo.status.UpdateNew()
repo.newScan() repo.newScan()
} }
}) })

View File

@ -10,6 +10,10 @@ import (
func globalDisplaySetRepoState() { func globalDisplaySetRepoState() {
for _, repo := range me.allrepos { for _, repo := range me.allrepos {
if repo.status.IsDirty() {
repo.Show()
continue
}
if me.autoHideReadOnly.Checked() { if me.autoHideReadOnly.Checked() {
if repo.status.ReadOnly() { if repo.status.ReadOnly() {
repo.Hide() repo.Hide()

View File

@ -45,7 +45,6 @@ func main() {
handleCmdLine() handleCmdLine()
for _, repo := range me.allrepos { for _, repo := range me.allrepos {
repo.status.UpdateNew()
repo.newScan() repo.newScan()
} }
me.Enable() me.Enable()

View File

@ -214,14 +214,13 @@ func mergeAllDevelToMain() bool {
continue continue
} }
log.Info("found", repo.String(), repo.dirtyLabel.String()) log.Info("found", repo.String(), repo.dirtyLabel.String())
repo.status.UpdateNew() repo.newScan()
if repo.status.RunDevelMergeB() { if repo.status.RunDevelMergeB() {
log.Warn("THINGS SEEM OK fullAutomation() returned true.") log.Warn("THINGS SEEM OK fullAutomation() returned true.")
} else { } else {
log.Warn("THINGS FAILED fullAutomation() returned false") log.Warn("THINGS FAILED fullAutomation() returned false")
return false return false
} }
repo.status.UpdateNew()
repo.newScan() repo.newScan()
} }
log.Warn("EVERYTHING WORKED") log.Warn("EVERYTHING WORKED")
@ -244,14 +243,13 @@ func mergeAllUserToDevel() bool {
continue continue
} }
log.Info("found", repo.String(), repo.dirtyLabel.String()) log.Info("found", repo.String(), repo.dirtyLabel.String())
repo.status.UpdateNew() repo.newScan()
if repo.status.RunDevelMergeB() { if repo.status.RunDevelMergeB() {
log.Warn("THINGS SEEM OK fullAutomation() returned true.") log.Warn("THINGS SEEM OK fullAutomation() returned true.")
} else { } else {
log.Warn("THINGS FAILED fullAutomation() returned false") log.Warn("THINGS FAILED fullAutomation() returned false")
return false return false
} }
repo.status.UpdateNew()
repo.newScan() repo.newScan()
} }
log.Warn("EVERYTHING WORKED") log.Warn("EVERYTHING WORKED")

19
scan.go
View File

@ -13,7 +13,6 @@ func scanRepositories() {
log.Info("Scanned", me.summary.totalOL.String(), "repositories. todo: count/show changes") log.Info("Scanned", me.summary.totalOL.String(), "repositories. todo: count/show changes")
t := timeFunction(func() { t := timeFunction(func() {
for _, repo := range me.allrepos { for _, repo := range me.allrepos {
repo.status.UpdateNew()
repo.newScan() repo.newScan()
} }
}) })
@ -26,15 +25,11 @@ func (r *repo) newScan() bool {
log.Warn("repo.status = nil. not initialized for some reason") log.Warn("repo.status = nil. not initialized for some reason")
return false return false
} }
// r.scan()
/* // first run the repostatus update
if repostatus.VerifyLocalGoRepo(r.getPath()) { r.status.UpdateNew()
log.Verbose("repo actually exists", r.getPath())
} else { // now read those values and display them in our table
log.Warn("repo does not exist", r.getPath())
return false
}
*/
mname := r.status.GetMasterBranchName() mname := r.status.GetMasterBranchName()
mver := r.status.GetMasterVersion() mver := r.status.GetMasterVersion()
mver = mver + " (" + mname + ")" mver = mver + " (" + mname + ")"
@ -63,7 +58,9 @@ func (r *repo) newScan() bool {
if c, ok := r.status.Changed(); ok { if c, ok := r.status.Changed(); ok {
c := strings.TrimSpace(c) c := strings.TrimSpace(c)
log.Warn("repo", r.status.Path(), "changed", c) for _, line := range strings.Split(c, "\n") {
log.Info(r.status.Path(), line)
}
} }
status := r.status.GetStatus() status := r.status.GetStatus()
r.dirtyLabel.SetLabel(status) r.dirtyLabel.SetLabel(status)

View File

@ -84,7 +84,7 @@ type autoType struct {
// these hold the branches that the user can switch all // these hold the branches that the user can switch all
// the repositories to them // the repositories to them
newBranch *gui.Node newBranch *gui.Node
setBranchB *gui.Node setBranchB *gui.Node
} }