{"header":{"message":"change: introduce changestore, print deleted lines","description":"Introduce a changestore structure for keeping track of multiple changes.\n\nThe changestore is primarily needed to allow fetching contents from a\nchange's dependencies (so we can print deleted lines). A\nchangecontents() function is able to extract content bytes from\ndependent change files.\n\nThis change also begins the introduction of a lot of facilities for\nfreeing resources in a more structured way. Using the changestore as\nan anchor point for all the allocated resources, we can navigate its\nstructure and free everything that's been allocated at once.\n\n","timestamp":"2023-07-13T08:15:24.230605548Z","authors":[{}]},"hash":"5D2IYPL75HEP6JUEILEADSZRRSV72NECT6UQR3PORNDR35I2P5GQC","authors":[{"login":"laumann","key":"3hFDodmFeE2ctGSdVvGCMGGumCr5RyZx83fRqEiTgwJg"}],"deps":{"hashes":[["5D2IYPL75HEP6JUEILEADSZRRSV72NECT6UQR3PORNDR35I2P5GQC","change: introduce changestore, print deleted lines"],["AA",null],["WQSKMNHR73ZUU3FBTETABMO5F2KIKSDFICLJH7XEJXHUJ5HP3KXQC","change: reformat line"],["L3HKOF4WYZZLJJY2Q6YJ65WGAB74GQ2A7ICD23M5NQGBP4BXF6DQC","wrap vendored zstd seekable in own file, #2"],["LKIBESCNQSK63O7SARMBH4VPEXSIBT32TRPXPSC6Z7SMSOF73GMAC","change: adjust function signatures"],["VXQYIOBXHTYEB62XSIAZGRNNIKXMDZLE5ANBGA7E7V3HOBVEMVSAC","change: avoid crash on different format versions"],["LPGHALLKCQRJUB7BNHABAG2VEEAFTUSN3WAPASM5B3V6JJ54GXJQC","change: adjust printing of file adds"],["7WA2F6RSQBGJJE5MZGQGAYJOWYEKQUWVI2MTZ4AMICEEQFENXANQC","change: decode resurrectzombies, addroot, delroot"],["KDJUAAALIKZDRTVNUZKXYYA5UYMZNYBCI3CCRKS4YONBVRUADPXAC","change: prefix function names with change_"],["WFA5BBRFVUHJ53MOPZ2WDXZ4CEHKA32LDYERSYLVETIZTZDW22GAC","Fix warnings"],["TGT4VSMEWWTFYILTXVZWA5WHB2RCZZYNGZJ3UUKZ5OPD6JQD4G5QC","change: decode FILE_ADD"],["DDLQMNGXZDIAK5ELYO5YYWKYKAZLH7FQ3L2J37MC2FOJEVDH6QDQC","change: find change files from repo dir"],["QEFCNNVCEDFUV7O4ASWVI4QUTUFWLHAOTJMDCZ3DFJIUQWTAN3SAC","change: display offsets for given change file"],["HKBM7HZGBH24UDVURTABIPF4P32AY6MDAZUDF3MWTXO7565BYWLQC","minor: formatting"],["QYRJIOYPM7SAB3OHMALL67K44U5HPBRQ2AFNWUKATPXM6BUYRKBQC","change: separate decoding and printing of hashed struct"],["OBKF6SIIFFHHY7YWKPPX75N23NAVUD5662DKIHXSSIDPKKXQ5ZDQC","change: decompress the hashed section too"],["XRGUHSC47YCVLCII7W7VDI3ZNZ4KT43GEQR2EL7Y5CH4SETUBOMQC","change: fix some formatting issues"],["JVU3TTT5T776LB2UNT5DCISJDWOITRSJPRG3CDTX4NDQEHC5VI3QC","all: switch away from typedefing anonymous structs"],["XTVLIC243WZF52NVTNRA3SV3WLE2ZZ5GTFQOK45IOLMXYQMTLOSAC","change: refactor to print_change()"],["WMFNGOYTKIZ7L25V3KMJPSWK23DTN6G3ESP6M55YIH6UTHFKL2XAC","change: reduce printed noise, rework some code"],["XTKRT6OQYN4LARQRDLI2KBSAJTOFZNT4AMBZ46CPUDZXD7IDYYWQC","format the codebase"],["YDQLW2ZOAH7PZ7HHVTSFUO5IWE6O7FDNXVNIN7GG4TJ3P2B2BM4AC","change: rework printing of patches - print Edit and Newvertex types"],["NZNIG2ULNMS5Z3OWEKRVOPLFA6CWYNF47U7UMXNZFSX256F2ZZVAC","Fix lots of warnings, adjust build flags"],["AEMTSEJXOEXQTJEVUK3NGBP4ESM4UOFIXTBYUV7LEDZDJNKIA6CAC","change: simplify readout of offsets"],["33ZXTRXRO7X7M2F5TM55CDE45RYVEYO5JGWULEJ337OHHQBO325QC","change: decode and print file deletions"],["NEORNIZEGPZAVZV2J6TTCWPZAQM3N7MH7SMS3NDT4WKTXI34NSUAC","change: decode and print file moves"],["VKLGQREYOZDV46F672RFE5XJO3OEOP4EHTCWZYOJY24HVPQX3L6QC","change: add base32 decode, initial deconstruction of hashed"],["3FT3XTJMUAXQ257T5GB7YWWTI7QBKKVC7WA6DCH5UY26RLQO5PFQC","change: support -v/-h flags"],["N3PUHKQNA2Q5LRKTXHOZVG4LCDRKY5WAOEDSXS34KL27RZCSVHHAC","change: fix scoping issue"],["Q7TKZCJP2Z75EICZYKCEZDHKGERSOKZGMTSU3UXETBHTF663T66AC","Add initial support for reading the offsets from a (fixed) change"],["UPYQ5FMNFMZKEN5UZYE4TW5Y4CTJTKZD55NRVJP4CXU6MFDXT7VAC","make fmt"],["2U7P5SFQG3AVALKMPJF4WMZE6PXIXXZYOMZ3RZKILBUJ4UMFXVIAC","Change struct names \"struct foo -> typedef struct Foo\""],["RIWSVVASWLJQQTSVRHIIUPENOZWOMHQLZMTQVGJUS2ZUGDPSWWIQC","change: decompress the 'contents' with zstd_seekable"],["Y26WT3ZFN7KSVXOZ26B5Y2OR4M4VQYQLPMAHPC4O5VIT3ENBISXAC","change: decode message, description and timestamp"],["ZPNA2D42RFGGC45PLDYDGQUDPC7D4NBEH2HD4Y2L5P2CK3R52FAQC","ani: add functions to locate .pijul"],["JAGXXSR7DR5FG77VKBF62BW7Q3JMVHCLHF4VB2PSLIZF4RLE553QC","change: initial work on decoding hunks"],["QA7HY2THWTEZ2AQ4SINYGJKHHX4RFNZKA5LY4EDQCLVAVDZAZ2OQC","hunk + hash: replace abort() calls with die()"],["YG4DZB3AW3Z3LB5CFBZZ4ORJOLZFN3G4CA2YTAMSUOQX3USVNVEAC","add representation of hash, decode dependencies"]],"deps":["WQSKMNHR73ZUU3FBTETABMO5F2KIKSDFICLJH7XEJXHUJ5HP3KXQC","L3HKOF4WYZZLJJY2Q6YJ65WGAB74GQ2A7ICD23M5NQGBP4BXF6DQC","LKIBESCNQSK63O7SARMBH4VPEXSIBT32TRPXPSC6Z7SMSOF73GMAC","VXQYIOBXHTYEB62XSIAZGRNNIKXMDZLE5ANBGA7E7V3HOBVEMVSAC","LPGHALLKCQRJUB7BNHABAG2VEEAFTUSN3WAPASM5B3V6JJ54GXJQC","7WA2F6RSQBGJJE5MZGQGAYJOWYEKQUWVI2MTZ4AMICEEQFENXANQC"],"known":["Q7TKZCJP2Z75EICZYKCEZDHKGERSOKZGMTSU3UXETBHTF663T66AC","AEMTSEJXOEXQTJEVUK3NGBP4ESM4UOFIXTBYUV7LEDZDJNKIA6CAC","QEFCNNVCEDFUV7O4ASWVI4QUTUFWLHAOTJMDCZ3DFJIUQWTAN3SAC","RIWSVVASWLJQQTSVRHIIUPENOZWOMHQLZMTQVGJUS2ZUGDPSWWIQC","KDJUAAALIKZDRTVNUZKXYYA5UYMZNYBCI3CCRKS4YONBVRUADPXAC","OBKF6SIIFFHHY7YWKPPX75N23NAVUD5662DKIHXSSIDPKKXQ5ZDQC","VKLGQREYOZDV46F672RFE5XJO3OEOP4EHTCWZYOJY24HVPQX3L6QC","WMFNGOYTKIZ7L25V3KMJPSWK23DTN6G3ESP6M55YIH6UTHFKL2XAC","3FT3XTJMUAXQ257T5GB7YWWTI7QBKKVC7WA6DCH5UY26RLQO5PFQC","XTKRT6OQYN4LARQRDLI2KBSAJTOFZNT4AMBZ46CPUDZXD7IDYYWQC","QYRJIOYPM7SAB3OHMALL67K44U5HPBRQ2AFNWUKATPXM6BUYRKBQC","2U7P5SFQG3AVALKMPJF4WMZE6PXIXXZYOMZ3RZKILBUJ4UMFXVIAC","YDQLW2ZOAH7PZ7HHVTSFUO5IWE6O7FDNXVNIN7GG4TJ3P2B2BM4AC","XTVLIC243WZF52NVTNRA3SV3WLE2ZZ5GTFQOK45IOLMXYQMTLOSAC","N3PUHKQNA2Q5LRKTXHOZVG4LCDRKY5WAOEDSXS34KL27RZCSVHHAC","NZNIG2ULNMS5Z3OWEKRVOPLFA6CWYNF47U7UMXNZFSX256F2ZZVAC","HKBM7HZGBH24UDVURTABIPF4P32AY6MDAZUDF3MWTXO7565BYWLQC","WFA5BBRFVUHJ53MOPZ2WDXZ4CEHKA32LDYERSYLVETIZTZDW22GAC","DDLQMNGXZDIAK5ELYO5YYWKYKAZLH7FQ3L2J37MC2FOJEVDH6QDQC","UPYQ5FMNFMZKEN5UZYE4TW5Y4CTJTKZD55NRVJP4CXU6MFDXT7VAC","JVU3TTT5T776LB2UNT5DCISJDWOITRSJPRG3CDTX4NDQEHC5VI3QC","TGT4VSMEWWTFYILTXVZWA5WHB2RCZZYNGZJ3UUKZ5OPD6JQD4G5QC","NEORNIZEGPZAVZV2J6TTCWPZAQM3N7MH7SMS3NDT4WKTXI34NSUAC","XRGUHSC47YCVLCII7W7VDI3ZNZ4KT43GEQR2EL7Y5CH4SETUBOMQC","33ZXTRXRO7X7M2F5TM55CDE45RYVEYO5JGWULEJ337OHHQBO325QC"]},"hunks":[{"Edit":{"inode":{"change":3,"pos":260},"path":"zstdseek.c","line":36,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1012},"to":{"change":3,"start":1012,"end":1057},"introduced_by":3}],"inode":{"change":3,"pos":260}}},"contents":[{"Del":"\tprintf(\"decompress result: %lu\\n\", result);\n"}]}},{"Edit":{"inode":{"change":34,"pos":35},"path":"scaffold.h","line":7,"atom":{"NewVertex":{"up_context":[{"change":34,"pos":164}],"down_context":[{"change":35,"pos":0}],"flag":"BLOCK","start":0,"end":40,"inode":{"change":34,"pos":35}}},"contents":[{"Add":"void *xrealloc(void *ptr, size_t size);"}]}},{"Edit":{"inode":{"change":34,"pos":208},"path":"scaffold.c","line":50,"atom":{"NewVertex":{"up_context":[{"change":34,"pos":459}],"down_context":[{"change":34,"pos":459}],"flag":"BLOCK","start":41,"end":64,"inode":{"change":34,"pos":208}}},"contents":[{"Add":"\tmemset(ret, 0, size);"}]}},{"Edit":{"inode":{"change":34,"pos":208},"path":"scaffold.c","line":53,"atom":{"NewVertex":{"up_context":[{"change":34,"pos":506}],"down_context":[{"change":34,"pos":506}],"flag":"BLOCK","start":65,"end":136,"inode":{"change":34,"pos":208}}},"contents":[{"Add":""},{"Add":"\treturn ret;"},{"Add":"}"},{"Add":""},{"Add":"void *"},{"Add":"xrealloc(void *ptr, size_t size)"},{"Add":"{"},{"Add":"\tvoid *ret;"}]}},{"Edit":{"inode":{"change":34,"pos":208},"path":"scaffold.c","line":62,"atom":{"NewVertex":{"up_context":[{"change":34,"pos":507}],"down_context":[{"change":34,"pos":507}],"flag":"BLOCK","start":137,"end":211,"inode":{"change":34,"pos":208}}},"contents":[{"Add":"\tret = realloc(ptr, size);"},{"Add":"\tif (!ret)"},{"Add":"\t\tdie(\"Unable to allocate memory\");"}]}},{"Edit":{"inode":{"change":36,"pos":664},"path":"hunk.h","line":138,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":1276}],"down_context":[{"change":36,"pos":1332}],"flag":"BLOCK","start":212,"end":255,"inode":{"change":36,"pos":664}}},"contents":[{"Add":"void hunk_hunklistfree(struct hunklist *);"}]}},{"Edit":{"inode":{"change":36,"pos":1372},"path":"hunk.c","line":51,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":1449}],"down_context":[{"change":37,"pos":44}],"flag":"BLOCK","start":256,"end":542,"inode":{"change":36,"pos":1372}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"void"},{"Add":"hunk_hunklistfree(struct hunklist *hunklist)"},{"Add":"{"},{"Add":"\tsize_t i;"},{"Add":""},{"Add":"\tfor (i = 0; i < hunklist->len; i++) {"},{"Add":"\t\tstruct basehunk *b = &hunklist->entries[i];"},{"Add":"\t\tswitch (b->hunktype) {"},{"Add":"\t\tcase FILE_MOVE:"},{"Add":"\t\t\t/* TBD */"},{"Add":"\t\t\tbreak;"},{"Add":"\t\tcase FILE_DEL:"},{"Add":"\t\t\t/* TBD */"},{"Add":"\t\t\tbreak;"},{"Add":"\t\tdefault:"},{"Add":"\t\t\tbreak;"},{"Add":"\t\t}"},{"Add":"\t}"}]}},{"Edit":{"inode":{"change":38,"pos":31},"path":"hash.h","line":11,"atom":{"NewVertex":{"up_context":[{"change":38,"pos":195}],"down_context":[{"change":38,"pos":195}],"flag":"BLOCK","start":543,"end":622,"inode":{"change":38,"pos":31}}},"contents":[{"Add":"\t/* FIXME(laumann): this should be a union { uint8_t blake3[BLAKE3_BYTES] } */"}]}},{"Edit":{"inode":{"change":38,"pos":31},"path":"hash.h","line":22,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":1579}],"down_context":[{"change":8,"pos":40}],"flag":"BLOCK","start":623,"end":716,"inode":{"change":38,"pos":31}}},"contents":[{"Add":""},{"Add":"/* Return 1 when hashes are equal, 0 otherwise */"},{"Add":"int hasheq(struct hash *, struct hash *);"}]}},{"Edit":{"inode":{"change":38,"pos":360},"path":"hash.c","line":8,"atom":{"NewVertex":{"up_context":[{"change":37,"pos":69}],"down_context":[{"change":38,"pos":421}],"flag":"BLOCK","start":717,"end":737,"inode":{"change":38,"pos":360}}},"contents":[{"Add":"#include \"blake3.h\""}]}},{"Edit":{"inode":{"change":38,"pos":360},"path":"hash.c","line":37,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":77}],"down_context":[{"change":8,"pos":77}],"flag":"BLOCK","start":738,"end":797,"inode":{"change":38,"pos":360}}},"contents":[{"Add":""},{"Add":"int"},{"Add":"hasheq(struct hash *h1, struct hash *h2)"},{"Add":"{"},{"Add":"\tsize_t i;"}]}},{"Edit":{"inode":{"change":38,"pos":360},"path":"hash.c","line":43,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":78}],"down_context":[{"change":8,"pos":78}],"flag":"BLOCK","start":798,"end":1077,"inode":{"change":38,"pos":360}}},"contents":[{"Add":"\tif (h1->variant != h2->variant)"},{"Add":"\t\treturn 0;"},{"Add":"\tswitch (h1->variant) {"},{"Add":"\tcase HASH_NONE:"},{"Add":"\t\treturn 1;"},{"Add":"\tcase HASH_BLAKE3:"},{"Add":"\t\tfor (i = 0; i < BLAKE3_LEN; i++)"},{"Add":"\t\t\tif (h1->bytes[i] != h2->bytes[i])"},{"Add":"\t\t\t\treturn 0;"},{"Add":"\t\treturn 1;"},{"Add":"\tdefault:"},{"Add":"\t\tdie(\"unknown hash variant: %u\", h1->variant);"},{"Add":"\t}"},{"Add":"}"},{"Add":""}]}},{"Edit":{"inode":{"change":8,"pos":80},"path":"change.h","line":77,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":2349}],"down_context":[{"change":8,"pos":664}],"flag":"BLOCK","start":1078,"end":1113,"inode":{"change":8,"pos":80}}},"contents":[{"Add":""},{"Add":"void hashedfree(struct hashed *);"}]}},{"Edit":{"inode":{"change":8,"pos":80},"path":"change.h","line":87,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":2396}],"down_context":[{"change":8,"pos":1005}],"flag":"BLOCK","start":1114,"end":1690,"inode":{"change":8,"pos":80}}},"contents":[{"Add":""},{"Add":"struct change {"},{"Add":"\tstruct offsets offsets;"},{"Add":"\tstruct hashed hashed;"},{"Add":"\tuint8_t *contents;"},{"Add":"};"},{"Add":""},{"Add":"struct changeentry {"},{"Add":"\tsize_t num;"},{"Add":"\tstruct hash hash;"},{"Add":"\tstruct change change;"},{"Add":"};"},{"Add":""},{"Add":"/**"},{"Add":" * structure for keeping track of multiple changes"},{"Add":" */"},{"Add":"struct changestore {"},{"Add":"\tsize_t len;"},{"Add":"\tsize_t cap;"},{"Add":"\tstruct changeentry *entries;"},{"Add":"};"},{"Add":""},{"Add":"void changestoreinit(struct changestore *, size_t cap);"},{"Add":"void changestorefree(struct changestore *);"},{"Add":""},{"Add":"/**"},{"Add":" * either fetch a change that's already loaded, or load a change into"},{"Add":" * the changestore."},{"Add":" */"},{"Add":"struct change *changestoreget(struct changestore *, struct hash *);"}]}},{"Edit":{"inode":{"change":8,"pos":1047},"path":"change.c","line":550,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":2024}],"down_context":[{"change":8,"pos":0}],"flag":"BLOCK","start":1691,"end":3609,"inode":{"change":8,"pos":1047}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"/**"},{"Add":" * Given an atom from a given change (by hash), extract the contents to return."},{"Add":" *"},{"Add":" * Returns a malloc()'ed buffer that must be free()'d, if there were"},{"Add":" * any contents to available. Returns NULL otherwise. The size of the"},{"Add":" * returned buffer is provided in the \"n\" parameter."},{"Add":" */"},{"Add":"static uint8_t *"},{"Add":"changecontents("},{"Add":"\tstruct changestore *changes, struct atom *change, uint8_t *contents,"},{"Add":"\tsize_t *n"},{"Add":")"},{"Add":"{"},{"Add":"\tstruct newvertex *v;"},{"Add":"\tstruct edgemap *e;"},{"Add":"\tstruct change *ch;"},{"Add":"\tuint8_t *buf = NULL;"},{"Add":"\tsize_t sz = 0;"},{"Add":""},{"Add":"\tswitch (change->atomtype) {"},{"Add":"\tcase NEW_VERTEX:"},{"Add":"\t\tv = &change->newvertex;"},{"Add":"\t\tsz = v->end - v->start;"},{"Add":"\t\tbuf = xmalloc(sizeof(uint8_t) * sz);"},{"Add":"\t\tmemcpy(buf, &contents[v->start], sz);"},{"Add":"\t\tbreak;"},{"Add":"\tcase EDGE_MAP:"},{"Add":"\t\te = &change->edgemap;"},{"Add":"\t\tif (e->edges.len == 0) {"},{"Add":"\t\t\t/* Technically an error */"},{"Add":"\t\t\tbreak;"},{"Add":"\t\t}"},{"Add":"\t\tif (!(e->edges.entries[0].flag & EDGE_FLAG_DELETED))"},{"Add":"\t\t\tbreak;"},{"Add":"\t\tfor (size_t i = 0; i < e->edges.len; i++) {"},{"Add":"\t\t\tstruct edge *edge = &e->edges.entries[i];"},{"Add":""},{"Add":"\t\t\t// FIXME: need to keep track of current! see"},{"Add":"\t\t\t// /home/t/sources/pijul/pijul/libpijul/src/changestore/filesystem.rs (get_contents_ext)"},{"Add":"\t\t\tsize_t z = edge->to.end - edge->to.start;"},{"Add":"\t\t\t/* TODO loop over the edges, extract relevant contents from the changestore */"},{"Add":"\t\t\t// keep track of current vertex"},{"Add":""},{"Add":"\t\t\tch = changestoreget(changes, &edge->to.change);"},{"Add":"\t\t\t/* printf(\"changestoreget(\"); */"},{"Add":"\t\t\t/* hashprint(&edge->to.change); */"},{"Add":"\t\t\t/* printf(\")\"); */"},{"Add":"\t\t\t/* printf(\" - %s\\n\", ch ? \"ok\" : \"fail :-(\"); */"},{"Add":""},{"Add":"\t\t\t// We find a change with some contents, and we"},{"Add":"\t\t\t// need to extract contents[start; end] we"},{"Add":"\t\t\t// then need to either xmalloc() buf, or"},{"Add":"\t\t\t// extend it to include more bytes"},{"Add":"\t\t\tif (ch) {"},{"Add":"\t\t\t\tif (buf) {"},{"Add":"\t\t\t\t\tbuf = xrealloc("},{"Add":"\t\t\t\t\t\tbuf, sz + sizeof(uint8_t) * z"},{"Add":"\t\t\t\t\t);"},{"Add":"\t\t\t\t} else {"},{"Add":"\t\t\t\t\tbuf = xmalloc(sizeof(uint8_t) * z);"},{"Add":"\t\t\t\t}"},{"Add":"\t\t\t\tmemcpy(&buf[sz], &ch->contents[edge->to.start],"},{"Add":"\t\t\t\t z);"},{"Add":"\t\t\t\tsz += z;"},{"Add":"\t\t\t}"},{"Add":"\t\t}"},{"Add":"\t\tbreak;"},{"Add":"\t}"},{"Add":"\t*n = sz;"},{"Add":"\treturn buf;"}]}},{"Edit":{"inode":{"change":8,"pos":1047},"path":"change.c","line":647,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":570}],"down_context":[{"change":8,"pos":570}],"flag":"BLOCK","start":3610,"end":3897,"inode":{"change":8,"pos":1047}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"void"},{"Add":"printcontents(uint8_t *buf, size_t len, char prefix)"},{"Add":"{"},{"Add":"\tint waseol = 1;"},{"Add":"\tsize_t i;"},{"Add":"\tuint8_t x;"},{"Add":""},{"Add":"\tfor (i = 0; i < len; i++) {"},{"Add":"\t\tif (waseol) {"},{"Add":"\t\t\tprintf(\"%c \", prefix);"},{"Add":"\t\t\twaseol = 0;"},{"Add":"\t\t}"},{"Add":"\t\tx = buf[i];"},{"Add":"\t\tputchar(x);"},{"Add":"\t\tif (x == '\\n')"},{"Add":"\t\t\twaseol = 1;"},{"Add":"\t}"},{"Add":"\tif (!waseol)"},{"Add":"\t\tprintf(\"\\n\");"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":675,"ins":{"up_context":[{"change":8,"pos":348}],"down_context":[{"change":8,"pos":387}],"flag":"BLOCK","start":3898,"end":3973,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":348},"to":{"change":8,"start":4060,"end":4106},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"print_atom(struct changestore *changes, struct atom *a, uint8_t *contents)"}],"del_contents":[{"Del":"print_atom(struct atom *a, uint8_t *contents)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":679,"ins":{"up_context":[{"change":8,"pos":4149}],"down_context":[{"change":8,"pos":446}],"flag":"BLOCK","start":3974,"end":4000,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":4149},"to":{"change":8,"start":130,"end":142},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":417},"to":{"change":8,"start":130,"end":142},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":142},"to":{"change":8,"start":569,"end":593},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":246},"to":{"change":8,"start":569,"end":593},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\tsize_t n;"},{"Add":"\tuint8_t *res;"}],"del_contents":[{"Del":"\tuint8_t x;\n"},{"Del":"\tsize_t i;\n\tint waseol;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":685,"ins":{"up_context":[{"change":8,"pos":510}],"down_context":[{"change":8,"pos":581}],"flag":"BLOCK","start":4001,"end":4090,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":510},"to":{"change":8,"start":510,"end":581},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t\t/* printf(\"up: \"); */"},{"Add":"\t\t/* print_positionlist(&v->upcontext); */"},{"Add":"\t\t/* printf(\", \"); */"}],"del_contents":[{"Del":"\t\tprintf(\"up: \");\n\t\tprint_positionlist(&v->upcontext);\n\t\tprintf(\", \");\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":689,"ins":{"up_context":[{"change":8,"pos":582}],"down_context":[{"change":8,"pos":634}],"flag":"BLOCK","start":4091,"end":4149,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":582},"to":{"change":8,"start":582,"end":634},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t\t/* printf(\"new: %lu:%lu, down: \", v->start, v->end); */"}],"del_contents":[{"Del":"\t\tprintf(\"new: %lu:%lu, down: \", v->start, v->end);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":691,"ins":{"up_context":[{"change":8,"pos":635}],"down_context":[{"change":8,"pos":690}],"flag":"BLOCK","start":4150,"end":4217,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":635},"to":{"change":8,"start":635,"end":690},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t\t/* print_positionlist(&v->downcontext); */"},{"Add":"\t\t/* printf(\"\\n\"); */"}],"del_contents":[{"Del":"\t\tprint_positionlist(&v->downcontext);\n\t\tprintf(\"\\n\");\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":694,"ins":{"up_context":[{"change":8,"pos":691}],"down_context":[{"change":8,"pos":890}],"flag":"BLOCK","start":4218,"end":4280,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":691},"to":{"change":8,"start":691,"end":890},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t\tprintcontents(&contents[v->start], v->end - v->start, '+');"}],"del_contents":[{"Del":"\t\twaseol = 1;\n\t\tfor (i = v->start; i < v->end; i++) {\n\t\t\tif (waseol) {\n\t\t\t\tprintf(\"+ \");\n\t\t\t\twaseol = 0;\n\t\t\t}\n\t\t\tx = contents[i];\n\t\t\tputchar(x);\n\t\t\tif (x == '\\n')\n\t\t\t\twaseol = 1;\n\t\t}\n\t\tprintf(\"\\n\");\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":699,"ins":{"up_context":[{"change":8,"pos":935}],"down_context":[{"change":8,"pos":962}],"flag":"BLOCK","start":4281,"end":5075,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":935},"to":{"change":8,"start":574,"end":949},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t\t/* edgemap debugging */"},{"Add":""},{"Add":"\t\t/* printf(\"edgemap {\\n edges: [\\n\"); */"},{"Add":"\t\t/* for (i = 0; i < m->edges.len; i++) { */"},{"Add":"\t\t/* \tstruct edge *e = &m->edges.entries[i]; */"},{"Add":"\t\t/* \tprintf(\" edge { previous = %u, flag = \", */"},{"Add":"\t\t/* \t e->previous); */"},{"Add":"\t\t/* \tprint_edgeflags(e->flag); */"},{"Add":"\t\t/* \tprintf(\", from = position { change = \"); */"},{"Add":"\t\t/* \thashprint(&e->from.change); */"},{"Add":"\t\t/* \tprintf(\", pos = %lu }\", e->from.pos); */"},{"Add":""},{"Add":"\t\t/* \tprintf(\", to = vertex { change = \"); */"},{"Add":"\t\t/* \thashprint(&e->to.change); */"},{"Add":"\t\t/* \tprintf(\", start = %lu, end = %lu }, introducedby = \", */"},{"Add":"\t\t/* \t e->to.start, e->to.end); */"},{"Add":"\t\t/* \thashprint(&e->introducedby); */"},{"Add":"\t\t/* \tprintf(\" }\\n\"); */"},{"Add":"\t\t/* } */"},{"Add":"\t\t/* printf(\" ]\\n}\\n\"); */"},{"Add":"\t\tres = changecontents(changes, a, contents, &n);"},{"Add":"\t\tif (res)"},{"Add":"\t\t\tprintcontents(res, n, '-');"}],"del_contents":[{"Del":"\t\tprintf(\"edgemap {\\n edges: [\\n\");\n\t\tfor (i = 0; i < m->edges.len; i++) {\n\t\t\tstruct edge *e = &m->edges.entries[i];\n\t\t\tprintf(\" edge { previous = %u, flag = \",\n\t\t\t e->previous);\n\t\t\tprint_edgeflags(e->flag);\n\t\t\tprintf(\", from = Position { .. }, to = vertex { .. }, introducedby = \"\n\t\t\t);\n\t\t\thashprint(&e->introducedby);\n\t\t\tprintf(\" }\\n\");\n\t\t}\n\t\tprintf(\" ]\\n}\\n\");\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":740,"ins":{"up_context":[{"change":8,"pos":875}],"down_context":[{"change":8,"pos":976}],"flag":"BLOCK","start":5076,"end":5120,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":875},"to":{"change":8,"start":875,"end":976},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\tchange_decode_encoding(&bc, &m->encoding);"}],"del_contents":[{"Del":"\tif (bincode_getu8(&bc)) {\n\t\tlen = bincode_getu64(&bc);\n\t\tm->encoding = bincode_getstr(&bc, len);\n\t}\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":744,"ins":{"up_context":[{"change":8,"pos":258}],"down_context":[{"change":8,"pos":306}],"flag":"BLOCK","start":5121,"end":5208,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":258},"to":{"change":8,"start":4150,"end":4205},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"print_change("},{"Add":"\tstruct changestore *changes, struct hashed *hashed, uint8_t *contents"},{"Add":")"}],"del_contents":[{"Del":"print_change(struct hashed *hashed, uint8_t *contents)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":775,"ins":{"up_context":[{"change":8,"pos":1092}],"down_context":[{"change":8,"pos":1205}],"flag":"BLOCK","start":5209,"end":5233,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1092},"to":{"change":8,"start":619,"end":645},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":645},"to":{"change":8,"start":1117,"end":1205},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1117},"to":{"change":8,"start":1117,"end":1205},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\tprintf(\"\\n# Hunks\\n\");"}],"del_contents":[{"Del":"\tprintf(\"\\n# Hunks\\n\\n\");\n"},{"Del":"\n\t/* FIXME: Put all the hashes of dependencies in a big list, and number them from 2 */\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":779,"ins":{"up_context":[{"change":8,"pos":4259}],"down_context":[{"change":8,"pos":242}],"flag":"BLOCK","start":5234,"end":5263,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":4259},"to":{"change":8,"start":215,"end":242},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1295},"to":{"change":8,"start":215,"end":242},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t\tprintf(\"\\n%lu. %s\", i + 1,"}],"del_contents":[{"Del":"\t\tprintf(\"%lu. %s\", i + 1,\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":789,"ins":{"up_context":[{"change":8,"pos":1554}],"down_context":[{"change":8,"pos":1582}],"flag":"BLOCK","start":5264,"end":5301,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1554},"to":{"change":8,"start":1554,"end":1582},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t\t\tprint_atom(changes, c, contents);"}],"del_contents":[{"Del":"\t\t\tprint_atom(c, contents);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":801,"ins":{"up_context":[{"change":8,"pos":1779}],"down_context":[{"change":8,"pos":1779}],"flag":"BLOCK","start":5302,"end":5388,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1779},"to":{"change":8,"start":102,"end":133},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":""},{"Add":"\t\t\tprint_atom(changes, c, contents);"},{"Add":""},{"Add":"\t\t\tprint_atom(changes, replacement, contents);"}],"del_contents":[{"Del":"\t\t\tprint_atom(ratm, contents);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":829,"ins":{"up_context":[{"change":6,"pos":551}],"down_context":[{"change":6,"pos":552}],"flag":"BLOCK","start":5389,"end":5437,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":551},"to":{"change":8,"start":1140,"end":1179},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1140},"to":{"change":8,"start":1140,"end":1179},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t\t\tprint_atom(changes, &f->contents, contents);"}],"del_contents":[{"Del":"\t\t\tprint_atom(&f->contents, contents);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":903,"ins":{"up_context":[{"change":7,"pos":1206}],"down_context":[{"change":7,"pos":1241}],"flag":"BLOCK","start":5438,"end":5482,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1206},"to":{"change":7,"start":1206,"end":1241},"introduced_by":7}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t\t\tprint_atom(changes, &r->name, contents);"}],"del_contents":[{"Del":"\t\t\tprint_atom(&r->name, contents);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":905,"ins":{"up_context":[{"change":7,"pos":1263}],"down_context":[{"change":7,"pos":1299}],"flag":"BLOCK","start":5483,"end":5528,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1263},"to":{"change":7,"start":1263,"end":1299},"introduced_by":7}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t\t\tprint_atom(changes, &r->inode, contents);"}],"del_contents":[{"Del":"\t\t\tprint_atom(&r->inode, contents);\n"}]}},{"Edit":{"inode":{"change":8,"pos":1047},"path":"change.c","line":912,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":1853}],"down_context":[{"change":8,"pos":992}],"flag":"BLOCK","start":5529,"end":6184,"inode":{"change":8,"pos":1047}}},"contents":[{"Add":"\t}"},{"Add":"}"},{"Add":""},{"Add":"struct change *"},{"Add":"changestoreget(struct changestore *store, struct hash *hash)"},{"Add":"{"},{"Add":"\tsize_t i;"},{"Add":""},{"Add":"\tfor (i = 0; i < store->len; i++) {"},{"Add":"\t\tif (hasheq(hash, &store->entries[i].hash))"},{"Add":"\t\t\treturn &store->entries[i].change;"},{"Add":"\t}"},{"Add":"\treturn NULL;"},{"Add":"}"},{"Add":""},{"Add":"void"},{"Add":"changestoreinit(struct changestore *s, size_t cap)"},{"Add":"{"},{"Add":"\ts->entries = xmalloc(sizeof(struct changeentry) * cap);"},{"Add":"\ts->cap = cap;"},{"Add":"\ts->len = 0;"},{"Add":"}"},{"Add":""},{"Add":"void"},{"Add":"changestorefree(struct changestore *s)"},{"Add":"{"},{"Add":"\tsize_t i;"},{"Add":"\tstruct changeentry *e;"},{"Add":"\tstruct change *c;"},{"Add":""},{"Add":"\t/* Free all the entries first */"},{"Add":"\tfor (i = 0; i < s->len; i++) {"},{"Add":"\t\te = &s->entries[i];"},{"Add":"\t\tc = &e->change;"},{"Add":"\t\thashedfree(&c->hashed);"},{"Add":"\t\tif (c->contents)"},{"Add":"\t\t\tfree(c->contents);"}]}},{"Edit":{"inode":{"change":8,"pos":1047},"path":"change.c","line":950,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":995}],"down_context":[{"change":8,"pos":995}],"flag":"BLOCK","start":6185,"end":6329,"inode":{"change":8,"pos":1047}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"void"},{"Add":"hashedfree(struct hashed *h)"},{"Add":"{"},{"Add":"\thashlist_free(&h->dependencies);"},{"Add":"\thashlist_free(&h->extraknown);"},{"Add":"\tif (h->metadata)"},{"Add":"\t\tfree(h->metadata);"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":962,"ins":{"up_context":[{"change":8,"pos":1002}],"down_context":[{"change":8,"pos":82}],"flag":"BLOCK","start":6330,"end":6434,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":1002},"to":{"change":8,"start":4,"end":82},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2599},"to":{"change":8,"start":4,"end":82},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":4},"to":{"change":8,"start":4,"end":82},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":" * Format a path to a change file, given the input repo dir and a"},{"Add":" * hash. The result is placed in dst."}],"del_contents":[{"Del":" * Takes an input hash, and tries to find a change file to open and read out.\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":965,"ins":{"up_context":[{"change":8,"pos":86}],"down_context":[{"change":8,"pos":2212}],"flag":"BLOCK","start":6435,"end":6517,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":86},"to":{"change":8,"start":2199,"end":2203},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2199},"to":{"change":8,"start":2199,"end":2203},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2203},"to":{"change":4,"start":119,"end":178},"introduced_by":4}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"static void"},{"Add":"formatchangepath(char *dst, const char *repodir, const char *hashstr)"}],"del_contents":[{"Del":"int\n"},{"Del":"change(const char *hash, int verbose, const char *repodir)\n"}]}},{"Edit":{"inode":{"change":8,"pos":1047},"path":"change.c","line":968,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2214},"to":{"change":8,"start":2214,"end":2233},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2233},"to":{"change":8,"start":4527,"end":4548},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3285},"to":{"change":8,"start":2600,"end":2620},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":4548},"to":{"change":8,"start":2600,"end":2620},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2254},"to":{"change":8,"start":2600,"end":2620},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2620},"to":{"change":8,"start":1401,"end":1429},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1429},"to":{"change":8,"start":103,"end":117},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":117},"to":{"change":8,"start":0,"end":32},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":32},"to":{"change":8,"start":4549,"end":4572},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":231},"to":{"change":8,"start":2254,"end":2255},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":918},"to":{"change":8,"start":2254,"end":2255},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2126},"to":{"change":8,"start":2254,"end":2255},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3302},"to":{"change":8,"start":2254,"end":2255},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":4572},"to":{"change":8,"start":2254,"end":2255},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2254},"to":{"change":8,"start":2254,"end":2255},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2255},"to":{"change":8,"start":148,"end":188},"introduced_by":8}],"inode":{"change":8,"pos":1047}}},"contents":[{"Del":"\tint fd;\n\tint err;\n"},{"Del":"\tstruct offsets off;\n"},{"Del":"\tuint8_t *contents;\n"},{"Del":"\tuint8_t contents_hash[32];\n"},{"Del":"\tchar *h, *p;\n"},{"Del":"\tchar chfile[PATH_MAX] = { 0 };\n"},{"Del":"\tstruct hashed hashed;\n"},{"Del":"\n"},{"Del":"\t/* FIXME - make this a lot nicer... */\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":969,"ins":{"up_context":[{"change":8,"pos":282}],"down_context":[{"change":8,"pos":323}],"flag":"BLOCK","start":6518,"end":6567,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":282},"to":{"change":8,"start":282,"end":323},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\tchar *p;"},{"Add":""},{"Add":"\tp = stpncpy(dst, repodir, PATH_MAX);"}],"del_contents":[{"Del":"\tp = stpncpy(chfile, repodir, PATH_MAX);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":977,"ins":{"up_context":[{"change":8,"pos":412}],"down_context":[{"change":8,"pos":441}],"flag":"BLOCK","start":6568,"end":6608,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":412},"to":{"change":8,"start":232,"end":251},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2255},"to":{"change":8,"start":232,"end":251},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":251},"to":{"change":8,"start":413,"end":441},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t*p++ = hashstr[0];"},{"Add":"\t*p++ = hashstr[1];"}],"del_contents":[{"Del":"\th = (char *)hash;\n"},{"Del":"\t*p++ = *h++;\n\t*p++ = *h++;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":981,"ins":{"up_context":[{"change":8,"pos":292}],"down_context":[{"change":8,"pos":479}],"flag":"BLOCK","start":6609,"end":6643,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":292},"to":{"change":8,"start":455,"end":479},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\tp = stpncpy(p, &hashstr[2], 51);"}],"del_contents":[{"Del":"\tp = stpncpy(p, h, 51);\n"}]}},{"Edit":{"inode":{"change":8,"pos":1047},"path":"change.c","line":983,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":506}],"down_context":[{"change":8,"pos":339}],"flag":"BLOCK","start":6644,"end":6646,"inode":{"change":8,"pos":1047}}},"contents":[{"Add":"}"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":985,"ins":{"up_context":[{"change":8,"pos":340}],"down_context":[{"change":2,"pos":0}],"flag":"BLOCK","start":6647,"end":7029,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":340},"to":{"change":8,"start":340,"end":374},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"static int"},{"Add":"loadchange("},{"Add":"\tstruct change *c, struct hash *hash, const char *repodir,"},{"Add":"\tconst char *hashstr, int verbose"},{"Add":")"},{"Add":"{"},{"Add":"\tint fd, err;"},{"Add":"\tchar chfile[PATH_MAX] = { 0 };"},{"Add":"\tstruct offsets *off;"},{"Add":"\tstruct hashed *hashed;"},{"Add":"\tuint8_t contents_hash[32];"},{"Add":""},{"Add":"\toff = &c->offsets;"},{"Add":"\thashed = &c->hashed;"},{"Add":"\terr = 0;"},{"Add":""},{"Add":"\tprintf(\"loading change %s\\n\", hashstr);"},{"Add":""},{"Add":"\tformatchangepath(chfile, repodir, hashstr);"},{"Add":""}],"del_contents":[{"Del":"\tprintf(\"Opening: %s\\n\", chfile);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":1010,"ins":{"up_context":[{"change":8,"pos":2474}],"down_context":[{"change":8,"pos":2474}],"flag":"BLOCK","start":7030,"end":7236,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2474},"to":{"change":8,"start":3303,"end":3344},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t// FIXME: hash decoding should result in a \"struct hash\" not"},{"Add":"\t// just raw bytes"},{"Add":"\tbase32_hashdecode(contents_hash, hashstr);"},{"Add":"\tmemcpy(hash->bytes, contents_hash, BLAKE3_BYTES);"},{"Add":"\thash->variant = HASH_BLAKE3;"}],"del_contents":[{"Del":"\tbase32_hashdecode(contents_hash, hash);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":1016,"ins":{"up_context":[{"change":8,"pos":2475}],"down_context":[{"change":8,"pos":2508}],"flag":"BLOCK","start":7237,"end":7276,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2475},"to":{"change":8,"start":103,"end":143},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\terr = change_decode_offsets(fd, off);"}],"del_contents":[{"Del":"\terr = change_decode_offsets(fd, &off);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":1022,"ins":{"up_context":[{"change":8,"pos":1874}],"down_context":[{"change":5,"pos":335}],"flag":"BLOCK","start":7277,"end":7348,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1874},"to":{"change":5,"start":266,"end":335},"introduced_by":5}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\tif (off->version != VERSION) {"},{"Add":"\t\tif (off->version == VERSION_NOENC) {"}],"del_contents":[{"Del":"\tif (off.version != VERSION) {\n\t\tif (off.version == VERSION_NOENC) {\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":1025,"ins":{"up_context":[{"change":5,"pos":421}],"down_context":[{"change":5,"pos":445}],"flag":"BLOCK","start":7349,"end":7374,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":421},"to":{"change":5,"start":421,"end":445},"introduced_by":5}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t\t\t off->version);"}],"del_contents":[{"Del":"\t\t\t off.version);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":1028,"ins":{"up_context":[{"change":5,"pos":512}],"down_context":[{"change":5,"pos":536}],"flag":"BLOCK","start":7375,"end":7400,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":512},"to":{"change":5,"start":512,"end":536},"introduced_by":5}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t\t\t off->version);"}],"del_contents":[{"Del":"\t\t\t off.version);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":1034,"ins":{"up_context":[{"change":8,"pos":2156}],"down_context":[{"change":8,"pos":2227}],"flag":"BLOCK","start":7401,"end":7482,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2156},"to":{"change":8,"start":2156,"end":2211},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2211},"to":{"change":8,"start":919,"end":944},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t\tfd, off->unhashed_off - OFFSETS_SIZE, off->hashed_len,"},{"Add":"\t\tcontents_hash, hashed"}],"del_contents":[{"Del":"\t\tfd, off.unhashed_off - OFFSETS_SIZE, off.hashed_len,\n"},{"Del":"\t\tcontents_hash, &hashed\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":1046,"ins":{"up_context":[{"change":8,"pos":1116}],"down_context":[{"change":8,"pos":1168}],"flag":"BLOCK","start":7483,"end":7543,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1116},"to":{"change":8,"start":263,"end":322},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\tif (lseek(fd, (off_t)off->contents_off, SEEK_SET) == -1) {"}],"del_contents":[{"Del":"\tif (lseek(fd, (off_t)off.contents_off, SEEK_SET) == -1) {\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":1050,"ins":{"up_context":[{"change":8,"pos":1202}],"down_context":[{"change":8,"pos":1246}],"flag":"BLOCK","start":7544,"end":7590,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1202},"to":{"change":8,"start":1202,"end":1246},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\tc->contents = change_read_contents(fd, off);"}],"del_contents":[{"Del":"\tcontents = change_read_contents(fd, &off);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":1052,"ins":{"up_context":[{"change":8,"pos":1260}],"down_context":[{"change":8,"pos":1312}],"flag":"BLOCK","start":7591,"end":7667,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1260},"to":{"change":8,"start":1260,"end":1312},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t\tdump_buf(\"contents\", c->contents, off->contents_len);"},{"Add":"out:"},{"Add":"\treturn err;"},{"Add":"}"}],"del_contents":[{"Del":"\t\tdump_buf(\"contents\", contents, off.contents_len);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":1057,"ins":{"up_context":[{"change":8,"pos":1313}],"down_context":[{"change":8,"pos":1674}],"flag":"BLOCK","start":7668,"end":7890,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1313},"to":{"change":8,"start":1856,"end":1890},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"/**"},{"Add":" * Same as loadchange() but takes a \"struct hash\" as input instead of a string"},{"Add":" */"},{"Add":"static int"},{"Add":"loadchangeh("},{"Add":"\tstruct change *c, struct hash *h, const char *repodir,"},{"Add":"\tstruct hash *hash, int verbose"},{"Add":")"},{"Add":"{"},{"Add":"\tchar hashstr[54];"}],"del_contents":[{"Del":"\tprint_change(&hashed, contents);\n"}]}},{"Replacement":{"inode":{"change":8,"pos":1047},"path":"change.c","line":1068,"ins":{"up_context":[{"change":8,"pos":1675}],"down_context":[{"change":8,"pos":2983}],"flag":"BLOCK","start":7891,"end":9270,"inode":{"change":8,"pos":1047}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":184},"to":{"change":8,"start":239,"end":256},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":904},"to":{"change":8,"start":239,"end":256},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":239},"to":{"change":8,"start":239,"end":256},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2966},"to":{"change":8,"start":2966,"end":2983},"introduced_by":8}],"inode":{"change":8,"pos":1047}},"ins_contents":[{"Add":"\t/* FIXME consider that it might not only be blake3 bytes */"},{"Add":"\tbase32_hashencode(hashstr, hash->bytes);"},{"Add":""},{"Add":"\treturn loadchange(c, h, repodir, hashstr, verbose);"},{"Add":"}"},{"Add":""},{"Add":"/**"},{"Add":" * Takes an input hash, and tries to find a change file to open and read out."},{"Add":" */"},{"Add":"int"},{"Add":"change(const char *hash, int verbose, const char *repodir)"},{"Add":"{"},{"Add":"\tint err;"},{"Add":"\tstruct changestore changestore = { 0 };"},{"Add":"\tstruct changeentry *ch;"},{"Add":"\tsize_t i, x;"},{"Add":""},{"Add":"\tchangestoreinit(&changestore, 32);"},{"Add":"\tch = &changestore.entries[0];"},{"Add":""},{"Add":"\terr = loadchange(&ch->change, &ch->hash, repodir, hash, verbose);"},{"Add":"\tif (err)"},{"Add":"\t\treturn err;"},{"Add":"\tx = 1;"},{"Add":"\tchangestore.len = 1;"},{"Add":""},{"Add":"\tchangestore.entries[0].num = 1;"},{"Add":""},{"Add":"\tfor (i = 0; i < ch->change.hashed.dependencies.len; i++) {"},{"Add":"\t\terr = loadchangeh("},{"Add":"\t\t\t&changestore.entries[x].change,"},{"Add":"\t\t\t&changestore.entries[x].hash, repodir,"},{"Add":"\t\t\t&ch->change.hashed.dependencies.entries[i], verbose"},{"Add":"\t\t);"},{"Add":"\t\tif (err)"},{"Add":"\t\t\tgoto changeout;"},{"Add":"\t\tchangestore.len++;"},{"Add":"\t\tchangestore.entries[x].num = ++x;"},{"Add":"\t}"},{"Add":"\tfor (i = 0; i < ch->change.hashed.extraknown.len; i++) {"},{"Add":"\t\terr = loadchangeh("},{"Add":"\t\t\t&changestore.entries[x].change,"},{"Add":"\t\t\t&changestore.entries[x].hash, repodir,"},{"Add":"\t\t\t&ch->change.hashed.extraknown.entries[i], verbose"},{"Add":"\t\t);"},{"Add":"\t\tif (err)"},{"Add":"\t\t\tgoto changeout;"},{"Add":"\t\tchangestore.len++;"},{"Add":"\t\tchangestore.entries[x].num = ++x;"},{"Add":"\t}"},{"Add":""},{"Add":"\tprintf(\"x = %lu\\n\", x);"},{"Add":""},{"Add":"\tprint_change(&changestore, &ch->change.hashed, ch->change.contents);"},{"Add":""},{"Add":"changeout:"},{"Add":"\tchangestorefree(&changestore);"}],"del_contents":[{"Del":"\tfree(contents);\n"},{"Del":"out:\n\tclose(fd);\n"}]}}],"owner":"laumann","repo":"ani","token":"UcgN7DYpRxdieGDO8uyeOt24RN1xFkvyGZDm/SxcAwg=","login":null}

…

Dependencies

Change contents