jcarr
/
forge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try merge

This commit is contained in:
Jeff Carr 2025-01-05 12:02:19 -06:00
parent 6ded56a13a
commit 34fc90e4bf
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
windowRepos.go
View File

@ -129,31 +129,31 @@ func (r *repoWindow) repoMenu() *gui.Node {
func (r *repoWindow) mergeAllDevelToMain() bool { func (r *repoWindow) mergeAllDevelToMain() bool {
log.Info("merge all here") log.Info("merge all here")
loop := me.repos.View.ReposSortByName() loop := me.forge.Repos.All()
for loop.Scan() { for loop.Scan() {
repo := loop.Repo() repo := loop.Next()
if repo.ReadOnly() { if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
log.Info("skipping readonly", repo.Name(), repo.State()) log.Info("skipping readonly", repo.GetFullPath())
continue continue
} }
if repo.State() != "merge to main" { if repo.IsDirty() {
log.Info("skipping. not merge to main", repo.Name(), repo.State()) log.Info("skipping dirty", repo.GetFullPath())
continue continue
} }
if repo.CheckDirty() { if result, err := repo.MergeDevelToMaster(); err == nil {
log.Info("skipping dirty", repo.Name(), repo.State()) log.Warn("THINGS SEEM OK", repo.GetFullPath())
continue continue
}
log.Info("repo:", repo.Name(), repo.State())
repo.NewScan()
if repo.Status.MergeDevelToMaster() {
log.Warn("THINGS SEEM OK fullAutomation() returned true.")
} else { } else {
log.Warn("last repo:", repo.Name()) log.Warn("THINGS FAILED ", repo.GetFullPath())
log.Warn("THINGS FAILED fullAutomation() returned false") log.Warn("err", err)
for _, line := range result.Stdout {
log.Warn("stdout:", line)
}
for _, line := range result.Stderr {
log.Warn("stderr:", line)
}
return false return false
} }
repo.NewScan()
} }
log.Warn("EVERYTHING WORKED") log.Warn("EVERYTHING WORKED")
return true return true
@ -161,31 +161,31 @@ func (r *repoWindow) mergeAllDevelToMain() bool {
func (r *repoWindow) mergeAllUserToDevel() bool { func (r *repoWindow) mergeAllUserToDevel() bool {
log.Info("merge all here") log.Info("merge all here")
loop := me.repos.View.ReposSortByName() loop := me.forge.Repos.All()
for loop.Scan() { for loop.Scan() {
repo := loop.Repo() repo := loop.Next()
if repo.ReadOnly() { if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
log.Info("skipping readonly", repo.Name(), repo.State()) log.Info("skipping readonly", repo.GetFullPath())
continue continue
} }
if repo.State() != "merge to devel" { if repo.IsDirty() {
log.Info("skipping. not merge to devel", repo.Name(), repo.State()) log.Info("skipping dirty", repo.GetFullPath())
continue continue
} }
if repo.CheckDirty() { if result, err := repo.MergeUserToDevel(); err == nil {
log.Info("skipping dirty", repo.Name(), repo.State()) log.Warn("THINGS SEEM OK", repo.GetFullPath())
continue continue
}
log.Info("repo:", repo.Name(), repo.State())
repo.NewScan()
if repo.Status.MergeUserToDevel() {
log.Warn("THINGS SEEM OK fullAutomation() returned true.")
} else { } else {
log.Warn("last repo:", repo.Status.Path()) log.Warn("THINGS FAILED ", repo.GetFullPath())
log.Warn("THINGS FAILED fullAutomation() returned false") log.Warn("err", err)
for _, line := range result.Stdout {
log.Warn("stdout:", line)
}
for _, line := range result.Stderr {
log.Warn("stderr:", line)
}
return false return false
} }
repo.NewScan()
} }
log.Warn("EVERYTHING WORKED") log.Warn("EVERYTHING WORKED")
return true return true