diff options
| -rw-r--r-- | newRepo.go | 23 | ||||
| -rw-r--r-- | scan.go | 54 |
2 files changed, 42 insertions, 35 deletions
@@ -1,8 +1,6 @@ package repolist import ( - "strings" - "go.wit.com/lib/gui/repostatus" "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" @@ -81,24 +79,24 @@ func (r *RepoList) AddRepo(pb *gitpb.Repo) (*RepoRow, error) { newRepo.hidden = false r.allrepos[pb.GoPath] = newRepo - newRepo.NewScan() + // newRepo.NewScan() + + newRepo.lastTag = r.reposgrid.NewLabel("") + newRepo.masterVersion = r.reposgrid.NewLabel("") + newRepo.develVersion = r.reposgrid.NewLabel("") + newRepo.userVersion = r.reposgrid.NewLabel("") + newRepo.gitState = r.reposgrid.NewLabel("") + newRepo.currentName = r.reposgrid.NewLabel("") + newRepo.currentVersion = r.reposgrid.NewLabel("") - switch r.viewName { - case "autotypist": - r.makeAutotypistView(newRepo) - case "guireleaser": - r.makeGuireleaserView(newRepo) - default: - r.makeAutotypistView(newRepo) - } r.reposgrid.NextRow() newRepo.Status.InitOk = true // newRepo.Hide() return newRepo, nil } +/* func (r *RepoList) makeAutotypistView(newRepo *RepoRow) { - grid := r.reposgrid newRepo.lastTag = grid.NewLabel("") newRepo.masterVersion = grid.NewLabel("") @@ -161,6 +159,7 @@ func (r *RepoList) makeAutotypistView(newRepo *RepoRow) { } } } +*/ func (r *RepoList) makeGuireleaserView(newRepo *RepoRow) { grid := r.reposgrid @@ -58,32 +58,40 @@ func (r *RepoRow) NewScan() int { } } -// r.masterVersion.SetLabel(r.pb.GetMasterVersion()) -// r.develVersion.SetLabel(r.pb.GetDevelVersion()) -// r.userVersion.SetLabel(r.pb.GetUserVersion()) -// r.gitState.SetLabel(r.Status.GetState()) -// r.currentName.SetLabel(r.Status.CurrentBranchName()) -// r.currentVersion.SetLabel(r.Status.CurrentBranchVersion()) - - tags := []string{"%(objectname)", "%(creatordate)", "%(*authordate)", "%(refname)", "%(subject)"} - format := strings.Join(tags, "_,,,_") - cmd := []string{"git", "for-each-ref", "--sort=taggerdate", "--format", format} - // log.Info("RUNNING:", strings.Join(cmd, " ")) - result := r.pb.RunQuiet(cmd) - if result.Error != nil { - log.Warn("git for-each-ref error:", result.Error) + if r.masterVersion == nil { + panic("what the fuck node") } - for i, line := range result.Stdout { - log.Info(i, line) + if r.pb == nil { + panic("what the fuck pb") } + r.masterVersion.SetLabel(r.pb.GitMasterVersion()) + r.develVersion.SetLabel(r.pb.GitDevelVersion()) + r.userVersion.SetLabel(r.pb.GitUserVersion()) + // r.gitState.SetLabel(r.Status.GetState()) + // r.currentName.SetLabel(r.Status.CurrentBranchName()) + // r.currentVersion.SetLabel(r.Status.CurrentBranchVersion()) - if me.hideFunction == nil { - // application didn't register a hide function - // always show everything in that case - r.Show() - } else { - me.hideFunction(r) - } + /* + tags := []string{"%(objectname)", "%(creatordate)", "%(*authordate)", "%(refname)", "%(subject)"} + format := strings.Join(tags, "_,,,_") + cmd := []string{"git", "for-each-ref", "--sort=taggerdate", "--format", format} + // log.Info("RUNNING:", strings.Join(cmd, " ")) + result := r.pb.RunQuiet(cmd) + if result.Error != nil { + log.Warn("git for-each-ref error:", result.Error) + } + for i, line := range result.Stdout { + log.Info(i, line) + } + + if me.hideFunction == nil { + // application didn't register a hide function + // always show everything in that case + r.Show() + } else { + me.hideFunction(r) + } + */ // print out whatever changes have happened if c, ok := r.Status.Changed(); ok { |