diff options
| -rw-r--r-- | init.go | 18 | ||||
| -rw-r--r-- | patchset.Get.go | 16 |
2 files changed, 5 insertions, 29 deletions
@@ -96,6 +96,9 @@ func (f *Forge) InitPB() { f.hasFullScan = true } + // init the Patchsets + f.Patchsets = NewPatchsets() + // todo: play with these / determine good values based on user's machine f.rillX = 10 f.rillY = 20 @@ -139,20 +142,7 @@ func RawInitPB() *Forge { } func (f *Forge) RawInitPB() { - f.setenv() - - // load the ~/.config/forge/ config - f.Config = new(ForgeConfigs) - if err := f.Config.ConfigLoad(f.configDir); err != nil { - log.Log(WARN, "forgepb.ConfigLoad() failed", err) - } - - f.Repos = gitpb.NewRepos() - f.Repos.ConfigLoad() - - // todo: play with these / determine good values based on user's machine - f.rillX = 10 - f.rillY = 20 + f.InitPB() } // the first thing done is process any ENV settings diff --git a/patchset.Get.go b/patchset.Get.go index d287898..5570b87 100644 --- a/patchset.Get.go +++ b/patchset.Get.go @@ -8,13 +8,6 @@ import ( // retrieves current patches from forge func (f *Forge) GetPatches() error { - /* - defer func() { - if r := recover(); r != nil { - log.Warn("PANIC ecovered in loadUpstream()", r) - } - }() - */ url := f.forgeURL + "GetPatchsets" log.Info("GetPatchsets() url", url) body, err := f.HttpPost(url, nil) @@ -36,15 +29,8 @@ func (f *Forge) GetPatches() error { } func (f *Forge) loadUpstreamPatchsets(psets *Patchsets) { - /* - defer func() { - if r := recover(); r != nil { - log.Warn("PANIC ecovered in loadUpstream()", r) - } - }() - */ - var foundnew bool + all := psets.All() for all.Scan() { pset := all.Next() |