diff options
Diffstat (limited to 'doGui.go')
| -rw-r--r-- | doGui.go | 25 |
1 files changed, 20 insertions, 5 deletions
@@ -251,15 +251,30 @@ func findMergeToMaster() { all := me.forge.Repos.SortByFullPath() for all.Scan() { repo := all.Next() - if repo.IsDirty() { - continue - } if me.forge.Config.IsReadOnly(repo.GetGoPath()) { continue } - if repo.GetMasterVersion() != repo.GetDevelVersion() { + /* + if repo.IsDirty() { + continue + } + if repo.GetMasterVersion() != repo.GetDevelVersion() { + me.found.AppendByGoPath(repo) + continue + } + */ + + // this sees if devel is behind master. IT SHOULD NOT BE + if repo.CountDiffObjects(repo.GetMasterBranchName(), repo.GetDevelBranchName()) == 0 { + // everything is normal + } else { + repo.State = "DEVEL < MASTER" + log.Info("SERIOUS ERROR. DEVEL BRANCH IS BEHIND MASTER", repo.GetGoPath()) + } + + // this sees if devel has patches for master. If it does, add it to me.found + if repo.CountDiffObjects(repo.GetMasterBranchName(), repo.GetDevelBranchName()) > 0 { me.found.AppendByGoPath(repo) - continue } } now := time.Now() |
