diff --git a/Makefile b/Makefile index 7fb0915..b5d8e68 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ all: build # reset # ./autotypist -build: +build: goimports echo "build it!" @# copy the toolkits into the binary during debugging -rm resources/*.so diff --git a/repoview.go b/repoview.go index f8487f8..bb3895e 100644 --- a/repoview.go +++ b/repoview.go @@ -3,6 +3,7 @@ package main import ( "go.wit.com/lib/gadgets" "go.wit.com/lib/gui/repolist" + "go.wit.com/lib/gui/shell" "go.wit.com/log" "go.wit.com/gui" @@ -135,24 +136,23 @@ func (r *repoWindow) repoMenu() *gui.Node { }) box2.NewButton("make patch set", func() { - pset, err := me.forge.MakeDevelPatchSet() - if err != nil { - log.Info("make devel patch set failed", err) - return - } - all := pset.SortByFilename() - for all.Scan() { - p := all.Next() - log.Info("read in patch:", p.Filename) - } - err = me.forge.SendPatchSet(pset) - if err != nil { - log.Info("send patch set failed", err) - return - } + pset, err := me.forge.MakeDevelPatchSet() + if err != nil { + log.Info("make devel patch set failed", err) + return + } + all := pset.SortByFilename() + for all.Scan() { + p := all.Next() + log.Info("read in patch:", p.Filename) + } + err = me.forge.SendPatchSet(pset) + if err != nil { + log.Info("send patch set failed", err) + return + } }) - return box2 } @@ -184,7 +184,11 @@ func (r *repoWindow) mergeAllDevelToMain() bool { } repo.NewScan() } - log.Warn("EVERYTHING WORKED") + log.Warn("EVERYTHING WORKED. with merge to master") + cmd := []string{"forge", "user"} + shell.Run(cmd) + cmd = []string{"forge", "list"} + shell.Run(cmd) return true }