summaryrefslogtreecommitdiff
path: root/cobol.go
diff options
context:
space:
mode:
Diffstat (limited to 'cobol.go')
-rw-r--r--cobol.go40
1 files changed, 22 insertions, 18 deletions
diff --git a/cobol.go b/cobol.go
index f2bcfaa..5c54568 100644
--- a/cobol.go
+++ b/cobol.go
@@ -34,7 +34,7 @@ func doCobol() {
log.DaemonMode(true)
// log.Info(standardStart5("gopath", "cur name", "master", "user", "repo type"))
- log.Info(standardStart8("gopath", "cur name", "age", "target", "master", "devel", "user", "curver", "repo type"))
+ log.Info(standardStart8("repopath", "cur name", "age", "target", "master", "devel", "user", "curver", "repo type"))
all := me.found.SortByFullPath()
for all.Scan() {
repo := all.Next()
@@ -133,28 +133,32 @@ func verifyPrint(repo *gitpb.Repo) {
if repo.IsDirty() {
end += "(dirty) "
}
- s := make(map[string]string)
- if !verify(repo, s) {
- log.Info("going to delete", repo.GetGoPath())
- if argv.Fix {
- me.forge.DeleteByGoPath(repo.GetGoPath())
- me.forge.Repos.ConfigSave()
- } else {
- log.Info("need argv --fix to delete", repo.GetGoPath())
+ // s := make(map[string]string)
+ /*
+ if !verify(repo, s) {
+ log.Info("going to delete", repo.GetGoPath())
+ if argv.Fix {
+ me.forge.DeleteByGoPath(repo.GetGoPath())
+ me.forge.Repos.ConfigSave()
+ } else {
+ log.Info("need argv --fix to delete", repo.GetGoPath())
+ }
}
- }
+ */
+
+ var mhort string = repo.GetMasterVersion()
+ var dhort string = repo.GetDevelVersion()
+ var uhort string = repo.GetUserVersion()
+ var thort string = repo.GetTargetVersion()
+ var chort string = repo.GetCurrentBranchVersion()
+ var cname string = repo.GetCurrentBranchName()
- var mhort string = s["mver"] // master version
- var dhort string = s["dver"] // devel version
- var uhort string = s["uver"] // user version
- var thort string = s["tver"] // target version
- var chort string = s["cver"] // current version
- var cname string = s["cname"] // current branch name git is on now
+ var gopath string = repo.GetGoPath()
+ var rtype string = repo.GetRepoType()
age := shell.FormatDuration(repo.NewestAge())
- // start := fmt.Sprintf("%-40s %-12s %-12s %-12s %-8s", s["gopath"], cname, mhort, uhort, s["rtype"])
- start := standardStart8(s["gopath"], cname, age, thort, mhort, dhort, uhort, chort, s["rtype"])
+ start := standardStart8(gopath, cname, age, thort, mhort, dhort, uhort, chort, rtype)
if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
end += "(readonly) "