From fd410590876032f703ee3f8bc0dea1ebfb4b7045 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sat, 22 Feb 2025 18:55:46 -0600 Subject: keep working on a merge button --- doGui.go | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'doGui.go') diff --git a/doGui.go b/doGui.go index 7531841..6ab9420 100644 --- a/doGui.go +++ b/doGui.go @@ -234,10 +234,27 @@ func drawWindow(win *gadgets.BasicWindow) { _, box := makeStandardReposWindow("repos to merge from user to devel", found) hbox := box.Box().Horizontal() hbox.NewButton("merge all", func() { + win.Disable() + defer win.Enable() all := found.SortByFullPath() for all.Scan() { repo := all.Next() - log.Info("todo: merge here on", repo.GetGoPath()) + if repo.CheckDirty() { + log.Info("repo is dirty", repo.GetGoPath()) + continue + } + log.Info("Starting merge on", repo.GetGoPath()) + if repo.CheckoutDevel() { + log.Info("checkout devel failed", repo.GetGoPath()) + return + } + if _, err := repo.MergeToDevel(); err != nil { + log.Info("merge from user failed", repo.GetGoPath(), err) + // log.Info(strings.Join(r.Stdout, "\n")) + // log.Info(strings.Join(r.Stderr, "\n")) + return + } + } }) }) -- cgit v1.2.3