summaryrefslogtreecommitdiff
path: root/doMerge.go
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-09-07 22:49:23 -0500
committerJeff Carr <[email protected]>2025-09-07 22:49:23 -0500
commitb71471c61e09d895f2439f24b503db1bd891d57a (patch)
tree73f8f5dd9507a20e775c2cc1a5077c34e4697ebe /doMerge.go
parentca3a70d6236dc45c7030405464a41f32ab98845a (diff)
more general work for patches
Diffstat (limited to 'doMerge.go')
-rw-r--r--doMerge.go18
1 files changed, 17 insertions, 1 deletions
diff --git a/doMerge.go b/doMerge.go
index 518b483..f30358b 100644
--- a/doMerge.go
+++ b/doMerge.go
@@ -4,10 +4,27 @@
package main
import (
+ "go.wit.com/lib/protobuf/forgepb"
"go.wit.com/lib/protobuf/gitpb"
"go.wit.com/log"
)
+func doMergeReport() *forgepb.Patches {
+ found := forgepb.NewPatches()
+ for repo := range me.forge.Repos.IterAll() {
+ if repo.GetDevelVersion() == repo.GetMasterVersion() {
+ continue
+ }
+ tmp := log.Sprintf("%s..%s", repo.GetMasterVersion(), repo.GetDevelVersion())
+ r, err := repo.RunStrict([]string{"git", "log", "--pretty=format:%H", tmp})
+ _ = err
+ for i, line := range r.Stdout {
+ log.Info(i, line, repo.FullPath)
+ }
+ }
+ return found
+}
+
func doMergeDevel() (*gitpb.Repos, error) {
var err error
done := gitpb.NewRepos()
@@ -37,7 +54,6 @@ func doMergeDevel() (*gitpb.Repos, error) {
}
done.Append(repo)
}
- configSave = true
return done, err
}