{"header":{"message":"Adding a root inode (aka supporting submodules)","description":null,"timestamp":"2021-10-22T10:04:30.109256219Z","authors":[{}]},"hash":"RMDMAYRXYBU5OQXV5HSF6LFD4NBMKRNH5EPIVW3K5HAV6D56IG6QC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["RMDMAYRXYBU5OQXV5HSF6LFD4NBMKRNH5EPIVW3K5HAV6D56IG6QC","Adding a root inode (aka supporting submodules)"],["AA",null],["GBX4AFASHNICJ25B6PAGXP3C3NJ5PPXZ76STLDVPBUVEGDJP5ZAAC","Collecting conflicts in output (broken by parallel output)"],["RUBSM5DRA4O7SGD7NO7QYFGDQ2CQL6K7SZTIQVGRWAQHGSFUBGCQC","Fixing a bug when outputting changes in text format"],["SAADQM3H4JAE2JE65Y6IHONZ57V3ZZ3IBBV72O3LRBTGWBPJWR3AC","Finer-grained detection of metadata on Windows"],["OQQ4TGEMWDB6JXZ4H4D2XQJE3PDLINTZ4YCL2O2EVG67CDSAM35AC","Printing modifications only once in pijul diff"],["V6J6DTJCGVYSL5W7NVSRP5ROIUWTMZW2MBYO7UBZFCUEJQO3ADWQC","Do not compute the entire diff if all we want is --json --untracked"],["7KNPYIDUXCBZ65NA74NL2DIFS6STJWN4XXHXLTIV5QXZSVLARJMAC","Splitting the WorkingCopy trait into a read-only record and a read/write output"],["KJOOI346EYXQIRDEGWHYILGX44AZNPHBFUDW5HYEEG5IC2ZXV6GAC","Cleanup and formatting"],["2VXTRPO4OML5A2RPI7SAEV5SJNOFIVS4TMYYG6TUUS5EXFMAPRJAC","Custom diff separators"],["HOTQHK5URWTJ4IBMSWYPZQOPHA2ZQSPQAN5MAKGUDUAC6LZRDKOQC","Fixing tests"],["ZAEUSICJC3YOWGF6NZEQCQ34PHPRSBCJEP7FIWE6VIWJGVU734HQC","File deletions were not shown with their names in the metadata during record"],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["DJYHARZ7CSRMX6ZFM6P52SM2EC57VTSHWAIMFSD7Q3EL7UYZGLXQC","Skipping old files when recording"],["IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Cleanup, formatting, and fixing the Git feature"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["MDADYULS5AWVMTJDGYCGNQTN6T7XJDRUBDTFILDY5MLF6I2PE5NAC","Fix a panic when switching between channels that have different files"],["XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","file encoding in updates"],["LLT3GY6ULCVHMO3VUSVI5H4O244Z3ULOWLTW2IGJXIA2TWIHJDSQC","When recording, do not consider deleted filenames as current"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","encoded file deletion"],["TVVW53HZGYPODAXEQ4BFZNSPBOFG6JEDVOKIYIDZMWFAMOBKOR2QC","Conflict resolution"],["CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","Renaming \"Record\" to \"Hunk\" in the changes"],["GJZWSXHQ6SYUDTVDOUBTJYU3SG567M2AXWURWKRNVP2MISZ444DQC","Do not remove files not tracked in the new channel when outputting"],["NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","track file encoding in the record, including change text for file adds"],["VNBLGT6GAN2AHKRFKTKED7WNDDRGNULY5H343ZYV3ETSDZZKGBTAC","Do not output unmodified files when resetting (fix)"],["YCEZL7VFBZNOZTSSI24D36ACJVZKXCCEOIFWIHQWK22QPB4PDTRAC","Moving to temporary paths when outputting"],["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","Do not update the mtime of unmodified files"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["3S6LU2U5TIU43WRE5RQS3IOLVJLVNCDL4W44FVK2HR3NAXZ7IDUAC","abstract out FileMetadata (de)serialistion"],["AJEH3FSPKLBYSRQQQ4UL4QA3SPT4MHIC4VEM3XDVATMFFU3R7JKAC","Properly propagate errors in `libpijul::record::record` instead of unwrap()ing"],["ADPAFSMYUBTKSK63EPCY5WQGROJQWFCWO4UFPWY3ZXD5ZNH26P2QC","Proper old metadata when recording"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["P6WE7YKL6ILKLYKMJUJLGINN7L4U7X4KUIE5ELTK2LEENX3DUBCQC","Unrecord did not check whether a file already existed before adding it back"],["3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","More convenient interface for channels"],["BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","Deleting conflict resolution vertices when the sides are deleted"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["NUAOEIXMKZO5KQWQ3TLQWO3RIXBPJU4QOPW7MGCV3ITDAUHFEK5QC","Adding inode and byte to Local"],["PKIHBUGT3N4BUZ2QP2UWJI4ICOIF6EZVXBFKG753SOTYBAKSVTFAC","Setting the oldest modification time to EPOCH if no file has changed"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["246V5TYIUL7CFN7G5Y7A35EEM6IJPN532ROEYVSM7Q4HCQSWPDBQC","decode existing files"],["27PYHR6LO4M4RMSMLVMUKSYNQ72V6RRMRXLYQI3JA3LBHJO747YAC","Making the get_latest_touch function (useful to make archives) public in libpijul"],["XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","Reset only files that have been modified"],["2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","Making libpijul deterministic (and getting rid of `rand`)"],["3I4PAA2AW3VUTA3HLS2G4TQMWB7BO25DMCC7VWJHG6WMHCBHR6JAC","Making a few types and methods public"],["VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","Versions and formatting"],["C4MJ7D7QCOFGIHQSDV3UC76DTSE5M7JSLGN5MROMSVKFVQRFSP5QC","Verbose printing of conflicts to stderr"],["LERRJNFC6324RC6ADDTEPCNR3MYH6GKIQUDD433ZAIEECFF5CADAC","Fixing the text change version of \"FileMove\" to include the former path"],["5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","Cleanup (debugging a crash related to trees/inodes)"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","Canonicalize all paths"],["G6S6PWZEFJK7ARWBIFKDU6VYC5DCJ2YFJMWZOLLWWKU52R2QPXZAC","Do not touch the channel if this is a partial record"],["LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","Fixing output (including its uses in reset and pull)"],["RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","Formatting"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","Cleaunp and proofreading of libpijul::record"]],"deps":["GBX4AFASHNICJ25B6PAGXP3C3NJ5PPXZ76STLDVPBUVEGDJP5ZAAC","RUBSM5DRA4O7SGD7NO7QYFGDQ2CQL6K7SZTIQVGRWAQHGSFUBGCQC","SAADQM3H4JAE2JE65Y6IHONZ57V3ZZ3IBBV72O3LRBTGWBPJWR3AC","OQQ4TGEMWDB6JXZ4H4D2XQJE3PDLINTZ4YCL2O2EVG67CDSAM35AC","V6J6DTJCGVYSL5W7NVSRP5ROIUWTMZW2MBYO7UBZFCUEJQO3ADWQC","7KNPYIDUXCBZ65NA74NL2DIFS6STJWN4XXHXLTIV5QXZSVLARJMAC","KJOOI346EYXQIRDEGWHYILGX44AZNPHBFUDW5HYEEG5IC2ZXV6GAC","2VXTRPO4OML5A2RPI7SAEV5SJNOFIVS4TMYYG6TUUS5EXFMAPRJAC","HOTQHK5URWTJ4IBMSWYPZQOPHA2ZQSPQAN5MAKGUDUAC6LZRDKOQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","ZAEUSICJC3YOWGF6NZEQCQ34PHPRSBCJEP7FIWE6VIWJGVU734HQC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","DJYHARZ7CSRMX6ZFM6P52SM2EC57VTSHWAIMFSD7Q3EL7UYZGLXQC","XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","VNBLGT6GAN2AHKRFKTKED7WNDDRGNULY5H343ZYV3ETSDZZKGBTAC","G6S6PWZEFJK7ARWBIFKDU6VYC5DCJ2YFJMWZOLLWWKU52R2QPXZAC","27PYHR6LO4M4RMSMLVMUKSYNQ72V6RRMRXLYQI3JA3LBHJO747YAC","3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","PKIHBUGT3N4BUZ2QP2UWJI4ICOIF6EZVXBFKG753SOTYBAKSVTFAC","LLT3GY6ULCVHMO3VUSVI5H4O244Z3ULOWLTW2IGJXIA2TWIHJDSQC","LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","MDADYULS5AWVMTJDGYCGNQTN6T7XJDRUBDTFILDY5MLF6I2PE5NAC","ADPAFSMYUBTKSK63EPCY5WQGROJQWFCWO4UFPWY3ZXD5ZNH26P2QC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","YCEZL7VFBZNOZTSSI24D36ACJVZKXCCEOIFWIHQWK22QPB4PDTRAC","P6WE7YKL6ILKLYKMJUJLGINN7L4U7X4KUIE5ELTK2LEENX3DUBCQC","LERRJNFC6324RC6ADDTEPCNR3MYH6GKIQUDD433ZAIEECFF5CADAC","2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","246V5TYIUL7CFN7G5Y7A35EEM6IJPN532ROEYVSM7Q4HCQSWPDBQC","NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","3S6LU2U5TIU43WRE5RQS3IOLVJLVNCDL4W44FVK2HR3NAXZ7IDUAC","ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","TVVW53HZGYPODAXEQ4BFZNSPBOFG6JEDVOKIYIDZMWFAMOBKOR2QC","RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","AJEH3FSPKLBYSRQQQ4UL4QA3SPT4MHIC4VEM3XDVATMFFU3R7JKAC","FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","GJZWSXHQ6SYUDTVDOUBTJYU3SG567M2AXWURWKRNVP2MISZ444DQC","C4MJ7D7QCOFGIHQSDV3UC76DTSE5M7JSLGN5MROMSVKFVQRFSP5QC","NUAOEIXMKZO5KQWQ3TLQWO3RIXBPJU4QOPW7MGCV3ITDAUHFEK5QC","3I4PAA2AW3VUTA3HLS2G4TQMWB7BO25DMCC7VWJHG6WMHCBHR6JAC"]},"hunks":[{"Edit":{"inode":{"change":11,"pos":173551},"path":"\"pijul/src/commands/diff.rs\"","line":152,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":1413}],"down_context":[{"change":6,"pos":1413}],"flag":"BLOCK","start":0,"end":122,"inode":{"change":11,"pos":173551}}},"contents":[{"Add":" Hunk::AddRoot { .. } => \"root\","},{"Add":" Hunk::DelRoot { .. } => \"unroot\","}]}},{"Edit":{"inode":{"change":11,"pos":173551},"path":"\"pijul/src/commands/diff.rs\"","line":202,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":985}],"down_context":[{"change":5,"pos":985}],"flag":"BLOCK","start":123,"end":195,"inode":{"change":11,"pos":173551}}},"contents":[{"Add":" Hunk::AddRoot { .. } | Hunk::DelRoot { .. } => true"}]}},{"Edit":{"inode":{"change":11,"pos":225940},"path":"\"libpijul/src/unrecord/working_copy.rs\"","line":62,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":227747}],"down_context":[{"change":11,"pos":227747}],"flag":"BLOCK","start":196,"end":256,"inode":{"change":11,"pos":225940}}},"contents":[{"Add":" debug!(\"source = {:?}, dest = {:?}\", source, dest);"}]}},{"Replacement":{"inode":{"change":11,"pos":225940},"path":"\"libpijul/src/unrecord/working_copy.rs\"","line":93,"ins":{"up_context":[{"change":11,"pos":228745}],"down_context":[{"change":11,"pos":228839}],"flag":"BLOCK","start":257,"end":567,"inode":{"change":11,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":228745},"to":{"change":11,"start":228745,"end":228839},"introduced_by":11}],"inode":{"change":11,"pos":225940}},"ins_contents":[{"Add":" if grandparent.is_root() || grandparent.start == grandparent.end {"},{"Add":" return_value = restore_inode(txn, changes, source, dest, Inode::ROOT, salt)?;"},{"Add":" } else {"},{"Add":" stack.push((source, dest));"},{"Add":" stack.push((grandparent, source_parent));"},{"Add":" }"}],"del_contents":[{"Del":" stack.push((source, dest));\n stack.push((grandparent, source_parent));\n"}]}},{"Replacement":{"inode":{"change":11,"pos":454125},"path":"\"libpijul/src/tests/add_file.rs\"","line":56,"ins":{"up_context":[{"change":11,"pos":30752}],"down_context":[{"change":11,"pos":456129}],"flag":"BLOCK","start":568,"end":624,"inode":{"change":11,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":30752},"to":{"change":11,"start":30752,"end":30810},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":30810},"to":{"change":10,"start":1394,"end":1501},"introduced_by":10}],"inode":{"change":11,"pos":454125}},"ins_contents":[{"Add":" let (_, _, name) = it.next().unwrap().unwrap();"}],"del_contents":[{"Del":" let (key, _, name) = it.next().unwrap().unwrap();\n"},{"Del":" let key_ = get_inode_vertex(&txn, &channel.graph, Position::ROOT)?;\n assert_eq!(key, key_);\n"}]}},{"Replacement":{"inode":{"change":11,"pos":454125},"path":"\"libpijul/src/tests/add_file.rs\"","line":846,"ins":{"up_context":[{"change":10,"pos":2518}],"down_context":[{"change":10,"pos":2566}],"flag":"BLOCK","start":625,"end":737,"inode":{"change":11,"pos":454125}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":10,"pos":2518},"to":{"change":10,"start":2518,"end":2566},"introduced_by":10}],"inode":{"change":11,"pos":454125}},"ins_contents":[{"Add":" let env2 = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":" let txn = env2.arc_txn_begin().unwrap();"}],"del_contents":[{"Del":" let txn = env.arc_txn_begin().unwrap();\n"}]}},{"Edit":{"inode":{"change":11,"pos":454125},"path":"\"libpijul/src/tests/add_file.rs\"","line":860,"atom":{"NewVertex":{"up_context":[{"change":10,"pos":3132}],"down_context":[{"change":10,"pos":3132}],"flag":"BLOCK","start":738,"end":923,"inode":{"change":11,"pos":454125}}},"contents":[{"Add":" {"},{"Add":" let txn_ = txn.write();"},{"Add":" let mut f = std::fs::File::create(\"add_file2.dot\")?;"},{"Add":" crate::pristine::debug(&*txn_, &txn_.graph(&*channel.read()), &mut f)?;"},{"Add":" }"}]}},{"Edit":{"inode":{"change":11,"pos":454125},"path":"\"libpijul/src/tests/add_file.rs\"","line":866,"atom":{"NewVertex":{"up_context":[{"change":10,"pos":3133}],"down_context":[{"change":10,"pos":3133}],"flag":"BLOCK","start":924,"end":1011,"inode":{"change":11,"pos":454125}}},"contents":[{"Add":" // Check that there's a name conflict."},{"Add":" assert_eq!(repo.list_files().len(), 8);"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":73,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":41156}],"down_context":[{"change":11,"pos":489652}],"flag":"BLOCK","start":1012,"end":1062,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":" new_root: Arc>>,"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":106,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":41498}],"down_context":[{"change":11,"pos":490405}],"flag":"BLOCK","start":1063,"end":1113,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":" new_root: Arc>>,"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":118,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":41728}],"down_context":[{"change":11,"pos":490934}],"flag":"BLOCK","start":1114,"end":1164,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":" new_root: Arc::new(Mutex::new(None)),"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":147,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":42400}],"down_context":[{"change":11,"pos":42400}],"flag":"BLOCK","start":1165,"end":1210,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":" new_root: self.new_root.clone(),"}]}},{"Replacement":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":346,"ins":{"up_context":[{"change":11,"pos":46637}],"down_context":[{"change":11,"pos":492928}],"flag":"BLOCK","start":1211,"end":1248,"inode":{"change":11,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":46637},"to":{"change":11,"start":46637,"end":46638},"introduced_by":11}],"inode":{"change":11,"pos":488880}},"ins_contents":[{"Add":" info!(\"Starting to record\");"}],"del_contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":355,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":96917}],"down_context":[{"change":11,"pos":46989}],"flag":"BLOCK","start":1249,"end":1299,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":""},{"Add":" let mut root_vertices = Vec::new();"},{"Add":""}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":361,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":493385},"to":{"change":11,"start":493385,"end":493422},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":493422},"to":{"change":11,"start":47069,"end":47097},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":47127},"to":{"change":11,"start":493422,"end":493487},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":493422},"to":{"change":11,"start":493422,"end":493487},"introduced_by":11}],"inode":{"change":11,"pos":488880}}},"contents":[{"Del":" self.recorded_inodes\n"},{"Del":" .lock()\n"},{"Del":" .insert(Inode::ROOT, Position::OPTION_ROOT);\n"}]}},{"Replacement":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":365,"ins":{"up_context":[{"change":11,"pos":97005}],"down_context":[{"change":11,"pos":97041}],"flag":"BLOCK","start":1300,"end":2980,"inode":{"change":11,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":97005},"to":{"change":11,"start":47316,"end":47351},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":47316},"to":{"change":11,"start":47316,"end":47351},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":47351},"to":{"change":11,"start":493487,"end":493534},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":493487},"to":{"change":11,"start":493487,"end":493534},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":493534},"to":{"change":11,"start":47352,"end":47420},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":47420},"to":{"change":11,"start":97006,"end":97040},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":47463},"to":{"change":11,"start":0,"end":29},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":97040},"to":{"change":11,"start":0,"end":29},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":493623},"to":{"change":11,"start":0,"end":29},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":29},"to":{"change":11,"start":493623,"end":493660},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":493623},"to":{"change":11,"start":493623,"end":493660},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":493660},"to":{"change":11,"start":493660,"end":493696},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":493696},"to":{"change":11,"start":32844,"end":32864},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":32864},"to":{"change":11,"start":493715,"end":493753},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":493715},"to":{"change":11,"start":493715,"end":493753},"introduced_by":11}],"inode":{"change":11,"pos":488880}},"ins_contents":[{"Add":""},{"Add":" // Test for a \"root\" vertex below the 0 one."},{"Add":" let f0 = EdgeFlags::FOLDER | EdgeFlags::BLOCK;"},{"Add":" let f1 = f0 | EdgeFlags::PSEUDO;"},{"Add":" self.recorded_inodes"},{"Add":" .lock()"},{"Add":" .insert(Inode::ROOT, Position::ROOT.to_option());"},{"Add":" let mut has_nonempty_root = false;"},{"Add":" for e in iter_adjacent(&*txn, txn.graph(&*channel), Vertex::ROOT, f0, f1)? {"},{"Add":" let e = e?;"},{"Add":" let child = txn.find_block(txn.graph(&*channel), e.dest()).unwrap();"},{"Add":" if child.start == child.end {"},{"Add":" let grandchild ="},{"Add":" iter_adjacent(&*txn, txn.graph(&*channel), *child, f0, f1)?"},{"Add":" .next()"},{"Add":" .unwrap()?"},{"Add":" .dest();"},{"Add":" root_vertices.push(grandchild);"},{"Add":" self.delete_obsolete_children("},{"Add":" &*txn,"},{"Add":" txn.graph(&channel),"},{"Add":" working_copy,"},{"Add":" changes,"},{"Add":" &item.full_path,"},{"Add":" grandchild,"},{"Add":" )?;"},{"Add":" } else {"},{"Add":" has_nonempty_root = true"},{"Add":" }"},{"Add":" }"},{"Add":" if has_nonempty_root && !root_vertices.is_empty() {"},{"Add":" // This repository is mixed between \"zero\" roots,"},{"Add":" // and new-style-roots."},{"Add":" root_vertices.push(Position::ROOT)"},{"Add":" }"},{"Add":" Position::ROOT.to_option()"}],"del_contents":[{"Del":" debug!(\"TAKEN 2\");\n"},{"Del":" self.delete_obsolete_children(\n"},{"Del":" &*txn,\n txn.graph(&channel),\n"},{"Del":" working_copy,\n"},{"Del":" changes,\n"},{"Del":" &item.full_path,\n"},{"Del":" Position::ROOT,\n"},{"Del":" )?;\n"},{"Del":" Position::OPTION_ROOT\n"}]}},{"Replacement":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":444,"ins":{"up_context":[{"change":11,"pos":495196}],"down_context":[{"change":11,"pos":49309}],"flag":"BLOCK","start":2981,"end":4142,"inode":{"change":11,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":495196},"to":{"change":11,"start":495196,"end":495237},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":495237},"to":{"change":11,"start":49041,"end":49088},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":49088},"to":{"change":11,"start":97574,"end":97652},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":49184},"to":{"change":11,"start":11697,"end":11740},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":97652},"to":{"change":11,"start":11697,"end":11740},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":495237},"to":{"change":11,"start":11697,"end":11740},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":11740},"to":{"change":11,"start":49185,"end":49235},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":49235},"to":{"change":11,"start":97653,"end":97683},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":49274},"to":{"change":11,"start":495346,"end":495373},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":97683},"to":{"change":11,"start":495346,"end":495373},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":495346},"to":{"change":11,"start":495346,"end":495373},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":495373},"to":{"change":11,"start":49275,"end":49308},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":49308},"to":{"change":11,"start":495373,"end":495449},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":495373},"to":{"change":11,"start":495373,"end":495449},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":495449},"to":{"change":11,"start":1585,"end":1610},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1610},"to":{"change":11,"start":495449,"end":495465},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":495449},"to":{"change":11,"start":495449,"end":495465},"introduced_by":11}],"inode":{"change":11,"pos":488880}},"ins_contents":[{"Add":" if root_vertices.is_empty() {"},{"Add":" // Move on to the next step."},{"Add":" debug!(\"TAKING LOCK {}\", line!());"},{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.r.read();"},{"Add":" self.push_children::<_, _, C>("},{"Add":" &*txn,"},{"Add":" &*channel,"},{"Add":" working_copy,"},{"Add":" &mut item,"},{"Add":" &mut components,"},{"Add":" vertex,"},{"Add":" &mut stack,"},{"Add":" prefix,"},{"Add":" changes,"},{"Add":" )?;"},{"Add":" } else {"},{"Add":" for vertex in root_vertices {"},{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.r.read();"},{"Add":" self.push_children::<_, _, C>("},{"Add":" &*txn,"},{"Add":" &*channel,"},{"Add":" working_copy,"},{"Add":" &mut item,"},{"Add":" &mut components,"},{"Add":" vertex.to_option(),"},{"Add":" &mut stack,"},{"Add":" prefix,"},{"Add":" changes,"},{"Add":" )?;"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" // Move on to the next step.\n"},{"Del":" debug!(\"TAKING LOCK {}\", line!());\n"},{"Del":" let txn = txn.read();\n let channel = channel.r.read();\n"},{"Del":" self.push_children::<_, _, C>(\n"},{"Del":" &*txn,\n &*channel,\n"},{"Del":" working_copy,\n"},{"Del":" &mut item,\n"},{"Del":" &mut components,\n"},{"Del":" vertex,\n &mut stack,\n prefix,\n"},{"Del":" changes,\n"},{"Del":" )?;\n"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":547,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":51363}],"down_context":[{"change":11,"pos":51363}],"flag":"BLOCK","start":4143,"end":4305,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":" if child.start == child.end {"},{"Add":" // This is an empty name, i.e. the grandchild is a root vertex."},{"Add":" continue;"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":617,"ins":{"up_context":[{"change":11,"pos":53953}],"down_context":[{"change":11,"pos":54005}],"flag":"BLOCK","start":4306,"end":4381,"inode":{"change":11,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":53953},"to":{"change":11,"start":53953,"end":54005},"introduced_by":11}],"inode":{"change":11,"pos":488880}},"ins_contents":[{"Add":" debug!(\"push_children, vertex = {:?}, item = {:?}\", vertex, item);"}],"del_contents":[{"Del":" debug!(\"push_children, item = {:?}\", item);\n"}]}},{"Replacement":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":628,"ins":{"up_context":[{"change":11,"pos":54427}],"down_context":[{"change":11,"pos":54518}],"flag":"BLOCK","start":4382,"end":4493,"inode":{"change":11,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":54427},"to":{"change":11,"start":54427,"end":54518},"introduced_by":11}],"inode":{"change":11,"pos":488880}},"ins_contents":[{"Add":" assert!(fileid_.parent_inode >= fileid.parent_inode);"},{"Add":" if fileid_.basename.is_empty() {"}],"del_contents":[{"Del":" if fileid_.parent_inode < fileid.parent_inode || fileid_.basename.is_empty() {\n"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":648,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":55233}],"down_context":[{"change":11,"pos":55233}],"flag":"BLOCK","start":4494,"end":4568,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":" debug!(\"full_path = {:?}, meta = {:?}\", full_path, meta);"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":677,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":56093}],"down_context":[{"change":11,"pos":56093}],"flag":"BLOCK","start":4569,"end":4607,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":" debug!(\"push_children done\");"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":706,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":56806}],"down_context":[{"change":7,"pos":1845}],"flag":"BLOCK","start":4608,"end":6395,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":" fn add_root_if_needed("},{"Add":" &mut self,"},{"Add":" v_papa: Position>,"},{"Add":" ) -> Position> {"},{"Add":" let mut contents = self.contents.lock();"},{"Add":" if v_papa.change == Some(ChangeId::ROOT) {"},{"Add":" let mut new_root = self.new_root.lock();"},{"Add":" if let Some(pos) = *new_root {"},{"Add":" Position { change: None, pos }"},{"Add":" } else {"},{"Add":" contents.push(0);"},{"Add":" let pos = ChangePosition(contents.len().into());"},{"Add":" contents.push(0);"},{"Add":" let pos2 = ChangePosition(contents.len().into());"},{"Add":" contents.push(0);"},{"Add":" self.actions.push(Hunk::FileAdd {"},{"Add":" add_name: Atom::NewVertex(NewVertex {"},{"Add":" up_context: vec![v_papa],"},{"Add":" down_context: vec![],"},{"Add":" start: pos2,"},{"Add":" end: pos2,"},{"Add":" flag: EdgeFlags::FOLDER | EdgeFlags::BLOCK,"},{"Add":" inode: v_papa,"},{"Add":" }),"},{"Add":" add_inode: Atom::NewVertex(NewVertex {"},{"Add":" up_context: vec![Position {"},{"Add":" change: None,"},{"Add":" pos: pos2,"},{"Add":" }],"},{"Add":" down_context: vec![],"},{"Add":" start: pos,"},{"Add":" end: pos,"},{"Add":" flag: EdgeFlags::FOLDER | EdgeFlags::BLOCK,"},{"Add":" inode: v_papa,"},{"Add":" }),"},{"Add":" contents: None,"},{"Add":" path: \"/\".to_string(),"},{"Add":" encoding: None,"},{"Add":" });"},{"Add":" *new_root = Some(pos);"},{"Add":" Position { change: None, pos }"},{"Add":" }"},{"Add":" } else {"},{"Add":" v_papa"},{"Add":" }"},{"Add":" }"},{"Add":""}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":760,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":495974}],"down_context":[{"change":11,"pos":97960}],"flag":"BLOCK","start":6396,"end":6560,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":""},{"Add":" // If we're inserting at the root, add an extra \"root"},{"Add":" // directory\" empty vertex."},{"Add":" let item_v_papa = self.add_root_if_needed(item.v_papa);"},{"Add":""}]}},{"Replacement":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":812,"ins":{"up_context":[{"change":11,"pos":498073}],"down_context":[{"change":11,"pos":498120}],"flag":"BLOCK","start":6561,"end":6608,"inode":{"change":11,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":498073},"to":{"change":11,"start":498073,"end":498120},"introduced_by":11}],"inode":{"change":11,"pos":488880}},"ins_contents":[{"Add":" up_context: vec![item_v_papa],"}],"del_contents":[{"Del":" up_context: vec![item.v_papa],\n"}]}},{"Replacement":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":872,"ins":{"up_context":[{"change":11,"pos":499734}],"down_context":[{"change":11,"pos":499833}],"flag":"BLOCK","start":6609,"end":6724,"inode":{"change":11,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":499734},"to":{"change":11,"start":499734,"end":499833},"introduced_by":11}],"inode":{"change":11,"pos":488880}},"ins_contents":[{"Add":" \"record_existing_file {:?}: {:?} {:?} {:?}\","},{"Add":" item.full_path, item.inode, vertex, new_papa,"}],"del_contents":[{"Del":" \"record_existing_file {:?}: {:?} {:?}\",\n item.full_path, item.inode, vertex\n"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":876,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":499882},"to":{"change":11,"start":58136,"end":58181},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":58181},"to":{"change":11,"start":499919,"end":500045},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":499919},"to":{"change":11,"start":499919,"end":500045},"introduced_by":11}],"inode":{"change":11,"pos":488880}}},"contents":[{"Del":" let mut former_parents = Vec::new();\n"},{"Del":" let f0 = EdgeFlags::FOLDER | EdgeFlags::PARENT;\n let f1 = EdgeFlags::all();\n let mut is_deleted = true;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":878,"ins":{"up_context":[{"change":11,"pos":98198}],"down_context":[{"change":11,"pos":501222}],"flag":"BLOCK","start":6725,"end":6853,"inode":{"change":11,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":98198},"to":{"change":11,"start":58270,"end":58442},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":58270},"to":{"change":11,"start":58270,"end":58442},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":58442},"to":{"change":11,"start":49753,"end":49796},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1378},"to":{"change":11,"start":49753,"end":49796},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1378},"to":{"change":11,"start":33350,"end":33382},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":28511},"to":{"change":11,"start":33350,"end":33382},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":49796},"to":{"change":11,"start":33350,"end":33382},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":33350},"to":{"change":11,"start":33350,"end":33382},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":33382},"to":{"change":11,"start":49797,"end":49892},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":49892},"to":{"change":11,"start":33439,"end":33479},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":33439},"to":{"change":11,"start":33439,"end":33479},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":33479},"to":{"change":11,"start":49893,"end":49952},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":49952},"to":{"change":11,"start":500308,"end":500452},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":500308},"to":{"change":11,"start":500308,"end":500452},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":500452},"to":{"change":11,"start":58443,"end":58546},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":58546},"to":{"change":11,"start":6515,"end":6542},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":6515},"to":{"change":11,"start":6515,"end":6542},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":6542},"to":{"change":11,"start":2008,"end":2180},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":2180},"to":{"change":11,"start":361,"end":393},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":361},"to":{"change":11,"start":361,"end":393},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":393},"to":{"change":11,"start":1397,"end":1469},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1469},"to":{"change":11,"start":6645,"end":6677},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":58619},"to":{"change":11,"start":6645,"end":6677},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":6645},"to":{"change":11,"start":6645,"end":6677},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":6677},"to":{"change":11,"start":2181,"end":2212},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":2212},"to":{"change":11,"start":6708,"end":6726},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":6708},"to":{"change":11,"start":6708,"end":6726},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":6726},"to":{"change":11,"start":11969,"end":12022},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":33653},"to":{"change":11,"start":11969,"end":12022},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":50149},"to":{"change":11,"start":11969,"end":12022},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":11969},"to":{"change":11,"start":11969,"end":12022},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":500855},"to":{"change":11,"start":773,"end":905},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":905},"to":{"change":11,"start":58620,"end":58744},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":50251},"to":{"change":11,"start":495,"end":509},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":58744},"to":{"change":11,"start":495,"end":509},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":495},"to":{"change":11,"start":495,"end":509},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":509},"to":{"change":11,"start":33752,"end":33790},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1571},"to":{"change":11,"start":33752,"end":33790},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":28702},"to":{"change":11,"start":33752,"end":33790},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":33752},"to":{"change":11,"start":33752,"end":33790},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":33790},"to":{"change":11,"start":50252,"end":50317},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":50317},"to":{"change":11,"start":1470,"end":1519},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1519},"to":{"change":11,"start":394,"end":450},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":204},"to":{"change":11,"start":394,"end":450},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":450},"to":{"change":11,"start":238,"end":272},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":238},"to":{"change":11,"start":238,"end":272},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":272},"to":{"change":11,"start":2213,"end":2247},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":2247},"to":{"change":11,"start":50318,"end":50377},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":272},"to":{"change":11,"start":50318,"end":50377},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":50377},"to":{"change":11,"start":329,"end":370},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":329},"to":{"change":11,"start":329,"end":370},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":370},"to":{"change":11,"start":501198,"end":501222},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":501198},"to":{"change":11,"start":501198,"end":501222},"introduced_by":11}],"inode":{"change":11,"pos":488880}},"ins_contents":[{"Add":" let (former_parents, is_deleted) ="},{"Add":" collect_former_parents::(changes, &*txn_, &*channel_, vertex)?;"}],"del_contents":[{"Del":" for name_ in iter_adjacent(\n &*txn_,\n txn_.graph(&*channel_),\n vertex.inode_vertex(),\n f0,\n f1,\n )? {\n"},{"Del":" debug!(\"name_ = {:?}\", name_);\n"},{"Del":" let name_ = name_?;\n"},{"Del":" if !name_.flag().contains(EdgeFlags::PARENT) {\n debug!(\"continue\");\n"},{"Del":" continue;\n }\n"},{"Del":" if name_.flag().contains(EdgeFlags::DELETED) {\n"},{"Del":" debug!(\"is_deleted {:?}: {:?}\", item.full_path, name_);\n is_deleted = true;\n break;\n }\n"},{"Del":" let name_dest = txn_\n .find_block_end(txn_.graph(&*channel_), name_.dest())\n"},{"Del":" .unwrap();\n"},{"Del":" let mut meta = Vec::new();\n let FileMetadata {\n basename,\n metadata,\n encoding,\n } = changes\n"},{"Del":" .get_file_meta(\n"},{"Del":" |p| txn_.get_external(&p).unwrap().map(From::from),\n"},{"Del":" *name_dest,\n"},{"Del":" &mut meta,\n"},{"Del":" )\n"},{"Del":" .map_err(RecordError::Changestore)?;\n"},{"Del":" debug!(\n \"former basename of {:?}: {:?} {:?}\",\n vertex, basename, metadata\n );\n"},{"Del":" if let Some(v_papa) =\n iter_adjacent(&*txn_, txn_.graph(&*channel_), *name_dest, f0, f1)?.next()\n"},{"Del":" {\n"},{"Del":" let v_papa = v_papa?;\n"},{"Del":" if !v_papa.flag().contains(EdgeFlags::DELETED) {\n"},{"Del":" former_parents.push(Parent {\n"},{"Del":" basename: basename.to_string(),\n"},{"Del":" metadata,\n"},{"Del":" encoding,\n"},{"Del":" parent: v_papa.dest().to_option(),\n"},{"Del":" })\n }\n"},{"Del":" }\n }\n"}]}},{"Replacement":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":886,"ins":{"up_context":[{"change":11,"pos":501478}],"down_context":[{"change":11,"pos":503118}],"flag":"BLOCK","start":6854,"end":7229,"inode":{"change":11,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":501478},"to":{"change":11,"start":501478,"end":501527},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":501527},"to":{"change":11,"start":58888,"end":59113},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":59113},"to":{"change":11,"start":501772,"end":501816},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":501772},"to":{"change":11,"start":501772,"end":501816},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":501939},"to":{"change":11,"start":501939,"end":501992},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":501992},"to":{"change":11,"start":33791,"end":33842},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":33842},"to":{"change":11,"start":502032,"end":502061},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502032},"to":{"change":11,"start":502032,"end":502061},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502061},"to":{"change":11,"start":59114,"end":59142},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":59142},"to":{"change":11,"start":538,"end":570},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":570},"to":{"change":11,"start":502116,"end":502171},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1612},"to":{"change":11,"start":502116,"end":502171},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":28742},"to":{"change":11,"start":502116,"end":502171},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":33879},"to":{"change":11,"start":502116,"end":502171},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":59186},"to":{"change":11,"start":502116,"end":502171},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502116},"to":{"change":11,"start":502116,"end":502171},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502171},"to":{"change":11,"start":59187,"end":59226},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":59226},"to":{"change":11,"start":1521,"end":1521},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1521},"to":{"change":11,"start":1522,"end":1578},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1578},"to":{"change":11,"start":33880,"end":33899},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":2309},"to":{"change":11,"start":33880,"end":33899},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":59226},"to":{"change":11,"start":33880,"end":33899},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502254},"to":{"change":11,"start":33880,"end":33899},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":12093},"to":{"change":11,"start":502273,"end":502359},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":33899},"to":{"change":11,"start":502273,"end":502359},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502273},"to":{"change":11,"start":502273,"end":502359},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502359},"to":{"change":11,"start":59227,"end":59346},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":59346},"to":{"change":11,"start":98199,"end":98238},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":59393},"to":{"change":11,"start":452,"end":517},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":98238},"to":{"change":11,"start":452,"end":517},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":452},"to":{"change":11,"start":452,"end":517},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":517},"to":{"change":11,"start":502452,"end":502466},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1500},"to":{"change":11,"start":502452,"end":502466},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":28844},"to":{"change":11,"start":502452,"end":502466},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502452},"to":{"change":11,"start":502452,"end":502466},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502466},"to":{"change":11,"start":59394,"end":59475},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1773},"to":{"change":11,"start":502529,"end":502569},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":28918},"to":{"change":11,"start":502529,"end":502569},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":33970},"to":{"change":11,"start":502529,"end":502569},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":59475},"to":{"change":11,"start":502529,"end":502569},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502529},"to":{"change":11,"start":502529,"end":502569},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502569},"to":{"change":11,"start":73,"end":117},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":117},"to":{"change":11,"start":1102,"end":1160},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12123},"to":{"change":11,"start":1102,"end":1160},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1160},"to":{"change":11,"start":12179,"end":12236},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":12179},"to":{"change":11,"start":12179,"end":12236},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":12236},"to":{"change":11,"start":502635,"end":502673},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502635},"to":{"change":11,"start":502635,"end":502673},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502673},"to":{"change":11,"start":59476,"end":59522},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":59522},"to":{"change":11,"start":502723,"end":502779},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502723},"to":{"change":11,"start":502723,"end":502779},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502779},"to":{"change":11,"start":59523,"end":59583},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":59583},"to":{"change":11,"start":502834,"end":502914},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502834},"to":{"change":11,"start":502834,"end":502914},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502914},"to":{"change":11,"start":58,"end":90},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":90},"to":{"change":11,"start":502914,"end":503008},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":502914},"to":{"change":11,"start":502914,"end":503008},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":503008},"to":{"change":11,"start":118,"end":149},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":149},"to":{"change":9,"start":274,"end":304},"introduced_by":9},{"previous":"","flag":"DELETED","from":{"change":11,"pos":149},"to":{"change":11,"start":503008,"end":503028},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":9,"pos":304},"to":{"change":11,"start":503008,"end":503028},"introduced_by":9},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":503008},"to":{"change":11,"start":503008,"end":503028},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":503028},"to":{"change":11,"start":59584,"end":59630},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":59630},"to":{"change":11,"start":1551,"end":1644},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1551},"to":{"change":11,"start":1551,"end":1644},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1644},"to":{"change":11,"start":59631,"end":59780},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":59780},"to":{"change":11,"start":224,"end":257},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":224},"to":{"change":11,"start":224,"end":257},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":257},"to":{"change":11,"start":59781,"end":59869},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":59869},"to":{"change":11,"start":353,"end":379},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":353},"to":{"change":11,"start":353,"end":379},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":379},"to":{"change":11,"start":1736,"end":1776},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1736},"to":{"change":11,"start":1736,"end":1776},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1776},"to":{"change":11,"start":2801,"end":2878},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":503028},"to":{"change":11,"start":2801,"end":2878},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2878},"to":{"change":11,"start":59870,"end":59956},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":59956},"to":{"change":11,"start":2972,"end":2991},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2972},"to":{"change":11,"start":2972,"end":2991},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":2991},"to":{"change":11,"start":503104,"end":503118},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":503104},"to":{"change":11,"start":503104,"end":503118},"introduced_by":11}],"inode":{"change":11,"pos":488880}},"ins_contents":[{"Add":" self.record_nondeleted("},{"Add":" &*txn_,"},{"Add":" diff_algorithm,"},{"Add":" diff_sep,"},{"Add":" &*channel_,"},{"Add":" working_copy,"},{"Add":" changes,"},{"Add":" item,"},{"Add":" new_papa,"},{"Add":" vertex,"},{"Add":" new_meta,"},{"Add":" &former_parents,"},{"Add":" is_deleted,"},{"Add":" )?"}],"del_contents":[{"Del":" debug!(\"new_meta = {:?}\", new_meta);\n"},{"Del":" if former_parents.len() > 1\n || former_parents[0].basename != item.basename\n || former_parents[0].metadata != item.metadata\n || former_parents[0].parent != item.v_papa\n"},{"Del":" || is_deleted\n {\n"},{"Del":" debug!(\"new_papa = {:?}\", new_papa);\n"},{"Del":" self.record_moved_file::<_, _, W>(\n"},{"Del":" changes,\n"},{"Del":" &*txn_,\n"},{"Del":" &*channel_,\n"},{"Del":" &item,\n vertex,\n"},{"Del":" new_papa.unwrap(),\n"},{"Del":""},{"Del":" former_parents[0].encoding.clone(),\n"},{"Del":" )?\n"},{"Del":" }\n if new_meta.is_file()\n && (self.force_rediff\n"},{"Del":" || modified_since_last_commit(\n &*txn_,\n &*channel_,\n"},{"Del":" &working_copy,\n"},{"Del":" &item.full_path,\n )?)\n"},{"Del":" {\n"},{"Del":" let mut ret = retrieve(&*txn_, txn_.graph(&*channel_), vertex)?;\n"},{"Del":" let mut b = Vec::new();\n"},{"Del":" let encoding = working_copy\n"},{"Del":" .decode_file(&item.full_path, &mut b)\n"},{"Del":" .map_err(RecordError::WorkingCopy)?;\n"},{"Del":" debug!(\"diffing…\");\n"},{"Del":" let len = self.actions.len();\n"},{"Del":" self.diff(\n changes,\n"},{"Del":" &*txn_,\n &*channel_,\n"},{"Del":" diff_algorithm,\n item.full_path.clone(),\n"},{"Del":" item.inode,\n"},{"Del":" vertex.to_option(),\n &mut ret,\n &b,\n"},{"Del":" &encoding,\n"},{"Del":" diff_sep,\n"},{"Del":" )?;\n"},{"Del":" if self.actions.len() > len {\n"},{"Del":" if let Ok(last_modified) = working_copy.modified_time(&item.full_path) {\n"},{"Del":" if self.oldest_change == std::time::SystemTime::UNIX_EPOCH {\n self.oldest_change = last_modified;\n"},{"Del":" } else {\n"},{"Del":" self.oldest_change = self.oldest_change.min(last_modified);\n"},{"Del":" }\n"},{"Del":" }\n }\n"},{"Del":" debug!(\n \"new actions: {:?}, total {:?}\",\n"},{"Del":" &self.actions.len() - len,\n self.actions.len()\n"},{"Del":" );\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":908,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":29100}],"down_context":[{"change":11,"pos":2310}],"flag":"BLOCK","start":7230,"end":8370,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":" changes,"},{"Add":" )?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn record_nondeleted<"},{"Add":" T: ChannelTxnT + TreeTxnT::GraphError>,"},{"Add":" W: WorkingCopyRead + Clone,"},{"Add":" C: ChangeStore,"},{"Add":" >("},{"Add":" &mut self,"},{"Add":" txn: &T,"},{"Add":" diff_algorithm: diff::Algorithm,"},{"Add":" diff_sep: ®ex::bytes::Regex,"},{"Add":" channel: &T::Channel,"},{"Add":" working_copy: W,"},{"Add":" changes: &C,"},{"Add":" item: &RecordItem,"},{"Add":" new_papa: Option>>,"},{"Add":" vertex: Position,"},{"Add":" new_meta: InodeMetadata,"},{"Add":" former_parents: &[Parent],"},{"Add":" is_deleted: bool,"},{"Add":" ) -> Result<(), RecordError>"},{"Add":" where"},{"Add":" ::Error: 'static,"},{"Add":" {"},{"Add":" if former_parents.len() > 1"},{"Add":" || former_parents[0].basename != item.basename"},{"Add":" || former_parents[0].metadata != item.metadata"},{"Add":" || former_parents[0].parent != item.v_papa"},{"Add":" || is_deleted"},{"Add":" {"},{"Add":" debug!(\"new_papa = {:?}\", new_papa);"},{"Add":" self.record_moved_file::<_, _, W>("}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":945,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":2335}],"down_context":[{"change":11,"pos":29100}],"flag":"BLOCK","start":8371,"end":8551,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":" txn,"},{"Add":" channel,"},{"Add":" &item,"},{"Add":" vertex,"},{"Add":" new_papa.unwrap(),"},{"Add":" former_parents[0].encoding.clone(),"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":952,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":29115}],"down_context":[{"change":11,"pos":503301}],"flag":"BLOCK","start":8552,"end":10005,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":" }"},{"Add":" if new_meta.is_file()"},{"Add":" && (self.force_rediff"},{"Add":" || modified_since_last_commit(txn, channel, &working_copy, &item.full_path)?)"},{"Add":" {"},{"Add":" let mut ret = retrieve(txn, txn.graph(channel), vertex)?;"},{"Add":" let mut b = Vec::new();"},{"Add":" let encoding = working_copy"},{"Add":" .decode_file(&item.full_path, &mut b)"},{"Add":" .map_err(RecordError::WorkingCopy)?;"},{"Add":" debug!(\"diffing…\");"},{"Add":" let len = self.actions.len();"},{"Add":" self.diff("},{"Add":" changes,"},{"Add":" txn,"},{"Add":" channel,"},{"Add":" diff_algorithm,"},{"Add":" item.full_path.clone(),"},{"Add":" item.inode,"},{"Add":" vertex.to_option(),"},{"Add":" &mut ret,"},{"Add":" &b,"},{"Add":" &encoding,"},{"Add":" diff_sep,"},{"Add":" )?;"},{"Add":" if self.actions.len() > len {"},{"Add":" if let Ok(last_modified) = working_copy.modified_time(&item.full_path) {"},{"Add":" if self.oldest_change == std::time::SystemTime::UNIX_EPOCH {"},{"Add":" self.oldest_change = last_modified;"},{"Add":" } else {"},{"Add":" self.oldest_change = self.oldest_change.min(last_modified);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" debug!("},{"Add":" \"new actions: {:?}, total {:?}\","},{"Add":" &self.actions.len() - len,"},{"Add":" self.actions.len()"},{"Add":" );"}]}},{"Replacement":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":1008,"ins":{"up_context":[{"change":11,"pos":36029}],"down_context":[{"change":11,"pos":98271}],"flag":"BLOCK","start":10006,"end":10067,"inode":{"change":11,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":36029},"to":{"change":11,"start":0,"end":48},"introduced_by":11}],"inode":{"change":11,"pos":488880}},"ins_contents":[{"Add":" debug!(\"record_moved_file {:?} {:?}\", item, vertex);"}],"del_contents":[{"Del":" debug!(\"record_moved_file {:?}\", item);\n"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":1083,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":244},"to":{"change":11,"start":244,"end":245},"introduced_by":11}],"inode":{"change":11,"pos":488880}}},"contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":1116,"atom":{"NewVertex":{"up_context":[{"change":58,"pos":5}],"down_context":[{"change":11,"pos":510565}],"flag":"BLOCK","start":10068,"end":12024,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":"fn collect_former_parents("},{"Add":" changes: &C,"},{"Add":" txn: &T,"},{"Add":" channel: &T::Channel,"},{"Add":" vertex: Position,"},{"Add":") -> Result<(Vec, bool), RecordError>"},{"Add":"where"},{"Add":" W::Error: 'static,"},{"Add":"{"},{"Add":" let mut former_parents = Vec::new();"},{"Add":" let f0 = EdgeFlags::FOLDER | EdgeFlags::PARENT;"},{"Add":" let f1 = EdgeFlags::all();"},{"Add":" let mut is_deleted = true;"},{"Add":" for name_ in iter_adjacent(txn, txn.graph(channel), vertex.inode_vertex(), f0, f1)? {"},{"Add":" debug!(\"name_ = {:?}\", name_);"},{"Add":" let name_ = name_?;"},{"Add":" if !name_.flag().contains(EdgeFlags::PARENT) {"},{"Add":" debug!(\"continue\");"},{"Add":" continue;"},{"Add":" }"},{"Add":" if name_.flag().contains(EdgeFlags::DELETED) {"},{"Add":" debug!(\"is_deleted {:?}\", name_);"},{"Add":" is_deleted = true;"},{"Add":" break;"},{"Add":" }"},{"Add":" let name_dest = txn"},{"Add":" .find_block_end(txn.graph(channel), name_.dest())"},{"Add":" .unwrap();"},{"Add":" let mut meta = Vec::new();"},{"Add":" let FileMetadata {"},{"Add":" basename,"},{"Add":" metadata,"},{"Add":" encoding,"},{"Add":" } = changes"},{"Add":" .get_file_meta("},{"Add":" |p| txn.get_external(&p).unwrap().map(From::from),"},{"Add":" *name_dest,"},{"Add":" &mut meta,"},{"Add":" )"},{"Add":" .map_err(RecordError::Changestore)?;"},{"Add":" debug!("},{"Add":" \"former basename of {:?}: {:?} {:?}\","},{"Add":" vertex, basename, metadata"},{"Add":" );"},{"Add":" if let Some(v_papa) = iter_adjacent(txn, txn.graph(channel), *name_dest, f0, f1)?.next() {"},{"Add":" let v_papa = v_papa?;"},{"Add":" if !v_papa.flag().contains(EdgeFlags::DELETED) {"},{"Add":" former_parents.push(Parent {"},{"Add":" basename: basename.to_string(),"},{"Add":" metadata,"},{"Add":" encoding,"},{"Add":" parent: v_papa.dest().to_option(),"},{"Add":" })"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok((former_parents, is_deleted))"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":1288,"ins":{"up_context":[{"change":11,"pos":513998}],"down_context":[{"change":11,"pos":514044}],"flag":"BLOCK","start":12025,"end":12090,"inode":{"change":11,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":513998},"to":{"change":11,"start":513998,"end":514044},"introduced_by":11}],"inode":{"change":11,"pos":488880}},"ins_contents":[{"Add":" \"grandparent_dest {:?} {:?}, parent_pos = {:?}\","}],"del_contents":[{"Del":" \"grandparent_dest {:?} {:?}\",\n"}]}},{"Replacement":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":1290,"ins":{"up_context":[{"change":11,"pos":514078}],"down_context":[{"change":11,"pos":514135}],"flag":"BLOCK","start":12091,"end":12177,"inode":{"change":11,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":514078},"to":{"change":11,"start":514078,"end":514135},"introduced_by":11}],"inode":{"change":11,"pos":488880}},"ins_contents":[{"Add":" std::str::from_utf8(&previous_name[2..]),"},{"Add":" parent_pos,"}],"del_contents":[{"Del":" std::str::from_utf8(&previous_name[2..])\n"}]}},{"Replacement":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":1293,"ins":{"up_context":[{"change":11,"pos":514150}],"down_context":[{"change":4,"pos":302}],"flag":"BLOCK","start":12178,"end":12427,"inode":{"change":11,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":514150},"to":{"change":11,"start":52391,"end":52475},"introduced_by":11}],"inode":{"change":11,"pos":488880}},"ins_contents":[{"Add":" let grandparent_changed = if parent_pos.change == Some(ChangeId::ROOT) {"},{"Add":" !is_root_vertex(txn, channel, grandparent.dest())?"},{"Add":" } else {"},{"Add":" parent_pos != grandparent.dest().to_option()"},{"Add":" };"}],"del_contents":[{"Del":" let grandparent_changed = parent_pos != grandparent.dest().to_option();\n"}]}},{"Edit":{"inode":{"change":11,"pos":488880},"path":"\"libpijul/src/record.rs\"","line":1400,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":518269}],"down_context":[{"change":11,"pos":518269}],"flag":"BLOCK","start":12428,"end":13027,"inode":{"change":11,"pos":488880}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"fn is_root_vertex("},{"Add":" txn: &T,"},{"Add":" channel: &T::Graph,"},{"Add":" v: Position,"},{"Add":") -> Result> {"},{"Add":" for parent in iter_adjacent("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" v.inode_vertex(),"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::PARENT,"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::PARENT | EdgeFlags::PSEUDO | EdgeFlags::BLOCK,"},{"Add":" )? {"},{"Add":" let p = parent?.dest();"},{"Add":" let p = txn.find_block_end(channel, p).unwrap();"},{"Add":" if p.start == p.end {"},{"Add":" return Ok(true);"},{"Add":" } else {"},{"Add":" return Ok(false);"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(false)"}]}},{"Edit":{"inode":{"change":11,"pos":525242},"path":"\"libpijul/src/pristine/vertex.rs\"","line":172,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":8},"to":{"change":11,"start":8,"end":9},"introduced_by":11}],"inode":{"change":11,"pos":525242}}},"contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":11,"pos":525242},"path":"\"libpijul/src/pristine/vertex.rs\"","line":173,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":10},"to":{"change":11,"start":10,"end":11},"introduced_by":11}],"inode":{"change":11,"pos":525242}}},"contents":[{"Del":"\n"}]}},{"Edit":{"inode":{"change":11,"pos":641569},"path":"\"libpijul/src/pristine/inode_metadata.rs\"","line":9,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":641952}],"down_context":[{"change":11,"pos":642172}],"flag":"BLOCK","start":13028,"end":13079,"inode":{"change":11,"pos":641569}}},"contents":[{"Add":" pub const DIR: Self = InodeMetadata(DIR_BIT);"},{"Add":""}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":168,"ins":{"up_context":[{"change":11,"pos":76470}],"down_context":[{"change":11,"pos":76471}],"flag":"BLOCK","start":13080,"end":13474,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":20226},"to":{"change":11,"start":673931,"end":673967},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":76470},"to":{"change":11,"start":673931,"end":673967},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":82151},"to":{"change":11,"start":673931,"end":673967},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":673931},"to":{"change":11,"start":673931,"end":673967},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":" let mut state = OutputState {"},{"Add":" done_vertices: HashMap::default(),"},{"Add":" actual_moves: Vec::new(),"},{"Add":" conflicts: Vec::new(),"},{"Add":" output_name_conflicts,"},{"Add":" work: work.clone(),"},{"Add":" done_inodes: HashSet::new(),"},{"Add":" salt,"},{"Add":" if_modified_after,"},{"Add":" next_prefix_basename: prefix.next(),"},{"Add":" is_following_prefix: true,"},{"Add":" pending_change_id,"},{"Add":" };"},{"Add":""}],"del_contents":[{"Del":" let mut conflicts = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":184,"ins":{"up_context":[{"change":11,"pos":76556}],"down_context":[{"change":11,"pos":76973}],"flag":"BLOCK","start":13475,"end":13536,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":76556},"to":{"change":11,"start":674044,"end":674094},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":674044},"to":{"change":11,"start":674044,"end":674094},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":674094},"to":{"change":11,"start":906,"end":980},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":980},"to":{"change":11,"start":76557,"end":76578},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":76578},"to":{"change":11,"start":102074,"end":102151},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":102151},"to":{"change":11,"start":76673,"end":76810},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":76673},"to":{"change":11,"start":76673,"end":76810},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":76810},"to":{"change":11,"start":1077,"end":1133},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1077},"to":{"change":11,"start":1077,"end":1133},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1133},"to":{"change":11,"start":76811,"end":76841},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":76841},"to":{"change":11,"start":102152,"end":102191},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":102191},"to":{"change":11,"start":0,"end":76},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":76},"to":{"change":11,"start":76962,"end":76972},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":102257},"to":{"change":11,"start":76962,"end":76972},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":76962},"to":{"change":11,"start":76962,"end":76972},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":76972},"to":{"change":11,"start":1188,"end":1225},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1188},"to":{"change":11,"start":1188,"end":1225},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":" state.kill_dead_files::<_, _, P>(repo, &txn, &channel)?;"}],"del_contents":[{"Del":" let mut next_prefix_basename = prefix.next();\n"},{"Del":" let mut is_first_none = true;\n if next_prefix_basename.is_none() {\n"},{"Del":" let dead = {\n"},{"Del":" let txn_ = txn.read();\n let channel = channel.read();\n"},{"Del":" let graph = txn_.graph(&*channel);\n collect_dead_files(&*txn_, graph, pending_change_id, Inode::ROOT)?\n };\n"},{"Del":" debug!(\"dead (line {}) = {:?}\", line!(), dead);\n"},{"Del":" if !dead.is_empty() {\n"},{"Del":" let mut txn = txn.write();\n"},{"Del":" kill_dead_files::(&mut *txn, &channel, &repo, &dead)?;\n"},{"Del":" }\n"},{"Del":" is_first_none = false;\n }\n"}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":196,"ins":{"up_context":[{"change":11,"pos":431}],"down_context":[{"change":11,"pos":77270}],"flag":"BLOCK","start":13537,"end":13577,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":431},"to":{"change":11,"start":77236,"end":77270},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":77236},"to":{"change":11,"start":77236,"end":77270},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":" state.next_prefix_basename,"}],"del_contents":[{"Del":" next_prefix_basename,\n"}]}},{"Edit":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":201,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":674618},"to":{"change":11,"start":77313,"end":77359},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":77359},"to":{"change":11,"start":4546,"end":4634},"introduced_by":11}],"inode":{"change":11,"pos":671807}}},"contents":[{"Del":" let mut done_inodes = HashSet::default();\n"},{"Del":" let mut done_vertices: HashMap<_, (Vertex, String)> = HashMap::default();\n"}]}},{"Edit":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":203,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":674819},"to":{"change":11,"start":674819,"end":674858},"introduced_by":11}],"inode":{"change":11,"pos":671807}}},"contents":[{"Del":" let mut actual_moves = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":206,"ins":{"up_context":[{"change":11,"pos":675018}],"down_context":[{"change":11,"pos":675065}],"flag":"BLOCK","start":13578,"end":13630,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":675018},"to":{"change":11,"start":675018,"end":675065},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":" state.next_prefix_basename = prefix.next();"}],"del_contents":[{"Del":" next_prefix_basename = prefix.next();\n\n"}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":208,"ins":{"up_context":[{"change":11,"pos":675107}],"down_context":[{"change":11,"pos":102365}],"flag":"BLOCK","start":13631,"end":15909,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":675107},"to":{"change":11,"start":675107,"end":675153},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":675153},"to":{"change":11,"start":77408,"end":77422},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":77422},"to":{"change":11,"start":102327,"end":102365},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":" sort_conflicting_names(&txn, &channel, &mut b);"},{"Add":" state.output_name(repo, changes, &txn, &channel, &mut next_files, a, b)?;"},{"Add":" }"},{"Add":" std::mem::swap(&mut files, &mut next_files);"},{"Add":" }"},{"Add":" stop.store(true, std::sync::atomic::Ordering::Relaxed);"},{"Add":" let o = output_loop(repo, changes, txn, channel, work, stop, 0);"},{"Add":" for t in threads {"},{"Add":" state.conflicts.extend(t.join().unwrap()?.into_iter());"},{"Add":" }"},{"Add":" state.conflicts.extend(o?.into_iter());"},{"Add":" for (a, b) in state.actual_moves.iter() {"},{"Add":" repo.rename(a, b).map_err(OutputError::WorkingCopy)?"},{"Add":" }"},{"Add":" Ok(state.conflicts)"},{"Add":"}"},{"Add":""},{"Add":"fn sort_conflicting_names("},{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"},{"Add":" b: &mut [(Vertex, OutputItem)],"},{"Add":") {"},{"Add":" debug!(\"files: {:?}\", b);"},{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.read();"},{"Add":" b.sort_unstable_by(|u, v| {"},{"Add":" txn.get_changeset(txn.changes(&channel), &u.0.change)"},{"Add":" .unwrap()"},{"Add":" .cmp("},{"Add":" &txn.get_changeset(txn.changes(&channel), &v.0.change)"},{"Add":" .unwrap(),"},{"Add":" )"},{"Add":" });"},{"Add":"}"},{"Add":""},{"Add":"struct OutputState<'a> {"},{"Add":" actual_moves: Vec<(String, String)>,"},{"Add":" output_name_conflicts: bool,"},{"Add":" done_vertices: HashMap, (Vertex, String)>,"},{"Add":" conflicts: Vec,"},{"Add":" work: Arc)>>,"},{"Add":" done_inodes: HashSet,"},{"Add":" salt: u64,"},{"Add":" if_modified_after: Option,"},{"Add":" next_prefix_basename: Option<&'a str>,"},{"Add":" is_following_prefix: bool,"},{"Add":" pending_change_id: ChangeId,"},{"Add":"}"},{"Add":""},{"Add":"impl<'a> OutputState<'a> {"},{"Add":" fn kill_dead_files<"},{"Add":" T: TreeMutTxnT"},{"Add":" + ChannelMutTxnT"},{"Add":" + GraphMutTxnT::TreeError>"},{"Add":" + Send"},{"Add":" + Sync"},{"Add":" + 'static,"},{"Add":" R: WorkingCopy + Clone + Send + Sync + 'static,"},{"Add":" P: ChangeStore + Clone + 'static,"},{"Add":" >("},{"Add":" &mut self,"},{"Add":" repo: &R,"},{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"},{"Add":" ) -> Result<(), OutputError> {"},{"Add":" if self.next_prefix_basename.is_none() && self.is_following_prefix {"},{"Add":" let dead = {"},{"Add":" let txn_ = txn.read();"}],"del_contents":[{"Del":" debug!(\"files: {:?} {:?}\", a, b);\n"},{"Del":" {\n"},{"Del":" let txn = txn.read();\n"}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":277,"ins":{"up_context":[{"change":11,"pos":102411}],"down_context":[{"change":11,"pos":77878}],"flag":"BLOCK","start":15910,"end":16281,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":102411},"to":{"change":11,"start":77524,"end":77878},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":77524},"to":{"change":11,"start":77524,"end":77878},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":" let graph = txn_.graph(&*channel);"},{"Add":" collect_dead_files(&*txn_, graph, self.pending_change_id, Inode::ROOT)?"},{"Add":" };"},{"Add":" debug!(\"dead (line {}) = {:?}\", line!(), dead);"},{"Add":" if !dead.is_empty() {"},{"Add":" let mut txn = txn.write();"},{"Add":" kill_dead_files::(&mut *txn, &channel, &repo, &dead)?;"}],"del_contents":[{"Del":" b.sort_unstable_by(|u, v| {\n txn.get_changeset(txn.changes(&channel), &u.0.change)\n .unwrap()\n .cmp(\n &txn.get_changeset(txn.changes(&channel), &v.0.change)\n .unwrap(),\n )\n });\n"}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":285,"ins":{"up_context":[{"change":11,"pos":77892}],"down_context":[{"change":11,"pos":82271}],"flag":"BLOCK","start":16282,"end":16359,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":77892},"to":{"change":11,"start":675466,"end":675559},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":675466},"to":{"change":11,"start":675466,"end":675559},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":675559},"to":{"change":11,"start":4635,"end":4713},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1332},"to":{"change":11,"start":675611,"end":675655},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":4713},"to":{"change":11,"start":675611,"end":675655},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":675611},"to":{"change":11,"start":675611,"end":675655},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":675655},"to":{"change":8,"start":120,"end":401},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":401},"to":{"change":11,"start":4714,"end":4765},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":675741},"to":{"change":11,"start":4714,"end":4765},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":4765},"to":{"change":11,"start":675791,"end":675914},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":675791},"to":{"change":11,"start":675791,"end":675914},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":675914},"to":{"change":11,"start":4766,"end":4823},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":4823},"to":{"change":11,"start":675914,"end":676028},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":675914},"to":{"change":11,"start":675914,"end":676028},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":676028},"to":{"change":8,"start":402,"end":569},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":569},"to":{"change":11,"start":4867,"end":4886},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":4867},"to":{"change":11,"start":4867,"end":4886},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":" self.is_following_prefix = false;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"}],"del_contents":[{"Del":" let mut is_first_name = true;\n for (name_key, mut output_item) in b {\n"},{"Del":" let name_entry = match done_vertices.entry(output_item.pos) {\n"},{"Del":" Entry::Occupied(e) => {\n"},{"Del":" debug!(\n \"pos already visited: {:?} {:?} {:?} {:?}\",\n a,\n output_item.pos,\n e.get(),\n name_key\n );\n"},{"Del":" if e.get().0 != name_key {\n"},{"Del":" conflicts.push(Conflict::MultipleNames {\n pos: output_item.pos,\n"},{"Del":" path: e.get().1.clone(),\n"},{"Del":" });\n }\n continue;\n }\n"},{"Del":" Entry::Vacant(e) => {\n debug!(\"first visit {:?} {:?}\", a, output_item.pos);\n e\n }\n"},{"Del":" };\n"}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":290,"ins":{"up_context":[{"change":11,"pos":82272}],"down_context":[{"change":11,"pos":82555}],"flag":"BLOCK","start":16360,"end":18308,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":82272},"to":{"change":11,"start":77893,"end":77935},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":77935},"to":{"change":11,"start":102412,"end":102454},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":77986},"to":{"change":11,"start":119905,"end":120070},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":102454},"to":{"change":11,"start":119905,"end":120070},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":82312},"to":{"change":11,"start":119905,"end":120070},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":120070},"to":{"change":11,"start":82474,"end":82532},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":82474},"to":{"change":11,"start":82474,"end":82532},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":82532},"to":{"change":11,"start":77987,"end":78028},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":" fn make_inode("},{"Add":" &mut self,"},{"Add":" a: &str,"},{"Add":" name_key: Vertex,"},{"Add":" output_item: &mut OutputItem,"},{"Add":" is_first_name: &mut bool,"},{"Add":" ) -> MakeInode {"},{"Add":" let name_entry = match self.done_vertices.entry(output_item.pos) {"},{"Add":" Entry::Occupied(e) => {"},{"Add":" debug!("},{"Add":" \"pos already visited: {:?} {:?} {:?} {:?}\","},{"Add":" a,"},{"Add":" output_item.pos,"},{"Add":" e.get(),"},{"Add":" name_key"},{"Add":" );"},{"Add":" if e.get().0 != name_key {"},{"Add":" // The same inode has more than one name."},{"Add":" self.conflicts.push(Conflict::MultipleNames {"},{"Add":" pos: output_item.pos,"},{"Add":" path: e.get().1.clone(),"},{"Add":" });"},{"Add":" }"},{"Add":" return MakeInode::AlreadyOutput;"},{"Add":" }"},{"Add":" Entry::Vacant(e) => {"},{"Add":" debug!(\"first visit {:?} {:?}\", a, output_item.pos);"},{"Add":" e"},{"Add":" }"},{"Add":" };"},{"Add":" let name = if !*is_first_name {"},{"Add":" // Multiple inodes share the same name."},{"Add":" if self.output_name_conflicts {"},{"Add":" let name = make_conflicting_name(&a, name_key);"},{"Add":" self.conflicts.push(Conflict::Name { path: name.clone() });"},{"Add":" name"},{"Add":" } else {"},{"Add":" debug!(\"not outputting {:?} {:?}\", a, name_key);"},{"Add":" self.conflicts.push(Conflict::Name {"},{"Add":" path: a.to_string(),"},{"Add":" });"},{"Add":" return MakeInode::NameConflict;"},{"Add":" }"},{"Add":" } else {"},{"Add":" *is_first_name = false;"},{"Add":" a.to_string()"},{"Add":" };"},{"Add":" debug!(\"name = {:?} {:?}\", name, name_key);"},{"Add":" let file_name = path::file_name(&name).unwrap();"},{"Add":" path::push(&mut output_item.path, file_name);"},{"Add":" name_entry.insert((name_key, output_item.path.clone()));"},{"Add":" MakeInode::Ok(name)"},{"Add":" }"}],"del_contents":[{"Del":" let output_item_inode = {\n"},{"Del":" let txn = txn.read();\n"},{"Del":" if let Some(inode) = txn.get_revinodes(&output_item.pos, None)? {\n Some((*inode, *txn.get_inodes(inode, None)?.unwrap()))\n"},{"Del":" } else {\n None\n"},{"Del":" }\n };\n"}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":344,"ins":{"up_context":[{"change":11,"pos":82556}],"down_context":[{"change":11,"pos":676268}],"flag":"BLOCK","start":18309,"end":19594,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":82556},"to":{"change":11,"start":82556,"end":82618},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":82618},"to":{"change":11,"start":676216,"end":676268},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":676216},"to":{"change":11,"start":676216,"end":676268},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":" fn output_name<"},{"Add":" T: TreeMutTxnT"},{"Add":" + ChannelMutTxnT"},{"Add":" + GraphMutTxnT::TreeError>"},{"Add":" + Send"},{"Add":" + Sync"},{"Add":" + 'static,"},{"Add":" R: WorkingCopy + Clone + Send + Sync + 'static,"},{"Add":" P: ChangeStore + Send + Clone + 'static,"},{"Add":" >("},{"Add":" &mut self,"},{"Add":" repo: &R,"},{"Add":" changes: &P,"},{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"},{"Add":" next_files: &mut HashMap, OutputItem)>>,"},{"Add":" a: String,"},{"Add":" b: Vec<(Vertex, OutputItem)>,"},{"Add":" ) -> Result<(), OutputError> {"},{"Add":" let mut is_first_name = true;"},{"Add":" for (name_key, mut output_item) in b {"},{"Add":" debug!(\"name_key = {:?} {:?}\", name_key, output_item);"},{"Add":" let name = match self.make_inode(&a, name_key, &mut output_item, &mut is_first_name) {"},{"Add":" MakeInode::Ok(file_name) => file_name,"},{"Add":" MakeInode::AlreadyOutput => continue,"},{"Add":" MakeInode::NameConflict => break,"},{"Add":" };"},{"Add":" let output_item_inode = {"},{"Add":" let txn = txn.read();"},{"Add":" if let Some(inode) = txn.get_revinodes(&output_item.pos, None)? {"},{"Add":" if !self.done_inodes.insert(*inode) {"}],"del_contents":[{"Del":" if let Some((inode, _)) = output_item_inode {\n"},{"Del":" if !done_inodes.insert(inode) {\n"}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":378,"ins":{"up_context":[{"change":11,"pos":676402}],"down_context":[{"change":11,"pos":676982}],"flag":"BLOCK","start":19595,"end":19670,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":676402},"to":{"change":11,"start":676402,"end":676982},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":" Some((*inode, *txn.get_inodes(inode, None)?.unwrap()))"}],"del_contents":[{"Del":" }\n let name = if !is_first_name {\n if output_name_conflicts {\n let name = make_conflicting_name(&a, name_key);\n conflicts.push(Conflict::Name { path: name.clone() });\n name\n } else {\n debug!(\"not outputting {:?} {:?}\", a, name_key);\n conflicts.push(Conflict::Name {\n path: a.to_string(),\n });\n break;\n }\n"}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":380,"ins":{"up_context":[{"change":11,"pos":677007}],"down_context":[{"change":11,"pos":677955}],"flag":"BLOCK","start":19671,"end":19696,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677007},"to":{"change":11,"start":677007,"end":677226},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677226},"to":{"change":11,"start":4887,"end":4962},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":4962},"to":{"change":11,"start":432,"end":559},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677226},"to":{"change":11,"start":432,"end":559},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":559},"to":{"change":11,"start":677226,"end":677310},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677226},"to":{"change":11,"start":677226,"end":677310},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677310},"to":{"change":11,"start":560,"end":614},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":614},"to":{"change":11,"start":20283,"end":20338},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677310},"to":{"change":11,"start":20283,"end":20338},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":20338},"to":{"change":11,"start":78029,"end":78062},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":78062},"to":{"change":11,"start":102455,"end":102482},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":78096},"to":{"change":11,"start":677476,"end":677510},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":102482},"to":{"change":11,"start":677476,"end":677510},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677476},"to":{"change":11,"start":677476,"end":677510},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677510},"to":{"change":11,"start":82619,"end":82658},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":82658},"to":{"change":11,"start":677510,"end":677537},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677510},"to":{"change":11,"start":677510,"end":677537},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677537},"to":{"change":11,"start":615,"end":645},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":645},"to":{"change":11,"start":677537,"end":677608},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677537},"to":{"change":11,"start":677537,"end":677608},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677608},"to":{"change":11,"start":3605,"end":3631},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":3631},"to":{"change":11,"start":677608,"end":677628},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677608},"to":{"change":11,"start":677608,"end":677628},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677628},"to":{"change":11,"start":78097,"end":78144},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":78144},"to":{"change":11,"start":677628,"end":677697},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677628},"to":{"change":11,"start":677628,"end":677697},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677697},"to":{"change":11,"start":78145,"end":78178},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":78178},"to":{"change":11,"start":102483,"end":102584},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":102584},"to":{"change":11,"start":78297,"end":78421},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":78297},"to":{"change":11,"start":78297,"end":78421},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":4719},"to":{"change":11,"start":677788,"end":677856},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":58151},"to":{"change":11,"start":677788,"end":677856},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":78421},"to":{"change":11,"start":677788,"end":677856},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":82758},"to":{"change":11,"start":677788,"end":677856},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677788},"to":{"change":11,"start":677788,"end":677856},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677856},"to":{"change":11,"start":78422,"end":78464},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":78464},"to":{"change":11,"start":102585,"end":102636},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":102636},"to":{"change":11,"start":77,"end":165},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":165},"to":{"change":11,"start":78609,"end":78631},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":102714},"to":{"change":11,"start":78609,"end":78631},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":78609},"to":{"change":11,"start":78609,"end":78631},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":20406},"to":{"change":11,"start":677912,"end":677955},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":78631},"to":{"change":11,"start":677912,"end":677955},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":677912},"to":{"change":11,"start":677912,"end":677955},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":" None"}],"del_contents":[{"Del":" is_first_name = false;\n a.clone()\n };\n let file_name = path::file_name(&name).unwrap();\n path::push(&mut output_item.path, file_name);\n"},{"Del":"\n name_entry.insert((name_key, output_item.path.clone()));\n\n"},{"Del":" if let Some(ref mut tmp) = output_item.tmp {\n path::push(tmp, file_name);\n }\n"},{"Del":" let path = std::mem::replace(&mut output_item.path, String::new());\n"},{"Del":" let mut tmp = output_item.tmp.take();\n"},{"Del":" let inode = move_or_create::(\n"},{"Del":" txn.clone(),\n"},{"Del":" &repo,\n"},{"Del":" &output_item,\n"},{"Del":" output_item_inode,\n"},{"Del":" &path,\n"},{"Del":" &mut tmp,\n"},{"Del":" &file_name,\n &mut actual_moves,\n"},{"Del":" salt,\n"},{"Del":" )?;\n"},{"Del":" debug!(\"inode = {:?}\", inode);\n"},{"Del":" if next_prefix_basename.is_none() && is_first_none {\n"},{"Del":" let dead = {\n"},{"Del":" let txn_ = txn.read();\n let channel = channel.read();\n"},{"Del":" collect_dead_files(&*txn_, txn_.graph(&*channel), pending_change_id, inode)?\n };\n"},{"Del":" debug!(\"dead (line {}) = {:?}\", line!(), dead);\n"},{"Del":" if !dead.is_empty() {\n"},{"Del":" let mut txn = txn.write();\n"},{"Del":" kill_dead_files::(&mut *txn, &channel, &repo, &dead)?;\n"},{"Del":" }\n"},{"Del":" is_first_none = false;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":382,"ins":{"up_context":[{"change":11,"pos":677973}],"down_context":[{"change":11,"pos":646}],"flag":"BLOCK","start":19697,"end":20522,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":678044},"to":{"change":11,"start":678044,"end":678091},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":" };"},{"Add":""},{"Add":" let file_name = path::file_name(&name).unwrap();"},{"Add":" let mut tmp = output_item.tmp.take().map(|mut tmp| {"},{"Add":" path::push(&mut tmp, file_name);"},{"Add":" tmp"},{"Add":" });"},{"Add":" let path = std::mem::replace(&mut output_item.path, String::new());"},{"Add":" let inode = move_or_create::("},{"Add":" txn.clone(),"},{"Add":" &repo,"},{"Add":" &output_item,"},{"Add":" output_item_inode,"},{"Add":" &path,"},{"Add":" &mut tmp,"},{"Add":" &file_name,"},{"Add":" &mut self.actual_moves,"},{"Add":" self.salt,"},{"Add":" )?;"},{"Add":" debug!(\"inode = {:?}\", inode);"},{"Add":" self.kill_dead_files::<_, _, P>(repo, txn, channel)?;"},{"Add":" if output_item.meta.is_dir() {"},{"Add":" if !path.is_empty() {"}],"del_contents":[{"Del":" if output_item.meta.is_dir() {\n"}]}},{"Edit":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":408,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":20515},"to":{"change":11,"start":78632,"end":78654},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":78654},"to":{"change":11,"start":102715,"end":102815},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":102815},"to":{"change":11,"start":78772,"end":79053},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":78772},"to":{"change":11,"start":78772,"end":79053},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":79053},"to":{"change":11,"start":757,"end":801},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":801},"to":{"change":11,"start":79053,"end":79264},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":79053},"to":{"change":11,"start":79053,"end":79264},"introduced_by":11}],"inode":{"change":11,"pos":671807}}},"contents":[{"Del":" {\n"},{"Del":" let txn = txn.read();\n let channel = channel.read();\n"},{"Del":" collect_children(\n &*txn,\n &*changes,\n txn.graph(&*channel),\n output_item.pos,\n inode,\n &path,\n"},{"Del":" tmp.as_deref(),\n"},{"Del":" next_prefix_basename,\n &mut next_files,\n )?;\n }\n debug!(\"setting permissions for {:?}\", path);\n"}]}},{"Edit":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":410,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":79405},"to":{"change":11,"start":678486,"end":678511},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":82824},"to":{"change":11,"start":678486,"end":678511},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":678486},"to":{"change":11,"start":678486,"end":678511},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":678511},"to":{"change":11,"start":102816,"end":102886},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":102886},"to":{"change":11,"start":882,"end":967},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":79485},"to":{"change":11,"start":882,"end":967},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":967},"to":{"change":11,"start":963,"end":1052},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1297},"to":{"change":11,"start":963,"end":1052},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":79557},"to":{"change":11,"start":963,"end":1052},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2574},"to":{"change":11,"start":963,"end":1052},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1052},"to":{"change":11,"start":2574,"end":2596},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2574},"to":{"change":11,"start":2574,"end":2596},"introduced_by":11}],"inode":{"change":11,"pos":671807}}},"contents":[{"Del":" } else {\n"},{"Del":" if needs_output(repo, if_modified_after, &path) {\n"},{"Del":" work.push((output_item.clone(), path.clone(), tmp.clone()));\n"},{"Del":" } else {\n debug!(\"Not outputting {:?}\", path)\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":411,"ins":{"up_context":[{"change":11,"pos":678720}],"down_context":[{"change":11,"pos":678892}],"flag":"BLOCK","start":20523,"end":21251,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":678720},"to":{"change":11,"start":678720,"end":678892},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.read();"},{"Add":" collect_children("},{"Add":" &*txn,"},{"Add":" &*changes,"},{"Add":" txn.graph(&*channel),"},{"Add":" output_item.pos,"},{"Add":" inode,"},{"Add":" &path,"},{"Add":" tmp.as_deref(),"},{"Add":" self.next_prefix_basename,"},{"Add":" next_files,"},{"Add":" )?;"},{"Add":" } else {"},{"Add":" if needs_output(repo, self.if_modified_after, &path) {"},{"Add":" self.work"},{"Add":" .push((output_item.clone(), path.clone(), tmp.clone()));"},{"Add":" } else {"},{"Add":" debug!(\"Not outputting {:?}\", path)"}],"del_contents":[{"Del":" if output_item.is_zombie {\n conflicts.push(Conflict::ZombieFile {\n path: name.to_string(),\n })\n"}]}},{"Edit":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":431,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":678910}],"down_context":[{"change":11,"pos":679059}],"flag":"BLOCK","start":21252,"end":21427,"inode":{"change":11,"pos":671807}}},"contents":[{"Add":" }"},{"Add":" if output_item.is_zombie {"},{"Add":" self.conflicts.push(Conflict::ZombieFile {"},{"Add":" path: name.to_string(),"},{"Add":" })"}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":438,"ins":{"up_context":[{"change":11,"pos":679083}],"down_context":[{"change":11,"pos":1147}],"flag":"BLOCK","start":21428,"end":21443,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":679083},"to":{"change":11,"start":679083,"end":679142},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":79565},"to":{"change":11,"start":79565,"end":79625},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":79625},"to":{"change":11,"start":102887,"end":102956},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1045},"to":{"change":11,"start":79694,"end":79717},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":102956},"to":{"change":11,"start":79694,"end":79717},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":79694},"to":{"change":11,"start":79694,"end":79717},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":79717},"to":{"change":2,"start":134,"end":192},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":192},"to":{"change":11,"start":679209,"end":679215},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":11,"pos":21082},"to":{"change":11,"start":679209,"end":679215},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":79744},"to":{"change":11,"start":679209,"end":679215},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":679209},"to":{"change":11,"start":679209,"end":679215},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":679215},"to":{"change":2,"start":193,"end":231},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":231},"to":{"change":11,"start":1046,"end":1147},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":79753},"to":{"change":11,"start":1046,"end":1147},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":" Ok(())"}],"del_contents":[{"Del":" std::mem::swap(&mut files, &mut next_files);\n }\n"},{"Del":" stop.store(true, std::sync::atomic::Ordering::Relaxed);\n"},{"Del":" let o = output_loop(repo, changes, txn, channel, work, stop, 0);\n"},{"Del":" for t in threads {\n"},{"Del":" conflicts.extend(t.join().unwrap()?.into_iter());\n"},{"Del":" }\n"},{"Del":" conflicts.extend(o?.into_iter());\n"},{"Del":" for (a, b) in actual_moves.iter() {\n repo.rename(a, b).map_err(OutputError::WorkingCopy)?\n"}]}},{"Replacement":{"inode":{"change":11,"pos":671807},"path":"\"libpijul/src/output/output.rs\"","line":440,"ins":{"up_context":[{"change":11,"pos":1153}],"down_context":[{"change":11,"pos":679233}],"flag":"BLOCK","start":21444,"end":21517,"inode":{"change":11,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":1153},"to":{"change":11,"start":679215,"end":679233},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":79753},"to":{"change":11,"start":679215,"end":679233},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":679215},"to":{"change":11,"start":679215,"end":679233},"introduced_by":11}],"inode":{"change":11,"pos":671807}},"ins_contents":[{"Add":"}"},{"Add":""},{"Add":"enum MakeInode {"},{"Add":" AlreadyOutput,"},{"Add":" NameConflict,"},{"Add":" Ok(String),"}],"del_contents":[{"Del":" Ok(conflicts)\n"}]}},{"Replacement":{"inode":{"change":11,"pos":686190},"path":"\"libpijul/src/output/mod.rs\"","line":101,"ins":{"up_context":[{"change":11,"pos":86337}],"down_context":[{"change":11,"pos":56008}],"flag":"BLOCK","start":21518,"end":21580,"inode":{"change":11,"pos":686190}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":24839},"to":{"change":11,"start":686875,"end":686908},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":86337},"to":{"change":11,"start":686875,"end":686908},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":686875},"to":{"change":11,"start":686875,"end":686908},"introduced_by":11}],"inode":{"change":11,"pos":686190}},"ins_contents":[{"Add":" debug!(\"path = {:?}, inode_pos = {:?}\", path, inode_pos);"}],"del_contents":[{"Del":" debug!(\"path = {:?}\", path);\n"}]}},{"Edit":{"inode":{"change":11,"pos":686190},"path":"\"libpijul/src/output/mod.rs\"","line":110,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":86385}],"down_context":[{"change":11,"pos":122019}],"flag":"BLOCK","start":21581,"end":21612,"inode":{"change":11,"pos":686190}}},"contents":[{"Add":" debug!(\"e = {:?}\", e);"}]}},{"Replacement":{"inode":{"change":11,"pos":686190},"path":"\"libpijul/src/output/mod.rs\"","line":112,"ins":{"up_context":[{"change":11,"pos":122089}],"down_context":[{"change":11,"pos":17652}],"flag":"BLOCK","start":21613,"end":22089,"inode":{"change":11,"pos":686190}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":56162},"to":{"change":11,"start":687480,"end":687519},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":58558},"to":{"change":11,"start":687480,"end":687519},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":86454},"to":{"change":11,"start":687480,"end":687519},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":122089},"to":{"change":11,"start":687480,"end":687519},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":687480},"to":{"change":11,"start":687480,"end":687519},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":687519},"to":{"change":11,"start":1478,"end":1556},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1556},"to":{"change":11,"start":3999,"end":4014},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":4014},"to":{"change":11,"start":1556,"end":1604},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":1556},"to":{"change":11,"start":1556,"end":1604},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1604},"to":{"change":11,"start":17583,"end":17652},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":17583},"to":{"change":11,"start":17583,"end":17652},"introduced_by":11}],"inode":{"change":11,"pos":686190}},"ins_contents":[{"Add":" if name_vertex.start != name_vertex.end {"},{"Add":" debug!(\"name_vertex: {:?} {:?}\", e, name_vertex);"},{"Add":" collect("},{"Add":" txn,"},{"Add":" changes,"},{"Add":" channel,"},{"Add":" inode,"},{"Add":" path,"},{"Add":" tmp,"},{"Add":" prefix_basename,"},{"Add":" files,"},{"Add":" name_vertex,"},{"Add":" )?"},{"Add":" } else {"},{"Add":" let inode_pos = iter_adjacent("},{"Add":" txn,"},{"Add":" channel,"}],"del_contents":[{"Del":" let mut name_buf = Vec::new();\n"},{"Del":" let FileMetadata {\n basename,\n metadata: perms,\n"},{"Del":" ..\n"},{"Del":" } = changes\n .get_file_meta(\n"},{"Del":" |h| txn.get_external(&h).unwrap().map(|x| x.into()),\n"}]}},{"Replacement":{"inode":{"change":11,"pos":686190},"path":"\"libpijul/src/output/mod.rs\"","line":130,"ins":{"up_context":[{"change":11,"pos":17682}],"down_context":[{"change":11,"pos":86688}],"flag":"BLOCK","start":22090,"end":22278,"inode":{"change":11,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":17682},"to":{"change":11,"start":17682,"end":17727},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":17727},"to":{"change":11,"start":86543,"end":86600},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":122198},"to":{"change":11,"start":86543,"end":86600},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":86543},"to":{"change":11,"start":86543,"end":86600},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":687814},"to":{"change":11,"start":687814,"end":688082},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":688145},"to":{"change":11,"start":688145,"end":688203},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":688346},"to":{"change":11,"start":56334,"end":56407},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":56407},"to":{"change":11,"start":86601,"end":86622},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":86622},"to":{"change":11,"start":122199,"end":122225},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":122225},"to":{"change":11,"start":56454,"end":56555},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":56454},"to":{"change":11,"start":56454,"end":56555},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":56555},"to":{"change":11,"start":86623,"end":86634},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":86634},"to":{"change":11,"start":56565,"end":56591},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":56565},"to":{"change":11,"start":56565,"end":56591},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":56591},"to":{"change":11,"start":86635,"end":86654},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":86654},"to":{"change":11,"start":56609,"end":56626},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":56609},"to":{"change":11,"start":56609,"end":56626},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":56626},"to":{"change":11,"start":86655,"end":86688},"introduced_by":11}],"inode":{"change":11,"pos":686190}},"ins_contents":[{"Add":" EdgeFlags::FOLDER,"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::PSEUDO | EdgeFlags::BLOCK,"},{"Add":" )?"},{"Add":" .next()"},{"Add":" .unwrap()?"},{"Add":" .dest();"}],"del_contents":[{"Del":" &mut name_buf,\n )\n"},{"Del":" .map_err(PristineOutputError::Changestore)?;\n"},{"Del":" debug!(\"filename: {:?} {:?}\", perms, basename);\n let mut name = path.to_string();\n if let Some(next) = prefix_basename {\n if next != basename {\n continue;\n }\n }\n path::push(&mut name, basename);\n"},{"Del":" debug!(\"name_vertex: {:?} {:?}\", e, name_vertex);\n"},{"Del":" let child = if let Some(child) = iter_adjacent(\n txn,\n"},{"Del":" channel,\n"},{"Del":" *name_vertex,\n"},{"Del":" EdgeFlags::FOLDER,\n EdgeFlags::FOLDER | EdgeFlags::BLOCK | EdgeFlags::PSEUDO,\n"},{"Del":" )?\n"},{"Del":" .next()\n {\n"},{"Del":" child?\n"},{"Del":" } else {\n"},{"Del":" let mut edge = None;\n"}]}},{"Replacement":{"inode":{"change":11,"pos":686190},"path":"\"libpijul/src/output/mod.rs\"","line":139,"ins":{"up_context":[{"change":11,"pos":86750}],"down_context":[{"change":11,"pos":688474}],"flag":"BLOCK","start":22279,"end":22321,"inode":{"change":11,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":86750},"to":{"change":11,"start":122226,"end":122256},"introduced_by":11}],"inode":{"change":11,"pos":686190}},"ins_contents":[{"Add":" inode_pos.inode_vertex(),"}],"del_contents":[{"Del":" *name_vertex,\n"}]}},{"Replacement":{"inode":{"change":11,"pos":686190},"path":"\"libpijul/src/output/mod.rs\"","line":141,"ins":{"up_context":[{"change":11,"pos":688509}],"down_context":[{"change":11,"pos":86751}],"flag":"BLOCK","start":22322,"end":22396,"inode":{"change":11,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":688509},"to":{"change":11,"start":56687,"end":56721},"introduced_by":11}],"inode":{"change":11,"pos":686190}},"ins_contents":[{"Add":" EdgeFlags::FOLDER | EdgeFlags::PSEUDO | EdgeFlags::BLOCK,"}],"del_contents":[{"Del":" EdgeFlags::all(),\n"}]}},{"Replacement":{"inode":{"change":11,"pos":686190},"path":"\"libpijul/src/output/mod.rs\"","line":144,"ins":{"up_context":[{"change":11,"pos":86796}],"down_context":[{"change":11,"pos":86934}],"flag":"BLOCK","start":22397,"end":22816,"inode":{"change":11,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":86796},"to":{"change":11,"start":122257,"end":122316},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":122316},"to":{"change":11,"start":86853,"end":86934},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":86853},"to":{"change":11,"start":86853,"end":86934},"introduced_by":11}],"inode":{"change":11,"pos":686190}},"ins_contents":[{"Add":" debug!(\"e = {:?}\", e);"},{"Add":" let name_vertex = txn.find_block(channel, e.dest()).unwrap();"},{"Add":" collect("},{"Add":" txn,"},{"Add":" changes,"},{"Add":" channel,"},{"Add":" inode,"},{"Add":" path,"},{"Add":" tmp,"},{"Add":" prefix_basename,"},{"Add":" files,"},{"Add":" name_vertex,"},{"Add":" )?"}],"del_contents":[{"Del":" if !e.flag().contains(EdgeFlags::PARENT) {\n"},{"Del":" edge = Some(e);\n break;\n }\n"}]}},{"Replacement":{"inode":{"change":11,"pos":686190},"path":"\"libpijul/src/output/mod.rs\"","line":158,"ins":{"up_context":[{"change":11,"pos":86948}],"down_context":[{"change":11,"pos":689115}],"flag":"BLOCK","start":22817,"end":22846,"inode":{"change":11,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":86948},"to":{"change":11,"start":86948,"end":86983},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":86983},"to":{"change":11,"start":688898,"end":688970},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":688898},"to":{"change":11,"start":688898,"end":688970},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":688970},"to":{"change":11,"start":122317,"end":122404},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":962},"to":{"change":11,"start":689072,"end":689115},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":3292},"to":{"change":11,"start":689072,"end":689115},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":56894},"to":{"change":11,"start":689072,"end":689115},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":87069},"to":{"change":11,"start":689072,"end":689115},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":122404},"to":{"change":11,"start":689072,"end":689115},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":689072},"to":{"change":11,"start":689072,"end":689115},"introduced_by":11}],"inode":{"change":11,"pos":686190}},"ins_contents":[{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"}],"del_contents":[{"Del":" let e = edge.unwrap();\n"},{"Del":" let mut f = std::fs::File::create(\"debug_output\").unwrap();\n"},{"Del":" debug_root(txn, channel, e.dest().inode_vertex(), &mut f, false).unwrap();\n"},{"Del":" panic!(\"no child\");\n };\n"}]}},{"Replacement":{"inode":{"change":11,"pos":686190},"path":"\"libpijul/src/output/mod.rs\"","line":163,"ins":{"up_context":[{"change":11,"pos":689116}],"down_context":[{"change":11,"pos":122405}],"flag":"BLOCK","start":22847,"end":23422,"inode":{"change":11,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":689116},"to":{"change":11,"start":689116,"end":689154},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":689352},"to":{"change":11,"start":4958,"end":5018},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":5018},"to":{"change":11,"start":689409,"end":689426},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":689409},"to":{"change":11,"start":689409,"end":689426},"introduced_by":11}],"inode":{"change":11,"pos":686190}},"ins_contents":[{"Add":"fn collect("},{"Add":" txn: &T,"},{"Add":" changes: &P,"},{"Add":" channel: &T::Graph,"},{"Add":" inode: Inode,"},{"Add":" path: &str,"},{"Add":" tmp: Option<&str>,"},{"Add":" prefix_basename: Option<&str>,"},{"Add":" files: &mut HashMap, OutputItem)>>,"},{"Add":" name_vertex: &Vertex,"},{"Add":") -> Result<(), PristineOutputError> {"},{"Add":" let mut name_buf = Vec::new();"},{"Add":" let FileMetadata {"},{"Add":" basename,"},{"Add":" metadata: perms,"},{"Add":" .."},{"Add":" } = changes"},{"Add":" .get_file_meta("},{"Add":" |h| txn.get_external(&h).unwrap().map(|x| x.into()),"}],"del_contents":[{"Del":" debug!(\"child: {:?}\", child);\n"},{"Del":" let v = files.entry(name).or_insert_with(Vec::new);\n"},{"Del":" v.push((\n"}]}},{"Replacement":{"inode":{"change":11,"pos":686190},"path":"\"libpijul/src/output/mod.rs\"","line":183,"ins":{"up_context":[{"change":11,"pos":122431}],"down_context":[{"change":11,"pos":689736}],"flag":"BLOCK","start":23423,"end":23711,"inode":{"change":11,"pos":686190}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":122431},"to":{"change":11,"start":689451,"end":689547},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":689451},"to":{"change":11,"start":689451,"end":689547},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":689547},"to":{"change":11,"start":1427,"end":1471},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":1471},"to":{"change":11,"start":689547,"end":689576},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":689547},"to":{"change":11,"start":689547,"end":689576},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":689576},"to":{"change":11,"start":122432,"end":122534},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":87135},"to":{"change":11,"start":689709,"end":689736},"introduced_by":11},{"previous":"","flag":"DELETED","from":{"change":11,"pos":122534},"to":{"change":11,"start":689709,"end":689736},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":689709},"to":{"change":11,"start":689709,"end":689736},"introduced_by":11}],"inode":{"change":11,"pos":686190}},"ins_contents":[{"Add":" &mut name_buf,"},{"Add":" )"},{"Add":" .map_err(PristineOutputError::Changestore)?;"},{"Add":" debug!(\"filename: {:?} {:?}\", perms, basename);"},{"Add":" let mut name = path.to_string();"},{"Add":" if let Some(next) = prefix_basename {"},{"Add":" if next != basename {"},{"Add":" return Ok(());"},{"Add":" }"}],"del_contents":[{"Del":" OutputItem {\n parent: inode,\n path: path.to_string(),\n"},{"Del":" tmp: tmp.map(String::from),\n"},{"Del":" meta: perms,\n"},{"Del":" pos: child.dest(),\n is_zombie: is_zombie(txn, channel, child.dest())?,\n"},{"Del":" },\n ));\n"}]}},{"Edit":{"inode":{"change":11,"pos":686190},"path":"\"libpijul/src/output/mod.rs\"","line":193,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":689742}],"down_context":[{"change":11,"pos":689742}],"flag":"BLOCK","start":23712,"end":24961,"inode":{"change":11,"pos":686190}}},"contents":[{"Add":" path::push(&mut name, basename);"},{"Add":" let child = if let Some(child) = iter_adjacent("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" *name_vertex,"},{"Add":" EdgeFlags::FOLDER,"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::BLOCK | EdgeFlags::PSEUDO,"},{"Add":" )?"},{"Add":" .next()"},{"Add":" {"},{"Add":" child?"},{"Add":" } else {"},{"Add":" let mut edge = None;"},{"Add":" for e in iter_adjacent("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" *name_vertex,"},{"Add":" EdgeFlags::FOLDER,"},{"Add":" EdgeFlags::all(),"},{"Add":" )? {"},{"Add":" let e = e?;"},{"Add":" if !e.flag().contains(EdgeFlags::PARENT) {"},{"Add":" edge = Some(e);"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" let e = edge.unwrap();"},{"Add":" let mut f = std::fs::File::create(\"debug_output\").unwrap();"},{"Add":" debug_root(txn, channel, e.dest().inode_vertex(), &mut f, false).unwrap();"},{"Add":" panic!(\"no child\");"},{"Add":" };"},{"Add":""},{"Add":" debug!(\"child: {:?}\", child);"},{"Add":" let v = files.entry(name).or_insert_with(Vec::new);"},{"Add":" v.push(("},{"Add":" *name_vertex,"},{"Add":" OutputItem {"},{"Add":" parent: inode,"},{"Add":" path: path.to_string(),"},{"Add":" tmp: tmp.map(String::from),"},{"Add":" meta: perms,"},{"Add":" pos: child.dest(),"},{"Add":" is_zombie: is_zombie(txn, channel, child.dest())?,"},{"Add":" },"},{"Add":" ));"}]}},{"Edit":{"inode":{"change":11,"pos":737429},"path":"\"libpijul/src/fs.rs\"","line":568,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":752522}],"down_context":[{"change":11,"pos":752522}],"flag":"BLOCK","start":24962,"end":25007,"inode":{"change":11,"pos":737429}}},"contents":[{"Add":" adj2: Option>,"}]}},{"Replacement":{"inode":{"change":11,"pos":737429},"path":"\"libpijul/src/fs.rs\"","line":578,"ins":{"up_context":[{"change":11,"pos":752809}],"down_context":[{"change":11,"pos":109603}],"flag":"BLOCK","start":25008,"end":26861,"inode":{"change":11,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":752809},"to":{"change":11,"start":109481,"end":109603},"introduced_by":11}],"inode":{"change":11,"pos":737429}},"ins_contents":[{"Add":" let dest = loop {"},{"Add":" debug!(\"adj2 = {:?}\", self.adj2.is_some());"},{"Add":" if let Some(mut adj2) = self.adj2.take() {"},{"Add":" match adj2.next() {"},{"Add":" None => {}"},{"Add":" Some(Ok(ch)) => {"},{"Add":" self.adj2 = Some(adj2);"},{"Add":" break self.txn.find_block(self.channel, ch.dest()).unwrap();"},{"Add":" }"},{"Add":" Some(Err(e)) => return Some(Err(e.0)),"},{"Add":" }"},{"Add":" }"},{"Add":" match self.adj.next() {"},{"Add":" Some(Ok(child)) => {"},{"Add":" let d = self.txn.find_block(self.channel, child.dest()).unwrap();"},{"Add":" if d.start == d.end {"},{"Add":" match iter_adjacent("},{"Add":" self.txn,"},{"Add":" self.channel,"},{"Add":" *d,"},{"Add":" EdgeFlags::FOLDER,"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::PSEUDO | EdgeFlags::BLOCK,"},{"Add":" )"},{"Add":" .and_then(|mut it| it.next().unwrap())"},{"Add":" .and_then(|x| {"},{"Add":" iter_adjacent("},{"Add":" self.txn,"},{"Add":" self.channel,"},{"Add":" x.dest().inode_vertex(),"},{"Add":" EdgeFlags::FOLDER,"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::PSEUDO | EdgeFlags::BLOCK,"},{"Add":" )"},{"Add":" }) {"},{"Add":" Ok(adj) => self.adj2 = Some(adj),"},{"Add":" Err(e) => return Some(Err(e.0)),"},{"Add":" }"},{"Add":" } else {"},{"Add":" break d;"},{"Add":" }"},{"Add":" }"},{"Add":" Some(Err(e)) => return Some(Err(e.0)),"},{"Add":" None => return None,"},{"Add":" }"}],"del_contents":[{"Del":" let child = match self.adj.next()? {\n Ok(child) => child,\n Err(e) => return Some(Err(e.0)),\n"}]}},{"Replacement":{"inode":{"change":11,"pos":737429},"path":"\"libpijul/src/fs.rs\"","line":622,"ins":{"up_context":[{"change":11,"pos":109614}],"down_context":[{"change":11,"pos":109690}],"flag":"BLOCK","start":26862,"end":26900,"inode":{"change":11,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":109614},"to":{"change":11,"start":131879,"end":131956},"introduced_by":11}],"inode":{"change":11,"pos":737429}},"ins_contents":[{"Add":" debug!(\"dest = {:?}\", dest);"},{"Add":""}],"del_contents":[{"Del":" let dest = self.txn.find_block(self.channel, child.dest()).unwrap();\n"}]}},{"Edit":{"inode":{"change":11,"pos":737429},"path":"\"libpijul/src/fs.rs\"","line":685,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":110831}],"down_context":[{"change":11,"pos":754401}],"flag":"BLOCK","start":26901,"end":26921,"inode":{"change":11,"pos":737429}}},"contents":[{"Add":" adj2: None,"}]}},{"Replacement":{"inode":{"change":11,"pos":737429},"path":"\"libpijul/src/fs.rs\"","line":907,"ins":{"up_context":[{"change":11,"pos":761369}],"down_context":[{"change":11,"pos":761401}],"flag":"BLOCK","start":26922,"end":26962,"inode":{"change":11,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":761369},"to":{"change":11,"start":761369,"end":761401},"introduced_by":11}],"inode":{"change":11,"pos":737429}},"ins_contents":[{"Add":" 'outer: while !v.change.is_root() {"}],"del_contents":[{"Del":" while !v.change.is_root() {\n"}]}},{"Edit":{"inode":{"change":11,"pos":737429},"path":"\"libpijul/src/fs.rs\"","line":929,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":114156}],"down_context":[{"change":11,"pos":133151}],"flag":"BLOCK","start":26963,"end":27046,"inode":{"change":11,"pos":737429}}},"contents":[{"Add":" if name.dest().is_root() {"},{"Add":" break 'outer;"},{"Add":" }"}]}},{"Edit":{"inode":{"change":11,"pos":737429},"path":"\"libpijul/src/fs.rs\"","line":968,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":762898}],"down_context":[{"change":11,"pos":762898}],"flag":"BLOCK","start":27047,"end":27192,"inode":{"change":11,"pos":737429}}},"contents":[{"Add":" if name.start == name.end {"},{"Add":" // Non-zero root vertex"},{"Add":" assert!(next.change.is_root());"},{"Add":" break;"},{"Add":" }"}]}},{"Edit":{"inode":{"change":11,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":561,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":847507}],"down_context":[{"change":11,"pos":2919}],"flag":"BLOCK","start":27193,"end":27427,"inode":{"change":11,"pos":831311}}},"contents":[{"Add":" Hunk::AddRoot { change } => Hunk::DelRoot {"},{"Add":" change: change.inverse(hash),"},{"Add":" },"},{"Add":" Hunk::DelRoot { change } => Hunk::AddRoot {"},{"Add":" change: change.inverse(hash),"},{"Add":" },"}]}},{"Edit":{"inode":{"change":11,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":755,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":2045}],"down_context":[{"change":11,"pos":852249}],"flag":"BLOCK","start":27428,"end":27471,"inode":{"change":11,"pos":831311}}},"contents":[{"Add":" },"},{"Add":" AddRoot {"},{"Add":" change: Atom,"}]}},{"Edit":{"inode":{"change":11,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":759,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":852256}],"down_context":[{"change":11,"pos":852256}],"flag":"BLOCK","start":27472,"end":27515,"inode":{"change":11,"pos":831311}}},"contents":[{"Add":" DelRoot {"},{"Add":" change: Atom,"},{"Add":" },"}]}},{"Edit":{"inode":{"change":11,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":847,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":4889}],"down_context":[{"change":11,"pos":855085}],"flag":"BLOCK","start":27516,"end":27601,"inode":{"change":11,"pos":831311}}},"contents":[{"Add":" Hunk::AddRoot { change } | Hunk::DelRoot { change } => Some(change),"}]}},{"Edit":{"inode":{"change":11,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":910,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":5597}],"down_context":[{"change":11,"pos":857285}],"flag":"BLOCK","start":27602,"end":27695,"inode":{"change":11,"pos":831311}}},"contents":[{"Add":" Hunk::AddRoot { ref change } | Hunk::DelRoot { ref change } => Some(change),"}]}},{"Edit":{"inode":{"change":11,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":992,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":6340}],"down_context":[{"change":11,"pos":860058}],"flag":"BLOCK","start":27696,"end":27789,"inode":{"change":11,"pos":831311}}},"contents":[{"Add":" Hunk::AddRoot { ref change } | Hunk::DelRoot { ref change } => Some(change),"}]}},{"Edit":{"inode":{"change":11,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1111,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":6947}],"down_context":[{"change":11,"pos":863349}],"flag":"BLOCK","start":27790,"end":27854,"inode":{"change":11,"pos":831311}}},"contents":[{"Add":" Hunk::AddRoot { .. } | Hunk::DelRoot { .. } => \"/\","}]}},{"Edit":{"inode":{"change":11,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1224,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":866586}],"down_context":[{"change":11,"pos":122493}],"flag":"BLOCK","start":27855,"end":28027,"inode":{"change":11,"pos":831311}}},"contents":[{"Add":" BaseHunk::AddRoot { change } => BaseHunk::AddRoot { change: f(change)? },"},{"Add":" BaseHunk::DelRoot { change } => BaseHunk::DelRoot { change: f(change)? },"}]}},{"Replacement":{"inode":{"change":11,"pos":37976},"path":"\"libpijul/src/change/text_changes.rs\"","line":453,"ins":{"up_context":[{"change":11,"pos":4295}],"down_context":[{"change":11,"pos":52241}],"flag":"BLOCK","start":28028,"end":28492,"inode":{"change":11,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":11,"pos":4295},"to":{"change":11,"start":2861,"end":2981},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":51864},"to":{"change":11,"start":2861,"end":2981},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":2981},"to":{"change":11,"start":5417,"end":5444},"introduced_by":11},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":11,"pos":5444},"to":{"change":3,"start":101,"end":197},"introduced_by":3}],"inode":{"change":11,"pos":37976}},"ins_contents":[{"Add":" let (name, perms) = if n.start == n.end {"},{"Add":" (\"\", InodeMetadata::DIR)"},{"Add":" } else {"},{"Add":" let FileMetadata {"},{"Add":" basename: name,"},{"Add":" metadata: perms,"},{"Add":" .."},{"Add":" } = FileMetadata::read(&change_contents[n.start.0.into()..n.end.0.into()]);"},{"Add":" (name, perms)"},{"Add":" };"}],"del_contents":[{"Del":" let FileMetadata {\n basename: name,\n metadata: perms,\n"},{"Del":" ..\n"},{"Del":" } = FileMetadata::read(&change_contents[n.start.0.into()..n.end.0.into()]);\n"}]}},{"Edit":{"inode":{"change":11,"pos":37976},"path":"\"libpijul/src/change/text_changes.rs\"","line":589,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":5532}],"down_context":[{"change":11,"pos":56555}],"flag":"BLOCK","start":28493,"end":28793,"inode":{"change":11,"pos":37976}}},"contents":[{"Add":" }"},{"Add":" Hunk::AddRoot { change } => {"},{"Add":" writeln!(w, \"Root\",)?;"},{"Add":" write_atom(&mut w, hashes, &change)?;"},{"Add":" }"},{"Add":" Hunk::DelRoot { change } => {"},{"Add":" writeln!(w, \"Unroot\",)?;"},{"Add":" write_atom(&mut w, hashes, &change)?;"}]}},{"Edit":{"inode":{"change":11,"pos":37976},"path":"\"libpijul/src/change/text_changes.rs\"","line":1172,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":79917}],"down_context":[{"change":11,"pos":79917}],"flag":"BLOCK","start":28794,"end":28833,"inode":{"change":11,"pos":37976}}},"contents":[{"Add":" _ => unimplemented!(),"}]}}],"owner":"irevoire","repo":"pijul","token":"Bt3hDMFNt5aNkhdAUOIt2ALKm8DbZcqVdwR9lJWVQ9Q=","login":null}

…

Dependencies

Change contents