// Copyright 2017-2025 WIT.COM Inc. All rights reserved. // Use of this source code is governed by the GPL 3.0 package main import ( "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.Infof("%s starting git merge\n", repo.FullPath) if repo.CheckoutDevel() { log.Info("checkout devel failed", repo.GetGoPath()) err = log.Errorf("checkout devel failed") break } // hash differences when merging user into devel branch out := repo.GetBranchDifferences(repo.GetDevelBranchName(), repo.GetUserBranchName()) for i, hash := range out { log.Info("MERGE HASH FROM USER TO DEVEL", i, hash) } if _, err := repo.MergeToDevel(); err != nil { log.Info("merge from user failed", repo.GetGoPath(), err) err = log.Errorf("merge from user failed") // log.Info(strings.Join(r.Stdout, "\n")) // log.Info(strings.Join(r.Stderr, "\n")) break } done.Append(repo) } configSave = true 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 = log.Errorf("checkout devel failed") break } if _, err := repo.MergeToMaster(); err != nil { log.Info("merge from user failed", repo.GetGoPath(), err) err = log.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 }