{"header":{"message":"Allowing vertex buffer to use references to the transaction, by changing `output::output` to take an ArcTxn instead of a simple T","description":null,"timestamp":"2022-04-29T09:06:54.627619897Z","authors":[{}]},"hash":"YXAVFTPP2PQAYMKGQH7QNKFVGKDI2UHVWB7SIDA4QEYSBP75ZGUQC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["YXAVFTPP2PQAYMKGQH7QNKFVGKDI2UHVWB7SIDA4QEYSBP75ZGUQC","Allowing vertex buffer to use references to the transaction, by changing `output::output` to take an ArcTxn instead of a simple T"],["AA",null],["VPENMXMZHLOUBEGORNOWABULOWC3AOOEWTL4RB25735CJL7MI36QC","Using prefixes of the base32 of external hashes instead of full internal hashes"],["PXR7LQ26P3UJ3XHGJDCFJMXVAXQS3OGE4AESRVMEI74AWYKAHSAQC","Resurrecting known deleted files instead of re-adding them (this is needed after `tag reset`)"],["3X5ZCEPZDO2UYKQHX5YN7DC6J2WPHGR6X736NRF7QMLSUVUBYZOAC","Fixing a panic when `pijul archive` does not find the channel"],["YHG37GA4BELXO4I6TKXMEBIX5MHQT6DWFFFIYYUGLZ4UWCC3NGOQC","Removing one buffer copy in VertexBuffer"],["G55Y75FUL4LWA346HQCZ5EVA5G54EDTZAW7MPVTO44BP6D5UMURAC","Avoiding deadlocks when using output.rs with a non-filesystem output"],["27PYHR6LO4M4RMSMLVMUKSYNQ72V6RRMRXLYQI3JA3LBHJO747YAC","Making the get_latest_touch function (useful to make archives) public in libpijul"],["3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","More convenient interface for channels"],["Z6FWHKCAGF5MJCIG327JK7SYXQ53KM2UVGVE3QL64KDVOUPKQ3HQC","Improving the UI around zombie conflicts"],["5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","Store the current channel in the pristine"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["PIQCNEEBNHZDYOU2O7667XBB6D3V2MUALRRVJX6VO5BGYR7LTYRQC","Upgrading to Clap 3.0.0-alpha.5"],["2UTQVDLPXDC3QH5EAGGAC4M6CNZ6WZIMUOVP6DXF4KIR3CIU2U7QC","Do not create an archive if the prefix is absolute"],["2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","Making libpijul deterministic (and getting rid of `rand`)"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","Fixing the Git feature"],["RMDMAYRXYBU5OQXV5HSF6LFD4NBMKRNH5EPIVW3K5HAV6D56IG6QC","Adding a root inode (aka supporting submodules)"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","encoded file deletion"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["C4MJ7D7QCOFGIHQSDV3UC76DTSE5M7JSLGN5MROMSVKFVQRFSP5QC","Verbose printing of conflicts to stderr"],["BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","address clippy lints"],["ZBNKSYA6PW4DSPC3NCRUZLVHW2GNXMCSDSAGEIKHGHDGGZRBH7ZQC","Fixing a bus error when starting a transaction on a full disk"],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","Implement the Sanakirja concurrency model in a cross-process way"],["2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","No pager on Windows"],["ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","Tag transactions (including a massive refactoring of errors)"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["OWCCRVO5LMF3AJ6CU76UOT6HS2VNGI6O3LGTTYQBKZLPCCRNETXQC","Fixing a broken pipe in credit"],["FBZ6LBF3M4NI7SXNSDLITDTPQKHHEVFQXBHEVBO5FK6Q2VSCZM6QC","Permissions in archives (since we do not store full permissions anymore)"],["YCEZL7VFBZNOZTSSI24D36ACJVZKXCCEOIFWIHQWK22QPB4PDTRAC","Moving to temporary paths when outputting"],["NLGQAH4H35XC5XTH26BRXVFWGPPAMA4MDN3MHMGCOYE6ZZQMQ4AAC","Credit and reset relative to current directory instead of the root"],["Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","Don't output files if they aren't in the current channel"],["SECWDBUHJUJJD42LVFZEAUFR56B4OFWYW34H7PQ5Y7QNTPVIXYOQC","Adding empty directories to archives"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["I7VL7VPZV2NKOZRKBWWEHFOGNGGTYLPONHABVJ767D6HPJJNY5RAC","Minor cleanup"],["EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","Updating Pijul with the latest changes in Libpijul"],["OY3CGEHQCHMCPWQAXCW2SZCDIDTE2OB6CRFIDT7E2TCFFKXQ43XAC","Early stop in the diff algorithms for diff --short"],["GA3P7FOMATKDOGCZDYWLZJHAUNOWMRIP3BXTYFEH7PNWTTYYVLIAC","Nicer conflict markers"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["YRBOKAWJVS24QTCEMYIUWTEE6HE7BM5OBF5U5MPYFTYW4ZYV2THQC","Formatting (why wasn't this recorded before? I'm not sure)"],["WW2EOFBBX6LGMMRKEVGST2SIITJGMK2MTYDAHUTO6QGYPS2JATLQC","Umask in archives"],["VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","Versions and formatting"],["IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Cleanup, formatting, and fixing the Git feature"],["GLMOA3PFDR7HHJ3QMVZBNNJ3CGZAF72AZ5UBNEQON37K5WFNZP6QC","More edges in \"credit\""],["I3OVP3NHSMB2YLU4EPU5BFH7KB54PMQ4WDATGINIJKRIHMSVFUSQC","Archive: set the accurate and deterministic mtime"],["XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","file encoding in updates"]],"deps":["VPENMXMZHLOUBEGORNOWABULOWC3AOOEWTL4RB25735CJL7MI36QC","PXR7LQ26P3UJ3XHGJDCFJMXVAXQS3OGE4AESRVMEI74AWYKAHSAQC","3X5ZCEPZDO2UYKQHX5YN7DC6J2WPHGR6X736NRF7QMLSUVUBYZOAC","YHG37GA4BELXO4I6TKXMEBIX5MHQT6DWFFFIYYUGLZ4UWCC3NGOQC","G55Y75FUL4LWA346HQCZ5EVA5G54EDTZAW7MPVTO44BP6D5UMURAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","NLGQAH4H35XC5XTH26BRXVFWGPPAMA4MDN3MHMGCOYE6ZZQMQ4AAC","GLMOA3PFDR7HHJ3QMVZBNNJ3CGZAF72AZ5UBNEQON37K5WFNZP6QC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","2K7JLB4Z7BS5VFNWD4DO3MKYU7VNPA5MTVHVSDI3FQZ5ICM6XM6QC","BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","I3OVP3NHSMB2YLU4EPU5BFH7KB54PMQ4WDATGINIJKRIHMSVFUSQC","27PYHR6LO4M4RMSMLVMUKSYNQ72V6RRMRXLYQI3JA3LBHJO747YAC","3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","SECWDBUHJUJJD42LVFZEAUFR56B4OFWYW34H7PQ5Y7QNTPVIXYOQC","VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","I7VL7VPZV2NKOZRKBWWEHFOGNGGTYLPONHABVJ767D6HPJJNY5RAC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","FBZ6LBF3M4NI7SXNSDLITDTPQKHHEVFQXBHEVBO5FK6Q2VSCZM6QC","2UTQVDLPXDC3QH5EAGGAC4M6CNZ6WZIMUOVP6DXF4KIR3CIU2U7QC","YRBOKAWJVS24QTCEMYIUWTEE6HE7BM5OBF5U5MPYFTYW4ZYV2THQC","ZBNKSYA6PW4DSPC3NCRUZLVHW2GNXMCSDSAGEIKHGHDGGZRBH7ZQC","WW2EOFBBX6LGMMRKEVGST2SIITJGMK2MTYDAHUTO6QGYPS2JATLQC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","YCEZL7VFBZNOZTSSI24D36ACJVZKXCCEOIFWIHQWK22QPB4PDTRAC","OWCCRVO5LMF3AJ6CU76UOT6HS2VNGI6O3LGTTYQBKZLPCCRNETXQC","Z6FWHKCAGF5MJCIG327JK7SYXQ53KM2UVGVE3QL64KDVOUPKQ3HQC","2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","C4MJ7D7QCOFGIHQSDV3UC76DTSE5M7JSLGN5MROMSVKFVQRFSP5QC","PIQCNEEBNHZDYOU2O7667XBB6D3V2MUALRRVJX6VO5BGYR7LTYRQC","RMDMAYRXYBU5OQXV5HSF6LFD4NBMKRNH5EPIVW3K5HAV6D56IG6QC","OY3CGEHQCHMCPWQAXCW2SZCDIDTE2OB6CRFIDT7E2TCFFKXQ43XAC","GA3P7FOMATKDOGCZDYWLZJHAUNOWMRIP3BXTYFEH7PNWTTYYVLIAC","ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC"]},"hunks":[{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul/src/remote/mod.rs","line":936,"ins":{"up_context":[{"change":7,"pos":61269}],"down_context":[{"change":7,"pos":61504}],"flag":"BLOCK","start":0,"end":323,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61269},"to":{"change":7,"start":0,"end":63},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":63},"to":{"change":7,"start":8957,"end":9035},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61331},"to":{"change":7,"start":8957,"end":9035},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":9035},"to":{"change":7,"start":0,"end":100},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" let txn = l.pristine.arc_txn_begin()?;"},{"Add":" let channel = {"},{"Add":" let txn = txn.read();"},{"Add":" txn.load_channel(&l.channel)?.unwrap()"},{"Add":" };"},{"Add":" txn.archive_with_state(&changes, &channel, &state, extra, &mut tarball, 0)?"}],"del_contents":[{"Del":" let mut txn = l.pristine.mut_txn_begin()?;\n"},{"Del":" let mut channel = txn.load_channel(&l.channel)?.unwrap();\n"},{"Del":" txn.archive_with_state(&changes, &mut channel, &state, extra, &mut tarball, 0)?\n"}]}},{"Replacement":{"inode":{"change":7,"pos":52474},"path":"pijul/src/remote/mod.rs","line":943,"ins":{"up_context":[{"change":7,"pos":61529}],"down_context":[{"change":7,"pos":61657}],"flag":"BLOCK","start":324,"end":551,"inode":{"change":7,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61529},"to":{"change":7,"start":61529,"end":61584},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":61584},"to":{"change":7,"start":9036,"end":9110},"introduced_by":7}],"inode":{"change":7,"pos":52474}},"ins_contents":[{"Add":" let txn = l.pristine.arc_txn_begin()?;"},{"Add":" let channel = {"},{"Add":" let txn = txn.read();"},{"Add":" txn.load_channel(&l.channel)?.unwrap()"},{"Add":" };"}],"del_contents":[{"Del":" let txn = l.pristine.txn_begin()?;\n"},{"Del":" let channel = txn.load_channel(&l.channel)?.unwrap();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":97650},"path":"pijul/src/commands/reset.rs","line":86,"ins":{"up_context":[{"change":7,"pos":99469}],"down_context":[{"change":7,"pos":99495}],"flag":"BLOCK","start":552,"end":600,"inode":{"change":7,"pos":97650}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":99469},"to":{"change":7,"start":3852,"end":3915},"introduced_by":7}],"inode":{"change":7,"pos":97650}},"ins_contents":[{"Add":" &txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" &*txn.read(),\n &channel.read(),\n"}]}},{"Replacement":{"inode":{"change":7,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":297,"ins":{"up_context":[{"change":7,"pos":12446}],"down_context":[{"change":7,"pos":131952}],"flag":"BLOCK","start":601,"end":677,"inode":{"change":7,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":12446},"to":{"change":7,"start":12446,"end":12529},"introduced_by":7}],"inode":{"change":7,"pos":123281}},"ins_contents":[{"Add":" txn.archive(&repo.changes, &channel, &mut tarball)?"}],"del_contents":[{"Del":" txn.read().archive(&repo.changes, &channel, &mut tarball)?\n"}]}},{"Replacement":{"inode":{"change":7,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":305,"ins":{"up_context":[{"change":7,"pos":132242}],"down_context":[{"change":7,"pos":132314}],"flag":"BLOCK","start":678,"end":861,"inode":{"change":7,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":132242},"to":{"change":7,"start":12530,"end":12581},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":12581},"to":{"change":7,"start":132242,"end":132314},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":132242},"to":{"change":7,"start":132242,"end":132314},"introduced_by":7}],"inode":{"change":7,"pos":123281}},"ins_contents":[{"Add":" let mut fork = {"},{"Add":" let mut txn = txn.write();"},{"Add":" txn.fork(&channel, &fork_name)?"},{"Add":" };"}],"del_contents":[{"Del":" let mut txn = txn.write();\n"},{"Del":" let mut fork = txn.fork(&channel, &fork_name)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":317,"ins":{"up_context":[{"change":7,"pos":132601}],"down_context":[{"change":7,"pos":132656}],"flag":"BLOCK","start":862,"end":925,"inode":{"change":7,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":132601},"to":{"change":7,"start":132601,"end":132656},"introduced_by":7}],"inode":{"change":7,"pos":123281}},"ins_contents":[{"Add":" txn.write().drop_channel(&fork_name)?;"}],"del_contents":[{"Del":" txn.drop_channel(&fork_name)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":321,"ins":{"up_context":[{"change":7,"pos":132737}],"down_context":[{"change":7,"pos":132809}],"flag":"BLOCK","start":926,"end":998,"inode":{"change":7,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":132737},"to":{"change":7,"start":12582,"end":12662},"introduced_by":7}],"inode":{"change":7,"pos":123281}},"ins_contents":[{"Add":" txn.archive(&repo.changes, &channel, &mut tarball)?"}],"del_contents":[{"Del":" txn.write().archive(&repo.changes, &channel, &mut tarball)?\n"}]}},{"Replacement":{"inode":{"change":7,"pos":178684},"path":"pijul/src/commands/credit.rs","line":29,"ins":{"up_context":[{"change":7,"pos":24306}],"down_context":[{"change":7,"pos":3573}],"flag":"BLOCK","start":999,"end":1081,"inode":{"change":7,"pos":178684}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":3572},"to":{"change":7,"start":179302,"end":179348},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":13643},"to":{"change":7,"start":179302,"end":179348},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":15812},"to":{"change":7,"start":179302,"end":179348},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":24306},"to":{"change":7,"start":179302,"end":179348},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":179302},"to":{"change":7,"start":179302,"end":179348},"introduced_by":7}],"inode":{"change":7,"pos":178684}},"ins_contents":[{"Add":" let txn_ = repo.pristine.arc_txn_begin()?;"},{"Add":" let txn = txn_.read();"}],"del_contents":[{"Del":" let txn = repo.pristine.txn_begin()?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":178684},"path":"pijul/src/commands/credit.rs","line":54,"ins":{"up_context":[{"change":7,"pos":237}],"down_context":[{"change":7,"pos":0}],"flag":"BLOCK","start":1082,"end":1111,"inode":{"change":7,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":237},"to":{"change":7,"start":16703,"end":16741},"introduced_by":7}],"inode":{"change":7,"pos":178684}},"ins_contents":[{"Add":" std::mem::drop(txn);"}],"del_contents":[{"Del":" let channel = channel.read();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":178684},"path":"pijul/src/commands/credit.rs","line":57,"ins":{"up_context":[{"change":7,"pos":180336}],"down_context":[{"change":7,"pos":180336}],"flag":"BLOCK","start":1112,"end":1131,"inode":{"change":7,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":180336},"to":{"change":7,"start":22252,"end":22270},"introduced_by":7}],"inode":{"change":7,"pos":178684}},"ins_contents":[{"Add":" &txn_,"}],"del_contents":[{"Del":" &txn,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":178684},"path":"pijul/src/commands/credit.rs","line":60,"ins":{"up_context":[{"change":7,"pos":180375}],"down_context":[{"change":7,"pos":46}],"flag":"BLOCK","start":1132,"end":1214,"inode":{"change":7,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":180375},"to":{"change":7,"start":22271,"end":22338},"introduced_by":7}],"inode":{"change":7,"pos":178684}},"ins_contents":[{"Add":" &mut Creditor::new(std::io::stdout(), txn_.clone(), channel.clone()),"}],"del_contents":[{"Del":" &mut Creditor::new(std::io::stdout(), &txn, &channel),\n"}]}},{"Replacement":{"inode":{"change":7,"pos":178684},"path":"pijul/src/commands/credit.rs","line":75,"ins":{"up_context":[{"change":7,"pos":180479}],"down_context":[{"change":7,"pos":180533}],"flag":"BLOCK","start":1215,"end":1272,"inode":{"change":7,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":180479},"to":{"change":7,"start":18260,"end":18321},"introduced_by":7}],"inode":{"change":7,"pos":178684}},"ins_contents":[{"Add":"pub struct Creditor {"}],"del_contents":[{"Del":"pub struct Creditor<'a, W: std::io::Write, T: ChannelTxnT> {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":178684},"path":"pijul/src/commands/credit.rs","line":80,"ins":{"up_context":[{"change":2,"pos":28}],"down_context":[{"change":7,"pos":180658}],"flag":"BLOCK","start":1273,"end":1321,"inode":{"change":7,"pos":178684}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":28},"to":{"change":7,"start":180613,"end":180629},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":180613},"to":{"change":7,"start":180613,"end":180629},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":180629},"to":{"change":7,"start":844,"end":873},"introduced_by":7}],"inode":{"change":7,"pos":178684}},"ins_contents":[{"Add":" txn: ArcTxn,"},{"Add":" channel: ChannelRef,"}],"del_contents":[{"Del":" txn: &'a T,\n"},{"Del":" channel: &'a T::Channel,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":178684},"path":"pijul/src/commands/credit.rs","line":84,"ins":{"up_context":[{"change":7,"pos":180661}],"down_context":[{"change":7,"pos":180787}],"flag":"BLOCK","start":1322,"end":1450,"inode":{"change":7,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":180661},"to":{"change":7,"start":18322,"end":18387},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":18387},"to":{"change":7,"start":874,"end":942},"introduced_by":7}],"inode":{"change":7,"pos":178684}},"ins_contents":[{"Add":"impl Creditor {"},{"Add":" pub fn new(w: W, txn: ArcTxn, channel: ChannelRef) -> Self {"}],"del_contents":[{"Del":"impl<'a, W: std::io::Write, T: ChannelTxnT> Creditor<'a, W, T> {\n"},{"Del":" pub fn new(w: W, txn: &'a T, channel: &'a T::Channel) -> Self {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":178684},"path":"pijul/src/commands/credit.rs","line":97,"ins":{"up_context":[{"change":7,"pos":180972}],"down_context":[{"change":5,"pos":0}],"flag":"BLOCK","start":1451,"end":1521,"inode":{"change":7,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":180972},"to":{"change":7,"start":6081,"end":6159},"introduced_by":7}],"inode":{"change":7,"pos":178684}},"ins_contents":[{"Add":"impl VertexBuffer for Creditor {"}],"del_contents":[{"Del":"impl<'a, W: std::io::Write, T: TxnTExt> VertexBuffer for Creditor<'a, W, T> {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":178684},"path":"pijul/src/commands/credit.rs","line":112,"ins":{"up_context":[{"change":7,"pos":181426}],"down_context":[{"change":7,"pos":18388}],"flag":"BLOCK","start":1522,"end":1714,"inode":{"change":7,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":181426},"to":{"change":7,"start":181426,"end":181558},"introduced_by":7}],"inode":{"change":7,"pos":178684}},"ins_contents":[{"Add":" let txn = self.txn.read();"},{"Add":" let channel = self.channel.read();"},{"Add":" for e in txn"},{"Add":" .iter_adjacent(&channel, v, EdgeFlags::PARENT, EdgeFlags::all())"}],"del_contents":[{"Del":" for e in self\n .txn\n .iter_adjacent(self.channel, v, EdgeFlags::PARENT, EdgeFlags::all())\n"}]}},{"Replacement":{"inode":{"change":7,"pos":178684},"path":"pijul/src/commands/credit.rs","line":122,"ins":{"up_context":[{"change":7,"pos":18546}],"down_context":[{"change":2,"pos":114}],"flag":"BLOCK","start":1715,"end":1795,"inode":{"change":7,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":18546},"to":{"change":2,"start":29,"end":114},"introduced_by":2}],"inode":{"change":7,"pos":178684}},"ins_contents":[{"Add":" if let Ok(Some(intro)) = txn.get_external(&e.introduced_by()) {"}],"del_contents":[{"Del":" if let Ok(Some(intro)) = self.txn.get_external(&e.introduced_by()) {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":191083},"path":"pijul/src/commands/archive.rs","line":5,"ins":{"up_context":[{"change":7,"pos":1637}],"down_context":[{"change":7,"pos":3252}],"flag":"BLOCK","start":1796,"end":1832,"inode":{"change":7,"pos":191083}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":1637},"to":{"change":7,"start":6427,"end":6484},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":3169},"to":{"change":7,"start":6427,"end":6484},"introduced_by":7}],"inode":{"change":7,"pos":191083}},"ins_contents":[{"Add":"use libpijul::{Hash, Merkle, TxnT};"}],"del_contents":[{"Del":"use libpijul::{Hash, Merkle, MutTxnTExt, TxnT, TxnTExt};\n"}]}},{"Replacement":{"inode":{"change":7,"pos":191083},"path":"pijul/src/commands/archive.rs","line":114,"ins":{"up_context":[{"change":7,"pos":193436}],"down_context":[{"change":7,"pos":4586}],"flag":"BLOCK","start":1833,"end":2260,"inode":{"change":7,"pos":191083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":193436},"to":{"change":7,"start":1023,"end":1085},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1085},"to":{"change":7,"start":4392,"end":4586},"introduced_by":7}],"inode":{"change":7,"pos":191083}},"ins_contents":[{"Add":" let txn = repo.pristine.arc_txn_begin()?;"},{"Add":" let channel = {"},{"Add":" let txn = txn.read();"},{"Add":" let channel_name = if let Some(ref c) = self.channel {"},{"Add":" c"},{"Add":" } else {"},{"Add":" txn.current_channel().unwrap_or(crate::DEFAULT_CHANNEL)"},{"Add":" };"},{"Add":" txn.load_channel(&channel_name)?.unwrap()"}],"del_contents":[{"Del":" let mut txn = repo.pristine.mut_txn_begin()?;\n"},{"Del":" let channel_name = if let Some(ref c) = self.channel {\n c\n } else {\n txn.current_channel().unwrap_or(crate::DEFAULT_CHANNEL)\n"}]}},{"Edit":{"inode":{"change":7,"pos":191083},"path":"pijul/src/commands/archive.rs","line":124,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":1085},"to":{"change":7,"start":19221,"end":19298},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":4605},"to":{"change":7,"start":19221,"end":19298},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":193497},"to":{"change":7,"start":19221,"end":19298},"introduced_by":7}],"inode":{"change":7,"pos":191083}}},"contents":[{"Del":" let mut channel = txn.load_channel(&channel_name)?.unwrap();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":191083},"path":"pijul/src/commands/archive.rs","line":126,"ins":{"up_context":[{"change":7,"pos":193648}],"down_context":[{"change":7,"pos":14173}],"flag":"BLOCK","start":2261,"end":2291,"inode":{"change":7,"pos":191083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":193648},"to":{"change":7,"start":193648,"end":193682},"introduced_by":7}],"inode":{"change":7,"pos":191083}},"ins_contents":[{"Add":" &channel,"}],"del_contents":[{"Del":" &mut channel,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":191083},"path":"pijul/src/commands/archive.rs","line":133,"ins":{"up_context":[{"change":7,"pos":193815}],"down_context":[{"change":7,"pos":4800}],"flag":"BLOCK","start":2292,"end":2888,"inode":{"change":7,"pos":191083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":193815},"to":{"change":7,"start":193815,"end":193869},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":193869},"to":{"change":7,"start":4606,"end":4800},"introduced_by":7}],"inode":{"change":7,"pos":191083}},"ins_contents":[{"Add":" let txn = repo.pristine.arc_txn_begin()?;"},{"Add":" let channel = {"},{"Add":" let txn = txn.read();"},{"Add":" let channel_name = if let Some(ref c) = self.channel {"},{"Add":" c"},{"Add":" } else {"},{"Add":" txn.current_channel().unwrap_or(crate::DEFAULT_CHANNEL)"},{"Add":" };"},{"Add":" if let Some(channel) = txn.load_channel(&channel_name)? {"},{"Add":" channel"},{"Add":" } else {"},{"Add":" bail!(\"No such channel: {:?}\", channel_name);"},{"Add":" }"}],"del_contents":[{"Del":" let txn = repo.pristine.txn_begin()?;\n"},{"Del":" let channel_name = if let Some(ref c) = self.channel {\n c\n } else {\n txn.current_channel().unwrap_or(crate::DEFAULT_CHANNEL)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":191083},"path":"pijul/src/commands/archive.rs","line":147,"ins":{"up_context":[{"change":7,"pos":4819}],"down_context":[{"change":7,"pos":194009}],"flag":"BLOCK","start":2889,"end":2957,"inode":{"change":7,"pos":191083}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":4819},"to":{"change":4,"start":0,"end":255},"introduced_by":4}],"inode":{"change":7,"pos":191083}},"ins_contents":[{"Add":" txn.archive(&repo.changes, &channel, &mut tarball)?"}],"del_contents":[{"Del":" if let Some(channel) = txn.load_channel(&channel_name)? {\n txn.archive(&repo.changes, &channel, &mut tarball)?\n } else {\n bail!(\"No such channel: {:?}\", channel_name);\n }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":907,"ins":{"up_context":[{"change":7,"pos":499882}],"down_context":[{"change":7,"pos":501222}],"flag":"BLOCK","start":2958,"end":3186,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":500045},"to":{"change":7,"start":98128,"end":98198},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":98198},"to":{"change":3,"start":40,"end":93},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":93},"to":{"change":7,"start":6768,"end":6853},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6768},"to":{"change":7,"start":6768,"end":6853},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" let (former_parents, is_deleted, encoding) = {"},{"Add":" let txn_ = txn.read();"},{"Add":" let channel_ = channel.read();"},{"Add":" collect_former_parents::(changes, &*txn_, &*channel_, vertex)?"},{"Add":" };"}],"del_contents":[{"Del":" let txn_ = txn.read();\n let channel_ = channel.read();\n"},{"Del":" let (former_parents, is_deleted, encoding) =\n"},{"Del":" collect_former_parents::(changes, &*txn_, &*channel_, vertex)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":918,"ins":{"up_context":[{"change":7,"pos":6890}],"down_context":[{"change":7,"pos":6914}],"flag":"BLOCK","start":3187,"end":3208,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6890},"to":{"change":7,"start":6890,"end":6914},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" txn,"}],"del_contents":[{"Del":" &*txn_,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":922,"ins":{"up_context":[{"change":7,"pos":6972}],"down_context":[{"change":7,"pos":7000}],"flag":"BLOCK","start":3209,"end":3234,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6972},"to":{"change":7,"start":6972,"end":7000},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" channel,"}],"del_contents":[{"Del":" &*channel_,\n"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":935,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":503210}],"down_context":[{"change":7,"pos":28919}],"flag":"BLOCK","start":3235,"end":3313,"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" let txn_ = txn.read();"},{"Add":" let channel_ = channel.read();"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":951,"ins":{"up_context":[{"change":7,"pos":7491}],"down_context":[{"change":7,"pos":7508}],"flag":"BLOCK","start":3314,"end":3339,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7491},"to":{"change":7,"start":7491,"end":7508},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" txn: &ArcTxn,"}],"del_contents":[{"Del":" txn: &T,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":955,"ins":{"up_context":[{"change":7,"pos":7589}],"down_context":[{"change":7,"pos":7619}],"flag":"BLOCK","start":3340,"end":3373,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":7589},"to":{"change":7,"start":7589,"end":7619},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" channel: &T::Channel,\n"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":979,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":681}],"down_context":[{"change":3,"pos":681}],"flag":"BLOCK","start":3374,"end":3450,"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.read();"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":983,"ins":{"up_context":[{"change":3,"pos":753}],"down_context":[{"change":3,"pos":799}],"flag":"BLOCK","start":3451,"end":3501,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":753},"to":{"change":3,"start":753,"end":799},"introduced_by":3}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" &*txn,"},{"Add":" &*channel,"}],"del_contents":[{"Del":" txn,\n channel,\n"}]}},{"Edit":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":997,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":8323}],"down_context":[{"change":7,"pos":8323}],"flag":"BLOCK","start":3502,"end":3578,"inode":{"change":7,"pos":488880}}},"contents":[{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.read();"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":1001,"ins":{"up_context":[{"change":7,"pos":2335}],"down_context":[{"change":7,"pos":8417}],"flag":"BLOCK","start":3579,"end":3629,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":2335},"to":{"change":7,"start":8371,"end":8417},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" &*txn,"},{"Add":" &*channel,"}],"del_contents":[{"Del":" txn,\n channel,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":1011,"ins":{"up_context":[{"change":7,"pos":8626}],"down_context":[{"change":7,"pos":8720}],"flag":"BLOCK","start":3630,"end":3841,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":8626},"to":{"change":7,"start":8626,"end":8720},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" || modified_since_last_commit("},{"Add":" &*txn.read(),"},{"Add":" &*channel.read(),"},{"Add":" &working_copy,"},{"Add":" &item.full_path,"},{"Add":" )?)"}],"del_contents":[{"Del":" || modified_since_last_commit(txn, channel, &working_copy, &item.full_path)?)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":488880},"path":"libpijul/src/record.rs","line":1018,"ins":{"up_context":[{"change":7,"pos":8730}],"down_context":[{"change":7,"pos":8800}],"flag":"BLOCK","start":3842,"end":4032,"inode":{"change":7,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":8730},"to":{"change":7,"start":8730,"end":8800},"introduced_by":7}],"inode":{"change":7,"pos":488880}},"ins_contents":[{"Add":" let mut ret = {"},{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.read();"},{"Add":" retrieve(&*txn, txn.graph(&*channel), vertex)?"},{"Add":" };"}],"del_contents":[{"Del":" let mut ret = retrieve(txn, txn.graph(channel), vertex)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":671807},"path":"libpijul/src/output/output.rs","line":649,"ins":{"up_context":[{"change":7,"pos":26402}],"down_context":[{"change":7,"pos":26524}],"flag":"BLOCK","start":4033,"end":4153,"inode":{"change":7,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":26402},"to":{"change":6,"start":158,"end":368},"introduced_by":6}],"inode":{"change":7,"pos":671807}},"ins_contents":[{"Add":" alive::output_graph(changes, &txn, &channel, &mut f, &mut l, forward)"},{"Add":" .map_err(PristineOutputError::from)?;"}],"del_contents":[{"Del":" {\n let txn = txn.read();\n let channel = channel.read();\n alive::output_graph(changes, &*txn, &*channel, &mut f, &mut l, forward)\n .map_err(PristineOutputError::from)?;\n }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":686190},"path":"libpijul/src/output/mod.rs","line":316,"ins":{"up_context":[{"change":7,"pos":82736}],"down_context":[{"change":7,"pos":82775}],"flag":"BLOCK","start":4154,"end":4204,"inode":{"change":7,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":82736},"to":{"change":7,"start":82736,"end":82775},"introduced_by":7}],"inode":{"change":7,"pos":686190}},"ins_contents":[{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" txn: &T,\n channel: &T::Channel,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":686190},"path":"libpijul/src/output/mod.rs","line":322,"ins":{"up_context":[{"change":7,"pos":82908}],"down_context":[{"change":7,"pos":83077}],"flag":"BLOCK","start":4205,"end":4454,"inode":{"change":7,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":82908},"to":{"change":7,"start":82908,"end":83077},"introduced_by":7}],"inode":{"change":7,"pos":686190}},"ins_contents":[{"Add":" let mut graph = {"},{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.read();"},{"Add":" crate::alive::retrieve(&*txn, txn.graph(&*channel), v0)?"},{"Add":" };"},{"Add":" crate::alive::output_graph(changes, txn, channel, out, &mut graph, &mut forward)?;"}],"del_contents":[{"Del":" let mut graph = crate::alive::retrieve(&*txn, txn.graph(&*channel), v0)?;\n crate::alive::output_graph(changes, &*txn, &*channel, out, &mut graph, &mut forward)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":690044},"path":"libpijul/src/output/archive.rs","line":150,"ins":{"up_context":[{"change":7,"pos":692279}],"down_context":[{"change":7,"pos":692292}],"flag":"BLOCK","start":4455,"end":4476,"inode":{"change":7,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":692279},"to":{"change":7,"start":692279,"end":692292},"introduced_by":7}],"inode":{"change":7,"pos":690044}},"ins_contents":[{"Add":" txn: &ArcTxn,"}],"del_contents":[{"Del":" txn: &T,\n"}]}},{"Edit":{"inode":{"change":7,"pos":690044},"path":"libpijul/src/output/archive.rs","line":155,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":7,"pos":32374},"to":{"change":7,"start":103479,"end":103513},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":88013},"to":{"change":7,"start":103479,"end":103513},"introduced_by":7}],"inode":{"change":7,"pos":690044}}},"contents":[{"Del":" let channel = channel.read();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":690044},"path":"libpijul/src/output/archive.rs","line":159,"ins":{"up_context":[{"change":7,"pos":692602}],"down_context":[{"change":7,"pos":4963}],"flag":"BLOCK","start":4477,"end":4818,"inode":{"change":7,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":692602},"to":{"change":7,"start":692602,"end":692654},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":692654},"to":{"change":7,"start":5033,"end":5062},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":5062},"to":{"change":7,"start":692672,"end":692729},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":58587},"to":{"change":7,"start":692672,"end":692729},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":88038},"to":{"change":7,"start":692672,"end":692729},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":692672},"to":{"change":7,"start":692672,"end":692729},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":692729},"to":{"change":7,"start":1472,"end":1486},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1486},"to":{"change":7,"start":692729,"end":692788},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":692729},"to":{"change":7,"start":692729,"end":692788},"introduced_by":7}],"inode":{"change":7,"pos":690044}},"ins_contents":[{"Add":" {"},{"Add":" let txn_ = txn.read();"},{"Add":" let channel_ = channel.read();"},{"Add":" collect_children("},{"Add":" &*txn_,"},{"Add":" changes,"},{"Add":" txn_.graph(&channel_),"},{"Add":" Position::ROOT,"},{"Add":" Inode::ROOT,"},{"Add":" \"\","},{"Add":" None,"},{"Add":" next_prefix_basename,"},{"Add":" &mut files,"},{"Add":" )?;"},{"Add":" }"}],"del_contents":[{"Del":" collect_children(\n txn,\n changes,\n"},{"Del":" txn.graph(&channel),\n"},{"Del":" Position::ROOT,\n Inode::ROOT,\n \"\",\n"},{"Del":" None,\n"},{"Del":" next_prefix_basename,\n &mut files,\n )?;\n\n"}]}},{"Replacement":{"inode":{"change":7,"pos":690044},"path":"libpijul/src/output/archive.rs","line":183,"ins":{"up_context":[{"change":7,"pos":693101}],"down_context":[{"change":7,"pos":693414}],"flag":"BLOCK","start":4819,"end":5317,"inode":{"change":7,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":693101},"to":{"change":7,"start":693101,"end":693132},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":693132},"to":{"change":7,"start":122535,"end":122605},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":5132},"to":{"change":7,"start":693202,"end":693232},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":58656},"to":{"change":7,"start":693202,"end":693232},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":122605},"to":{"change":7,"start":693202,"end":693232},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":693202},"to":{"change":7,"start":693202,"end":693232},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":693232},"to":{"change":7,"start":907,"end":933},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":933},"to":{"change":7,"start":122606,"end":122685},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":122685},"to":{"change":7,"start":1011,"end":1072},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1011},"to":{"change":7,"start":1011,"end":1072},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":1072},"to":{"change":7,"start":693398,"end":693414},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":5222},"to":{"change":7,"start":693398,"end":693414},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":58745},"to":{"change":7,"start":693398,"end":693414},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":693398},"to":{"change":7,"start":693398,"end":693414},"introduced_by":7}],"inode":{"change":7,"pos":690044}},"ins_contents":[{"Add":" {"},{"Add":" let txn_ = txn.read();"},{"Add":" let channel_ = channel.read();"},{"Add":" b.sort_by(|u, v| {"},{"Add":" txn_.get_changeset(txn_.changes(&channel_), &u.0.change)"},{"Add":" .unwrap()"},{"Add":" .cmp("},{"Add":" &txn_"},{"Add":" .get_changeset(txn_.changes(&channel_), &v.0.change)"},{"Add":" .unwrap(),"},{"Add":" )"},{"Add":" });"},{"Add":" }"}],"del_contents":[{"Del":" b.sort_by(|u, v| {\n"},{"Del":" txn.get_changeset(txn.changes(&channel), &u.0.change)\n"},{"Del":" .unwrap()\n"},{"Del":" .cmp(\n"},{"Del":" &txn.get_changeset(txn.changes(&channel), &v.0.change)\n"},{"Del":" .unwrap(),\n )\n"},{"Del":" });\n"}]}},{"Edit":{"inode":{"change":7,"pos":690044},"path":"libpijul/src/output/archive.rs","line":198,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":693507}],"down_context":[{"change":7,"pos":5043}],"flag":"BLOCK","start":5318,"end":5404,"inode":{"change":7,"pos":690044}}},"contents":[{"Add":" let txn_ = txn.read();"},{"Add":" let channel_ = channel.read();"}]}},{"Replacement":{"inode":{"change":7,"pos":690044},"path":"libpijul/src/output/archive.rs","line":233,"ins":{"up_context":[{"change":7,"pos":40}],"down_context":[{"change":7,"pos":122}],"flag":"BLOCK","start":5405,"end":5492,"inode":{"change":7,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":40},"to":{"change":7,"start":122686,"end":122769},"introduced_by":7}],"inode":{"change":7,"pos":690044}},"ins_contents":[{"Add":" crate::fs::get_latest_touch(&*txn_, &channel_, &output_item.pos)?;"}],"del_contents":[{"Del":" crate::fs::get_latest_touch(txn, &channel, &output_item.pos)?;\n"}]}},{"Replacement":{"inode":{"change":7,"pos":690044},"path":"libpijul/src/output/archive.rs","line":235,"ins":{"up_context":[{"change":7,"pos":159}],"down_context":[{"change":7,"pos":122843}],"flag":"BLOCK","start":5493,"end":5567,"inode":{"change":7,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":159},"to":{"change":7,"start":122770,"end":122843},"introduced_by":7}],"inode":{"change":7,"pos":690044}},"ins_contents":[{"Add":" let ext = txn_.get_external(&latest_touch)?.unwrap();"}],"del_contents":[{"Del":" let ext = txn.get_external(&latest_touch)?.unwrap();\n"}]}},{"Replacement":{"inode":{"change":7,"pos":690044},"path":"libpijul/src/output/archive.rs","line":242,"ins":{"up_context":[{"change":7,"pos":694976}],"down_context":[{"change":7,"pos":695005}],"flag":"BLOCK","start":5568,"end":5600,"inode":{"change":7,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":694976},"to":{"change":7,"start":694976,"end":695005},"introduced_by":7}],"inode":{"change":7,"pos":690044}},"ins_contents":[{"Add":" &*txn_,"}],"del_contents":[{"Del":" txn,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":690044},"path":"libpijul/src/output/archive.rs","line":244,"ins":{"up_context":[{"change":7,"pos":695038}],"down_context":[{"change":7,"pos":695072}],"flag":"BLOCK","start":5601,"end":5648,"inode":{"change":7,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":695038},"to":{"change":7,"start":5223,"end":5268},"introduced_by":7}],"inode":{"change":7,"pos":690044}},"ins_contents":[{"Add":" txn_.graph(&channel_),"}],"del_contents":[{"Del":" txn.graph(&channel),\n"}]}},{"Replacement":{"inode":{"change":7,"pos":690044},"path":"libpijul/src/output/archive.rs","line":258,"ins":{"up_context":[{"change":7,"pos":1275}],"down_context":[{"change":7,"pos":0}],"flag":"BLOCK","start":5649,"end":5778,"inode":{"change":7,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":1275},"to":{"change":7,"start":5269,"end":5369},"introduced_by":7}],"inode":{"change":7,"pos":690044}},"ins_contents":[{"Add":" let mut l ="},{"Add":" crate::alive::retrieve(&*txn_, txn_.graph(&channel_), output_item.pos)?;"}],"del_contents":[{"Del":" let mut l = crate::alive::retrieve(txn, txn.graph(&channel), output_item.pos)?;\n"}]}},{"Edit":{"inode":{"change":7,"pos":690044},"path":"libpijul/src/output/archive.rs","line":272,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":695759}],"down_context":[{"change":7,"pos":695759}],"flag":"BLOCK","start":5779,"end":5875,"inode":{"change":7,"pos":690044}}},"contents":[{"Add":" std::mem::drop(channel_);"},{"Add":" std::mem::drop(txn_);"}]}},{"Replacement":{"inode":{"change":7,"pos":690044},"path":"libpijul/src/output/archive.rs","line":277,"ins":{"up_context":[{"change":7,"pos":695881}],"down_context":[{"change":7,"pos":695919}],"flag":"BLOCK","start":5876,"end":5913,"inode":{"change":7,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":695881},"to":{"change":7,"start":695881,"end":695919},"introduced_by":7}],"inode":{"change":7,"pos":690044}},"ins_contents":[{"Add":" channel,"}],"del_contents":[{"Del":" &channel,\n"}]}},{"Edit":{"inode":{"change":7,"pos":717381},"path":"libpijul/src/lib.rs","line":261,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":727750},"to":{"change":7,"start":727750,"end":727756},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":727756},"to":{"change":7,"start":84622,"end":84623},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":84623},"to":{"change":7,"start":2901,"end":2969},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":126273},"to":{"change":7,"start":2901,"end":2969},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":727757},"to":{"change":7,"start":2901,"end":2969},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":2969},"to":{"change":7,"start":727829,"end":727919},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":727829},"to":{"change":7,"start":727829,"end":727919},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":727919},"to":{"change":7,"start":126274,"end":126308},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":126308},"to":{"change":7,"start":727952,"end":728008},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":727952},"to":{"change":7,"start":727952,"end":728008},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":728008},"to":{"change":7,"start":4880,"end":4899},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":4899},"to":{"change":7,"start":33677,"end":33766},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":29838},"to":{"change":7,"start":728064,"end":728239},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":33766},"to":{"change":7,"start":728064,"end":728239},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":95462},"to":{"change":7,"start":728064,"end":728239},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":728064},"to":{"change":7,"start":728064,"end":728239},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":728239},"to":{"change":7,"start":4900,"end":4918},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":4918},"to":{"change":7,"start":728239,"end":728644},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":728239},"to":{"change":7,"start":728239,"end":728644},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":728644},"to":{"change":7,"start":126309,"end":126343},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":126343},"to":{"change":7,"start":728677,"end":728757},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":728677},"to":{"change":7,"start":728677,"end":728757},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":728757},"to":{"change":7,"start":4919,"end":4938},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":4938},"to":{"change":7,"start":33767,"end":33856},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":29935},"to":{"change":7,"start":728813,"end":728883},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":33856},"to":{"change":7,"start":728813,"end":728883},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":95568},"to":{"change":7,"start":728813,"end":728883},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":728813},"to":{"change":7,"start":728813,"end":728883},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":728883},"to":{"change":7,"start":103863,"end":103939},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":84709},"to":{"change":7,"start":126344,"end":126445},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":103939},"to":{"change":7,"start":126344,"end":126445},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":95647},"to":{"change":7,"start":126344,"end":126445},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":126445},"to":{"change":7,"start":728987,"end":729061},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":728987},"to":{"change":7,"start":728987,"end":729061},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":729061},"to":{"change":7,"start":126446,"end":126488},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":126488},"to":{"change":7,"start":729094,"end":729182},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":729094},"to":{"change":7,"start":729094,"end":729182},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":729182},"to":{"change":7,"start":126489,"end":126591},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":126591},"to":{"change":7,"start":4939,"end":4999},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":4999},"to":{"change":7,"start":729333,"end":729347},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":729333},"to":{"change":7,"start":729333,"end":729347},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":729347},"to":{"change":7,"start":5958,"end":5972},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":5972},"to":{"change":7,"start":103940,"end":103992},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":103992},"to":{"change":7,"start":6033,"end":6165},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":6033},"to":{"change":7,"start":6033,"end":6165},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":6165},"to":{"change":7,"start":729448,"end":729545},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":126654},"to":{"change":7,"start":729448,"end":729545},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":729448},"to":{"change":7,"start":729448,"end":729545},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":729545},"to":{"change":7,"start":126655,"end":126726},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":29999},"to":{"change":7,"start":729602,"end":729612},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":126726},"to":{"change":7,"start":729602,"end":729612},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":729602},"to":{"change":7,"start":729602,"end":729612},"introduced_by":7}],"inode":{"change":7,"pos":717381}}},"contents":[{"Del":" }\n"},{"Del":"\n"},{"Del":" fn archive_with_state(\n"},{"Del":" &mut self,\n changes: &P,\n channel: &mut pristine::ChannelRef,\n"},{"Del":" state: &pristine::Merkle,\n"},{"Del":" extra: &[pristine::Hash],\n arch: &mut A,\n"},{"Del":" salt: u64,\n"},{"Del":" ) -> Result, output::ArchiveError> {\n"},{"Del":" self.archive_prefix_with_state(\n changes,\n channel,\n state,\n extra,\n &mut std::iter::empty(),\n arch,\n"},{"Del":" salt,\n"},{"Del":" )\n }\n\n /// Warning: this method unrecords changes until finding the\n /// state. If this is not wanted, please fork the channel before\n /// calling.\n fn archive_prefix_with_state<\n 'a,\n P: changestore::ChangeStore,\n A: Archive,\n I: Iterator,\n >(\n &mut self,\n changes: &P,\n channel: &mut pristine::ChannelRef,\n"},{"Del":" state: &pristine::Merkle,\n"},{"Del":" extra: &[pristine::Hash],\n prefix: &mut I,\n arch: &mut A,\n"},{"Del":" salt: u64,\n"},{"Del":" ) -> Result, output::ArchiveError> {\n"},{"Del":" let mut unrecord = Vec::new();\n let mut found = false;\n"},{"Del":" for x in pristine::changeid_rev_log(self, &channel.read(), None)? {\n"},{"Del":" let (_, p) = x?;\n let m: Merkle = (&p.b).into();\n if &m == state {\n"},{"Del":" found = true;\n break;\n } else {\n"},{"Del":" unrecord.push(p.a.into())\n"},{"Del":" }\n }\n debug!(\"unrecord = {:?}\", unrecord);\n if found {\n"},{"Del":" for h in unrecord.iter() {\n let h = self.get_external(h)?.unwrap().into();\n"},{"Del":" self.unrecord(changes, channel, &h, salt)?;\n"},{"Del":" }\n"},{"Del":" {\n"},{"Del":" let mut channel_ = channel.write();\n"},{"Del":" for app in extra.iter() {\n self.apply_change_rec(changes, &mut channel_, app)?\n }\n"},{"Del":" }\n output::archive(changes, self, channel, prefix, arch)\n } else {\n"},{"Del":" Err(output::ArchiveError::StateNotFound { state: *state })\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":7,"pos":717381},"path":"libpijul/src/lib.rs","line":456,"ins":{"up_context":[{"change":7,"pos":733559}],"down_context":[{"change":7,"pos":733620}],"flag":"BLOCK","start":5914,"end":6460,"inode":{"change":7,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":733559},"to":{"change":7,"start":3109,"end":3166},"introduced_by":7}],"inode":{"change":7,"pos":717381}},"ins_contents":[{"Add":" fn iter_adjacent<'txn>("},{"Add":" &'txn self,"},{"Add":" graph: &'txn Self::Channel,"},{"Add":" key: Vertex,"},{"Add":" min_flag: pristine::EdgeFlags,"},{"Add":" max_flag: pristine::EdgeFlags,"},{"Add":" ) -> Result, pristine::TxnErr> {"},{"Add":" pristine::iter_adjacent(self, self.graph(graph), key, min_flag, max_flag)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl::GraphError>> ArcTxn {"},{"Add":" pub fn archive("}],"del_contents":[{"Del":" fn archive(\n"}]}},{"Replacement":{"inode":{"change":7,"pos":717381},"path":"libpijul/src/lib.rs","line":471,"ins":{"up_context":[{"change":7,"pos":733656}],"down_context":[{"change":7,"pos":733702}],"flag":"BLOCK","start":6461,"end":6504,"inode":{"change":7,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":733656},"to":{"change":7,"start":733656,"end":733702},"introduced_by":7}],"inode":{"change":7,"pos":717381}},"ins_contents":[{"Add":" channel: &pristine::ChannelRef,"}],"del_contents":[{"Del":" channel: &pristine::ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":717381},"path":"libpijul/src/lib.rs","line":473,"ins":{"up_context":[{"change":7,"pos":733724}],"down_context":[{"change":7,"pos":733780}],"flag":"BLOCK","start":6505,"end":6591,"inode":{"change":7,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":733724},"to":{"change":7,"start":34110,"end":34199},"introduced_by":7}],"inode":{"change":7,"pos":717381}},"ins_contents":[{"Add":" ) -> Result, output::ArchiveError> {"}],"del_contents":[{"Del":" ) -> Result, output::ArchiveError> {\n"}]}},{"Replacement":{"inode":{"change":7,"pos":717381},"path":"libpijul/src/lib.rs","line":477,"ins":{"up_context":[{"change":7,"pos":733866}],"down_context":[{"change":7,"pos":733963}],"flag":"BLOCK","start":6592,"end":6732,"inode":{"change":7,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":733866},"to":{"change":7,"start":733866,"end":733963},"introduced_by":7}],"inode":{"change":7,"pos":717381}},"ins_contents":[{"Add":" pub fn archive_prefix<"},{"Add":" 'a,"},{"Add":" C: changestore::ChangeStore,"},{"Add":" I: Iterator,"},{"Add":" A: Archive,"},{"Add":" >("}],"del_contents":[{"Del":" fn archive_prefix<'a, C: changestore::ChangeStore, I: Iterator, A: Archive>(\n"}]}},{"Replacement":{"inode":{"change":7,"pos":717381},"path":"libpijul/src/lib.rs","line":485,"ins":{"up_context":[{"change":7,"pos":733999}],"down_context":[{"change":7,"pos":734045}],"flag":"BLOCK","start":6733,"end":6776,"inode":{"change":7,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":733999},"to":{"change":7,"start":733999,"end":734045},"introduced_by":7}],"inode":{"change":7,"pos":717381}},"ins_contents":[{"Add":" channel: &pristine::ChannelRef,"}],"del_contents":[{"Del":" channel: &pristine::ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":717381},"path":"libpijul/src/lib.rs","line":488,"ins":{"up_context":[{"change":7,"pos":734091}],"down_context":[{"change":7,"pos":734147}],"flag":"BLOCK","start":6777,"end":6863,"inode":{"change":7,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":734091},"to":{"change":7,"start":34200,"end":34289},"introduced_by":7}],"inode":{"change":7,"pos":717381}},"ins_contents":[{"Add":" ) -> Result, output::ArchiveError> {"}],"del_contents":[{"Del":" ) -> Result, output::ArchiveError> {\n"}]}},{"Edit":{"inode":{"change":7,"pos":717381},"path":"libpijul/src/lib.rs","line":490,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":734209}],"down_context":[{"change":7,"pos":734209}],"flag":"BLOCK","start":6864,"end":7451,"inode":{"change":7,"pos":717381}}},"contents":[{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl ArcTxn {"},{"Add":" pub fn archive_with_state("},{"Add":" &self,"},{"Add":" changes: &P,"},{"Add":" channel: &pristine::ChannelRef,"},{"Add":" state: &pristine::Merkle,"},{"Add":" extra: &[pristine::Hash],"},{"Add":" arch: &mut A,"},{"Add":" salt: u64,"},{"Add":" ) -> Result, output::ArchiveError> {"},{"Add":" self.archive_prefix_with_state("},{"Add":" changes,"},{"Add":" channel,"},{"Add":" state,"},{"Add":" extra,"},{"Add":" &mut std::iter::empty(),"},{"Add":" arch,"},{"Add":" salt,"},{"Add":" )"}]}},{"Replacement":{"inode":{"change":7,"pos":717381},"path":"libpijul/src/lib.rs","line":514,"ins":{"up_context":[{"change":7,"pos":62357}],"down_context":[{"change":7,"pos":62703}],"flag":"BLOCK","start":7452,"end":9167,"inode":{"change":7,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62357},"to":{"change":7,"start":60581,"end":60609},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":60609},"to":{"change":7,"start":62395,"end":62415},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62395},"to":{"change":7,"start":62395,"end":62415},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62415},"to":{"change":7,"start":60610,"end":60646},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":60646},"to":{"change":7,"start":62462,"end":62581},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":99401},"to":{"change":7,"start":62462,"end":62581},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62462},"to":{"change":7,"start":62462,"end":62581},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":62581},"to":{"change":7,"start":99402,"end":99496},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":99496},"to":{"change":7,"start":5729,"end":5811},"introduced_by":7}],"inode":{"change":7,"pos":717381}},"ins_contents":[{"Add":" /// Warning: this method unrecords changes until finding the"},{"Add":" /// state. If this is not wanted, please fork the channel before"},{"Add":" /// calling."},{"Add":" pub fn archive_prefix_with_state<"},{"Add":" 'a,"},{"Add":" P: changestore::ChangeStore,"},{"Add":" A: Archive,"},{"Add":" I: Iterator,"},{"Add":" >("},{"Add":" &self,"},{"Add":" changes: &P,"},{"Add":" channel: &pristine::ChannelRef,"},{"Add":" state: &pristine::Merkle,"},{"Add":" extra: &[pristine::Hash],"},{"Add":" prefix: &mut I,"},{"Add":" arch: &mut A,"},{"Add":" salt: u64,"},{"Add":" ) -> Result, output::ArchiveError> {"},{"Add":" let mut unrecord = Vec::new();"},{"Add":" let mut found = false;"},{"Add":" let mut txn = self.write();"},{"Add":" for x in pristine::changeid_rev_log(&*txn, &channel.read(), None)? {"},{"Add":" let (_, p) = x?;"},{"Add":" let m: Merkle = (&p.b).into();"},{"Add":" if &m == state {"},{"Add":" found = true;"},{"Add":" break;"},{"Add":" } else {"},{"Add":" unrecord.push(p.a.into())"},{"Add":" }"},{"Add":" }"},{"Add":" debug!(\"unrecord = {:?}\", unrecord);"},{"Add":" if found {"},{"Add":" for h in unrecord.iter() {"},{"Add":" let h = txn.get_external(h)?.unwrap().into();"},{"Add":" unrecord::unrecord(&mut *txn, channel, changes, &h, salt)?;"},{"Add":" }"},{"Add":" {"},{"Add":" let mut channel_ = channel.write();"},{"Add":" for app in extra.iter() {"},{"Add":" crate::apply::apply_change_rec(changes, &mut *txn, &mut channel_, app, false)?"},{"Add":" }"},{"Add":" }"},{"Add":" std::mem::drop(txn);"},{"Add":" output::archive(changes, self, channel, prefix, arch)"},{"Add":" } else {"},{"Add":" Err(output::ArchiveError::StateNotFound { state: *state })"},{"Add":" }"}],"del_contents":[{"Del":" fn iter_adjacent<'txn>(\n"},{"Del":" &'txn self,\n"},{"Del":" graph: &'txn Self::Channel,\n"},{"Del":" key: Vertex,\n min_flag: pristine::EdgeFlags,\n max_flag: pristine::EdgeFlags,\n"},{"Del":" ) -> Result, pristine::TxnErr> {\n"},{"Del":" pristine::iter_adjacent(self, self.graph(graph), key, min_flag, max_flag)\n"}]}},{"Replacement":{"inode":{"change":7,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":132,"ins":{"up_context":[{"change":7,"pos":794205}],"down_context":[{"change":7,"pos":794252}],"flag":"BLOCK","start":9168,"end":9226,"inode":{"change":7,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":794205},"to":{"change":7,"start":794205,"end":794222},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":794222},"to":{"change":7,"start":63534,"end":63564},"introduced_by":7}],"inode":{"change":7,"pos":793247}},"ins_contents":[{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" txn: &T,\n"},{"Del":" channel: &T::Channel,\n"}]}},{"Edit":{"inode":{"change":7,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":147,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":794648}],"down_context":[{"change":50,"pos":716}],"flag":"BLOCK","start":9227,"end":9295,"inode":{"change":7,"pos":793247}}},"contents":[{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.read();"}]}},{"Replacement":{"inode":{"change":7,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":176,"ins":{"up_context":[{"change":7,"pos":796878}],"down_context":[{"change":7,"pos":796932}],"flag":"BLOCK","start":9296,"end":9365,"inode":{"change":7,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":796878},"to":{"change":7,"start":796878,"end":796903},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":796903},"to":{"change":7,"start":6761,"end":6801},"introduced_by":7}],"inode":{"change":7,"pos":793247}},"ins_contents":[{"Add":" &*txn,"},{"Add":" txn.graph(&*channel),"}],"del_contents":[{"Del":" txn,\n"},{"Del":" txn.graph(channel),\n"}]}},{"Replacement":{"inode":{"change":7,"pos":988425},"path":"libpijul/src/alive/output.rs","line":19,"ins":{"up_context":[{"change":7,"pos":988922}],"down_context":[{"change":7,"pos":988961}],"flag":"BLOCK","start":9366,"end":9416,"inode":{"change":7,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":988922},"to":{"change":7,"start":988922,"end":988935},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":988935},"to":{"change":7,"start":67155,"end":67181},"introduced_by":7}],"inode":{"change":7,"pos":988425}},"ins_contents":[{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" txn: &T,\n"},{"Del":" channel: &T::Channel,\n"}]}},{"Edit":{"inode":{"change":7,"pos":988425},"path":"libpijul/src/alive/output.rs","line":37,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":989411}],"down_context":[{"change":7,"pos":989518}],"flag":"BLOCK","start":9417,"end":9493,"inode":{"change":7,"pos":988425}}},"contents":[{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.read();"}]}},{"Replacement":{"inode":{"change":7,"pos":988425},"path":"libpijul/src/alive/output.rs","line":43,"ins":{"up_context":[{"change":7,"pos":989641}],"down_context":[{"change":7,"pos":989723}],"flag":"BLOCK","start":9494,"end":9666,"inode":{"change":7,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":989641},"to":{"change":7,"start":135742,"end":135833},"introduced_by":7}],"inode":{"change":7,"pos":988425}},"ins_contents":[{"Add":" .map(|a| {"},{"Add":" a.oldest_vertex(changes, &*txn, &*channel, graph, sccs)"},{"Add":" .unwrap()"},{"Add":" })"}],"del_contents":[{"Del":" .map(|a| a.oldest_vertex(changes, txn, channel, graph, sccs).unwrap())\n"}]}},{"Replacement":{"inode":{"change":7,"pos":988425},"path":"libpijul/src/alive/output.rs","line":52,"ins":{"up_context":[{"change":7,"pos":989862}],"down_context":[{"change":7,"pos":989944}],"flag":"BLOCK","start":9667,"end":9839,"inode":{"change":7,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":989862},"to":{"change":7,"start":135834,"end":135925},"introduced_by":7}],"inode":{"change":7,"pos":988425}},"ins_contents":[{"Add":" .map(|b| {"},{"Add":" b.oldest_vertex(changes, &*txn, &*channel, graph, sccs)"},{"Add":" .unwrap()"},{"Add":" })"}],"del_contents":[{"Del":" .map(|b| b.oldest_vertex(changes, txn, channel, graph, sccs).unwrap())\n"}]}},{"Edit":{"inode":{"change":7,"pos":988425},"path":"libpijul/src/alive/output.rs","line":81,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":6440}],"down_context":[{"change":7,"pos":6440}],"flag":"BLOCK","start":9840,"end":9886,"inode":{"change":7,"pos":988425}}},"contents":[{"Add":" let txn = txn.read();"}]}},{"Replacement":{"inode":{"change":7,"pos":988425},"path":"libpijul/src/alive/output.rs","line":196,"ins":{"up_context":[{"change":7,"pos":993009}],"down_context":[{"change":7,"pos":993022}],"flag":"BLOCK","start":9887,"end":9908,"inode":{"change":7,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":993009},"to":{"change":7,"start":993009,"end":993022},"introduced_by":7}],"inode":{"change":7,"pos":988425}},"ins_contents":[{"Add":" txn: &ArcTxn,"}],"del_contents":[{"Del":" txn: &T,\n"}]}},{"Edit":{"inode":{"change":7,"pos":988425},"path":"libpijul/src/alive/output.rs","line":213,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":7638}],"down_context":[{"change":7,"pos":7638}],"flag":"BLOCK","start":9909,"end":9947,"inode":{"change":7,"pos":988425}}},"contents":[{"Add":" let txn = txn.read();"}]}},{"Replacement":{"inode":{"change":7,"pos":988425},"path":"libpijul/src/alive/output.rs","line":229,"ins":{"up_context":[{"change":7,"pos":22286}],"down_context":[{"change":7,"pos":22359}],"flag":"BLOCK","start":9948,"end":10028,"inode":{"change":7,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":22286},"to":{"change":7,"start":22286,"end":22359},"introduced_by":7}],"inode":{"change":7,"pos":988425}},"ins_contents":[{"Add":" |p| txn.read().get_external(&p).unwrap().map(|x| x.into()),"}],"del_contents":[{"Del":" |p| txn.get_external(&p).unwrap().map(|x| x.into()),\n"}]}},{"Replacement":{"inode":{"change":7,"pos":988425},"path":"libpijul/src/alive/output.rs","line":254,"ins":{"up_context":[{"change":7,"pos":994361}],"down_context":[{"change":7,"pos":994400}],"flag":"BLOCK","start":10029,"end":10079,"inode":{"change":7,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":994361},"to":{"change":7,"start":994361,"end":994374},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":994374},"to":{"change":7,"start":67393,"end":67419},"introduced_by":7}],"inode":{"change":7,"pos":988425}},"ins_contents":[{"Add":" txn: &ArcTxn,"},{"Add":" channel: &ChannelRef,"}],"del_contents":[{"Del":" txn: &T,\n"},{"Del":" channel: &T::Channel,\n"}]}},{"Replacement":{"inode":{"change":7,"pos":988425},"path":"libpijul/src/alive/output.rs","line":266,"ins":{"up_context":[{"change":7,"pos":994757}],"down_context":[{"change":7,"pos":994834}],"flag":"BLOCK","start":10080,"end":10256,"inode":{"change":7,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":994757},"to":{"change":7,"start":8316,"end":8404},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":8404},"to":{"change":7,"start":994833,"end":994834},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":67507},"to":{"change":7,"start":994833,"end":994834},"introduced_by":7},{"previous":"","flag":"DELETED","from":{"change":7,"pos":137675},"to":{"change":7,"start":994833,"end":994834},"introduced_by":7},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":7,"pos":994833},"to":{"change":7,"start":994833,"end":994834},"introduced_by":7}],"inode":{"change":7,"pos":988425}},"ins_contents":[{"Add":" {"},{"Add":" let txn = txn.read();"},{"Add":" let channel = channel.read();"},{"Add":" graph.collect_forward_edges(&*txn, txn.graph(&*channel), &scc, &forward_scc, forward)?;"},{"Add":" }"}],"del_contents":[{"Del":" graph.collect_forward_edges(txn, txn.graph(channel), &scc, &forward_scc, forward)?;\n"},{"Del":"\n"}]}}],"owner":"irevoire","repo":"pijul","token":"e0ERGJ5yjgTmeNXyKkIu5WXH1LyZGyHgXK1+++oDkGc=","login":null}

…

Dependencies

Change contents