diff options
Diffstat (limited to 'windowRepos.go')
| -rw-r--r-- | windowRepos.go | 203 |
1 files changed, 0 insertions, 203 deletions
diff --git a/windowRepos.go b/windowRepos.go index bc34318..a7a3018 100644 --- a/windowRepos.go +++ b/windowRepos.go @@ -5,8 +5,6 @@ package main import ( "go.wit.com/lib/gadgets" - "go.wit.com/lib/gui/repolist" - "go.wit.com/log" "go.wit.com/gui" ) @@ -15,9 +13,6 @@ 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 } func (r *repoWindow) Hidden() bool { @@ -38,40 +33,6 @@ func (r *repoWindow) Show() { return } 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() - } - - // 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() - for loop.Scan() { - // var repo *repolist.RepoRow - view := loop.Repo() - if view.Hidden() { - continue - } - view.Update() - } } func (r *repoWindow) Hide() { @@ -103,167 +64,3 @@ func (r *repoWindow) Enable() { } r.box.Enable() } - -func (r *repoWindow) repoMenu() *gui.Node { - // reposbox.SetExpand(false) - group1 := r.box.NewGroup("Filter:") - - hbox := group1.Box() - // hbox.Horizontal() - hbox.Vertical() - - box2 := hbox.Box().Horizontal() - - all := box2.NewCheckbox("all") - all.Custom = func() { - log.Info("filter all =", all.Checked()) - if all.Checked() { - loop := r.View.ReposSortByName() - for loop.Scan() { - // var repo *repolist.RepoRow - view := loop.Repo() - view.Show() - } - } else { - loop := r.View.ReposSortByName() - for loop.Scan() { - // var repo *repolist.RepoRow - view := loop.Repo() - view.Hide() - } - } - } - - dirty := box2.NewCheckbox("dirty") - dirty.Custom = func() { - log.Info("filter dirty =", dirty.Checked()) - loop := r.View.ReposSortByName() - for loop.Scan() { - // var repo *repolist.RepoRow - view := loop.Repo() - if view.Hidden() { - view.Show() - } - } - } - - /* - 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) - } - 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 - } - me.forge.SetConfigSave(true) - view.Update() - } - 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) - } - 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 - } - me.forge.SetConfigSave(true) - view.Update() - } - me.forge.ConfigSave() - }) - */ - box2.NewButton("update", 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("check master vs devel here on", repo.GetGoPath()) - if repo.GetDevelVersion() == repo.GetMasterVersion() { - continue - } - b1 := countDiffObjects(repo, repo.GetMasterBranchName(), repo.GetDevelBranchName()) - if b1 == 0 { - // log.Info("master vs devel count is normal b1 == 0", b1) - } else { - // log.Info("master vs devel count b1 != 0", b1) - log.Info("SERIOUS ERROR. DEVEL BRANCH NEEDS MERGE FROM MASTER b1 ==", b1, repo.GetGoPath()) - } - /* - // THIS IS TERRIBLE. STOP DEVELOPING AND FIX THIS IF THIS HAPPENS - cmd := repo.ConstructGitDiffLog(repo.GetMasterBranchName(), repo.GetDevelBranchName()) - if _, err := repo.RunVerbose(cmd); err != nil { - log.Info("failed", err) - } - */ - /* this is normal - cmd := repo.ConstructGitDiffLog(repo.GetDevelBranchName(), repo.GetMasterBranchName()) - if _, err := repo.RunVerbose(cmd); err != nil { - log.Info("failed", err) - } - */ - } - }) - return box2 -} |