diff options
Diffstat (limited to 'windowRepoProblems.go')
| -rw-r--r-- | windowRepoProblems.go | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/windowRepoProblems.go b/windowRepoProblems.go index 1f61fd1..b8f39d8 100644 --- a/windowRepoProblems.go +++ b/windowRepoProblems.go @@ -5,6 +5,7 @@ package main import ( "fmt" + "os" "sync" "go.wit.com/lib/gadgets" @@ -96,8 +97,18 @@ func makeRepoProblemsWindow() *repoProblemsWindow { found := develBehindMasterProblem() group := box.NewGroup("test buttons") - group.NewButton("hello", func() { - log.Info("world") + hbox := group.Box().Horizontal() + hbox.NewButton("git merge master devel", func() { + all := found.SortByFullPath() + for all.Scan() { + repo := all.Next() + mname := repo.GetMasterBranchName() + dname := repo.GetDevelBranchName() + cmd := []string{"git", "merge", mname, dname} + log.Info(repo.GetGoPath(), cmd) + } + }) + hbox.NewButton("test", func() { }) t := makeStandardReposGrid(found) @@ -119,7 +130,8 @@ func makeRepoProblemsWindow() *repoProblemsWindow { found := remoteUserBranchProblem() group := box.NewGroup("test buttons") - group.NewButton("git branch delete", func() { + hbox := group.Box().Horizontal() + hbox.NewButton("git branch delete", func() { win.Disable() defer win.Enable() all := found.SortByFullPath() @@ -127,9 +139,11 @@ func makeRepoProblemsWindow() *repoProblemsWindow { repo := all.Next() brname := repo.GetUserBranchName() // git push origin --delete jcarr + os.Setenv("GIT_TERMINAL_PROMPT", "0") cmd := []string{"git", "push", "origin", "--delete", brname} - log.Info(repo.GetGoPath(), cmd) + log.Info("You may want to run:", repo.GetGoPath(), cmd) repo.RunVerbose(cmd) + os.Unsetenv("GIT_TERMINAL_PROMPT") // git branch --delete --remote origin/jcarr cmd = []string{"git", "branch", "--delete", "--remote", "origin/" + brname} |