From 76a0347fdfcd7bdc29587ed209e8ba07e5fba2ed Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Tue, 28 Jan 2025 21:03:54 -0600 Subject: mv --- getPatchsets.go | 79 ------------------------------------------------------ gitCheckout.go | 82 --------------------------------------------------------- patchset.Get.go | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 161 deletions(-) delete mode 100644 getPatchsets.go delete mode 100644 gitCheckout.go create mode 100644 patchset.Get.go diff --git a/getPatchsets.go b/getPatchsets.go deleted file mode 100644 index 0ffccb1..0000000 --- a/getPatchsets.go +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright 1994-2025 WIT.COM Inc Licensed GPL 3.0 - -package forgepb - -import ( - "bytes" - "io/ioutil" - "net/http" - "os" - "os/user" - - "go.wit.com/log" -) - -var forgeURL string = "https://go.wit.com/" - -func (f *Forge) GetPatchesets() (*Patchsets, error) { - url := forgeURL + "/GetPatchsets" - log.Info("GetPatchsets() url", url) - body, err := f.HttpPost(url, nil) - if err != nil { - log.Info("httpPost() failed:", err) - return nil, err - } - log.Info("GetPatchets() len(body)", len(body)) - var psets *Patchsets - psets = new(Patchsets) - err = psets.Unmarshal(body) - if err != nil { - log.Info("Unmarshal failed", err) - return nil, err - } - /* - filename := filepath.Join("/tmp", pbfile) - f, _ := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) - f.Write(body) - f.Close() - */ - return psets, nil -} - -func (f *Forge) HttpPost(url string, data []byte) ([]byte, error) { - var err error - var req *http.Request - - // data := []byte("some junk") - // url := "https://go.wit.com/register/" - - req, err = http.NewRequest(http.MethodPost, url, bytes.NewBuffer(data)) - log.Info("httpPost() with len", len(data), "url", url) - - usr, _ := user.Current() - req.Header.Set("author", usr.Username) - hostname, _ := os.Hostname() - req.Header.Set("hostname", hostname) - - client := &http.Client{} - resp, err := client.Do(req) - if err != nil { - log.Error(err) - return []byte("client.Do(req) error"), err - } - defer resp.Body.Close() - log.Info("httpPost() with len", len(data)) - - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - log.Error(err) - return body, err - } - - // test := strings.TrimSpace(string(body)) - // log.Info("go.wit.com returned body:", test) - // if test == "OK" { - // return body, nil - // } - - return body, nil -} diff --git a/gitCheckout.go b/gitCheckout.go deleted file mode 100644 index 0602de9..0000000 --- a/gitCheckout.go +++ /dev/null @@ -1,82 +0,0 @@ -package forgepb - -func (f *Forge) GitPull() bool { - f.Repos.RillGitPull(5, 5) - return true -} - -/* -func (f *Forge) CheckoutDevel() bool { - log.Log(WARN, "running git checkout devel everwhere") - var failed int = 0 - var count int = 0 - all := f.Repos.SortByFullPath() - for all.Scan() { - repo := all.Next() - count += 1 - if repo.CheckoutDevel() { - // checkout ok - } else { - dname := repo.GetDevelBranchName() - if err := f.makeBranch(repo, dname); err != nil { - log.Info(repo.GetGoPath(), "can not make devel branch", dname) - failed += 1 - } - } - } - log.Log(WARN, "Ran git checkout in", count, "repos. failure count =", failed) - return true -} - -func (f *Forge) MakeDevelBranch(repo *gitpb.Repo) error { - dname := repo.GetDevelBranchName() - if dname == "" { - dname = f.configDevelBranchName(repo) - } - if err := f.makeBranch(repo, dname); err != nil { - return err - } - repo.DevelBranchName = dname - return nil -} - -func (f *Forge) MakeUserBranch(repo *gitpb.Repo) error { - uname := repo.GetUserBranchName() - if uname == "" { - uname = f.configUserBranchName(repo) - } - if err := f.makeBranch(repo, uname); err != nil { - return err - } - repo.UserBranchName = uname - return nil -} - -func (f *Forge) makeBranch(repo *gitpb.Repo, bname string) error { - if repo.IsLocalBranch(bname) { - // branch already exists in refs/heads/ - return nil - } - if repo.IsBranch(bname) { - // branch already exists refs/remotes/ - return nil - } else { - log.Info("makeBranch() says", bname, "does not exist") - loop := repo.Tags.All() - for loop.Scan() { - t := loop.Next() - log.Info("LocalTagExists() tag:", t.Refname) - } - } - mname := repo.GetMasterBranchName() - cname := repo.GetCurrentBranchName() - if mname != cname { - return errors.New("can only make branches from master branch") - } - cmd := []string{"git", "branch", bname} - if err := repo.StrictRun(cmd); err != nil { - return err - } - return nil -} -*/ diff --git a/patchset.Get.go b/patchset.Get.go new file mode 100644 index 0000000..0ffccb1 --- /dev/null +++ b/patchset.Get.go @@ -0,0 +1,79 @@ +// Copyright 1994-2025 WIT.COM Inc Licensed GPL 3.0 + +package forgepb + +import ( + "bytes" + "io/ioutil" + "net/http" + "os" + "os/user" + + "go.wit.com/log" +) + +var forgeURL string = "https://go.wit.com/" + +func (f *Forge) GetPatchesets() (*Patchsets, error) { + url := forgeURL + "/GetPatchsets" + log.Info("GetPatchsets() url", url) + body, err := f.HttpPost(url, nil) + if err != nil { + log.Info("httpPost() failed:", err) + return nil, err + } + log.Info("GetPatchets() len(body)", len(body)) + var psets *Patchsets + psets = new(Patchsets) + err = psets.Unmarshal(body) + if err != nil { + log.Info("Unmarshal failed", err) + return nil, err + } + /* + filename := filepath.Join("/tmp", pbfile) + f, _ := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) + f.Write(body) + f.Close() + */ + return psets, nil +} + +func (f *Forge) HttpPost(url string, data []byte) ([]byte, error) { + var err error + var req *http.Request + + // data := []byte("some junk") + // url := "https://go.wit.com/register/" + + req, err = http.NewRequest(http.MethodPost, url, bytes.NewBuffer(data)) + log.Info("httpPost() with len", len(data), "url", url) + + usr, _ := user.Current() + req.Header.Set("author", usr.Username) + hostname, _ := os.Hostname() + req.Header.Set("hostname", hostname) + + client := &http.Client{} + resp, err := client.Do(req) + if err != nil { + log.Error(err) + return []byte("client.Do(req) error"), err + } + defer resp.Body.Close() + log.Info("httpPost() with len", len(data)) + + body, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Error(err) + return body, err + } + + // test := strings.TrimSpace(string(body)) + // log.Info("go.wit.com returned body:", test) + // if test == "OK" { + // return body, nil + // } + + return body, nil +} -- cgit v1.2.3