diff --git a/doMerge.go b/doMerge.go new file mode 100644 index 0000000..b58078d --- /dev/null +++ b/doMerge.go @@ -0,0 +1,68 @@ +// Copyright 2017-2025 WIT.COM Inc. All rights reserved. +// Use of this source code is governed by the GPL 3.0 + +package main + +import ( + "fmt" + + "go.wit.com/lib/protobuf/gitpb" + "go.wit.com/log" +) + +func doMergeDevel() (*gitpb.Repos, error) { + var err error + done := gitpb.NewRepos() + found := findMergeToDevel() + for repo := range found.IterAll() { + if repo.CheckDirty() { + log.Info("repo is dirty", repo.GetGoPath()) + continue + } + log.Info("Starting merge on", repo.GetGoPath()) + if repo.CheckoutDevel() { + log.Info("checkout devel failed", repo.GetGoPath()) + err = fmt.Errorf("checkout devel failed") + break + } + if _, err := repo.MergeToDevel(); err != nil { + log.Info("merge from user failed", repo.GetGoPath(), err) + err = fmt.Errorf("merge from user failed") + // log.Info(strings.Join(r.Stdout, "\n")) + // log.Info(strings.Join(r.Stderr, "\n")) + break + } + done.Append(repo) + } + return done, err +} + +func doMergeMaster() (*gitpb.Repos, error) { + var err error + done := gitpb.NewRepos() + found := findMergeToMaster() + for repo := range found.IterAll() { + if repo.CheckDirty() { + log.Info("repo is dirty", repo.GetGoPath()) + continue + } + + log.Info("Starting merge on", repo.GetGoPath()) + if repo.CheckoutMaster() { + log.Info("checkout devel failed", repo.GetGoPath()) + err = fmt.Errorf("checkout devel failed") + break + } + + if _, err := repo.MergeToMaster(); err != nil { + log.Info("merge from user failed", repo.GetGoPath(), err) + err = fmt.Errorf("merge from user failed") + // log.Info(strings.Join(r.Stdout, "\n")) + // log.Info(strings.Join(r.Stderr, "\n")) + break + } + + done.Append(repo) + } + return done, err +} diff --git a/doPull.go b/doPull.go index 8c0e24e..029a9e1 100644 --- a/doPull.go +++ b/doPull.go @@ -157,70 +157,3 @@ func doGitFetch() { me.forge.ConfigSave() } } - -func doMergeDevel() (*gitpb.Repos, error) { - var err error - done := gitpb.NewRepos() - found := findMergeToDevel() - for repo := range found.IterAll() { - if repo.CheckDirty() { - log.Info("repo is dirty", repo.GetGoPath()) - continue - } - log.Info("Starting merge on", repo.GetGoPath()) - if repo.CheckoutDevel() { - log.Info("checkout devel failed", repo.GetGoPath()) - err = fmt.Errorf("checkout devel failed") - break - } - if _, err := repo.MergeToDevel(); err != nil { - log.Info("merge from user failed", repo.GetGoPath(), err) - err = fmt.Errorf("merge from user failed") - // log.Info(strings.Join(r.Stdout, "\n")) - // log.Info(strings.Join(r.Stderr, "\n")) - break - } - done.Append(repo) - /* - if repo.CheckoutMaster() { - log.Info("checkout master failed", repo.GetGoPath()) - return - } - if _, err := repo.MergeToMaster(); err != nil { - log.Info("merge from devel failed", repo.GetGoPath(), err) - return - } - */ - } - return done, err -} - -func doMergeMaster() (*gitpb.Repos, error) { - var err error - done := gitpb.NewRepos() - found := findMergeToMaster() - for repo := range found.IterAll() { - if repo.CheckDirty() { - log.Info("repo is dirty", repo.GetGoPath()) - continue - } - - log.Info("Starting merge on", repo.GetGoPath()) - if repo.CheckoutMaster() { - log.Info("checkout devel failed", repo.GetGoPath()) - err = fmt.Errorf("checkout devel failed") - break - } - - if _, err := repo.MergeToMaster(); err != nil { - log.Info("merge from user failed", repo.GetGoPath(), err) - err = fmt.Errorf("merge from user failed") - // log.Info(strings.Join(r.Stdout, "\n")) - // log.Info(strings.Join(r.Stderr, "\n")) - break - } - - done.Append(repo) - } - return done, err -}