{"header":{"message":"Fixing the Git feature","description":null,"timestamp":"2021-04-24T06:22:38.065164424Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","authors":[],"deps":{"hashes":[["5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","Fixing the Git feature"],["AA",null],["L2LPPKD4CL7RQFGNJFCRVRBKHUJY7ZIQCLDGPTTOCJB3PVT7CS2AC","Fixing the Git feature"],["XSRTXUAS3DXJA42TZESMETFVTKU2OBUDGDE4N5F2CVWI4CLOUJ4AC","Pull: show progress bar when applying"],["3AZB5NUOZ3PEP5RX2M2QKA4OVAF6AIXQZ6GH4D6W3JK7UFCLA2RQC","Fixing the Git feature"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["RHHNPMZI6SYPNDFFXT6NXC7K6LCY44LX4SMGYDLL2XUZY7JC6XHAC","Fixing `pijul git`"],["ZBNKSYA6PW4DSPC3NCRUZLVHW2GNXMCSDSAGEIKHGHDGGZRBH7ZQC","Fixing a bus error when starting a transaction on a full disk"],["CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC","Fixing git import, and adding more useful feedback (with `RUST_LOG=\"pijul=info\"`)"],["I7VL7VPZV2NKOZRKBWWEHFOGNGGTYLPONHABVJ767D6HPJJNY5RAC","Minor cleanup"],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"],["A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","Upgrading the `git` subcommand to the latest Sanakirja and Libpijul"],["B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","Fixing the Git features with the latest Pijul (+ conflicts in Cargo.toml)"],["JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","Implement the Sanakirja concurrency model in a cross-process way"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","Don't output files if they aren't in the current channel"],["NHO3QO3WZTJBRPGIQVLNPHUYAB6YMTDOPHNGGTYVPSTP47TBQJ2AC","Return a clean error instead of a panic when the channel for a commit is not found in `pijul git`"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["GNMZNKB46GTPTWBR452FITHPBCMYPSDLV5VZQSY7BX6OJHWTWTZAC","Cursors cleanup"],["LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","Fixing output (including its uses in reset and pull)"],["6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC","Current state: return zero instead of an Option if there is no change on the channel"],["ZZXBHCN3WGJG26SBKZP3ZG4FYUKY7WK2EDSDXLDMQLK7PDKXISPQC","fixing the protocol"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","Change completions (where the whole progress bar story started)"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["GBLM3JLRCNEZLICNLV6M26YCZ4EYDG2F5BJOBH4FIBOM4W473LYAC","Fix options of git subcommand"],["AXVPNZ2NVKYRCTKYI77H72CALZBRTHY3OK4CMWGMTSU2NPMOS42QC","commands/git: fix imports"],["BJOZ25EUUCRNS5K4RVPA6Z7C2QEQXZOJDIQR2PGQZQ5ZV544OVQQC","Deterministic Git import"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","Feedback on network stuff"],["7PM25EXLNQ6JUUIZNTAOQYNNIZNG6TJREEBUSAIC3FIOE7FHETSAC","Recursive apply was written a little too fast…"],["OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","MUCH faster `pijul add -r`"],["43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","Getting rid of edge validation, which does not work for zombie conflicts"],["IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Cleanup, formatting, and fixing the Git feature"],["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","Canonicalize all paths"],["R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","Debugging `pijul git`: proper error reporting"],["BNPSVXIC72C3WT33YKCH766OBLLNCS7POX6U6JXZSQQPJF2M22MQC","Friendlier progress bars"],["44BN7FWSIXKG75IJUTCXLJE7VANNQFPRHQXTPLQHFU7AKGLSPQRAC","Do not output files introduced by patches that were not applied during a push"]],"deps":["L2LPPKD4CL7RQFGNJFCRVRBKHUJY7ZIQCLDGPTTOCJB3PVT7CS2AC","XSRTXUAS3DXJA42TZESMETFVTKU2OBUDGDE4N5F2CVWI4CLOUJ4AC","3AZB5NUOZ3PEP5RX2M2QKA4OVAF6AIXQZ6GH4D6W3JK7UFCLA2RQC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","AXVPNZ2NVKYRCTKYI77H72CALZBRTHY3OK4CMWGMTSU2NPMOS42QC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","GBLM3JLRCNEZLICNLV6M26YCZ4EYDG2F5BJOBH4FIBOM4W473LYAC","Q45QHPO4HDTEZF2W4UDZSYYQ46BPEIWSW4GJILZR5HTJNLKXJABQC","7PM25EXLNQ6JUUIZNTAOQYNNIZNG6TJREEBUSAIC3FIOE7FHETSAC","R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","BJOZ25EUUCRNS5K4RVPA6Z7C2QEQXZOJDIQR2PGQZQ5ZV544OVQQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","OJZWJUF2TCGZ7RFVY6FPKBS5P3C4BGHZDPVH775OHVNVFMJICKNQC","ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","RHHNPMZI6SYPNDFFXT6NXC7K6LCY44LX4SMGYDLL2XUZY7JC6XHAC","ZZXBHCN3WGJG26SBKZP3ZG4FYUKY7WK2EDSDXLDMQLK7PDKXISPQC","JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","I7VL7VPZV2NKOZRKBWWEHFOGNGGTYLPONHABVJ767D6HPJJNY5RAC","LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","NHO3QO3WZTJBRPGIQVLNPHUYAB6YMTDOPHNGGTYVPSTP47TBQJ2AC","Y6EVFMTA6FOH3OQH6QCSWMI3F6SYZT2FSHO6GF4M3ICENDCWFM4QC","BNPSVXIC72C3WT33YKCH766OBLLNCS7POX6U6JXZSQQPJF2M22MQC","GNMZNKB46GTPTWBR452FITHPBCMYPSDLV5VZQSY7BX6OJHWTWTZAC","2D7P2VKJASU7QDQZHGCLBIT6G2V5WUFYLWTCEVVEI2EZHGM6XYRAC","ZBNKSYA6PW4DSPC3NCRUZLVHW2GNXMCSDSAGEIKHGHDGGZRBH7ZQC"]},"hunks":[{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":451,"ins":{"up_context":[{"change":6,"pos":3600}],"down_context":[{"change":6,"pos":3601}],"flag":"BLOCK","start":0,"end":139,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":3600},"to":{"change":6,"start":7658,"end":7732},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1048},"to":{"change":6,"start":7658,"end":7732},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" let mut channel = channel.write().unwrap();"},{"Add":" txn.apply_change_ws(&repo.changes, &mut channel, h, &mut ws)?;"}],"del_contents":[{"Del":" txn.apply_change_ws(&repo.changes, channel, h, &mut ws)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":52474},"path":"pijul/src/remote/mod.rs","line":521,"ins":{"up_context":[{"change":6,"pos":72806}],"down_context":[{"change":6,"pos":72925}],"flag":"BLOCK","start":140,"end":344,"inode":{"change":6,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":72806},"to":{"change":6,"start":1763,"end":1872},"introduced_by":6}],"inode":{"change":6,"pos":52474}},"ins_contents":[{"Add":" {"},{"Add":" let mut channel_ = channel.write().unwrap();"},{"Add":" for hash in hashes.iter() {"},{"Add":" txn.apply_change_ws(&repo.changes, &mut channel_, hash, &mut ws)?;"},{"Add":" }"}],"del_contents":[{"Del":" for hash in hashes.iter() {\n txn.apply_change_ws(&repo.changes, channel, hash, &mut ws)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":176,"ins":{"up_context":[{"change":6,"pos":3935}],"down_context":[{"change":6,"pos":3988}],"flag":"BLOCK","start":345,"end":394,"inode":{"change":6,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3935},"to":{"change":6,"start":3935,"end":3988},"introduced_by":6}],"inode":{"change":6,"pos":79745}},"ins_contents":[{"Add":" channel: &libpijul::pristine::ChannelRef,"}],"del_contents":[{"Del":" channel: &mut libpijul::pristine::ChannelRef,\n"}]}},{"Edit":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":180,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":4093}],"down_context":[{"change":6,"pos":4093}],"flag":"BLOCK","start":395,"end":443,"inode":{"change":6,"pos":79745}}},"contents":[{"Add":" let mut channel = channel.write().unwrap();"}]}},{"Replacement":{"inode":{"change":6,"pos":79745},"path":"pijul/src/remote/local.rs","line":182,"ins":{"up_context":[{"change":6,"pos":4116}],"down_context":[{"change":6,"pos":4175}],"flag":"BLOCK","start":444,"end":508,"inode":{"change":6,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4116},"to":{"change":6,"start":8910,"end":8968},"introduced_by":6}],"inode":{"change":6,"pos":79745}},"ins_contents":[{"Add":" txn.apply_change_ws(store, &mut *channel, c, &mut ws)?;"}],"del_contents":[{"Del":" txn.apply_change_ws(store, channel, c, &mut ws)?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":111631},"path":"pijul/src/commands/pushpull.rs","line":423,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":267}],"down_context":[{"change":40,"pos":155}],"flag":"BLOCK","start":509,"end":565,"inode":{"change":6,"pos":111631}}},"contents":[{"Add":" let mut channel = channel.write().unwrap();"}]}},{"Replacement":{"inode":{"change":6,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":184,"ins":{"up_context":[{"change":6,"pos":130373}],"down_context":[{"change":6,"pos":67}],"flag":"BLOCK","start":566,"end":812,"inode":{"change":6,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":130373},"to":{"change":6,"start":130373,"end":130437},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":130437},"to":{"change":6,"start":12632,"end":12712},"introduced_by":6}],"inode":{"change":6,"pos":123281}},"ins_contents":[{"Add":" let channel = load_channel(&txn, &cap[1])?;"},{"Add":" {"},{"Add":" let mut channel_ = channel.write().unwrap();"},{"Add":" txn.apply_change_ws(&repo.changes, &mut channel_, &h, &mut ws)?;"},{"Add":" }"}],"del_contents":[{"Del":" let mut channel = load_channel(&txn, &cap[1])?;\n"},{"Del":" txn.apply_change_ws(&repo.changes, &mut channel, &h, &mut ws)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":6,"ins":{"up_context":[{"change":6,"pos":137436}],"down_context":[{"change":6,"pos":0}],"flag":"BLOCK","start":813,"end":843,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":137436},"to":{"change":6,"start":2236,"end":2237},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":"use std::sync::{Arc, RwLock};"}],"del_contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":165,"ins":{"up_context":[{"change":6,"pos":141594}],"down_context":[{"change":6,"pos":141615}],"flag":"BLOCK","start":844,"end":873,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":141594},"to":{"change":6,"start":141594,"end":141615},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" txn: Arc>,"}],"del_contents":[{"Del":" txn: &mut T,\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":175,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":142007}],"down_context":[{"change":6,"pos":142007}],"flag":"BLOCK","start":874,"end":930,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" let mut txn = txn.write().unwrap();"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":263,"ins":{"up_context":[{"change":6,"pos":1005}],"down_context":[{"change":6,"pos":144396}],"flag":"BLOCK","start":931,"end":995,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":1005},"to":{"change":6,"start":163,"end":227},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":144337},"to":{"change":6,"start":163,"end":227},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" .changeid_reverse_log(&*channel.read()?, None)?"}],"del_contents":[{"Del":" .changeid_reverse_log(&channel.borrow(), None)?\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":292,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":145374},"to":{"change":4,"start":52,"end":115},"introduced_by":4}],"inode":{"change":6,"pos":137210}}},"contents":[{"Del":" let mut txn = repo.repo.pristine.mut_txn_begin()?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":293,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":145484}],"down_context":[{"change":6,"pos":145484}],"flag":"BLOCK","start":996,"end":1105,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" let txn = repo.repo.pristine.mut_txn_begin()?;"},{"Add":" let txn = Arc::new(RwLock::new(txn));"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":296,"ins":{"up_context":[{"change":6,"pos":145536}],"down_context":[{"change":6,"pos":145617}],"flag":"BLOCK","start":1106,"end":1183,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":145536},"to":{"change":6,"start":145536,"end":145617},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" let channel = if let Some(parents) = dag.parents.get(&oid) {"}],"del_contents":[{"Del":" let mut channel = if let Some(parents) = dag.parents.get(&oid) {\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":304,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":145980}],"down_context":[{"change":6,"pos":389}],"flag":"BLOCK","start":1184,"end":1240,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" let mut txn = txn.write().unwrap();"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":314,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":146349}],"down_context":[{"change":6,"pos":146349}],"flag":"BLOCK","start":1241,"end":1297,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" let mut txn = txn.write().unwrap();"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":323,"ins":{"up_context":[{"change":6,"pos":146606}],"down_context":[{"change":6,"pos":146670}],"flag":"BLOCK","start":1298,"end":1368,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":146606},"to":{"change":6,"start":146606,"end":146670},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" txn.clone(),"},{"Add":" channel.clone(),"}],"del_contents":[{"Del":" &mut txn,\n &mut channel,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":329,"ins":{"up_context":[{"change":6,"pos":146777}],"down_context":[{"change":6,"pos":146874}],"flag":"BLOCK","start":1369,"end":1472,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":146777},"to":{"change":6,"start":146777,"end":146874},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" let state = import_commit(git, repo, txn.clone(), channel.clone(), &oid, &mut stats)?;"}],"del_contents":[{"Del":" let state = import_commit(git, repo, &mut txn, &mut channel, &oid, &mut stats)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":331,"ins":{"up_context":[{"change":6,"pos":146925}],"down_context":[{"change":6,"pos":146995}],"flag":"BLOCK","start":1473,"end":1546,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":146925},"to":{"change":6,"start":146925,"end":146995},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" dag.collect_dead_parents(&oid, &mut todo, txn.clone())?;"}],"del_contents":[{"Del":" dag.collect_dead_parents(&oid, &mut todo, &mut txn)?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":344,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":147512}],"down_context":[{"change":6,"pos":147512}],"flag":"BLOCK","start":1547,"end":1718,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" let txn = if let Ok(txn) = Arc::try_unwrap(txn) {"},{"Add":" txn.into_inner().unwrap()"},{"Add":" } else {"},{"Add":" unreachable!()"},{"Add":" };"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":377,"ins":{"up_context":[{"change":6,"pos":148197}],"down_context":[{"change":6,"pos":148239}],"flag":"BLOCK","start":1719,"end":1772,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":148197},"to":{"change":6,"start":148197,"end":148239},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" txn: Arc>,"},{"Add":" channel: ChannelRef,"}],"del_contents":[{"Del":" txn: &T,\n channel: &ChannelRef,\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":386,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":148491}],"down_context":[{"change":6,"pos":148491}],"flag":"BLOCK","start":1773,"end":1812,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" let txn = txn.read().unwrap();"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":400,"ins":{"up_context":[{"change":6,"pos":131}],"down_context":[{"change":6,"pos":594}],"flag":"BLOCK","start":1813,"end":1869,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":131},"to":{"change":6,"start":538,"end":594},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":149112},"to":{"change":6,"start":538,"end":594},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" for x in txn.log(&*p_channel.read()?, 0)? {"}],"del_contents":[{"Del":" for x in txn.log(&p_channel.borrow(), 0)? {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":423,"ins":{"up_context":[{"change":6,"pos":149765}],"down_context":[{"change":6,"pos":149816}],"flag":"BLOCK","start":1870,"end":1957,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":149765},"to":{"change":6,"start":693,"end":756},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":"fn import_commit_parents("}],"del_contents":[{"Del":"fn import_commit_parents(\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":426,"ins":{"up_context":[{"change":6,"pos":149856}],"down_context":[{"change":6,"pos":149906}],"flag":"BLOCK","start":1958,"end":2011,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":149856},"to":{"change":6,"start":149856,"end":149906},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" txn: Arc>,"},{"Add":" channel: ChannelRef,"}],"del_contents":[{"Del":" txn: &mut T,\n channel: &mut ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":433,"ins":{"up_context":[{"change":6,"pos":150070}],"down_context":[{"change":6,"pos":150152}],"flag":"BLOCK","start":2012,"end":2111,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":150070},"to":{"change":6,"start":166,"end":249},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" let (needs_output, to_apply) = make_apply_plan(repo, txn.clone(), channel.clone(), dag, oid)?;"}],"del_contents":[{"Del":" let (needs_output, to_apply) = make_apply_plan(repo, txn, channel, dag, oid)?;\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":438,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":150285}],"down_context":[{"change":6,"pos":150285}],"flag":"BLOCK","start":2112,"end":2153,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" let mut txn_ = txn.write().unwrap();"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":440,"ins":{"up_context":[{"change":6,"pos":150321}],"down_context":[{"change":6,"pos":886}],"flag":"BLOCK","start":2154,"end":2272,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":150321},"to":{"change":2,"start":0,"end":72},"introduced_by":2}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" let mut channel_ = channel.write().unwrap();"},{"Add":" info!(\"applying {:?} to {:?}\", h, txn_.name(&channel_));"}],"del_contents":[{"Del":" info!(\"applying {:?} to {:?}\", h, txn.name(&channel.borrow()));\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":443,"ins":{"up_context":[{"change":6,"pos":887}],"down_context":[{"change":6,"pos":150456}],"flag":"BLOCK","start":2273,"end":2346,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":887},"to":{"change":6,"start":1604,"end":1670},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" txn_.apply_change_ws(&repo.repo.changes, &mut channel_, h, ws)?;"}],"del_contents":[{"Del":" txn.apply_change_ws(&repo.repo.changes, channel, h, ws)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":445,"ins":{"up_context":[{"change":6,"pos":150512}],"down_context":[{"change":6,"pos":150581}],"flag":"BLOCK","start":2347,"end":2427,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":150512},"to":{"change":6,"start":322,"end":407},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" check_alive_debug(&repo.repo.changes, &*txn_, &channel_, line!())?;"}],"del_contents":[{"Del":" check_alive_debug(&repo.repo.changes, txn, &channel.borrow(), line!())?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":449,"ins":{"up_context":[{"change":6,"pos":150649}],"down_context":[{"change":6,"pos":150714}],"flag":"BLOCK","start":2428,"end":2512,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":150649},"to":{"change":6,"start":408,"end":489},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" check_alive_debug(&repo.repo.changes, &*txn_, &*channel.read()?, line!())?;"}],"del_contents":[{"Del":" check_alive_debug(&repo.repo.changes, txn, &channel.borrow(), line!())?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":459,"ins":{"up_context":[{"change":6,"pos":151103}],"down_context":[{"change":6,"pos":151135}],"flag":"BLOCK","start":2513,"end":2551,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151103},"to":{"change":2,"start":73,"end":110},"introduced_by":2}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" txn_.name(&*channel.read()?),"}],"del_contents":[{"Del":" txn.name(&channel.borrow()),\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":461,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":151142}],"down_context":[{"change":6,"pos":151142}],"flag":"BLOCK","start":2552,"end":2578,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" std::mem::drop(txn_);"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":465,"ins":{"up_context":[{"change":6,"pos":151291}],"down_context":[{"change":6,"pos":151374}],"flag":"BLOCK","start":2579,"end":2679,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151291},"to":{"change":6,"start":151291,"end":151374},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" libpijul::output::output_repository_no_pending("},{"Add":" repo.repo.working_copy.clone(),"}],"del_contents":[{"Del":" txn.output_repository_no_pending(\n &mut repo.repo.working_copy,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":468,"ins":{"up_context":[{"change":6,"pos":151406}],"down_context":[{"change":6,"pos":151427}],"flag":"BLOCK","start":2680,"end":2734,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151406},"to":{"change":6,"start":151406,"end":151427},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" txn.clone(),"},{"Add":" channel.clone(),"}],"del_contents":[{"Del":" channel,\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":473,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":129}],"down_context":[{"change":6,"pos":151462}],"flag":"BLOCK","start":2735,"end":2764,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" num_cpus::get(),"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":477,"ins":{"up_context":[{"change":6,"pos":151569}],"down_context":[{"change":6,"pos":151638}],"flag":"BLOCK","start":2765,"end":2902,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151569},"to":{"change":6,"start":527,"end":612},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" let txn = txn.read().unwrap();"},{"Add":" check_alive_debug(&repo.repo.changes, &*txn, &channel.read().unwrap(), line!())?;"}],"del_contents":[{"Del":" check_alive_debug(&repo.repo.changes, txn, &channel.borrow(), line!())?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":485,"ins":{"up_context":[{"change":6,"pos":151772}],"down_context":[{"change":6,"pos":151823}],"flag":"BLOCK","start":2903,"end":3014,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151772},"to":{"change":2,"start":130,"end":192},"introduced_by":2}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" let txn = txn.read().unwrap();"},{"Add":" check_tree_inodes(&*txn, txn.graph(&*channel.read().unwrap()));"}],"del_contents":[{"Del":" check_tree_inodes(txn, txn.graph(&channel.borrow()));\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":497,"ins":{"up_context":[{"change":6,"pos":152048}],"down_context":[{"change":6,"pos":152098}],"flag":"BLOCK","start":3015,"end":3068,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":152048},"to":{"change":6,"start":152048,"end":152098},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" txn: Arc>,"},{"Add":" channel: ChannelRef,"}],"del_contents":[{"Del":" txn: &mut T,\n channel: &mut ChannelRef,\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":550,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":153980}],"down_context":[{"change":6,"pos":153980}],"flag":"BLOCK","start":3069,"end":3117,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" let mut txn = txn.write().unwrap();"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":567,"ins":{"up_context":[{"change":6,"pos":1756}],"down_context":[{"change":6,"pos":154875}],"flag":"BLOCK","start":3118,"end":3221,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1756},"to":{"change":6,"start":1756,"end":1857},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" if let Some(old_path) = libpijul::fs::inode_filename(&*txn, *inode)? {"}],"del_contents":[{"Del":" if let Some(old_path) = libpijul::fs::inode_filename(txn, *inode)? {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":632,"ins":{"up_context":[{"change":6,"pos":157569}],"down_context":[{"change":6,"pos":157612}],"flag":"BLOCK","start":3222,"end":3301,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":157569},"to":{"change":6,"start":921,"end":976},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":"fn import_commit("}],"del_contents":[{"Del":"fn import_commit(\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":635,"ins":{"up_context":[{"change":6,"pos":157665}],"down_context":[{"change":6,"pos":157715}],"flag":"BLOCK","start":3302,"end":3355,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":157665},"to":{"change":6,"start":157665,"end":157715},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" txn: Arc>,"},{"Add":" channel: ChannelRef,"}],"del_contents":[{"Del":" txn: &mut T,\n channel: &mut ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":640,"ins":{"up_context":[{"change":6,"pos":3958}],"down_context":[{"change":6,"pos":157898}],"flag":"BLOCK","start":3356,"end":3493,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":3958},"to":{"change":6,"start":157818,"end":157898},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":157818},"to":{"change":6,"start":157818,"end":157898},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" let (object, prefixes) = git_reset(git, repo, txn.clone(), channel.clone(), child, stats)?;"},{"Add":" let mut txn_ = txn.write().unwrap();"}],"del_contents":[{"Del":" let (object, prefixes) = git_reset(git, repo, txn, channel, child, stats)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":645,"ins":{"up_context":[{"change":6,"pos":158004}],"down_context":[{"change":6,"pos":158068}],"flag":"BLOCK","start":3494,"end":3559,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":158004},"to":{"change":6,"start":158004,"end":158068},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" txn_.add_dir(p.to_str().unwrap()).unwrap_or(());"}],"del_contents":[{"Del":" txn.add_dir(p.to_str().unwrap()).unwrap_or(());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":647,"ins":{"up_context":[{"change":6,"pos":158089}],"down_context":[{"change":6,"pos":158154}],"flag":"BLOCK","start":3560,"end":3626,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":158089},"to":{"change":6,"start":158089,"end":158154},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" txn_.add_file(p.to_str().unwrap()).unwrap_or(());"}],"del_contents":[{"Del":" txn.add_file(p.to_str().unwrap()).unwrap_or(());\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":654,"ins":{"up_context":[{"change":6,"pos":158287}],"down_context":[{"change":6,"pos":158352}],"flag":"BLOCK","start":3627,"end":3705,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":158287},"to":{"change":2,"start":193,"end":263},"introduced_by":2}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" debug!(\"recording on channel {:?}\", txn_.name(&channel.read().unwrap()));"}],"del_contents":[{"Del":" debug!(\"recording on channel {:?}\", txn.name(&channel.borrow()));\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":663,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":332}],"down_context":[{"change":6,"pos":158463}],"flag":"BLOCK","start":3706,"end":3732,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" std::mem::drop(txn_);"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":665,"ins":{"up_context":[{"change":6,"pos":158491}],"down_context":[{"change":6,"pos":158558}],"flag":"BLOCK","start":3733,"end":3819,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":158491},"to":{"change":6,"start":158491,"end":158558},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" txn.clone(),"},{"Add":" channel.clone(),"},{"Add":" repo.repo.working_copy.clone(),"}],"del_contents":[{"Del":" txn,\n channel,\n &mut repo.repo.working_copy,\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":685,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":159191}],"down_context":[{"change":6,"pos":159191}],"flag":"BLOCK","start":3820,"end":3855,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" let txn = txn.read().unwrap();"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":690,"ins":{"up_context":[{"change":6,"pos":404}],"down_context":[{"change":6,"pos":474}],"flag":"BLOCK","start":3856,"end":3925,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":404},"to":{"change":6,"start":1047,"end":1109},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" return Ok(txn.current_state(&channel.read().unwrap())?);"}],"del_contents":[{"Del":" return Ok(txn.current_state(&channel.borrow())?);\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":697,"ins":{"up_context":[{"change":6,"pos":159718}],"down_context":[{"change":6,"pos":159783}],"flag":"BLOCK","start":3926,"end":4016,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":159718},"to":{"change":6,"start":1110,"end":1191},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" check_alive_debug(&repo.repo.changes, &*txn, &channel.read().unwrap(), line!())?;"}],"del_contents":[{"Del":" check_alive_debug(&repo.repo.changes, txn, &channel.borrow(), line!())?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":705,"ins":{"up_context":[{"change":6,"pos":159934}],"down_context":[{"change":6,"pos":159981}],"flag":"BLOCK","start":4017,"end":4075,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":159934},"to":{"change":2,"start":264,"end":315},"introduced_by":2}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" cur.push_str(txn.name(&channel.read().unwrap()));"}],"del_contents":[{"Del":" cur.push_str(txn.name(&channel.borrow()));\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":707,"ins":{"up_context":[{"change":6,"pos":159994}],"down_context":[{"change":6,"pos":160079}],"flag":"BLOCK","start":4076,"end":4172,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":159994},"to":{"change":2,"start":316,"end":405},"introduced_by":2}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" repo.repo.config.current_channel = Some(txn.name(&channel.read().unwrap()).to_string())"}],"del_contents":[{"Del":" repo.repo.config.current_channel = Some(txn.name(&channel.borrow()).to_string())\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":712,"ins":{"up_context":[{"change":6,"pos":160168}],"down_context":[{"change":6,"pos":160219}],"flag":"BLOCK","start":4173,"end":4244,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":160168},"to":{"change":2,"start":406,"end":468},"introduced_by":2}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" check_tree_inodes(&*txn, txn.graph(&channel.read().unwrap()));"}],"del_contents":[{"Del":" check_tree_inodes(txn, txn.graph(&channel.borrow()));\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":718,"ins":{"up_context":[{"change":6,"pos":160373}],"down_context":[{"change":6,"pos":160570}],"flag":"BLOCK","start":4245,"end":4494,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":160373},"to":{"change":6,"start":160373,"end":160570},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":"fn record_apply("},{"Add":" txn: Arc>,"},{"Add":" channel: ChannelRef,"},{"Add":" working_copy: Arc,"}],"del_contents":[{"Del":"fn record_apply(\n txn: &mut T,\n channel: &mut ChannelRef,\n working_copy: &mut libpijul::working_copy::FileSystem,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":732,"ins":{"up_context":[{"change":6,"pos":70}],"down_context":[{"change":6,"pos":549}],"flag":"BLOCK","start":4495,"end":4996,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":70},"to":{"change":6,"start":188,"end":219},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":160881},"to":{"change":6,"start":188,"end":219},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":219},"to":{"change":6,"start":397,"end":608},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":191},"to":{"change":6,"start":647,"end":969},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":608},"to":{"change":6,"start":647,"end":969},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":317},"to":{"change":6,"start":647,"end":969},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":969},"to":{"change":6,"start":535,"end":549},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":535},"to":{"change":6,"start":535,"end":549},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" let result = working_copy.record_prefixes("},{"Add":" txn.clone(),"},{"Add":" channel.clone(),"},{"Add":" changes,"},{"Add":" &mut state,"},{"Add":" repo_path.clone(),"},{"Add":" prefixes,"},{"Add":" num_cpus,"},{"Add":" );"},{"Add":" use libpijul::working_copy::filesystem::*;"},{"Add":" match result {"},{"Add":" Ok(_) => {}"},{"Add":" Err(Error::Add(AddError::Fs(FsError::NotFound(_)))) => {}"},{"Add":" Err(Error::Add(AddError::Fs(FsError::AlreadyInRepo(_)))) => {}"},{"Add":" Err(e) => {"},{"Add":" error!(\"While adding {:?}: {}\", prefixes, e);"}],"del_contents":[{"Del":" for p in prefixes.iter() {\n"},{"Del":" let result = working_copy.record_prefix(\n txn,\n channel,\n changes,\n &mut state,\n repo_path.clone(),\n p,\n num_cpus,\n );\n"},{"Del":" use libpijul::working_copy::filesystem::*;\n match result {\n Ok(_) => {}\n Err(Error::Add(AddError::Fs(FsError::NotFound(_)))) => {}\n Err(Error::Add(AddError::Fs(FsError::AlreadyInRepo(_)))) => {}\n Err(e) => {\n error!(\"While adding {:?}: {}\", p, e);\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":751,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":161002}],"down_context":[{"change":6,"pos":161002}],"flag":"BLOCK","start":4997,"end":5037,"inode":{"change":6,"pos":137210}}},"contents":[{"Add":" let mut txn = txn.write().unwrap();"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":756,"ins":{"up_context":[{"change":6,"pos":1447}],"down_context":[{"change":6,"pos":1514}],"flag":"BLOCK","start":5038,"end":5112,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1447},"to":{"change":6,"start":1447,"end":1514},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" txn.current_state(&channel.read().unwrap()).map_err(TxnErr)?,"}],"del_contents":[{"Del":" txn.current_state(&channel.borrow()).map_err(TxnErr)?,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":762,"ins":{"up_context":[{"change":6,"pos":161176}],"down_context":[{"change":6,"pos":161215}],"flag":"BLOCK","start":5113,"end":5163,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":161176},"to":{"change":6,"start":1527,"end":1575},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" .map(|rec| rec.globalize(&*txn).unwrap())"}],"del_contents":[{"Del":" .map(|rec| rec.globalize(txn).unwrap())\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":766,"ins":{"up_context":[{"change":6,"pos":1614}],"down_context":[{"change":6,"pos":161362}],"flag":"BLOCK","start":5164,"end":5254,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1614},"to":{"change":6,"start":1614,"end":1695},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" libpijul::change::dependencies(&*txn, &channel.read().unwrap(), actions.iter())?;"}],"del_contents":[{"Del":" libpijul::change::dependencies(txn, &channel.borrow(), actions.iter())?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":768,"ins":{"up_context":[{"change":6,"pos":161427}],"down_context":[{"change":6,"pos":161457}],"flag":"BLOCK","start":5255,"end":5288,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":161427},"to":{"change":6,"start":161427,"end":161457},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" &*txn,"},{"Add":" &channel,"}],"del_contents":[{"Del":" txn,\n channel,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":771,"ins":{"up_context":[{"change":6,"pos":161474}],"down_context":[{"change":6,"pos":161496}],"flag":"BLOCK","start":5289,"end":5364,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":161474},"to":{"change":6,"start":161474,"end":161496},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" std::mem::replace(&mut *rec.contents.lock().unwrap(), Vec::new()),"}],"del_contents":[{"Del":" rec.contents,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":137210},"path":"pijul/src/commands/git.rs","line":780,"ins":{"up_context":[{"change":6,"pos":161721}],"down_context":[{"change":6,"pos":169}],"flag":"BLOCK","start":5365,"end":5450,"inode":{"change":6,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":161721},"to":{"change":6,"start":1858,"end":1942},"introduced_by":6}],"inode":{"change":6,"pos":137210}},"ins_contents":[{"Add":" let (_, m) = txn.apply_local_change(&channel, &change, &hash, &rec.updatables)?;"}],"del_contents":[{"Del":" let (_, m) = txn.apply_local_change(channel, &change, &hash, &rec.updatables)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":167873},"path":"pijul/src/commands/fork.rs","line":31,"ins":{"up_context":[{"change":6,"pos":168609}],"down_context":[{"change":6,"pos":13204}],"flag":"BLOCK","start":5451,"end":5572,"inode":{"change":6,"pos":167873}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":168609},"to":{"change":6,"start":168609,"end":168678},"introduced_by":6}],"inode":{"change":6,"pos":167873}},"ins_contents":[{"Add":" let channel = txn.open_or_create_channel(&self.to)?;"},{"Add":" let mut channel = channel.write().unwrap();"}],"del_contents":[{"Del":" let mut channel = txn.open_or_create_channel(&self.to)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":194289},"path":"pijul/src/commands/apply.rs","line":35,"ins":{"up_context":[{"change":6,"pos":2922}],"down_context":[{"change":6,"pos":195133}],"flag":"BLOCK","start":5573,"end":5653,"inode":{"change":6,"pos":194289}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":1239},"to":{"change":6,"start":19373,"end":19457},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":2922},"to":{"change":6,"start":19373,"end":19457},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":195050},"to":{"change":6,"start":19373,"end":19457},"introduced_by":6}],"inode":{"change":6,"pos":194289}},"ins_contents":[{"Add":" let channel = if let Some(channel) = txn.load_channel(&channel_name)? {"}],"del_contents":[{"Del":" let mut channel = if let Some(channel) = txn.load_channel(&channel_name)? {\n"}]}},{"Edit":{"inode":{"change":6,"pos":194289},"path":"pijul/src/commands/apply.rs","line":58,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":1173}],"down_context":[{"change":6,"pos":14215}],"flag":"BLOCK","start":5654,"end":5710,"inode":{"change":6,"pos":194289}}},"contents":[{"Add":" let mut channel = channel.write().unwrap();"}]}},{"Edit":{"inode":{"change":6,"pos":194289},"path":"pijul/src/commands/apply.rs","line":61,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":196057}],"down_context":[{"change":6,"pos":14302}],"flag":"BLOCK","start":5711,"end":5767,"inode":{"change":6,"pos":194289}}},"contents":[{"Add":" let mut channel = channel.write().unwrap();"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":122,"ins":{"up_context":[{"change":6,"pos":720672}],"down_context":[{"change":6,"pos":125930}],"flag":"BLOCK","start":5768,"end":5805,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":720672},"to":{"change":6,"start":720672,"end":720722},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" channel: &mut Self::Channel,"}],"del_contents":[{"Del":" channel: &mut pristine::ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":132,"ins":{"up_context":[{"change":6,"pos":721040}],"down_context":[{"change":6,"pos":125969}],"flag":"BLOCK","start":5806,"end":5843,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":721040},"to":{"change":6,"start":721040,"end":721090},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" channel: &mut Self::Channel,"}],"del_contents":[{"Del":" channel: &mut pristine::ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":142,"ins":{"up_context":[{"change":6,"pos":721391}],"down_context":[{"change":6,"pos":126008}],"flag":"BLOCK","start":5844,"end":5881,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":721391},"to":{"change":6,"start":721391,"end":721441},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" channel: &mut Self::Channel,"}],"del_contents":[{"Del":" channel: &mut pristine::ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":151,"ins":{"up_context":[{"change":6,"pos":721695}],"down_context":[{"change":6,"pos":126040}],"flag":"BLOCK","start":5882,"end":5919,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":721695},"to":{"change":6,"start":721695,"end":721745},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" channel: &mut Self::Channel,"}],"del_contents":[{"Del":" channel: &mut pristine::ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":160,"ins":{"up_context":[{"change":6,"pos":721987}],"down_context":[{"change":6,"pos":126072}],"flag":"BLOCK","start":5920,"end":5957,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":721987},"to":{"change":6,"start":721987,"end":722037},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" channel: &mut Self::Channel,"}],"del_contents":[{"Del":" channel: &mut pristine::ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":717381},"path":"libpijul/src/lib.rs","line":390,"ins":{"up_context":[{"change":6,"pos":729347}],"down_context":[{"change":6,"pos":729448}],"flag":"BLOCK","start":5958,"end":6165,"inode":{"change":6,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":729347},"to":{"change":6,"start":729347,"end":729385},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":729385},"to":{"change":6,"start":126592,"end":126654},"introduced_by":6}],"inode":{"change":6,"pos":717381}},"ins_contents":[{"Add":" {"},{"Add":" let mut channel_ = channel.write().unwrap();"},{"Add":" for app in extra.iter() {"},{"Add":" self.apply_change_rec(changes, &mut channel_, app)?"},{"Add":" }"}],"del_contents":[{"Del":" for app in extra.iter() {\n"},{"Del":" self.apply_change_rec(changes, channel, app)?\n"}]}},{"Replacement":{"inode":{"change":6,"pos":944089},"path":"libpijul/src/apply.rs","line":88,"ins":{"up_context":[{"change":6,"pos":944800}],"down_context":[{"change":6,"pos":143229}],"flag":"BLOCK","start":6166,"end":6196,"inode":{"change":6,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":944800},"to":{"change":6,"start":944800,"end":944833},"introduced_by":6}],"inode":{"change":6,"pos":944089}},"ins_contents":[{"Add":" channel: &mut T::Channel,"}],"del_contents":[{"Del":" channel: &mut ChannelRef,\n"}]}},{"Edit":{"inode":{"change":6,"pos":944089},"path":"libpijul/src/apply.rs","line":94,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":944998},"to":{"change":5,"start":89993,"end":90041},"introduced_by":5}],"inode":{"change":6,"pos":944089}}},"contents":[{"Del":" let mut channel = channel.write().unwrap();\n"}]}},{"Replacement":{"inode":{"change":6,"pos":944089},"path":"libpijul/src/apply.rs","line":118,"ins":{"up_context":[{"change":6,"pos":94986}],"down_context":[{"change":6,"pos":95008}],"flag":"BLOCK","start":6197,"end":6214,"inode":{"change":6,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":94986},"to":{"change":6,"start":94986,"end":95008},"introduced_by":6}],"inode":{"change":6,"pos":944089}},"ins_contents":[{"Add":" channel,"}],"del_contents":[{"Del":" &mut channel,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":944089},"path":"libpijul/src/apply.rs","line":129,"ins":{"up_context":[{"change":6,"pos":946010}],"down_context":[{"change":6,"pos":143567}],"flag":"BLOCK","start":6215,"end":6245,"inode":{"change":6,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":946010},"to":{"change":6,"start":946010,"end":946043},"introduced_by":6}],"inode":{"change":6,"pos":944089}},"ins_contents":[{"Add":" channel: &mut T::Channel,"}],"del_contents":[{"Del":" channel: &mut ChannelRef,\n"}]}},{"Edit":{"inode":{"change":6,"pos":944089},"path":"libpijul/src/apply.rs","line":136,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":946218},"to":{"change":5,"start":90042,"end":90090},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":90090},"to":{"change":6,"start":946264,"end":946265},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":946264},"to":{"change":6,"start":946264,"end":946265},"introduced_by":6}],"inode":{"change":6,"pos":944089}}},"contents":[{"Del":" let mut channel = channel.write().unwrap();\n"},{"Del":"\n"}]}},{"Replacement":{"inode":{"change":6,"pos":944089},"path":"libpijul/src/apply.rs","line":177,"ins":{"up_context":[{"change":6,"pos":947384}],"down_context":[{"change":6,"pos":947698}],"flag":"BLOCK","start":6246,"end":6339,"inode":{"change":6,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":947384},"to":{"change":6,"start":85,"end":183},"introduced_by":6}],"inode":{"change":6,"pos":944089}},"ins_contents":[{"Add":" apply_change_to_channel(txn, channel, internal, &hash, &change, workspace)?;"}],"del_contents":[{"Del":" apply_change_to_channel(txn, &mut channel, internal, &hash, &change, workspace)?;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":944089},"path":"libpijul/src/apply.rs","line":188,"ins":{"up_context":[{"change":6,"pos":947889}],"down_context":[{"change":6,"pos":143985}],"flag":"BLOCK","start":6340,"end":6370,"inode":{"change":6,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":947889},"to":{"change":6,"start":947889,"end":947922},"introduced_by":6}],"inode":{"change":6,"pos":944089}},"ins_contents":[{"Add":" channel: &mut T::Channel,"}],"del_contents":[{"Del":" channel: &mut ChannelRef,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":944089},"path":"libpijul/src/apply.rs","line":198,"ins":{"up_context":[{"change":6,"pos":948208}],"down_context":[{"change":6,"pos":144003}],"flag":"BLOCK","start":6371,"end":6401,"inode":{"change":6,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":948208},"to":{"change":6,"start":948208,"end":948241},"introduced_by":6}],"inode":{"change":6,"pos":944089}},"ins_contents":[{"Add":" channel: &mut T::Channel,"}],"del_contents":[{"Del":" channel: &mut ChannelRef,\n"}]}}],"owner":"irevoire","repo":"pijul","token":"GIHeLgB9FqjUduZrdGwA3L0wNUm9NS4z8q6UiQWfPU0=","login":null}

…

Dependencies

Change contents