diff options
| -rw-r--r-- | doGui.go | 18 | ||||
| -rw-r--r-- | exit.go | 4 | ||||
| -rw-r--r-- | windowHowto.go | 4 |
3 files changed, 13 insertions, 13 deletions
@@ -28,10 +28,10 @@ func doGui() { grid := win.Group.RawGrid() if me.forge.Config.GetPathLock() { me.goSrcPwd = gadgets.NewOneLiner(grid, "Working Directory") - me.goSrcPwd.SetText(me.forge.GetGoSrc()) + me.goSrcPwd.SetText(me.forge.Config.ReposDir) } else { me.goSrcEdit = gadgets.NewBasicEntry(grid, "Working Directory") - me.goSrcEdit.SetText(me.forge.GetGoSrc()) + me.goSrcEdit.SetText(me.forge.Config.ReposDir) me.goSrcEdit.Custom = func() { log.Info("updating text to", me.goSrcEdit.String()) } @@ -132,13 +132,13 @@ func makeStandardReposGrid(pb *gitpb.Repos) *gitpb.ReposTable { t := pb.NewTable("testDirty") t.NewUuid() sf := t.AddStringFunc("repo", func(r *gitpb.Repo) string { - return r.GetGoPath() + return r.GetNamespace() }) // t.Custom = func() { // log.Info("close grid?") // } 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 { return repo.NewestTime() @@ -197,7 +197,7 @@ func findMergeToMaster() *gitpb.Repos { for all.Scan() { repo := all.Next() - if me.forge.Config.IsReadOnly(repo.GetGoPath()) { + if me.forge.Config.IsReadOnly(repo.GetNamespace()) { continue } /* @@ -215,7 +215,7 @@ func findMergeToMaster() *gitpb.Repos { // everything is normal } else { 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 @@ -247,7 +247,7 @@ func mergeDevelToMaster(doit bool) { all := found.SortByFullPath() for all.Scan() { repo := all.Next() - log.Info("repo:", repo.GetGoPath()) + log.Info("repo:", repo.GetNamespace()) if result, err := repo.MergeToMaster(); err == nil { log.Warn("THINGS SEEM OK", repo.GetFullPath()) for _, line := range result.Stdout { @@ -298,10 +298,10 @@ func mergeUserToDevel(doit bool) { b1 := repo.CountDiffObjects(bruser, brdevel) // should be zero 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 } - 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 { log.Warn("THINGS SEEM OK", repo.GetFullPath()) for _, line := range result.Stdout { @@ -23,11 +23,11 @@ func okExit(thing string) { } func badExit(err error) { - log.Info("forge failed: ", err, me.forge.GetGoSrc()) + log.Info("forge failed: ", err, me.forge.Config.ReposDir) os.Exit(-1) } 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) } diff --git a/windowHowto.go b/windowHowto.go index 35c9f09..3663ee3 100644 --- a/windowHowto.go +++ b/windowHowto.go @@ -41,10 +41,10 @@ func makeHowtoWin() *gadgets.GenericWindow { grid.NewLabel("") // a stupid way to add padding grid.NextRow() - // howtoWin.Group.NewLabel("Working dir: " + me.forge.GetGoSrc()) + // howtoWin.Group.NewLabel("Working dir: " + me.forge.Config.ReposDir) grid = howtoWin.Group.RawGrid() - grid.NewButton("Download into "+me.forge.GetGoSrc(), func() { + grid.NewButton("Download into "+me.forge.Config.ReposDir, func() { howtoWin.Disable() defer howtoWin.Enable() downloadForge() |