jcarr
/
forge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stop using GoSrc()

This commit is contained in:
Jeff Carr 2025-09-11 22:14:30 -05:00
parent fa3e6c3cd5
commit bd951e4817
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doGui.go
View File

@ -28,10 +28,10 @@ func doGui() {
grid := win.Group.RawGrid() grid := win.Group.RawGrid()
if me.forge.Config.GetPathLock() { if me.forge.Config.GetPathLock() {
me.goSrcPwd = gadgets.NewOneLiner(grid, "Working Directory") me.goSrcPwd = gadgets.NewOneLiner(grid, "Working Directory")
me.goSrcPwd.SetText(me.forge.GetGoSrc()) me.goSrcPwd.SetText(me.forge.Config.ReposDir)
} else { } else {
me.goSrcEdit = gadgets.NewBasicEntry(grid, "Working Directory") me.goSrcEdit = gadgets.NewBasicEntry(grid, "Working Directory")
me.goSrcEdit.SetText(me.forge.GetGoSrc()) me.goSrcEdit.SetText(me.forge.Config.ReposDir)
me.goSrcEdit.Custom = func() { me.goSrcEdit.Custom = func() {
log.Info("updating text to", me.goSrcEdit.String()) log.Info("updating text to", me.goSrcEdit.String())
} }
@ -132,13 +132,13 @@ func makeStandardReposGrid(pb *gitpb.Repos) *gitpb.ReposTable {
t := pb.NewTable("testDirty") t := pb.NewTable("testDirty")
t.NewUuid() t.NewUuid()
sf := t.AddStringFunc("repo", func(r *gitpb.Repo) string { sf := t.AddStringFunc("repo", func(r *gitpb.Repo) string {
return r.GetGoPath() return r.GetNamespace()
}) })
// t.Custom = func() { // t.Custom = func() {
// log.Info("close grid?") // log.Info("close grid?")
// } // }
sf.Custom = func(r *gitpb.Repo) { sf.Custom = func(r *gitpb.Repo) {
log.Info("do button click on", r.GetGoPath()) log.Info("do button click on", r.GetNamespace())
} }
t.AddTimeFunc("age", func(repo *gitpb.Repo) time.Time { t.AddTimeFunc("age", func(repo *gitpb.Repo) time.Time {
return repo.NewestTime() return repo.NewestTime()
@ -197,7 +197,7 @@ func findMergeToMaster() *gitpb.Repos {
for all.Scan() { for all.Scan() {
repo := all.Next() repo := all.Next()
if me.forge.Config.IsReadOnly(repo.GetGoPath()) { if me.forge.Config.IsReadOnly(repo.GetNamespace()) {
continue continue
} }
/* /*
@ -215,7 +215,7 @@ func findMergeToMaster() *gitpb.Repos {
// everything is normal // everything is normal
} else { } else {
repo.State = "DEVEL < MASTER" repo.State = "DEVEL < MASTER"
log.Info("SERIOUS ERROR. DEVEL BRANCH IS BEHIND MASTER", repo.GetGoPath()) log.Info("SERIOUS ERROR. DEVEL BRANCH IS BEHIND MASTER", repo.GetNamespace())
} }
// this sees if devel has patches for master. If it does, add it to me.found // this sees if devel has patches for master. If it does, add it to me.found
@ -247,7 +247,7 @@ func mergeDevelToMaster(doit bool) {
all := found.SortByFullPath() all := found.SortByFullPath()
for all.Scan() { for all.Scan() {
repo := all.Next() repo := all.Next()
log.Info("repo:", repo.GetGoPath()) log.Info("repo:", repo.GetNamespace())
if result, err := repo.MergeToMaster(); err == nil { if result, err := repo.MergeToMaster(); err == nil {
log.Warn("THINGS SEEM OK", repo.GetFullPath()) log.Warn("THINGS SEEM OK", repo.GetFullPath())
for _, line := range result.Stdout { for _, line := range result.Stdout {
@ -298,10 +298,10 @@ func mergeUserToDevel(doit bool) {
b1 := repo.CountDiffObjects(bruser, brdevel) // should be zero b1 := repo.CountDiffObjects(bruser, brdevel) // should be zero
if b1 == 0 { if b1 == 0 {
// log.Info("User is already merged into Devel", repo.GetGoPath(), cmd) // log.Info("User is already merged into Devel", repo.GetNamespace(), cmd)
return return
} }
log.Info("merging user into devel repo:", repo.GetGoPath()) log.Info("merging user into devel repo:", repo.GetNamespace())
if result, err := repo.MergeToDevel(); err == nil { if result, err := repo.MergeToDevel(); err == nil {
log.Warn("THINGS SEEM OK", repo.GetFullPath()) log.Warn("THINGS SEEM OK", repo.GetFullPath())
for _, line := range result.Stdout { for _, line := range result.Stdout {

4
exit.go
View File

@ -23,11 +23,11 @@ func okExit(thing string) {
} }
func badExit(err error) { func badExit(err error) {
log.Info("forge failed: ", err, me.forge.GetGoSrc()) log.Info("forge failed: ", err, me.forge.Config.ReposDir)
os.Exit(-1) os.Exit(-1)
} }
func badRepoExit(repo *gitpb.Repo, err error) { func badRepoExit(repo *gitpb.Repo, err error) {
log.Printf("forge failed on %s with %v\n", repo.GetGoPath(), err) log.Printf("forge failed on %s with %v\n", repo.GetNamespace(), err)
os.Exit(-1) os.Exit(-1)
} }

4
windowHowto.go
View File

@ -41,10 +41,10 @@ func makeHowtoWin() *gadgets.GenericWindow {
grid.NewLabel("") // a stupid way to add padding grid.NewLabel("") // a stupid way to add padding
grid.NextRow() grid.NextRow()
// howtoWin.Group.NewLabel("Working dir: " + me.forge.GetGoSrc()) // howtoWin.Group.NewLabel("Working dir: " + me.forge.Config.ReposDir)
grid = howtoWin.Group.RawGrid() grid = howtoWin.Group.RawGrid()
grid.NewButton("Download into "+me.forge.GetGoSrc(), func() { grid.NewButton("Download into "+me.forge.Config.ReposDir, func() {
howtoWin.Disable() howtoWin.Disable()
defer howtoWin.Enable() defer howtoWin.Enable()
downloadForge() downloadForge()