diff options
| author | Jeff Carr <[email protected]> | 2025-02-09 14:18:37 -0600 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-02-09 14:18:37 -0600 |
| commit | f72756b089dca933f4345092b9e25dd11d4fa7ac (patch) | |
| tree | a5ecb3b428f9d1792cc5a98308afda9b232c3043 /windowRepos.go | |
| parent | b4cb43178b66992f8b6e0c35834c4bca3897f5f0 (diff) | |
check for serious problem of devel < master
Diffstat (limited to 'windowRepos.go')
| -rw-r--r-- | windowRepos.go | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/windowRepos.go b/windowRepos.go index 813f9df..8241d4a 100644 --- a/windowRepos.go +++ b/windowRepos.go @@ -216,21 +216,40 @@ func (r *repoWindow) repoMenu() *gui.Node { me.forge.ConfigSave() }) box2.NewButton("update", func() { - count := 0 r.Disable() defer r.Enable() loop := r.View.ReposSortByName() for loop.Scan() { // var repo *repolist.RepoRow view := loop.Repo() - log.Info("doing Update() on", view.GetGoPath()) - view.Update() - view.Hide() - view.Show() - count += 1 - if count > 3 { - // return + if view.Hidden() { + continue + } + repo := view.GetPb() + // log.Info("check master vs devel here on", repo.GetGoPath()) + if repo.GetDevelVersion() == repo.GetMasterVersion() { + continue + } + b1 := countDiffObjects(repo, repo.GetMasterBranchName(), repo.GetDevelBranchName()) + if b1 == 0 { + // log.Info("master vs devel count is normal b1 == 0", b1) + } else { + // log.Info("master vs devel count b1 != 0", b1) + log.Info("SERIOUS ERROR. DEVEL BRANCH NEEDS MERGE FROM MASTER b1 ==", b1, repo.GetGoPath()) + } + /* + // THIS IS TERRIBLE. STOP DEVELOPING AND FIX THIS IF THIS HAPPENS + cmd := repo.ConstructGitDiffLog(repo.GetMasterBranchName(), repo.GetDevelBranchName()) + if _, err := repo.RunVerbose(cmd); err != nil { + log.Info("failed", err) + } + */ + /* this is normal + cmd := repo.ConstructGitDiffLog(repo.GetDevelBranchName(), repo.GetMasterBranchName()) + if _, err := repo.RunVerbose(cmd); err != nil { + log.Info("failed", err) } + */ } }) return box2 |
