{"header":{"message":"change: initial work on decoding hunks","description":null,"timestamp":"2022-10-07T14:34:44.343505834Z","authors":[{}]},"hash":"JAGXXSR7DR5FG77VKBF62BW7Q3JMVHCLHF4VB2PSLIZF4RLE553QC","authors":[{"login":"laumann","key":"AFgzZkD8ARgC21gkkCvxPV5HbL7YDVzgYEhbAxQG7UQY"}],"deps":{"hashes":[["JAGXXSR7DR5FG77VKBF62BW7Q3JMVHCLHF4VB2PSLIZF4RLE553QC","change: initial work on decoding hunks"],["AA",null],["FMYCPGKDAPOUFLQOCXXKZ6TR75HT3TNCG4X3GAJDM4ARWKNWOSWAC","change: extract hash list decoding into reused function"],["LMUBFPDX3Z2OVJWYGV43V2HTNQXRTMUHRQ24ZK744GVQHRN43NTAC","build.ninja: group build targets by vendor/non-vendor"],["QYRJIOYPM7SAB3OHMALL67K44U5HPBRQ2AFNWUKATPXM6BUYRKBQC","change: separate decoding and printing of hashed struct"],["IS5A7VT6TJ6ZXKY5LNUVT4BF4OV2Y3XCII4L4VI6XAKRKL42DJSQC","change: print hashes"],["Y26WT3ZFN7KSVXOZ26B5Y2OR4M4VQYQLPMAHPC4O5VIT3ENBISXAC","change: decode message, description and timestamp"],["XTKRT6OQYN4LARQRDLI2KBSAJTOFZNT4AMBZ46CPUDZXD7IDYYWQC","format the codebase"],["ZYOEB24JLLX7AJG4K4OT3CQKWN6HWHENEN2L5QKUNFUFP5SSZMLAC","add build.ninja, adjust Makefile"],["4RYULBDDDIVSJTIOTBBSQAWMSN6ZBZEFJ6UR7P6ECEXEXTGPMUOAC","bincode: introduce a bincode_state struct"],["YG4DZB3AW3Z3LB5CFBZZ4ORJOLZFN3G4CA2YTAMSUOQX3USVNVEAC","add representation of hash, decode dependencies"],["LVX6U4EKYXM6H32X5SZS4UBIM5PW4ND4F4QQOF5EQDX3DUHBYFGAC","change: decode metadata bytes"],["PEUS54XQ5KJQYAVUYBG5MWLEHIOVPMZ3ANVC7HPQP6JUWWPRDW5AC",""],["Q7TKZCJP2Z75EICZYKCEZDHKGERSOKZGMTSU3UXETBHTF663T66AC","Add initial support for reading the offsets from a (fixed) change"],["OBKF6SIIFFHHY7YWKPPX75N23NAVUD5662DKIHXSSIDPKKXQ5ZDQC","change: decompress the hashed section too"]],"deps":["FMYCPGKDAPOUFLQOCXXKZ6TR75HT3TNCG4X3GAJDM4ARWKNWOSWAC","LMUBFPDX3Z2OVJWYGV43V2HTNQXRTMUHRQ24ZK744GVQHRN43NTAC"],"known":["Y26WT3ZFN7KSVXOZ26B5Y2OR4M4VQYQLPMAHPC4O5VIT3ENBISXAC","4RYULBDDDIVSJTIOTBBSQAWMSN6ZBZEFJ6UR7P6ECEXEXTGPMUOAC","YG4DZB3AW3Z3LB5CFBZZ4ORJOLZFN3G4CA2YTAMSUOQX3USVNVEAC","LVX6U4EKYXM6H32X5SZS4UBIM5PW4ND4F4QQOF5EQDX3DUHBYFGAC","XTKRT6OQYN4LARQRDLI2KBSAJTOFZNT4AMBZ46CPUDZXD7IDYYWQC","IS5A7VT6TJ6ZXKY5LNUVT4BF4OV2Y3XCII4L4VI6XAKRKL42DJSQC","ZYOEB24JLLX7AJG4K4OT3CQKWN6HWHENEN2L5QKUNFUFP5SSZMLAC","QYRJIOYPM7SAB3OHMALL67K44U5HPBRQ2AFNWUKATPXM6BUYRKBQC"]},"hunks":[{"FileAdd":{"meta":{"basename":"vertex.h","metadata":0},"context":[{"change":13,"pos":1}],"contents":[{"Add":"#ifndef ANI_VERTEX_H"},{"Add":"#define ANI_VERTEX_H"},{"Add":""},{"Add":"/**"},{"Add":" * Position of a byte within a change."},{"Add":" */"},{"Add":"typedef uint64_t change_position;"},{"Add":""},{"Add":"#define CHANGE_POSITION_ROOT ((change_position)0)"},{"Add":"#define CHANGE_POSITION_BOTTOM ((change_position)1)"},{"Add":""},{"Add":"/**"},{"Add":" * A byte identifier, a change together with a position"},{"Add":" *"},{"Add":" * Variants observed:"},{"Add":" * - Hash"},{"Add":" * - Option"},{"Add":" * - ChangeId"},{"Add":" */"},{"Add":"struct position {};"},{"Add":""},{"Add":"/**"},{"Add":" * A node in the repository graph, made of a change internal identifier, and a"},{"Add":" * line identifier in that change."},{"Add":" */"},{"Add":"struct vertex {"},{"Add":"\tvoid *change;"},{"Add":"\tchange_position start, end; /* line identifier */"},{"Add":"};"},{"Add":""},{"Add":"#endif"}]}},{"FileAdd":{"meta":{"basename":"hunk.h","metadata":0},"context":[{"change":13,"pos":1}],"contents":[{"Add":"#ifndef ANI_HUNK_H"},{"Add":"#define ANI_HUNK_H"},{"Add":""},{"Add":"struct local {"},{"Add":"\tchar *path;"},{"Add":"};"},{"Add":""},{"Add":"enum basehunk_type {"},{"Add":"\tFILE_MOVE,"},{"Add":"\tFILE_DEL,"},{"Add":"\tFILE_UNDEL,"},{"Add":"\tFILE_ADD,"},{"Add":"\tSOLVE_NAME_CONFLICT,"},{"Add":"\tUNSOLVE_NAME_CONFLICT,"},{"Add":"\tEDIT,"},{"Add":"\tREPLACEMENT,"},{"Add":"\tSOLVE_ORDER_CONFLICT,"},{"Add":"\tUNSOLVE_ORDER_CONFLICT,"},{"Add":"\tRESURRECT_ZOMBIES,"},{"Add":"\tADD_ROOT,"},{"Add":"\tDEL_ROOT,"},{"Add":"};"},{"Add":""},{"Add":"struct file_move {"},{"Add":"\tchar *path;"},{"Add":"};"},{"Add":""},{"Add":"struct edit {"},{"Add":"\tuint64_t atom;"},{"Add":"};"},{"Add":""},{"Add":"struct replacement {"},{"Add":"\tuint64_t atom;"},{"Add":"\tuint64_t replacement;"},{"Add":"\tstruct local local;"},{"Add":"};"},{"Add":""},{"Add":"struct basehunk {"},{"Add":"\tenum basehunk_type hunk_type;"},{"Add":"\tunion {"},{"Add":"\t\tstruct file_move file_move;"},{"Add":"\t\tstruct edit edit;"},{"Add":"\t\tstruct replacement replacement;"},{"Add":""},{"Add":"\t} hunk;"},{"Add":"};"},{"Add":""},{"Add":"const char *hunk_basehunk_type_str(enum basehunk_type);"},{"Add":""},{"Add":"#endif"}]}},{"FileAdd":{"meta":{"basename":"hunk.c","metadata":0},"context":[{"change":13,"pos":1}],"contents":[{"Add":"#include "},{"Add":"#include "},{"Add":"#include \"hunk.h\""},{"Add":""},{"Add":"const char *"},{"Add":"hunk_basehunk_type_str(enum basehunk_type hunk_type)"},{"Add":"{"},{"Add":"\tswitch (hunk_type) {"},{"Add":"\tcase FILE_MOVE:"},{"Add":"\t\treturn \"file move\";"},{"Add":"\tcase FILE_DEL:"},{"Add":"\t\treturn \"file del\";"},{"Add":"\tcase FILE_UNDEL:"},{"Add":"\t\treturn \"file undel\";"},{"Add":"\tcase FILE_ADD:"},{"Add":"\t\treturn \"file add\";"},{"Add":"\tcase SOLVE_NAME_CONFLICT:"},{"Add":"\t\treturn \"solve name conflict\";"},{"Add":"\tcase UNSOLVE_NAME_CONFLICT:"},{"Add":"\t\treturn \"unsolve name conflict\";"},{"Add":"\tcase EDIT:"},{"Add":"\t\treturn \"edit\";"},{"Add":"\tcase REPLACEMENT:"},{"Add":"\t\treturn \"replacement\";"},{"Add":"\tcase SOLVE_ORDER_CONFLICT:"},{"Add":"\t\treturn \"solve order conflict\";"},{"Add":"\tcase UNSOLVE_ORDER_CONFLICT:"},{"Add":"\t\treturn \"unsolve order conflict\";"},{"Add":"\tcase RESURRECT_ZOMBIES:"},{"Add":"\t\treturn \"resurrect zombies\";"},{"Add":"\tcase ADD_ROOT:"},{"Add":"\t\treturn \"add root\";"},{"Add":"\tcase DEL_ROOT:"},{"Add":"\t\treturn \"del root\";"},{"Add":"\tdefault:"},{"Add":"\t\tabort();"},{"Add":"\t}"},{"Add":"}"}]}},{"Edit":{"inode":{"change":14,"pos":1047},"path":"change.c","line":17,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":618}],"down_context":[{"change":15,"pos":0}],"flag":"BLOCK","start":2151,"end":2208,"inode":{"change":14,"pos":1047}}},"contents":[{"Add":""},{"Add":"#include \"atom.h\""},{"Add":"#include \"vertex.h\""},{"Add":"#include \"hunk.h\""}]}},{"Edit":{"inode":{"change":14,"pos":1047},"path":"change.c","line":182,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":583}],"down_context":[{"change":2,"pos":583}],"flag":"BLOCK","start":2209,"end":4442,"inode":{"change":14,"pos":1047}}},"contents":[{"Add":"\t\t\tbreak;"},{"Add":"\t\tdefault:"},{"Add":"\t\t\tabort();"},{"Add":"\t\t}"},{"Add":"\t}"},{"Add":"}"},{"Add":""},{"Add":"void"},{"Add":"change_decode_position(struct bincode_state *binstat)"},{"Add":"{"},{"Add":"\tuint64_t change_position; /* FIXME this should be its own type */"},{"Add":""},{"Add":"\tif (bincode_getu8(binstat)) {"},{"Add":"\t\tstruct hash hash;"},{"Add":"\t\thash.variant = (uint8_t)bincode_getu32(binstat);"},{"Add":"\t\tswitch (hash.variant) {"},{"Add":"\t\tcase HASH_NONE:"},{"Add":"\t\t\tbreak;"},{"Add":"\t\tcase HASH_BLAKE3:"},{"Add":"\t\t\tbincode_getbytes("},{"Add":"\t\t\t\tbinstat, (uint8_t *)hash.bytes, BLAKE3_BYTES"},{"Add":"\t\t\t);"},{"Add":"\t\t\tbreak;"},{"Add":"\t\tdefault:"},{"Add":"\t\t\tabort();"},{"Add":"\t\t}"},{"Add":"\t\thash_print(&hash);"},{"Add":"\t}"},{"Add":"\tchange_position = bincode_getu64(binstat);"},{"Add":"\tprintf(\"ChangePosition(%lu)\\n\", change_position);"},{"Add":"}"},{"Add":""},{"Add":"void"},{"Add":"change_decode_newedge(struct bincode_state *binstat)"},{"Add":"{"},{"Add":"\tuint8_t previous, flag;"},{"Add":""},{"Add":"\tdump_buf(\"newedge\", binstat->buf, binstat->avail);"},{"Add":"\tprevious = bincode_getu8(binstat);"},{"Add":"\tflag = bincode_getu8(binstat);"},{"Add":"\tprintf(\"previous = %u, flag = %u\\n\", previous, flag);"},{"Add":"\t/* TODO: It might be nice to be able to dump the flags? */"},{"Add":"\t/* from: Position> */"},{"Add":"\tchange_decode_position(binstat);"},{"Add":""},{"Add":"\t/* to: V(Some(HASH)[range?]) */"},{"Add":"\t/* introduced_by: Option */"},{"Add":"}"},{"Add":""},{"Add":"void"},{"Add":"change_decode_atom(struct bincode_state *binstat)"},{"Add":"{"},{"Add":"\tuint64_t edges_len;"},{"Add":"\tint i;"},{"Add":""},{"Add":"\tswitch (bincode_getu32(binstat)) {"},{"Add":"\tcase 0: /* NewVertex> */"},{"Add":"\t\t/* TODO */"},{"Add":"\t\tbreak;"},{"Add":"\tcase 1:"},{"Add":"\t\t/* A list of edges */"},{"Add":"\t\tedges_len = bincode_getu64(binstat);"},{"Add":"\t\tprintf(\"EdgeMap (%lu elements)\\n\", edges_len);"},{"Add":"\t\tfor (i = 0; i < edges_len; i++) {"},{"Add":"\t\t\tchange_decode_newedge(binstat);"},{"Add":"\t\t\tbreak; /* FIXME remove this */"},{"Add":"\t\t}"},{"Add":""},{"Add":"\t\t/* A Position> */"},{"Add":"\t\tbreak;"},{"Add":"\tdefault:"},{"Add":"\t\tabort();"},{"Add":"\t}"},{"Add":"}"},{"Add":""},{"Add":"/**"},{"Add":" * Decode the hunks in a change"},{"Add":" */"},{"Add":"void"},{"Add":"change_decode_hunks(struct bincode_state *binstat)"},{"Add":"{"},{"Add":"\tuint64_t len;"},{"Add":"\tint i;"},{"Add":""},{"Add":"\tlen = bincode_getu64(binstat);"},{"Add":"\tfor (i = 0; i < len; i++) {"},{"Add":"\t\tenum basehunk_type hunk_type = bincode_getu32(binstat);"},{"Add":"\t\tprintf(\"%d. %s\\n\", i + 1, hunk_basehunk_type_str(hunk_type));"},{"Add":""},{"Add":"\t\tswitch (hunk_type) {"},{"Add":"\t\tcase EDIT:"},{"Add":"\t\t\tprintf(\"Edit. change: Atom, local: Local, encoding: Option\\n\""},{"Add":"\t\t\t);"},{"Add":"\t\t\tchange_decode_atom(binstat); /* the change field */"},{"Add":"\t\t\t/* change_decode_local */"},{"Add":"\t\t\t/* change_decode_encoding (maybe) */"},{"Add":""},{"Add":"\t\t\tbreak;"},{"Add":"\t\tcase REPLACEMENT:"},{"Add":"\t\t\tprintf(\"Replacement. change: Atom, replacement: Atom, local: Local, encoding: Option\\n\""},{"Add":"\t\t\t);"}]}},{"Edit":{"inode":{"change":14,"pos":1047},"path":"change.c","line":285,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":604}],"down_context":[{"change":2,"pos":604}],"flag":"BLOCK","start":4443,"end":4531,"inode":{"change":14,"pos":1047}}},"contents":[{"Add":"\t\t\tfprintf(stderr, \"not yet implemented: %s\\n\","},{"Add":"\t\t\t\thunk_basehunk_type_str(hunk_type));"}]}},{"Edit":{"inode":{"change":14,"pos":1047},"path":"change.c","line":289,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":620}],"down_context":[{"change":2,"pos":620}],"flag":"BLOCK","start":4532,"end":4599,"inode":{"change":14,"pos":1047}}},"contents":[{"Add":"\t\tbreak; /* FIXME: Remove once full Hunk parsing is implemented */"}]}},{"Replacement":{"inode":{"change":14,"pos":1047},"path":"change.c","line":391,"ins":{"up_context":[{"change":4,"pos":76}],"down_context":[{"change":4,"pos":128}],"flag":"BLOCK","start":4600,"end":4675,"inode":{"change":14,"pos":1047}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":76},"to":{"change":4,"start":76,"end":128},"introduced_by":4}],"inode":{"change":14,"pos":1047}},"ins_contents":[{"Add":"\t\tuint8_t *bytes = xmalloc(len);"},{"Add":"\t\tbincode_getbytes(&binstat, bytes, len);"}],"del_contents":[{"Del":"\t\tuint8_t *bytes = bincode_getbytes(&binstat, len);\n"}]}},{"Edit":{"inode":{"change":14,"pos":1047},"path":"change.c","line":399,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":278}],"down_context":[{"change":4,"pos":278}],"flag":"BLOCK","start":4676,"end":4708,"inode":{"change":14,"pos":1047}}},"contents":[{"Add":"\tchange_decode_hunks(&binstat);"}]}},{"Edit":{"inode":{"change":4,"pos":36},"path":"build.ninja","line":24,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":114}],"down_context":[{"change":4,"pos":420}],"flag":"BLOCK","start":4709,"end":4733,"inode":{"change":4,"pos":36}}},"contents":[{"Add":"build hunk.o: cc hunk.c"}]}},{"Replacement":{"inode":{"change":4,"pos":36},"path":"build.ninja","line":35,"ins":{"up_context":[{"change":4,"pos":998}],"down_context":[{"change":3,"pos":192}],"flag":"BLOCK","start":4734,"end":4818,"inode":{"change":4,"pos":36}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":998},"to":{"change":3,"start":115,"end":192},"introduced_by":3}],"inode":{"change":4,"pos":36}},"ins_contents":[{"Add":"build ani: link ani.o init.o change.o bincode.o scaffold.o hash.o base32.o hunk.o $"}],"del_contents":[{"Del":"build ani: link ani.o init.o change.o bincode.o scaffold.o hash.o base32.o $\n"}]}},{"Replacement":{"inode":{"change":4,"pos":1676},"path":"bincode.h","line":45,"ins":{"up_context":[{"change":4,"pos":1120}],"down_context":[{"change":4,"pos":2543}],"flag":"BLOCK","start":4819,"end":4885,"inode":{"change":4,"pos":1676}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1120},"to":{"change":4,"start":304,"end":363},"introduced_by":4}],"inode":{"change":4,"pos":1676}},"ins_contents":[{"Add":"void bincode_getbytes(struct bincode_state *, uint8_t *, size_t);"}],"del_contents":[{"Del":"uint8_t *bincode_getbytes(struct bincode_state *, size_t);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":2731},"path":"bincode.c","line":82,"ins":{"up_context":[{"change":4,"pos":367}],"down_context":[{"change":4,"pos":430}],"flag":"BLOCK","start":4886,"end":4960,"inode":{"change":4,"pos":2731}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":367},"to":{"change":4,"start":367,"end":377},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":377},"to":{"change":4,"start":2713,"end":2767},"introduced_by":4}],"inode":{"change":4,"pos":2731}},"ins_contents":[{"Add":"void"},{"Add":"bincode_getbytes(struct bincode_state *s, uint8_t *dest, size_t len)"}],"del_contents":[{"Del":"uint8_t *\n"},{"Del":"bincode_getbytes(struct bincode_state *s, size_t len)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":2731},"path":"bincode.c","line":85,"ins":{"up_context":[{"change":4,"pos":432}],"down_context":[{"change":4,"pos":497}],"flag":"BLOCK","start":4961,"end":4989,"inode":{"change":4,"pos":2731}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":432},"to":{"change":4,"start":432,"end":497},"introduced_by":4}],"inode":{"change":4,"pos":2731}},"ins_contents":[{"Add":"\tmemcpy(dest, s->buf, len);"}],"del_contents":[{"Del":"\tuint8_t *ret;\n\n\tret = xmalloc(len);\n\tmemcpy(ret, s->buf, len);\n\n"}]}},{"Edit":{"inode":{"change":4,"pos":2731},"path":"bincode.c","line":88,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":531},"to":{"change":4,"start":531,"end":545},"introduced_by":4}],"inode":{"change":4,"pos":2731}}},"contents":[{"Del":"\n\treturn ret;\n"}]}},{"FileAdd":{"meta":{"basename":"atom.h","metadata":0},"context":[{"change":13,"pos":1}],"contents":[{"Add":"#ifndef ANI_ATOM_H"},{"Add":"#define ANI_ATOM_H"},{"Add":""},{"Add":"#define EDGE_FLAG_BLOCK 1"},{"Add":"#define EDGE_FLAG_PSEUDO 4"},{"Add":"#define EDGE_FLAG_FOLDER 16"},{"Add":"#define EDGE_FLAG_PARENT 32"},{"Add":"#define EDGE_FLAG_DELETED 128"},{"Add":""},{"Add":"enum atom_type {"},{"Add":"\tNEW_VERTEX,"},{"Add":"\tEDGE_MAP"},{"Add":"};"},{"Add":""},{"Add":"struct new_vertex {"},{"Add":"\tstruct hash up_context; /* FIXME Option */"},{"Add":"\tstruct hash down_context;"},{"Add":"\tuint8_t flag;\t/* EDGE_FLAG_* */"},{"Add":"\tuint64_t start; /* start, end: ChangePosition = L64 */"},{"Add":"\tuint64_t end;"},{"Add":"\t/* FIXME inode: Position> = struct { change: Option, pos: } */"},{"Add":"};"},{"Add":""},{"Add":"struct atom {"},{"Add":"\tenum atom_type atom_type;"},{"Add":"\tunion {"},{"Add":"\t\tstruct new_vertex new_vertex;"},{"Add":"\t} atom;"},{"Add":"};"},{"Add":""},{"Add":"#endif"}]}}],"owner":"laumann","repo":"ani","token":"GaU0ARDZT0QWzLI1gkiLMn4e6ErkfIcaoMTpN8/8ahg=","login":null}

…

Dependencies

Change contents