diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | all-patches.pb | 2 | ||||
| -rw-r--r-- | doPatch.go | 4 | ||||
| -rw-r--r-- | windowPatchsets.go | 40 |
5 files changed, 5 insertions, 45 deletions
@@ -1,4 +1,5 @@ *.swp +*.pb go.mod go.sum /resources/*.so @@ -7,8 +7,7 @@ BUILDTIME = $(shell date +%Y.%m.%d_%H%M) # make andlabs # try the andlabs gui plugin (uses GTK) default: verbose install - # forge clean - forge + forge patch get vet: @GO111MODULE=off go vet diff --git a/all-patches.pb b/all-patches.pb deleted file mode 100644 index 7ac8ae7..0000000 --- a/all-patches.pb +++ /dev/null @@ -1,2 +0,0 @@ - -$be926ad9-f07f-484c-adf2-d96eeabf3079'v0.0.45 go.wit.com/lib/protobuf/forgepb
\ No newline at end of file @@ -38,7 +38,9 @@ func doPatch() error { } if argv.Patch.List != nil { - return doPatchList() + me.forge.Patchsets.PrintTable() + // return doPatchList() + return nil } // if no option is given to patch, list out the diff --git a/windowPatchsets.go b/windowPatchsets.go index 29a2929..3756ec2 100644 --- a/windowPatchsets.go +++ b/windowPatchsets.go @@ -36,39 +36,6 @@ func (w *stdPatchsetTableWin) Toggle() { w.win.Toggle() } -/* -func loadUpstreamPatchsets() { - psets, err := me.forge.GetPatchesets() - if err != nil { - log.Info("Get Patchsets failed", err) - return - } - - var foundnew bool - all := psets.All() - for all.Scan() { - pset := all.Next() - found := me.psets.FindByUuid(pset.Uuid) - if found == nil { - log.Info("new patchset", pset.Name, pset.Uuid) - pset.State = "new" - foundnew = true - } else { - log.Info("patchset already on disk", found.Name, found.State) - pset.State = found.State - if pset.State == "" { - pset.State = "new" - } - } - } - if foundnew { - log.Info("should save these here") - me.psets = psets - savePatchsets() - } -} -*/ - func makePatchsetsWin() *stdPatchsetTableWin { dwin := new(stdPatchsetTableWin) dwin.win = gadgets.NewGenericWindow("forge current patchsets", "patchset options") @@ -86,13 +53,6 @@ func makePatchsetsWin() *stdPatchsetTableWin { dwin.doPatchsetsTable(me.psets) }) - /* - grid.NewButton("upstream", func() { - loadUpstreamPatchsets() - dwin.doPatchsetsTable(me.psets) - }) - */ - grid.NewButton("save", func() { if me.psets == nil { log.Info("No Patchsets loaded") |