From 22f823bebe66ea758cf9bb4b72087b167a14d288 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 28 Aug 2025 18:56:27 -0500 Subject: move common patches code to forgepb --- doMerge.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'doMerge.go') diff --git a/doMerge.go b/doMerge.go index ad1c45e..7603b34 100644 --- a/doMerge.go +++ b/doMerge.go @@ -14,7 +14,7 @@ import ( func doMerge() error { mergePatchsets() - if err := SavePatchsets(); err != nil { + if err := me.forge.SavePatchsets(); err != nil { log.Warn("savePatchsets() failed", err) return err } @@ -22,7 +22,7 @@ func doMerge() error { } func findAutoPatchset() *forgepb.Patchset { - for pset := range me.all.IterAll() { + for pset := range me.forge.Patchsets.IterAll() { if pset.Name == "forge auto commit" { return pset break @@ -36,7 +36,7 @@ func findAutoPatchset() *forgepb.Patchset { fauto.Name = "forge auto commit" fauto.Patches = forgepb.NewPatches() fauto.Uuid = uuid.New().String() - me.all.Patchsets = append(me.all.Patchsets, fauto) + me.forge.Patchsets.Patchsets = append(me.forge.Patchsets.Patchsets, fauto) } return fauto } @@ -88,18 +88,18 @@ func addPatchset(filename string, pb *forgepb.Patchset) { // if you got here, this patchset was submitted with a name // Has this patchset already been submitted? - for pset := range me.all.IterAll() { + for pset := range me.forge.Patchsets.IterAll() { if pset.Uuid == pb.Uuid { log.Info("ALREADY ADDED", pset.Uuid, pset.Name) return } } - // Clone() this protobuf into me.all + // Clone() this protobuf into me.forge.Patchsets var newpb *forgepb.Patchset newpb = proto.Clone(pb).(*forgepb.Patchset) if newpb != nil { - me.all.Patchsets = append(me.all.Patchsets, newpb) + me.forge.Patchsets.Patchsets = append(me.forge.Patchsets.Patchsets, newpb) } } -- cgit v1.2.3