jcarr
/
autotypist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

on merge success, switch to master and exit

This commit is contained in:
Jeff Carr 2024-12-30 05:52:38 -06:00
parent 9c7ef1a831
commit 2221e362a8
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -5,7 +5,7 @@ all: build
# reset # reset
# ./autotypist # ./autotypist
build: build: goimports
echo "build it!" echo "build it!"
@# copy the toolkits into the binary during debugging @# copy the toolkits into the binary during debugging
-rm resources/*.so -rm resources/*.so

38
repoview.go
View File

@ -3,6 +3,7 @@ package main
import ( import (
"go.wit.com/lib/gadgets" "go.wit.com/lib/gadgets"
"go.wit.com/lib/gui/repolist" "go.wit.com/lib/gui/repolist"
"go.wit.com/lib/gui/shell"
"go.wit.com/log" "go.wit.com/log"
"go.wit.com/gui" "go.wit.com/gui"
@ -135,24 +136,23 @@ func (r *repoWindow) repoMenu() *gui.Node {
}) })
box2.NewButton("make patch set", func() { box2.NewButton("make patch set", func() {
pset, err := me.forge.MakeDevelPatchSet() pset, err := me.forge.MakeDevelPatchSet()
if err != nil { if err != nil {
log.Info("make devel patch set failed", err) log.Info("make devel patch set failed", err)
return return
} }
all := pset.SortByFilename() all := pset.SortByFilename()
for all.Scan() { for all.Scan() {
p := all.Next() p := all.Next()
log.Info("read in patch:", p.Filename) log.Info("read in patch:", p.Filename)
} }
err = me.forge.SendPatchSet(pset) err = me.forge.SendPatchSet(pset)
if err != nil { if err != nil {
log.Info("send patch set failed", err) log.Info("send patch set failed", err)
return return
} }
}) })
return box2 return box2
} }
@ -184,7 +184,11 @@ func (r *repoWindow) mergeAllDevelToMain() bool {
} }
repo.NewScan() 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 return true
} }