96 lines
2.4 KiB
Go
96 lines
2.4 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"go.wit.com/lib/protobuf/forgepb"
|
|
"go.wit.com/log"
|
|
"google.golang.org/protobuf/proto"
|
|
)
|
|
|
|
func doMerge() error {
|
|
if err := loadConfigfile(); err != nil {
|
|
badExit(err)
|
|
}
|
|
|
|
mergePatchsets()
|
|
for pset := range me.all.IterAll() {
|
|
showPatchsets(pset)
|
|
}
|
|
// savePatchsets()
|
|
return nil
|
|
}
|
|
|
|
// adds submitted patches not specifically assigned to a patchset
|
|
// to the generic patchset called "forge auto commit"
|
|
func addRandomPatch(patch *forgepb.Patch) {
|
|
for pset := range me.all.IterAll() {
|
|
if pset.Name == "forge auto commit" {
|
|
newpb := proto.Clone(patch).(*forgepb.Patch)
|
|
if newpb != nil {
|
|
pset.Patches.Append(newpb)
|
|
}
|
|
}
|
|
}
|
|
log.Warn("patchset.Name == 'forge auto commit' could not be found so the patch in", patch.Namespace, "could not be added")
|
|
}
|
|
|
|
func addPatchset(filename string, pb *forgepb.Patchset) {
|
|
if pb.Name == "forge auto commit" {
|
|
author := "Author: " + pb.GitAuthorName
|
|
author += " <" + pb.GitAuthorEmail + ">"
|
|
|
|
// author := "Author: " + os.Getenv("GIT_AUTHOR_NAME")
|
|
// author += " <" + os.Getenv("GIT_AUTHOR_EMAIL") + ">"
|
|
fmt.Println(filename, pb.Name, pb.Comment, author)
|
|
for _, patch := range pb.Patches.Patches {
|
|
// log.Info("\tnew patch:", i, patch.CommitHash, patch.Namespace)
|
|
if findPatch(patch) {
|
|
// log.Info("\talready found!!!!!!!", pset.Uuid, patch.Namespace)
|
|
} else {
|
|
log.Info("\tnew patch:", filename, pb.Name, pb.Comment, author)
|
|
}
|
|
}
|
|
// add each of the patches to the general pool
|
|
} else {
|
|
// Clone() this protobuf into me.all
|
|
var newpb *forgepb.Patchset
|
|
newpb = proto.Clone(pb).(*forgepb.Patchset)
|
|
if newpb != nil {
|
|
me.all.Append(newpb)
|
|
}
|
|
}
|
|
}
|
|
|
|
func mergePatchsets() {
|
|
dirname := filepath.Join(LIBDIR, "patchset/")
|
|
// Open the directory
|
|
entries, err := os.ReadDir(dirname)
|
|
if err != nil {
|
|
fmt.Printf("Error reading directory: %v\n", err)
|
|
return
|
|
}
|
|
|
|
// Iterate through the directory entries
|
|
for _, entry := range entries {
|
|
// Check if the entry is a file and matches the *.pb pattern
|
|
if !entry.IsDir() && filepath.Ext(entry.Name()) == ".pb" {
|
|
bytes, err := os.ReadFile(filepath.Join(dirname, entry.Name()))
|
|
if err != nil {
|
|
fmt.Println(entry.Name(), err)
|
|
continue
|
|
}
|
|
var p *forgepb.Patchset
|
|
p = new(forgepb.Patchset)
|
|
err = p.Unmarshal(bytes)
|
|
if err != nil {
|
|
fmt.Println(entry.Name(), err)
|
|
continue
|
|
}
|
|
addPatchset(entry.Name(), p)
|
|
}
|
|
}
|
|
}
|