diff options
| -rw-r--r-- | newRepo.go | 26 | ||||
| -rw-r--r-- | scan.go | 29 |
2 files changed, 35 insertions, 20 deletions
@@ -100,25 +100,13 @@ func (r *RepoList) AddRepo(pb *gitpb.Repo) (*RepoRow, error) { func (r *RepoList) makeAutotypistView(newRepo *RepoRow) { grid := r.reposgrid - newRepo.lastTag = newRepo.Status.MirrorLastTag() - grid.Append(newRepo.lastTag) - - newRepo.masterVersion = newRepo.Status.MirrorMasterVersion() - grid.Append(newRepo.masterVersion) - - newRepo.develVersion = newRepo.Status.MirrorDevelVersion() - grid.Append(newRepo.develVersion) - - newRepo.userVersion = newRepo.Status.MirrorUserVersion() - grid.Append(newRepo.userVersion) - - newRepo.gitState = newRepo.Status.MirrorGitState() - grid.Append(newRepo.gitState) - - newRepo.currentName = newRepo.Status.MirrorCurrentName() - grid.Append(newRepo.currentName) - newRepo.currentVersion = newRepo.Status.MirrorCurrentVersion() - grid.Append(newRepo.currentVersion) + newRepo.lastTag = grid.NewLabel("") + newRepo.masterVersion = grid.NewLabel("") + newRepo.develVersion = grid.NewLabel("") + newRepo.userVersion = grid.NewLabel("") + newRepo.gitState = grid.NewLabel("") + newRepo.currentName = grid.NewLabel("") + newRepo.currentVersion = grid.NewLabel("") newRepo.endBox = grid.NewHorizontalBox("HBOX") newRepo.endBox.NewButton("Configure", func() { @@ -36,7 +36,7 @@ func (r *RepoList) ScanRepositories() (int, string) { me.shownCount.SetText(tmp) me.duration.SetText(s) - log.Log(REPO, "Scanned", i, "repositories.", total, "changes in", s) + log.Info("Scanned", i, "repositories.", total, "changes in", s) return i, s } @@ -50,6 +50,33 @@ func (r *RepoRow) NewScan() int { // run the repostatus update r.Status.Update() + if r.lastTag != nil { + if r.pb != nil { + r.lastTag.SetLabel(r.pb.GetLastTag()) + } else { + log.Info("r.pb was nil") + } + } + +// 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) + } + 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 |