diff --git a/common.go b/common.go index 6d4e23d..6480e56 100644 --- a/common.go +++ b/common.go @@ -37,28 +37,6 @@ func (rs *RepoStatus) String() string { return rs.path.String() } -// returns the go path for the repo. "go.wit.com/apps/autotypist" -func (rs *RepoStatus) GoName() string { - return rs.GoPath() -} - -// not sure which name is easier to remember. probably this one -func (rs *RepoStatus) GoPath() string { - return rs.goPath.String() -} - -// full path -func (rs *RepoStatus) FullPath() string { - return rs.realPath.String() -} - -func (rs *RepoStatus) IsPrimitive() bool { - if rs.primitive.String() == "true" { - return true - } - return false -} - // returns the filesystem path to the repo func (rs *RepoStatus) Path() string { if rs == nil { @@ -185,7 +163,6 @@ func (rs *RepoStatus) IncrementVersion() bool { rs.EnableSelectTag() rs.setTag() newtag := "v" + rs.newversion.String() - log.Log(REPOWARN, rs.GoPath(), "old version:", rs.LastTag(), "new version:", newtag) rs.targetReleaseVersion.SetText(newtag) return true } @@ -212,15 +189,6 @@ func (rs *RepoStatus) SetPrivate(b bool) { } } -// returns a name for human consuption only -// todo: implement nicknames -func (rs *RepoStatus) Name() string { - if rs.IsGoLang() { - return rs.GoPath() - } - return rs.Path() -} - func trimNonNumericFromStart(s string) string { for i, r := range s { if unicode.IsDigit(r) { diff --git a/merge.go b/merge.go index 2a37c08..d735d15 100644 --- a/merge.go +++ b/merge.go @@ -46,13 +46,11 @@ func (rs *RepoStatus) fetchBranchByName(bname string) (error, string) { if rs.gitConfig == nil { return errors.New("missing .git/config"), "" } - log.Log(REPO, rs.Name(), "looking for branch:", bname) for name, branch := range rs.gitConfig.branches { if name == bname { // found the branch! log.Log(REPO, " ", name, "remote:", branch.remote, "merge", branch.merge) cmd := []string{"git", "fetch", branch.remote, bname + ":" + bname} - log.Log(REPO, "running:", rs.Name(), cmd) r := rs.Run(cmd) output := strings.Join(r.Stdout, "\n") return r.Error, strings.TrimSpace(output)