diff --git a/configDefault.go b/configDefault.go index 0f505d5..89e8ba8 100644 --- a/configDefault.go +++ b/configDefault.go @@ -17,47 +17,5 @@ func (all *ForgeConfigs) sampleConfig() { log.Info("added", new1.GoPath, "failed") } - new1 = new(ForgeConfig) - new1.GoPath = "go.wit.com/apps/zookeeper" - new1.DebName = "zookeeper-go" - if all.Append(new1) { - log.Info("added", new1.GoPath, "ok") - } else { - log.Info("added", new1.GoPath, "failed") - } - - new1 = new(ForgeConfig) - new1.GoPath = "go.wit.com/apps/wit-package" - new1.Private = true - if all.Append(new1) { - log.Info("added", new1.GoPath, "ok") - } else { - log.Info("added", new1.GoPath, "failed") - } - - new1 = new(ForgeConfig) - new1.GoPath = "go.wit.com/apps/networkQuality" - new1.DebName = "networkquality" - new1.ReadOnly = true - if all.Append(new1) { - log.Info("added", new1.GoPath, "ok") - } else { - log.Info("added", new1.GoPath, "failed") - } - - new2 := new(ForgeConfig) - new2.GoPath = "go.wit.com/apps/go-clone" - if all.Append(new2) { - log.Info("added", new2.GoPath, "ok") - } else { - log.Info("added", new2.GoPath, "failed") - } - - if all.Append(new2) { - log.Info("added", new2.GoPath, "ok (this is bad)") - } else { - log.Info("added", new2.GoPath, "failed (but ok)") - } - fmt.Println("first time user. adding an example config file with", len(all.ForgeConfigs), "repos") } diff --git a/human.go b/human.go index 497f7a9..f184966 100644 --- a/human.go +++ b/human.go @@ -33,6 +33,15 @@ func (f *Forge) standardHeader(r *ForgeConfig) string { } else { readonly = "r/w" } + if r.MasterBranchName != "" { + flags += "(master=" + r.MasterBranchName + ") " + } + if r.DevelBranchName != "" { + flags += "(devel=" + r.DevelBranchName + ") " + } + if r.UserBranchName != "" { + flags += "(user=" + r.UserBranchName + ") " + } return fmt.Sprintf("%-4s %-40s %s", readonly, r.GoPath, flags) }