.

wcfs/δbtail.go

@@ -674,7 +674,7 @@ func (δBtail *ΔBtail) rebuild() (err error) {
 
 
 		// open ZODB connection corresponding to "current" and "prev" states
-		txn, ctx := transaction.New(context.TODO())
+		txn, ctx := transaction.New(context.TODO()) // XXX
 		defer txn.Abort() // XXX -> into func() or don't use defer
 
 		zconnPrev, err := δBtail.db.Open(ctx, &zodb.ConnOptions{At: atPrev})
@@ -738,6 +738,8 @@ func (δBtail *ΔBtail) rebuild() (err error) {
 	}
 
 	// merge trackNew into .trackIdx
+	// FIXME here trackNew was adjusted to correspond to @tail
+	// FIXME -> we have to map it back to correspond to @head before merge
 	δBtail.trackIdx.Update(trackNew)
 
 	return nil
@@ -1185,9 +1187,6 @@ func diffX(ctx context.Context, a, b Node, δZTC SetOid, trackIdx trackIndex, ho
 //
 // a, b point to top of subtrees @old and @new revisions.
 // δZTC is connected set of objects covering δZT (objects changed in this tree in old..new).
-//
-// XXX trackIdx -> just pass δBtail?
-// XXX ----//---- holeIdx
 func diffT(ctx context.Context, A, B *Tree, δZTC SetOid, trackIdx trackIndex, holeIdx treeSetKey) (δ map[Key]ΔValue, δtrack *δtrackIndex, err error) {
 	tracef("  diffT %s %s\n", xidOf(A), xidOf(B))
 	defer xerr.Contextf(&err, "diffT %s %s", xidOf(A), xidOf(B))