From d3e1a7ec8f5e7908c7d6bf461cfa9b9fe64c87a7 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sat, 30 Nov 2024 12:45:07 -0600 Subject: fixes along the way --- repoNew.go | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) (limited to 'repoNew.go') diff --git a/repoNew.go b/repoNew.go index 3ee2b38..71d7776 100644 --- a/repoNew.go +++ b/repoNew.go @@ -1,7 +1,45 @@ package forgepb -import "go.wit.com/lib/protobuf/gitpb" +import ( + "os/user" + + "go.wit.com/lib/protobuf/gitpb" + "go.wit.com/log" +) func (f *Forge) NewGoPath(gopath string) (*gitpb.Repo, error) { - return f.Repos.NewGoPath(f.goSrc, gopath) + newr, err := f.Repos.NewGoPath(f.goSrc, gopath) + if err != nil { + log.Log(FORGEPBWARN, "init failed", err) + panic("crapnuts") + } + 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") + } + + return newr, err } -- cgit v1.2.3