devel worked, now trying merge to masterv0.22.64

1 files changed, 41 insertions, 4 deletions

diff --git a/windowRepos.go b/windowRepos.go
index 181ddb1..91186cb 100644
--- a/windowRepos.go
+++ b/windowRepos.go
@@ -47,7 +47,8 @@ func (r *repoWindow) Show() {
 		// everything is on the master branch
 		r.mergeMaster.Enable()
 	}
-	log.Info("TODO: update the rows")
+
+	// updates the rows not hidden
 	loop := r.View.ReposSortByName()
 	for loop.Scan() {
 		// var repo *repolist.RepoRow
@@ -124,6 +125,12 @@ func (r *repoWindow) repoMenu() *gui.Node {
 			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)
@@ -136,7 +143,6 @@ func (r *repoWindow) repoMenu() *gui.Node {
 				break
 			}
 			me.forge.SetConfigSave(true)
-			repo.Reload() // move this to gitpb
 			view.Update()
 		}
 		me.forge.ConfigSave()
@@ -144,8 +150,39 @@ func (r *repoWindow) repoMenu() *gui.Node {
 
 	r.mergeMaster = box2.NewButton("merge to master", func() {
 		r.Disable()
-		// r.mergeAllDevelToMain()
-		r.Enable()
+		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())
+				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()
 	})
 
 	/*