general cleanups

common.go

@@ -56,28 +56,9 @@ func (r *RepoList) FindRepo(path string) *RepoRow {
 	return repo
 }
 
-/*
-func (r *RepoList) AllRepos() []*RepoRow {
-	var all []*RepoRow
-	for _, repo := range me.allrepos {
-		all = append(all, repo)
-	}
-	return all
-}
-
-// deprecate this
-func AllRepos() []*RepoRow {
-	var all []*RepoRow
-	for _, repo := range me.allrepos {
-		all = append(all, repo)
-	}
-	return all
-}
-*/
-
 // a human readable state of the current repo
 func (r *RepoRow) State() string {
-	return r.gitState.String()
+	return r.pbState.String()
 }
 
 func (r *RepoRow) Scan() int {
@@ -126,6 +107,7 @@ func (r *RepoRow) LastTag() string {
 	return r.lastTag.String()
 }
 
+/*
 func (r *RepoRow) IsPerfect() bool {
 	if r.gitState.String() == "PERFECT" {
 		return true
@@ -135,6 +117,7 @@ func (r *RepoRow) IsPerfect() bool {
 	}
 	return false
 }
+*/
 
 func (r *RepoRow) Run(cmd []string) cmd.Status {
 	return r.pb.Run(cmd)

newRepo.go

@@ -22,7 +22,7 @@ func (r *RepoRow) Hide() {
 	r.develVersion.Hide()
 	r.userVersion.Hide()
 
-	r.gitState.Hide()
+	// r.gitState.Hide()
 	r.pbState.Hide()
 	r.endBox.Hide()
 	r.targetV.Hide()
@@ -39,7 +39,7 @@ func (r *RepoRow) Show() {
 	r.develVersion.Show()
 	r.userVersion.Show()
 
-	r.gitState.Show()
+	// r.gitState.Show()
 	r.pbState.Show()
 	r.endBox.Show()
 	r.targetV.Show()
@@ -56,7 +56,7 @@ func (r *RepoRow) Show2() {
 	r.develVersion.Show()
 	r.userVersion.Show()
 
-	r.gitState.Show()
+	// r.gitState.Show()
 	r.endBox.Show()
 	r.targetV.Show()
 	r.hidden = false
@@ -93,7 +93,7 @@ func (r *RepoList) AddRepo(pb *gitpb.Repo) (*RepoRow, error) {
 	newRepo.masterVersion = r.reposgrid.NewLabel("")
 	newRepo.develVersion = r.reposgrid.NewLabel("")
 	newRepo.userVersion = r.reposgrid.NewLabel("")
-	newRepo.gitState = r.reposgrid.NewLabel("")
+	// newRepo.gitState = r.reposgrid.NewLabel("")
 	newRepo.pbState = r.reposgrid.NewLabel("")
 	newRepo.currentName = r.reposgrid.NewLabel("")
 	newRepo.currentVersion = r.reposgrid.NewLabel("")

scan.go

@@ -66,7 +66,6 @@ func (r *RepoRow) NewScan() int {
 	r.masterVersion.SetLabel(pb.GetMasterVersion())
 	r.develVersion.SetLabel(pb.GetDevelVersion())
 	r.userVersion.SetLabel(pb.GetUserVersion())
-	r.gitState.SetLabel(r.Status.CheckGitState())
 	r.pbState.SetLabel(pb.GetState())
 	r.currentName.SetLabel(pb.GetCurrentBranchName())
 	r.currentVersion.SetLabel(pb.GetCurrentBranchVersion())
@@ -74,7 +73,7 @@ func (r *RepoRow) NewScan() int {
 	if r.State() == "merge to main" {
 		r.Hide()
 	}
-	if r.Status.GitState() == "PERFECT" {
+	if pb.GetState() == "PERFECT" {
 		r.Hide()
 	} else {
 		r.Show()

structs.go

@@ -62,8 +62,8 @@ type RepoRow struct {
 	lastTag        *gui.Node // last tagged version label
 	currentName    *gui.Node // current branch name
 	currentVersion *gui.Node // current branch version
-	gitState       *gui.Node // git state (dirty or not?)
+	// gitState       *gui.Node // git state (dirty or not?)
-	pbState        *gui.Node // the state of the protobuf
+	pbState *gui.Node // the state of the protobuf
 
 	masterVersion *gui.Node // the master branch version
 	develVersion  *gui.Node // the devel branch version

viewAutotypist.go

@@ -20,7 +20,6 @@ func (rl *RepoList) AutotypistView(parent *gui.Node) {
 	rl.reposgrid.NewLabel("master version")
 	rl.reposgrid.NewLabel("devel version")
 	rl.reposgrid.NewLabel("user version")
-	rl.reposgrid.NewLabel("Status")
 	rl.reposgrid.NewLabel("pb state")
 	rl.reposgrid.NewLabel("Current").SetProgName("CurrentName")
 	rl.reposgrid.NewLabel("Version").SetProgName("CurrentVersion")