{"header":{"message":"Return parse errors in the text format when a hunk description is parsed, but the hunk fails to parse","description":null,"timestamp":"2023-12-17T14:54:29.727561604Z","authors":[{}]},"hash":"ALKSQF2FA5VUUUU3IMCDOWRB5PL4AXINZUA5I27SGNKQPD6Z7J3QC","authors":[{"login":"pmeunier","key":"AmpY6gpyUtVCgna89khErZX2VaKzQzx7cUu2tvYtp78F"}],"deps":{"hashes":[["ALKSQF2FA5VUUUU3IMCDOWRB5PL4AXINZUA5I27SGNKQPD6Z7J3QC","Return parse errors in the text format when a hunk description is parsed, but the hunk fails to parse"],["AA",null],["AF5AKUTO7AUAWFO5JS4W5BC5IG2F4EB4MGKYC5Q2CWJCVB65ZRYQC","Cleanup after the text changes refactoring"],["NWIZ65KEIZ7XPPAYBS3B56X7UQHPMPNPUXLB26NQKBMCUV4WN5EQC","Adjusting the parsing of new directories to the recent change in parsing binary changes from text patches"],["L5I5B4PVH7CVP2Y5LRNCM4IPOMVSKA553RTJG7MCM7PS2JQJGAEAC","Fixing another parsing issue preventing delete edit hunks to be recorded"],["NBM34JQZ3VLJO4B64WYAXNZVHXPNY2HY57LCWOZNX3UDG7PB2GBAC","Correct parsing of undelete hunks"],["YNDPMU3V76TWY4ASOAVRKDDPPXTDOCWPMWRPK3KCN7YMFQGU6DBQC","Fixing #792"],["BU7OHMPWYR4P6WKGBEKH5RPY55AQYFCXH6EAK2JOABVTJLQN3YNQC","Fixing the \"repeated records\" bug"],["FGIVSUFHH7DN65DYQHDGGDDCHHIB5Z7KKQWI4I3WMERE3BY6IMRQC","Fixing conflicts with the new patch parsing code, and introducing AddRoot"],["FMVDQHHCAL7FZEHK5C2ZCDSRHW6CAZP777PUF7FL2BY4WOXDIYVQC","Parsing binary file deletions in the change text format"],["HW7DZ2B42HNF35ZIJAVB4RMQS6CTKUWX5DBBBVF6P4ZQKHGUCTCQC","Fixing the change parser"],["MQ7TZOT6IEHNNSO6D333K4V6TO23D6CL7NKPZGTMNDBJR5QTUIFAC","Edits can delete lines too"],["OOJNAY34KSQSSIGYA7DLBIGSM6TGWZ66MVU42W3MCCIZ7ZGNS3YQC","allow LF or CRLF when parsing change headers"],["7ABOS34CMXRI34JDU5QZERX647PVV7HAFXKH7R4JYLB32DQAOI2AC","Debug statements and formatting"],["YQMLICLW2FABJBX5AQGPZIHICYLECR53TLPEBGUEH23YNKIMKC7AC","Fix the hunk_roundtrip test, simplify code, improve test coverage, fix some edge cases."],["HODZ2KUFCFSNV75KD7PP6CYLAD4XPY62DWVCAOKMOJTM65MHJSVQC","Solving a conflict"],["UGUWKK3IRZQJFGHOUMW2BWN42PZUS7TZL7X442XXDGQUB3FWW3NQC","Fixing conflicts"],["FVN4TICG4UKBMKUHCZ2KOLQYPEJZGBEN3KLDP6LOMD2MGQERT5HAC","Refusing to parse patches to binary files converted to text format, as there is no way to make sense of them"],["4ODDR4JLI3OJSKCIOJZNTWEQC2KRW2VV4I6S4RYMOCRKWUM52DPAC","Fixing a crash (asserting that the contents of an edit is non-empty)"],["5FI6SBEZ6RERERUAIWQJVAY66BEZ7YQOYOUNK2DPOLRGS2X326RAC","Re-implement change printing and parsing"]],"deps":["AF5AKUTO7AUAWFO5JS4W5BC5IG2F4EB4MGKYC5Q2CWJCVB65ZRYQC","NWIZ65KEIZ7XPPAYBS3B56X7UQHPMPNPUXLB26NQKBMCUV4WN5EQC","L5I5B4PVH7CVP2Y5LRNCM4IPOMVSKA553RTJG7MCM7PS2JQJGAEAC","NBM34JQZ3VLJO4B64WYAXNZVHXPNY2HY57LCWOZNX3UDG7PB2GBAC","YNDPMU3V76TWY4ASOAVRKDDPPXTDOCWPMWRPK3KCN7YMFQGU6DBQC","BU7OHMPWYR4P6WKGBEKH5RPY55AQYFCXH6EAK2JOABVTJLQN3YNQC"],"known":["5FI6SBEZ6RERERUAIWQJVAY66BEZ7YQOYOUNK2DPOLRGS2X326RAC","FGIVSUFHH7DN65DYQHDGGDDCHHIB5Z7KKQWI4I3WMERE3BY6IMRQC","MQ7TZOT6IEHNNSO6D333K4V6TO23D6CL7NKPZGTMNDBJR5QTUIFAC","7ABOS34CMXRI34JDU5QZERX647PVV7HAFXKH7R4JYLB32DQAOI2AC","HW7DZ2B42HNF35ZIJAVB4RMQS6CTKUWX5DBBBVF6P4ZQKHGUCTCQC","FMVDQHHCAL7FZEHK5C2ZCDSRHW6CAZP777PUF7FL2BY4WOXDIYVQC","YQMLICLW2FABJBX5AQGPZIHICYLECR53TLPEBGUEH23YNKIMKC7AC","UGUWKK3IRZQJFGHOUMW2BWN42PZUS7TZL7X442XXDGQUB3FWW3NQC","OOJNAY34KSQSSIGYA7DLBIGSM6TGWZ66MVU42W3MCCIZ7ZGNS3YQC","HODZ2KUFCFSNV75KD7PP6CYLAD4XPY62DWVCAOKMOJTM65MHJSVQC","FVN4TICG4UKBMKUHCZ2KOLQYPEJZGBEN3KLDP6LOMD2MGQERT5HAC","4ODDR4JLI3OJSKCIOJZNTWEQC2KRW2VV4I6S4RYMOCRKWUM52DPAC"]},"hunks":[{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":17,"ins":{"up_context":[{"change":8,"pos":65134}],"down_context":[{"change":8,"pos":65355}],"flag":"BLOCK","start":0,"end":301,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":65134},"to":{"change":8,"start":65134,"end":65308},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":65308},"to":{"change":8,"start":0,"end":51},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let parse = |i, path| -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, name) = preceded(space0, parse_string)(i)?;"},{"Add":" let (i, perms) = preceded(space0, parse_perms)(i)?;"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, _) = tuple((space0, line_ending))(i)?;"}],"del_contents":[{"Del":" let (i, name) = preceded(space0, parse_string)(i)?;\n let (i, perms) = preceded(space0, parse_perms)(i)?;\n let (i, pos) = preceded(space0, parse_printable_pos)(i)?;\n"},{"Del":" let (i, _) = tuple((space0, line_ending))(i)?;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":23,"ins":{"up_context":[{"change":8,"pos":65356}],"down_context":[{"change":8,"pos":65392}],"flag":"BLOCK","start":302,"end":342,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":65356},"to":{"change":8,"start":65356,"end":65392},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let (i, del) = parse_edges(i)?;"}],"del_contents":[{"Del":" let (i, del) = parse_edges(i)?;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":25,"ins":{"up_context":[{"change":8,"pos":65393}],"down_context":[{"change":8,"pos":65786}],"flag":"BLOCK","start":343,"end":922,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":65393},"to":{"change":8,"start":65393,"end":65559},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":65559},"to":{"change":8,"start":52,"end":86},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":86},"to":{"change":8,"start":65589,"end":65786},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":65589},"to":{"change":8,"start":65589,"end":65786},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let (i, up_context) = preceded(pair(space0, tag(\"up\")), parse_context)(i)?;"},{"Add":" let (i, down_context) = preceded(pair(space0, tag(\", down\")), parse_context)(i)?;"},{"Add":" let (i, _) = line_ending(i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" FileMoveV {"},{"Add":" path,"},{"Add":" name,"},{"Add":" perms,"},{"Add":" pos,"},{"Add":" up_context,"},{"Add":" down_context,"},{"Add":" del,"},{"Add":" },"},{"Add":" ))"},{"Add":" };"},{"Add":" parse(i, path)"},{"Add":" .map_err(|_| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Verify)))"}],"del_contents":[{"Del":" let (i, up_context) = preceded(pair(space0, tag(\"up\")), parse_context)(i)?;\n let (i, down_context) = preceded(pair(space0, tag(\", down\")), parse_context)(i)?;\n"},{"Del":" let (i, _) = line_ending(i)?;\n"},{"Del":" Ok((\n i,\n FileMoveV {\n path,\n name,\n perms,\n pos,\n up_context,\n down_context,\n del,\n },\n ))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":47,"ins":{"up_context":[{"change":8,"pos":65948}],"down_context":[{"change":8,"pos":66057}],"flag":"BLOCK","start":923,"end":1104,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":65948},"to":{"change":8,"start":65948,"end":66010},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":66010},"to":{"change":8,"start":87,"end":138},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let parse = |i, path| -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, _) = tuple((space0, line_ending))(i)?;"}],"del_contents":[{"Del":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;\n"},{"Del":" let (i, _) = tuple((space0, line_ending))(i)?;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":51,"ins":{"up_context":[{"change":8,"pos":66058}],"down_context":[{"change":8,"pos":66257}],"flag":"BLOCK","start":1105,"end":1470,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":66058},"to":{"change":8,"start":66058,"end":66257},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let (i, add) = parse_edges(i)?;"},{"Add":" let (i, del) = parse_edges(i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" FileMoveE {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" add,"},{"Add":" del,"},{"Add":" },"},{"Add":" ))"},{"Add":" };"},{"Add":" parse(i, path)"},{"Add":" .map_err(|_| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Verify)))"}],"del_contents":[{"Del":" let (i, add) = parse_edges(i)?;\n let (i, del) = parse_edges(i)?;\n Ok((\n i,\n FileMoveE {\n path,\n pos,\n add,\n del,\n },\n ))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":72,"ins":{"up_context":[{"change":8,"pos":66447}],"down_context":[{"change":7,"pos":214}],"flag":"BLOCK","start":1471,"end":2206,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":66447},"to":{"change":8,"start":66447,"end":66571},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":66571},"to":{"change":8,"start":139,"end":190},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":190},"to":{"change":8,"start":66618,"end":66660},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":66618},"to":{"change":8,"start":66618,"end":66660},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":66660},"to":{"change":8,"start":0,"end":85},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":85},"to":{"change":8,"start":0,"end":48},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":115},"to":{"change":8,"start":0,"end":48},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":48},"to":{"change":7,"start":0,"end":214},"introduced_by":7}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let parse = |i, path| -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, line_ending))(i)?;"},{"Add":" let (i, del_edges) = parse_edges(i)?;"},{"Add":" let (i, content_edges) = map(opt(parse_edges), |o| o.unwrap_or(Vec::new()))(i)?;"},{"Add":" let (i, contents) = if encoding.is_none() {"},{"Add":" debug!(\"encoding none\");"},{"Add":" // If the encoding is binary, we may have a base64 version of"},{"Add":" // the file."},{"Add":" if let Ok((i, c)) = parse_contents('-', encoding.clone(), i) {"},{"Add":" (i, c)"},{"Add":" } else {"},{"Add":" (i, Vec::new())"},{"Add":" }"}],"del_contents":[{"Del":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;\n let (i, encoding) = preceded(space0, parse_encoding)(i)?;\n"},{"Del":" let (i, _) = tuple((space0, line_ending))(i)?;\n"},{"Del":" let (i, del_edges) = parse_edges(i)?;\n"},{"Del":" let (i, content_edges) = map(opt(parse_edges), |o| o.unwrap_or(Vec::new()))(i)?;\n"},{"Del":" let (i, contents) = if encoding.is_none() {\n"},{"Del":" debug!(\"encoding none\");\n // If the encoding is binary, we may have a base64 version of\n // the file.\n if let Ok((i, c)) = parse_contents('-', encoding.clone(), i) {\n (i, c)\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":88,"ins":{"up_context":[{"change":7,"pos":231}],"down_context":[{"change":8,"pos":135}],"flag":"BLOCK","start":2207,"end":2501,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":231},"to":{"change":7,"start":231,"end":269},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":269},"to":{"change":8,"start":72,"end":135},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":72},"to":{"change":8,"start":72,"end":135},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" parse_contents('-', encoding.clone(), i)?"},{"Add":" };"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" FileDel {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" del_edges,"},{"Add":" content_edges,"},{"Add":" contents,"},{"Add":" },"},{"Add":" ))"}],"del_contents":[{"Del":" (i, Vec::new())\n }\n"},{"Del":" } else {\n parse_contents('-', encoding.clone(), i)?\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":102,"ins":{"up_context":[{"change":8,"pos":142}],"down_context":[{"change":8,"pos":66958}],"flag":"BLOCK","start":2502,"end":2617,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":142},"to":{"change":8,"start":86,"end":86},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":86},"to":{"change":8,"start":66773,"end":66958},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":142},"to":{"change":8,"start":66773,"end":66958},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":66773},"to":{"change":8,"start":66773,"end":66958},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" parse(i, path)"},{"Add":" .map_err(|_| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Verify)))"}],"del_contents":[{"Del":""},{"Del":" Ok((\n i,\n FileDel {\n path,\n pos,\n encoding,\n del_edges,\n content_edges,\n contents,\n },\n ))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":111,"ins":{"up_context":[{"change":8,"pos":67153}],"down_context":[{"change":5,"pos":182}],"flag":"BLOCK","start":2618,"end":3448,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":67153},"to":{"change":8,"start":67153,"end":67277},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":67277},"to":{"change":8,"start":191,"end":242},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":242},"to":{"change":8,"start":67324,"end":67368},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":67324},"to":{"change":8,"start":67324,"end":67368},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":67368},"to":{"change":8,"start":970,"end":1055},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1055},"to":{"change":5,"start":0,"end":182},"introduced_by":5}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let parse = |i, path| -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, line_ending))(i)?;"},{"Add":" let (i, undel_edges) = parse_edges(i)?;"},{"Add":" let (i, content_edges) = map(opt(parse_edges), |o| o.unwrap_or(Vec::new()))(i)?;"},{"Add":" let (i, contents) = if let Ok(x) = parse_contents('+', encoding.clone(), i) {"},{"Add":" x"},{"Add":" } else {"},{"Add":" // Contents is optional for FileUndel hunks."},{"Add":" (i, Vec::new())"},{"Add":" };"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" FileUndel {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" undel_edges,"},{"Add":" content_edges,"},{"Add":" contents,"},{"Add":" },"},{"Add":" ))"}],"del_contents":[{"Del":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;\n let (i, encoding) = preceded(space0, parse_encoding)(i)?;\n"},{"Del":" let (i, _) = tuple((space0, line_ending))(i)?;\n"},{"Del":" let (i, undel_edges) = parse_edges(i)?;\n"},{"Del":" let (i, content_edges) = map(opt(parse_edges), |o| o.unwrap_or(Vec::new()))(i)?;\n"},{"Del":" let (i, contents) = if let Ok(x) = parse_contents('+', encoding.clone(), i) {\n x\n } else {\n // Contents is optional for FileUndel hunks.\n (i, Vec::new())\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":135,"ins":{"up_context":[{"change":5,"pos":189}],"down_context":[{"change":8,"pos":67670}],"flag":"BLOCK","start":3449,"end":3564,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":189},"to":{"change":8,"start":67481,"end":67670},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":67481},"to":{"change":8,"start":67481,"end":67670},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" parse(i, path)"},{"Add":" .map_err(|_| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Verify)))"}],"del_contents":[{"Del":" Ok((\n i,\n FileUndel {\n path,\n pos,\n encoding,\n undel_edges,\n content_edges,\n contents,\n },\n ))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":144,"ins":{"up_context":[{"change":8,"pos":67865}],"down_context":[{"change":8,"pos":68131}],"flag":"BLOCK","start":3565,"end":3911,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":67865},"to":{"change":8,"start":67865,"end":68071},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":68071},"to":{"change":8,"start":243,"end":307},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let parse = |i, name| -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, parent) = preceded(delimited(space1, tag(\"in\"), space1), parse_string)(i)?;"},{"Add":" let (i, perms) = preceded(space0, parse_perms)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, line_ending, multispace0))(i)?;"}],"del_contents":[{"Del":" let (i, parent) = preceded(delimited(space1, tag(\"in\"), space1), parse_string)(i)?;\n let (i, perms) = preceded(space0, parse_perms)(i)?;\n let (i, encoding) = preceded(space0, parse_encoding)(i)?;\n"},{"Del":" let (i, _) = tuple((space0, line_ending, multispace0))(i)?;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":150,"ins":{"up_context":[{"change":8,"pos":68132}],"down_context":[{"change":3,"pos":150}],"flag":"BLOCK","start":3912,"end":4532,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":68132},"to":{"change":8,"start":68132,"end":68198},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":68198},"to":{"change":8,"start":0,"end":95},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":95},"to":{"change":3,"start":0,"end":150},"introduced_by":3}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let (i, up_context) = preceded(tag(\"up\"), parse_context)(i)?;"},{"Add":" let (i, (start, end)) = delimited(space0, parse_start_end, pair(space0, line_ending))(i)?;"},{"Add":" let (i, contents) = if let PrintablePerms::IsDir = perms {"},{"Add":" (i, Vec::new())"},{"Add":" } else {"},{"Add":" parse_contents('+', encoding.clone(), i)?"},{"Add":" };"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" FileAddition {"},{"Add":" name,"},{"Add":" parent,"},{"Add":" perms,"},{"Add":" encoding,"},{"Add":" up_context,"},{"Add":" start,"},{"Add":" end,"},{"Add":" contents,"},{"Add":" },"},{"Add":" ))"}],"del_contents":[{"Del":" let (i, up_context) = preceded(tag(\"up\"), parse_context)(i)?;\n"},{"Del":" let (i, (start, end)) = delimited(space0, parse_start_end, pair(space0, line_ending))(i)?;\n"},{"Del":" let (i, contents) = if let PrintablePerms::IsDir = perms {\n (i, Vec::new())\n } else {\n parse_contents('+', encoding.clone(), i)?\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":171,"ins":{"up_context":[{"change":3,"pos":157}],"down_context":[{"change":8,"pos":68578}],"flag":"BLOCK","start":4533,"end":4648,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":157},"to":{"change":8,"start":96,"end":96},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1123},"to":{"change":8,"start":96,"end":96},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":96},"to":{"change":8,"start":68356,"end":68578},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":389},"to":{"change":8,"start":68356,"end":68578},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1123},"to":{"change":8,"start":68356,"end":68578},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":68356},"to":{"change":8,"start":68356,"end":68578},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" parse(i, name)"},{"Add":" .map_err(|_| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Verify)))"}],"del_contents":[{"Del":""},{"Del":" Ok((\n i,\n FileAddition {\n name,\n parent,\n perms,\n encoding,\n up_context,\n start,\n end,\n contents,\n },\n ))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":179,"ins":{"up_context":[{"change":8,"pos":68765}],"down_context":[{"change":6,"pos":0}],"flag":"BLOCK","start":4649,"end":5469,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":68765},"to":{"change":8,"start":68765,"end":68939},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":68939},"to":{"change":8,"start":404,"end":455},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":455},"to":{"change":8,"start":68986,"end":69024},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":68986},"to":{"change":8,"start":68986,"end":69024},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":69024},"to":{"change":8,"start":1124,"end":1318},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1318},"to":{"change":8,"start":0,"end":39},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":83},"to":{"change":8,"start":83,"end":228},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let parse = |i, path| -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, line) = preceded(char(':'), u64)(i)?;"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, line_ending))(i)?;"},{"Add":" let (i, change) = parse_atom(i)?;"},{"Add":" let (i, contents_plus) = parse_contents('+', encoding.clone(), i)?;"},{"Add":" let (i, contents_minus) = parse_contents('-', encoding.clone(), i)?;"},{"Add":" let contents = if contents_plus.is_empty() {"},{"Add":" if contents_minus.is_empty() {"},{"Add":" return Err(nom::Err::Error(nom::error::Error::new("},{"Add":" i,"},{"Add":" nom::error::ErrorKind::Verify,"},{"Add":" )));"},{"Add":" } else {"},{"Add":" contents_minus"},{"Add":" }"}],"del_contents":[{"Del":" let (i, line) = preceded(char(':'), u64)(i)?;\n let (i, pos) = preceded(space0, parse_printable_pos)(i)?;\n let (i, encoding) = preceded(space0, parse_encoding)(i)?;\n"},{"Del":" let (i, _) = tuple((space0, line_ending))(i)?;\n"},{"Del":" let (i, change) = parse_atom(i)?;\n"},{"Del":" let (i, contents_plus) = parse_contents('+', encoding.clone(), i)?;\n let (i, contents_minus) = parse_contents('-', encoding.clone(), i)?;\n let contents = if contents_plus.is_empty() {\n"},{"Del":" if contents_minus.is_empty() {\n"},{"Del":" return Err(nom::Err::Error(nom::error::Error::new(\n i,\n nom::error::ErrorKind::Verify,\n )))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":197,"ins":{"up_context":[{"change":6,"pos":17}],"down_context":[{"change":8,"pos":509}],"flag":"BLOCK","start":5470,"end":5736,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":17},"to":{"change":6,"start":17,"end":44},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":44},"to":{"change":8,"start":228,"end":238},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":228},"to":{"change":8,"start":228,"end":238},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":238},"to":{"change":8,"start":446,"end":459},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":513},"to":{"change":8,"start":446,"end":459},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1341},"to":{"change":8,"start":446,"end":459},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":446},"to":{"change":8,"start":446,"end":459},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":459},"to":{"change":8,"start":1342,"end":1364},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" contents_plus"},{"Add":" };"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" Edit {"},{"Add":" path,"},{"Add":" line: line as usize,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" contents,"},{"Add":" },"},{"Add":" ))"}],"del_contents":[{"Del":" contents_minus\n"},{"Del":" }\n"},{"Del":" } else {\n"},{"Del":" contents_plus\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":211,"ins":{"up_context":[{"change":8,"pos":516}],"down_context":[{"change":8,"pos":69276}],"flag":"BLOCK","start":5737,"end":5852,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":516},"to":{"change":8,"start":69091,"end":69276},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":69091},"to":{"change":8,"start":69091,"end":69276},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" parse(i, path)"},{"Add":" .map_err(|_| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Verify)))"}],"del_contents":[{"Del":" Ok((\n i,\n Edit {\n path,\n line: line as usize,\n pos,\n encoding,\n change,\n contents,\n },\n ))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":220,"ins":{"up_context":[{"change":8,"pos":69465}],"down_context":[{"change":8,"pos":70232}],"flag":"BLOCK","start":5853,"end":6898,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":69465},"to":{"change":8,"start":69465,"end":69639},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":69639},"to":{"change":8,"start":456,"end":562},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":562},"to":{"change":8,"start":69737,"end":70232},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":69737},"to":{"change":8,"start":69737,"end":70232},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let parse = |i, path| -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, line) = preceded(char(':'), u64)(i)?;"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, line_ending))(i)?;"},{"Add":" // TODO: allow line_endings in between these lines"},{"Add":" let (i, change) = parse_edges(i)?;"},{"Add":" let (i, replacement) = parse_new_vertex(i)?;"},{"Add":" let (i, change_contents) = parse_contents('-', encoding.clone(), i)?;"},{"Add":" let (i, replacement_contents) = parse_contents('+', encoding.clone(), i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" Replace {"},{"Add":" path,"},{"Add":" line: line as usize,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" replacement,"},{"Add":" change_contents,"},{"Add":" replacement_contents,"},{"Add":" },"},{"Add":" ))"},{"Add":" };"},{"Add":" parse(i, path)"},{"Add":" .map_err(|_| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Verify)))"}],"del_contents":[{"Del":" let (i, line) = preceded(char(':'), u64)(i)?;\n let (i, pos) = preceded(space0, parse_printable_pos)(i)?;\n let (i, encoding) = preceded(space0, parse_encoding)(i)?;\n"},{"Del":" let (i, _) = tuple((space0, line_ending))(i)?;\n // TODO: allow line_endings in between these lines\n"},{"Del":" let (i, change) = parse_edges(i)?;\n let (i, replacement) = parse_new_vertex(i)?;\n let (i, change_contents) = parse_contents('-', encoding.clone(), i)?;\n let (i, replacement_contents) = parse_contents('+', encoding.clone(), i)?;\n Ok((\n i,\n Replace {\n path,\n line: line as usize,\n pos,\n encoding,\n change,\n replacement,\n change_contents,\n replacement_contents,\n },\n ))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":253,"ins":{"up_context":[{"change":8,"pos":70440}],"down_context":[{"change":8,"pos":70875}],"flag":"BLOCK","start":6899,"end":7576,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":70440},"to":{"change":8,"start":70440,"end":70651},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":70651},"to":{"change":8,"start":563,"end":614},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":614},"to":{"change":8,"start":70698,"end":70875},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":70698},"to":{"change":8,"start":70698,"end":70875},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let parse = |i, path| -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, _) = tuple((space0, char(':'), space0))(i)?;"},{"Add":" let (i, names) = separated_list0(tuple((space0, char(','), space0)), parse_string)(i)?;"},{"Add":" let (i, _) = tuple((space0, line_ending))(i)?;"},{"Add":" let (i, edges) = parse_edges(i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" SolveNameConflict {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" names,"},{"Add":" edges,"},{"Add":" },"},{"Add":" ))"},{"Add":" };"},{"Add":" parse(i, path)"},{"Add":" .map_err(|_| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Verify)))"}],"del_contents":[{"Del":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;\n let (i, _) = tuple((space0, char(':'), space0))(i)?;\n let (i, names) = separated_list0(tuple((space0, char(','), space0)), parse_string)(i)?;\n"},{"Del":" let (i, _) = tuple((space0, line_ending))(i)?;\n"},{"Del":" let (i, edges) = parse_edges(i)?;\n Ok((\n i,\n SolveNameConflict {\n path,\n pos,\n names,\n edges,\n },\n ))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":278,"ins":{"up_context":[{"change":8,"pos":71088}],"down_context":[{"change":8,"pos":71525}],"flag":"BLOCK","start":7577,"end":8256,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71088},"to":{"change":8,"start":71088,"end":71299},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71299},"to":{"change":8,"start":615,"end":666},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":666},"to":{"change":8,"start":71346,"end":71525},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71346},"to":{"change":8,"start":71346,"end":71525},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let parse = |i, path| -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, _) = tuple((space0, char(':'), space0))(i)?;"},{"Add":" let (i, names) = separated_list0(tuple((space0, char(','), space0)), parse_string)(i)?;"},{"Add":" let (i, _) = tuple((space0, line_ending))(i)?;"},{"Add":" let (i, edges) = parse_edges(i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" UnsolveNameConflict {"},{"Add":" path,"},{"Add":" pos,"},{"Add":" names,"},{"Add":" edges,"},{"Add":" },"},{"Add":" ))"},{"Add":" };"},{"Add":" parse(i, path)"},{"Add":" .map_err(|_| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Verify)))"}],"del_contents":[{"Del":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;\n let (i, _) = tuple((space0, char(':'), space0))(i)?;\n let (i, names) = separated_list0(tuple((space0, char(','), space0)), parse_string)(i)?;\n"},{"Del":" let (i, _) = tuple((space0, line_ending))(i)?;\n"},{"Del":" let (i, edges) = parse_edges(i)?;\n Ok((\n i,\n UnsolveNameConflict {\n path,\n pos,\n names,\n edges,\n },\n ))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":303,"ins":{"up_context":[{"change":8,"pos":71736}],"down_context":[{"change":8,"pos":72267}],"flag":"BLOCK","start":8257,"end":9042,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71736},"to":{"change":8,"start":71736,"end":71910},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71910},"to":{"change":8,"start":667,"end":718},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":718},"to":{"change":8,"start":71957,"end":72267},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":71957},"to":{"change":8,"start":71957,"end":72267},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let parse = |i, path| -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, line) = preceded(char(':'), u64)(i)?;"},{"Add":" let (i, pos) = preceded(space1, parse_printable_pos)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, line_ending))(i)?;"},{"Add":" let (i, change) = parse_new_vertex(i)?;"},{"Add":" let (i, contents) = parse_contents('+', encoding.clone(), i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" SolveOrderConflict {"},{"Add":" path,"},{"Add":" line: line as usize,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" contents,"},{"Add":" },"},{"Add":" ))"},{"Add":" };"},{"Add":" parse(i, path)"},{"Add":" .map_err(|_| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Verify)))"}],"del_contents":[{"Del":" let (i, line) = preceded(char(':'), u64)(i)?;\n let (i, pos) = preceded(space1, parse_printable_pos)(i)?;\n let (i, encoding) = preceded(space0, parse_encoding)(i)?;\n"},{"Del":" let (i, _) = tuple((space0, line_ending))(i)?;\n"},{"Del":" let (i, change) = parse_new_vertex(i)?;\n let (i, contents) = parse_contents('+', encoding.clone(), i)?;\n Ok((\n i,\n SolveOrderConflict {\n path,\n line: line as usize,\n pos,\n encoding,\n change,\n contents,\n },\n ))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":331,"ins":{"up_context":[{"change":8,"pos":72483}],"down_context":[{"change":8,"pos":73011}],"flag":"BLOCK","start":9043,"end":9825,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":72483},"to":{"change":8,"start":72483,"end":72657},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":72657},"to":{"change":8,"start":719,"end":770},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":770},"to":{"change":8,"start":72704,"end":73011},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":72704},"to":{"change":8,"start":72704,"end":73011},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let parse = |i, path| -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, line) = preceded(char(':'), u64)(i)?;"},{"Add":" let (i, pos) = preceded(space1, parse_printable_pos)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, line_ending))(i)?;"},{"Add":" let (i, change) = parse_edges(i)?;"},{"Add":" let (i, contents) = parse_contents('-', encoding.clone(), i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" UnsolveOrderConflict {"},{"Add":" path,"},{"Add":" line: line as usize,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" contents,"},{"Add":" },"},{"Add":" ))"},{"Add":" };"},{"Add":" parse(i, path)"},{"Add":" .map_err(|_| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Verify)))"}],"del_contents":[{"Del":" let (i, line) = preceded(char(':'), u64)(i)?;\n let (i, pos) = preceded(space1, parse_printable_pos)(i)?;\n let (i, encoding) = preceded(space0, parse_encoding)(i)?;\n"},{"Del":" let (i, _) = tuple((space0, line_ending))(i)?;\n"},{"Del":" let (i, change) = parse_edges(i)?;\n let (i, contents) = parse_contents('-', encoding.clone(), i)?;\n Ok((\n i,\n UnsolveOrderConflict {\n path,\n line: line as usize,\n pos,\n encoding,\n change,\n contents,\n },\n ))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":359,"ins":{"up_context":[{"change":8,"pos":73219}],"down_context":[{"change":8,"pos":73743}],"flag":"BLOCK","start":9826,"end":10604,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":73219},"to":{"change":8,"start":73219,"end":73393},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":73393},"to":{"change":8,"start":771,"end":822},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":822},"to":{"change":8,"start":73440,"end":73743},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":73440},"to":{"change":8,"start":73440,"end":73743},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let parse = |i, path| -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, line) = preceded(char(':'), u64)(i)?;"},{"Add":" let (i, pos) = preceded(space0, parse_printable_pos)(i)?;"},{"Add":" let (i, encoding) = preceded(space0, parse_encoding)(i)?;"},{"Add":" let (i, _) = tuple((space0, line_ending))(i)?;"},{"Add":" let (i, change) = parse_edges(i)?;"},{"Add":" let (i, contents) = parse_contents('+', encoding.clone(), i)?;"},{"Add":" Ok(("},{"Add":" i,"},{"Add":" ResurrectZombies {"},{"Add":" path,"},{"Add":" line: line as usize,"},{"Add":" pos,"},{"Add":" encoding,"},{"Add":" change,"},{"Add":" contents,"},{"Add":" },"},{"Add":" ))"},{"Add":" };"},{"Add":" parse(i, path)"},{"Add":" .map_err(|_| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Verify)))"}],"del_contents":[{"Del":" let (i, line) = preceded(char(':'), u64)(i)?;\n let (i, pos) = preceded(space0, parse_printable_pos)(i)?;\n let (i, encoding) = preceded(space0, parse_encoding)(i)?;\n"},{"Del":" let (i, _) = tuple((space0, line_ending))(i)?;\n"},{"Del":" let (i, change) = parse_edges(i)?;\n let (i, contents) = parse_contents('+', encoding.clone(), i)?;\n Ok((\n i,\n ResurrectZombies {\n path,\n line: line as usize,\n pos,\n encoding,\n change,\n contents,\n },\n ))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":385,"ins":{"up_context":[{"change":8,"pos":6983}],"down_context":[{"change":8,"pos":7469}],"flag":"BLOCK","start":10605,"end":11262,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":6983},"to":{"change":8,"start":823,"end":887},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":887},"to":{"change":8,"start":7043,"end":7173},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":7043},"to":{"change":8,"start":7043,"end":7173},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":7173},"to":{"change":8,"start":888,"end":983},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":983},"to":{"change":8,"start":7264,"end":7380},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":7264},"to":{"change":8,"start":7264,"end":7380},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":7380},"to":{"change":2,"start":4250,"end":4296},"introduced_by":2}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let parse = |i| -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, _) = tuple((space0, line_ending, multispace0))(i)?;"},{"Add":" debug!(\"root add {:?}\", i);"},{"Add":" let (i, up_context) = preceded(tag(\"up\"), parse_context)(i)?;"},{"Add":" debug!(\"root add {:?}\", i);"},{"Add":" let (i, (start, end)) = delimited(space0, parse_start_end, pair(space0, line_ending))(i)?;"},{"Add":" debug!(\"root add {:?}\", i);"},{"Add":" assert_eq!(&up_context[..], &[PrintablePos(1, 0)]);"},{"Add":" assert_eq!(start, end);"},{"Add":" Ok((i, PrintableHunk::AddRoot { start }))"},{"Add":" };"},{"Add":" parse(i)"},{"Add":" .map_err(|_| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Verify)))"}],"del_contents":[{"Del":" let (i, _) = tuple((space0, line_ending, multispace0))(i)?;\n"},{"Del":" debug!(\"root add {:?}\", i);\n let (i, up_context) = preceded(tag(\"up\"), parse_context)(i)?;\n debug!(\"root add {:?}\", i);\n"},{"Del":" let (i, (start, end)) = delimited(space0, parse_start_end, pair(space0, line_ending))(i)?;\n"},{"Del":" debug!(\"root add {:?}\", i);\n assert_eq!(&up_context[..], &[PrintablePos(1, 0)]);\n assert_eq!(start, end);\n"},{"Del":" Ok((i, PrintableHunk::AddRoot { start }))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":402,"ins":{"up_context":[{"change":8,"pos":7609}],"down_context":[{"change":8,"pos":7731}],"flag":"BLOCK","start":11263,"end":11455,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":7609},"to":{"change":8,"start":984,"end":1035},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":1035},"to":{"change":8,"start":7656,"end":7731},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":7656},"to":{"change":8,"start":7656,"end":7731},"introduced_by":8}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" let parse = |i| -> IResult<&str, PrintableHunk> {"},{"Add":" let (i, _) = tuple((space0, line_ending))(i)?;"},{"Add":" let (i, name) = parse_edges(i)?;"},{"Add":" let (i, inode) = parse_edges(i)?;"}],"del_contents":[{"Del":" let (i, _) = tuple((space0, line_ending))(i)?;\n"},{"Del":" let (i, name) = parse_edges(i)?;\n let (i, inode) = parse_edges(i)?;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":407,"ins":{"up_context":[{"change":8,"pos":7732}],"down_context":[{"change":8,"pos":7827}],"flag":"BLOCK","start":11456,"end":11628,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":7732},"to":{"change":2,"start":4297,"end":4349},"introduced_by":2}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" Ok((i, PrintableHunk::DelRoot { inode, name }))"},{"Add":" };"},{"Add":" parse(i)"},{"Add":" .map_err(|_| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Verify)))"}],"del_contents":[{"Del":" Ok((i, PrintableHunk::DelRoot { inode, name }))\n"}]}},{"Replacement":{"inode":{"change":8,"pos":64713},"path":"libpijul/src/change/parse.rs","line":446,"ins":{"up_context":[{"change":4,"pos":161}],"down_context":[{"change":4,"pos":177}],"flag":"BLOCK","start":11629,"end":11646,"inode":{"change":8,"pos":64713}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":161},"to":{"change":4,"start":161,"end":177},"introduced_by":4}],"inode":{"change":8,"pos":64713}},"ins_contents":[{"Add":" )));"}],"del_contents":[{"Del":" )))\n"}]}}],"owner":"oknozor","repo":"pijul","token":"5F3rfmVygYe75AFrCleZH6PtL7Gui4oOr/HfiQXoq6c=","login":null}

…

Dependencies

Change contents