+6

cmd/gosky/debug.go

reviewed

··· 222 222 fmt.Printf("\nEvent at sequence %d had an invalid repo slice: %s\n", evt.Seq, err) 223 223 return nil 224 224 } else { 225 225 + _ = r 226 226 + /* "prev" is no longer included in #commit messages 225 227 prev, err := r.PrevCommit(ctx) 226 228 if err != nil { 227 229 return err ··· 239 241 if !evt.Rebase && cs != es { 240 242 fmt.Printf("\nEvent at sequence %d has mismatch between slice prev and struct prev: %s != %s\n", evt.Seq, prev, evt.Prev) 241 243 } 244 244 + */ 242 245 } 243 246 } 244 247 ··· 345 348 346 349 for i, ev := range slice { 347 350 if ev.Commit == event.Commit { 351 351 + _ = pll 352 352 + /* TODO: prev is no longer included in #commit messages; could use prevData or rev? 348 353 if pll(ev.Prev) != pll(event.Prev) { 349 354 // same commit different prev?? 350 355 return nil, fmt.Errorf("matched event with same commit but different prev: (%d) %d - %d", n, ev.Seq, event.Seq) 351 356 } 357 357 + */ 352 358 } 353 359 354 360 if i != 0 {

+1 -5

cmd/gosky/main.go

reviewed

··· 254 254 } 255 255 fmt.Println(string(b)) 256 256 } else { 257 257 - pstr := "<nil>" 258 258 - if evt.Prev != nil && evt.Prev.Defined() { 259 259 - pstr = evt.Prev.String() 260 260 - } 261 257 var handle string 262 258 if resolveHandles { 263 259 h, err := resolveDid(ctx, evt.Repo) ··· 267 263 handle = h 268 264 } 269 265 } 270 270 - fmt.Printf("(%d) RepoAppend: %s %s (%s -> %s)\n", evt.Seq, evt.Repo, handle, pstr, evt.Commit.String()) 266 266 + fmt.Printf("(%d) RepoAppend: %s %s (%s)\n", evt.Seq, evt.Repo, handle, evt.Commit.String()) 271 267 272 268 if unpack { 273 269 recs, err := unpackRecords(evt.Blocks, evt.Ops)

+1 -1

cmd/gosky/streamdiff.go

reviewed

··· 141 141 } 142 142 143 143 func sameCommit(a, b *comatproto.SyncSubscribeRepos_Commit) bool { 144 144 - return a.Repo == b.Repo && cidStr(a.Prev) == cidStr(b.Prev) 144 144 + return a.Repo == b.Repo && a.Rev == b.Rev 145 145 } 146 146 147 147 func findEvt(evt *events.XRPCStreamEvent, list []*events.XRPCStreamEvent) int {