From cbdcfa05894636001e5f2a60c6ea70c1f715c0fc Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Tue, 3 Dec 2024 00:35:33 -0600 Subject: fixing Init() --- repoNew.go | 39 +++++---------------------------------- 1 file changed, 5 insertions(+), 34 deletions(-) (limited to 'repoNew.go') diff --git a/repoNew.go b/repoNew.go index f114487..c6cb8be 100644 --- a/repoNew.go +++ b/repoNew.go @@ -6,44 +6,15 @@ import ( "go.wit.com/lib/protobuf/gitpb" ) -/* -func (f *Forge) NewGoPath(gopath string) (*gitpb.Repo, error) { - newr, err := f.Repos.NewGoPath(f.goSrc, gopath) +func (f *Forge) NewGoPathRepo(gopath string) (*gitpb.Repo, error) { + repo, err := f.Repos.NewGoPath(f.GetGoSrc(), gopath, "") if err != nil { - log.Log(FORGEPBWARN, "init failed", err) return nil, err } - log.Info("init worked for", newr.GoPath) - // try to guess what the 'master' branch is - if newr.IsBranch("guimaster") { - newr.SetMasterBranchName("guimaster") - } else if newr.IsBranch("master") { - newr.SetMasterBranchName("master") - } else if newr.IsBranch("main") { - newr.SetMasterBranchName("main") - } else { - newr.SetMasterBranchName("masterFIXME") - } - - if newr.IsBranch("guidevel") { - newr.SetDevelBranchName("guidevel") - } else if newr.IsBranch("devel") { - newr.SetDevelBranchName("devel") - } else { - newr.SetDevelBranchName("develFIXME") - } - - usr, _ := user.Current() - uname := usr.Username - if newr.IsBranch(uname) { - newr.SetUserBranchName(uname) - } else { - newr.SetUserBranchName(uname + "FIXME") - } - f.Repos.ConfigSave() - return newr, err + f.VerifyBranchNames(repo) + repo.ParseGoSum() + return repo, nil } -*/ func (f *Forge) VerifyBranchNames(newr *gitpb.Repo) { // log.Info("init worked for", newr.GoPath) -- cgit v1.2.3