diff options
| -rw-r--r-- | control | 2 | ||||
| -rw-r--r-- | doGui.go | 4 | ||||
| -rw-r--r-- | structs.go | 1 | ||||
| -rw-r--r-- | windowRepoProblems.go | 6 |
4 files changed, 11 insertions, 2 deletions
@@ -3,6 +3,6 @@ Build-Depends: golang, protoc-gen-go, autogenpb, go-mod-clean Package: forge Maintainer: Jeff Carr <[email protected]> Architecture: amd64 -Depends: +Depends: go-gui-toolkits Recommends: go-clone Description: 'forge' an attempt at federated 'git' @@ -101,6 +101,10 @@ func drawWindow(win *gadgets.BasicWindow) { // me.autoWorkingPwd = gadgets.NewOneLiner(grid, "working directory (pwd)") me.goSrcPwd = gadgets.NewOneLiner(grid, "repo src home") + grid.NewLabel("") + me.demoB = grid.NewButton("Demo", func() { + log.Info("todo: put instructions here") + }) grid.NextRow() usr, _ := user.Current() @@ -76,6 +76,7 @@ type mainType struct { repoDirtyB *gui.Node // "dirty" repos button repoDevelMergeB *gui.Node // "merge to devel" repos button repoWritableB *gui.Node // "what repos are writable" repos button + demoB *gui.Node // opens the demo argvCheckoutUser bool // shared between the GUI and the command line tools argvCheckoutDevel bool // shared between the GUI and the command line tools diff --git a/windowRepoProblems.go b/windowRepoProblems.go index b8f39d8..61f5240 100644 --- a/windowRepoProblems.go +++ b/windowRepoProblems.go @@ -104,8 +104,12 @@ func makeRepoProblemsWindow() *repoProblemsWindow { repo := all.Next() mname := repo.GetMasterBranchName() dname := repo.GetDevelBranchName() - cmd := []string{"git", "merge", mname, dname} + if dname != repo.GetCurrentBranchName() { + log.Info("Repo is not on the devel branch", repo.GetGoPath()) + } + cmd := []string{"git", "merge", mname} log.Info(repo.GetGoPath(), cmd) + repo.RunVerbose(cmd) } }) hbox.NewButton("test", func() { |