diff options
Diffstat (limited to 'doMerge.go')
| -rw-r--r-- | doMerge.go | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -21,7 +21,7 @@ func doMerge() error { return nil } -func findAutoPatchset() *forgepb.Patchset { +func findAutoPatchset() *forgepb.Set { for pset := range me.forge.Patchsets.IterAll() { if pset.Name == "forge auto commit" { return pset @@ -29,14 +29,14 @@ func findAutoPatchset() *forgepb.Patchset { } } - var fauto *forgepb.Patchset + var fauto *forgepb.Set log.Warn("findAutoPatchset() had to create 'forge auto commit'") if fauto == nil { - fauto = new(forgepb.Patchset) + fauto = new(forgepb.Set) fauto.Name = "forge auto commit" fauto.Patches = forgepb.NewPatches() fauto.Uuid = uuid.New().String() - me.forge.Patchsets.Patchsets = append(me.forge.Patchsets.Patchsets, fauto) + me.forge.Patchsets.Append(fauto) } return fauto } @@ -63,7 +63,7 @@ func addRandomPatch(patch *forgepb.Patch) error { /* // adds a patchset or just the patches -func addPatchset(filename string, pb *forgepb.Patchset) { +func addPatchset(filename string, pb *forgepb.Set) { // if the name of the patchset is "forge auto commit" // then just add all the patches if pb.Name == "forge auto commit" { @@ -96,8 +96,8 @@ func addPatchset(filename string, pb *forgepb.Patchset) { } // Clone() this protobuf into me.forge.Patchsets - var newpb *forgepb.Patchset - newpb = proto.Clone(pb).(*forgepb.Patchset) + var newpb *forgepb.Set + newpb = proto.Clone(pb).(*forgepb.Set) if newpb != nil { me.forge.Patchsets.Patchsets = append(me.forge.Patchsets.Patchsets, newpb) } @@ -122,8 +122,8 @@ func mergePatchsets() { fmt.Println(entry.Name(), err) continue } - var p *forgepb.Patchset - p = new(forgepb.Patchset) + var p *forgepb.Set + p = new(forgepb.Set) err = p.Unmarshal(bytes) if err != nil { fmt.Println(entry.Name(), err) |