diff --git a/doGui.go b/doGui.go index 3c80e2b..95edc0e 100644 --- a/doGui.go +++ b/doGui.go @@ -243,6 +243,33 @@ func drawWindow(win *gadgets.BasicWindow) { mergeDevelToMaster(me.autoCreateBranches.Checked()) }) + + grid.NewButton("merge all", func() { + win.Disable() + defer win.Enable() + + me.argvCheckoutUser = false + me.argvCheckoutDevel = true + me.argvCheckoutMaster = false + if err := doCheckoutShared(); err != nil { + log.Info("checkout error:", err) + } else { + log.Info("checkout was ok") + } + + mergeDevelToMaster(me.autoCreateBranches.Checked()) + + me.argvCheckoutUser = false + me.argvCheckoutDevel = false + me.argvCheckoutMaster = true + if err := doCheckoutShared(); err != nil { + log.Info("checkout error:", err) + } else { + log.Info("checkout was ok") + } + + mergeDevelToMaster(me.autoCreateBranches.Checked()) + }) } func findMergeToDevel() { diff --git a/windowRepos.go b/windowRepos.go index dbbeba6..bc34318 100644 --- a/windowRepos.go +++ b/windowRepos.go @@ -4,23 +4,20 @@ package main import ( - "time" - "go.wit.com/lib/gadgets" "go.wit.com/lib/gui/repolist" - "go.wit.com/lib/gui/shell" "go.wit.com/log" "go.wit.com/gui" ) type repoWindow struct { - win *gadgets.BasicWindow // the window widget itself - box *gui.Node // notsure - topbox *gui.Node // the top box of the repolist window - mergeDevel *gui.Node // the buttton for merging user into devel - mergeMaster *gui.Node // the buttton for merging devel into master - View *repolist.RepoList // old code + win *gadgets.BasicWindow // the window widget itself + box *gui.Node // notsure + topbox *gui.Node // the top box of the repolist window + // mergeDevel *gui.Node // the buttton for merging user into devel + // mergeMaster *gui.Node // the buttton for merging devel into master + View *repolist.RepoList // old code } func (r *repoWindow) Hidden() bool { @@ -42,26 +39,28 @@ func (r *repoWindow) Show() { } r.win.Show() - now := time.Now() - // check for devel branches - total, count, nope, _ := IsEverythingOnDevel() - log.Printf("Devel branch check. %d total repos. (%d ok) (%d not on devel branch) (%s)\n", total, count, nope, shell.FormatDuration(time.Since(now))) - if nope != 0 { - r.mergeDevel.Disable() - } else { - // everything is on the devel branch - r.mergeDevel.Enable() - } + /* + now := time.Now() + // check for devel branches + total, count, nope, _ := IsEverythingOnDevel() + log.Printf("Devel branch check. %d total repos. (%d ok) (%d not on devel branch) (%s)\n", total, count, nope, shell.FormatDuration(time.Since(now))) + if nope != 0 { + // r.mergeDevel.Disable() + } else { + // everything is on the devel branch + // r.mergeDevel.Enable() + } - // check for master branches - total, count, nope, _ = IsEverythingOnMaster() - log.Printf("Master branch check. %d total repos. (%d ok) (%d not on master branch) (%s)\n", total, count, nope, shell.FormatDuration(time.Since(now))) - if nope != 0 { - r.mergeMaster.Disable() - } else { - // everything is on the master branch - r.mergeMaster.Enable() - } + // check for master branches + total, count, nope, _ = IsEverythingOnMaster() + log.Printf("Master branch check. %d total repos. (%d ok) (%d not on master branch) (%s)\n", total, count, nope, shell.FormatDuration(time.Since(now))) + if nope != 0 { + r.mergeMaster.Disable() + } else { + // everything is on the master branch + r.mergeMaster.Enable() + } + */ // updates the rows not hidden loop := r.View.ReposSortByName() @@ -148,85 +147,87 @@ func (r *repoWindow) repoMenu() *gui.Node { } } - r.mergeDevel = box2.NewButton("merge to devel", func() { - r.Disable() - defer r.Enable() - loop := r.View.ReposSortByName() - for loop.Scan() { - // var repo *repolist.RepoRow - view := loop.Repo() - if view.Hidden() { - continue - } - repo := view.GetPb() - log.Info("repo:", repo.GetGoPath()) - if result, err := repo.MergeToDevel(); err == nil { - log.Warn("THINGS SEEM OK", repo.GetFullPath()) - for _, line := range result.Stdout { - log.Warn("stdout:", line) + /* + r.mergeDevel = box2.NewButton("merge to devel", func() { + r.Disable() + defer r.Enable() + loop := r.View.ReposSortByName() + for loop.Scan() { + // var repo *repolist.RepoRow + view := loop.Repo() + if view.Hidden() { + continue } - for _, line := range result.Stderr { - log.Warn("stderr:", line) - } - } else { - log.Warn("THINGS FAILED ", repo.GetFullPath()) - log.Warn("err", err) - if result == nil { + repo := view.GetPb() + log.Info("repo:", repo.GetGoPath()) + if result, err := repo.MergeToDevel(); err == nil { + log.Warn("THINGS SEEM OK", repo.GetFullPath()) + for _, line := range result.Stdout { + log.Warn("stdout:", line) + } + for _, line := range result.Stderr { + log.Warn("stderr:", line) + } + } else { + log.Warn("THINGS FAILED ", repo.GetFullPath()) + log.Warn("err", err) + if result == nil { + break + } + for _, line := range result.Stdout { + log.Warn("stdout:", line) + } + for _, line := range result.Stderr { + log.Warn("stderr:", line) + } break } - for _, line := range result.Stdout { - log.Warn("stdout:", line) - } - for _, line := range result.Stderr { - log.Warn("stderr:", line) - } - break + me.forge.SetConfigSave(true) + view.Update() } - me.forge.SetConfigSave(true) - view.Update() - } - me.forge.ConfigSave() - }) + me.forge.ConfigSave() + }) - r.mergeMaster = box2.NewButton("merge to master", func() { - r.Disable() - defer r.Enable() - loop := r.View.ReposSortByName() - for loop.Scan() { - // var repo *repolist.RepoRow - view := loop.Repo() - if view.Hidden() { - continue - } - repo := view.GetPb() - log.Info("repo:", repo.GetGoPath()) - if result, err := repo.MergeToMaster(); err == nil { - log.Warn("THINGS SEEM OK", repo.GetFullPath()) - for _, line := range result.Stdout { - log.Warn("stdout:", line) + r.mergeMaster = box2.NewButton("merge to master", func() { + r.Disable() + defer r.Enable() + loop := r.View.ReposSortByName() + for loop.Scan() { + // var repo *repolist.RepoRow + view := loop.Repo() + if view.Hidden() { + continue } - for _, line := range result.Stderr { - log.Warn("stderr:", line) - } - } else { - log.Warn("THINGS FAILED ", repo.GetFullPath()) - if result == nil { + repo := view.GetPb() + log.Info("repo:", repo.GetGoPath()) + if result, err := repo.MergeToMaster(); err == nil { + log.Warn("THINGS SEEM OK", repo.GetFullPath()) + for _, line := range result.Stdout { + log.Warn("stdout:", line) + } + for _, line := range result.Stderr { + log.Warn("stderr:", line) + } + } else { + log.Warn("THINGS FAILED ", repo.GetFullPath()) + if result == nil { + break + } + log.Warn("err", err) + for _, line := range result.Stdout { + log.Warn("stdout:", line) + } + for _, line := range result.Stderr { + log.Warn("stderr:", line) + } break } - log.Warn("err", err) - for _, line := range result.Stdout { - log.Warn("stdout:", line) - } - for _, line := range result.Stderr { - log.Warn("stderr:", line) - } - break + me.forge.SetConfigSave(true) + view.Update() } - me.forge.SetConfigSave(true) - view.Update() - } - me.forge.ConfigSave() - }) + me.forge.ConfigSave() + }) + */ box2.NewButton("update", func() { r.Disable() defer r.Enable()