diff options
| -rw-r--r-- | doCheckout.go | 5 | ||||
| -rw-r--r-- | send.go | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/doCheckout.go b/doCheckout.go index 29a5fe3..7f9a6fa 100644 --- a/doCheckout.go +++ b/doCheckout.go @@ -208,8 +208,9 @@ func doAllCheckoutMaster() error { me.forge.ConfigSave() } - if total, count, nope, err := IsEverythingOnMaster(); err != nil { - log.Printf("Master branch check. %d total repos. (%d ok) (%d not on master branch) (%s)\n", total, count, nope, shell.FormatDuration(time.Since(now))) + total, count, nope, err := IsEverythingOnMaster() + log.Printf("Master branch check. %d total repos. (%d ok) (%d not on master branch) (%s)\n", total, count, nope, shell.FormatDuration(time.Since(now))) + if err != nil { // display all repos not on master me.found = new(gitpb.Repos) all := me.forge.Repos.SortByFullPath() @@ -21,7 +21,7 @@ func sendPatches(pset *forgepb.Patchset) error { return err } log.Info("proto.Marshal() msg len", len(msg)) - body, err := httpPost(url, msg) + body, err := me.forge.HttpPost(url, msg) if err != nil { log.Info("httpPost() failed:", err) return err @@ -38,7 +38,7 @@ func sendPatches(pset *forgepb.Patchset) error { func listPatches() error { var url string url = me.urlbase + "/patchsetlist" - body, err := httpPost(url, nil) + body, err := me.forge.HttpPost(url, nil) if err != nil { log.Info("httpPost() failed:", err) return err @@ -61,7 +61,7 @@ func listPatches() error { func lastPatch() string { var url string url = me.urlbase + "/patchsetlist" - body, err := httpPost(url, nil) + body, err := me.forge.HttpPost(url, nil) if err != nil { log.Info("httpPost() failed:", err) return "" @@ -80,7 +80,7 @@ func lastPatch() string { func doRegister(newurl string) error { var url string url = me.urlbase + "/register?url=" + newurl - body, err := httpPost(url, nil) + body, err := me.forge.HttpPost(url, nil) if err != nil { log.Info("httpPost() failed:", err) return err @@ -97,7 +97,7 @@ func doRegister(newurl string) error { func getPatch(pbfile string) (*forgepb.Patchset, error) { url := me.urlbase + "/patchsetget?filename=" + pbfile log.Info("getPatch() url", url) - body, err := httpPost(url, nil) + body, err := me.forge.HttpPost(url, nil) if err != nil { log.Info("httpPost() failed:", err) return nil, err |