{"header":{"message":"Cleanup and formatting","description":null,"timestamp":"2021-05-27T10:05:50.143067822Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","authors":[],"deps":{"hashes":[["GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","Cleanup and formatting"],["AA",null],["F6V27C3M7GZHBHXMGAZMYO5XGWDYYNNIF2HLDE2VPNHTEVDSYGVQC","Fixing the \"old file optimisation\" in record, after the move to parallelisable records"],["NS36CJCO6E2FS65JRHHMOK4GTL7CLNOOLQZZAAAIZI2CQYNPAYRQC","Validating timestamps in record"],["HWH4WWN3XZ4GWP225GVTW4IYZIEFMQLKZZOMMEGZVSRGWYUE6MMAC","Proper separation of Git commit messages into a message and description fields in changes"],["AAXP2534BWX2ZUDZZHUMLYDBMGFGUH32CNRA3KOLER3JKOIJUZLAC","Tags: completing the subcommand"],["PEUQPKDHN6ITBAQT2H2GPCM7BY3DAAF4ABSAKQYJW2UEYYGXU4MAC","Fixing a warning in pijul credit"],["3H6Q5LDSFBPGDMEMR6A5LRNHQF3TIZKSLIBXUTGRIBZSJP65JCTAC","Fixing a bug with the salt argument in `mv`"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","Upgrading the `git` subcommand to the latest Sanakirja and Libpijul"],["L2LPPKD4CL7RQFGNJFCRVRBKHUJY7ZIQCLDGPTTOCJB3PVT7CS2AC","Fixing the Git feature"],["CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC","Fixing git import, and adding more useful feedback (with `RUST_LOG=\"pijul=info\"`)"],["OWCCRVO5LMF3AJ6CU76UOT6HS2VNGI6O3LGTTYQBKZLPCCRNETXQC","Fixing a broken pipe in credit"],["3MHUNYERBYLR5FOB7YJZINOFKXSXMLGBF5F6UR2MKNYYODIJIFGQC","Changing --amend flag to respect -m flag"],["ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","Canonicalize all paths"],["YDTN6BGI5TFRJFM3N3Y2J463GKFHU5L3DPBQXBDIQJDWXU5ELKMQC","Touch the channel if no file was changed"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["MF3WAHBIH6Q2F7ZOKWPEJF6VGSKJITWLR3Z64GTD6YQZNA5EATWQC","commands/record: amend current change if unspecified"],["QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","Tags"],["K7JPP64SNKZNMB6XJAYYHDC2464I3BQDLVA3IX4YCQZ4P5TXZXRAC","Faster error in unrecord when the change is not on the channel"],["2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","Making libpijul deterministic (and getting rid of `rand`)"],["GBLM3JLRCNEZLICNLV6M26YCZ4EYDG2F5BJOBH4FIBOM4W473LYAC","Fix options of git subcommand"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["3FTEGCMRMELPIJRUKNKRTA5TDBXEOTOOVRUTZJ7DWD27ZTKKMV3QC","add timestamp_validator to tag --timestamp option"],["6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC","Current state: return zero instead of an Option if there is no change on the channel"],["V435QOJRFHNKW3NKJHMVMFOGO3KGAZVSURLSGFUHVKOMHMF4Q2ZQC","Using path-slash to fix path issues on Windows"],["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["AXVPNZ2NVKYRCTKYI77H72CALZBRTHY3OK4CMWGMTSU2NPMOS42QC","commands/git: fix imports"],["IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Cleanup, formatting, and fixing the Git feature"],["7MNTFTDF62XHPRL56GJLTGRVB6QOLYDRYGY2XOKDO745RXOCBB4QC","Exit with an error when a change could not be signed"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","Fixing the Git feature"],["KWAGWB73AMLJFK2Z7SBKHHKKHFRX7AQKXCWDN2MBX72RYCNMB36QC","Adding extra dependencies from the config file"],["B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","Fixing the Git features with the latest Pijul (+ conflicts in Cargo.toml)"],["DJYHARZ7CSRMX6ZFM6P52SM2EC57VTSHWAIMFSD7Q3EL7UYZGLXQC","Skipping old files when recording"]],"deps":["F6V27C3M7GZHBHXMGAZMYO5XGWDYYNNIF2HLDE2VPNHTEVDSYGVQC","NS36CJCO6E2FS65JRHHMOK4GTL7CLNOOLQZZAAAIZI2CQYNPAYRQC","HWH4WWN3XZ4GWP225GVTW4IYZIEFMQLKZZOMMEGZVSRGWYUE6MMAC","AAXP2534BWX2ZUDZZHUMLYDBMGFGUH32CNRA3KOLER3JKOIJUZLAC","PEUQPKDHN6ITBAQT2H2GPCM7BY3DAAF4ABSAKQYJW2UEYYGXU4MAC","3H6Q5LDSFBPGDMEMR6A5LRNHQF3TIZKSLIBXUTGRIBZSJP65JCTAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","AXVPNZ2NVKYRCTKYI77H72CALZBRTHY3OK4CMWGMTSU2NPMOS42QC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","GBLM3JLRCNEZLICNLV6M26YCZ4EYDG2F5BJOBH4FIBOM4W473LYAC","MF3WAHBIH6Q2F7ZOKWPEJF6VGSKJITWLR3Z64GTD6YQZNA5EATWQC","ZHABNS3S6FSINO74FOI5KHYXYDTBPO4FQTTYTUS7NNKEVVNLYC4AC","6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","3MHUNYERBYLR5FOB7YJZINOFKXSXMLGBF5F6UR2MKNYYODIJIFGQC","A3DMBJJAPLS6ASSZ7JVVVULRQNZCF2WKYTRUD7EY7PKVYABSATFAC","B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","DJYHARZ7CSRMX6ZFM6P52SM2EC57VTSHWAIMFSD7Q3EL7UYZGLXQC","KWAGWB73AMLJFK2Z7SBKHHKKHFRX7AQKXCWDN2MBX72RYCNMB36QC","L2LPPKD4CL7RQFGNJFCRVRBKHUJY7ZIQCLDGPTTOCJB3PVT7CS2AC","7MNTFTDF62XHPRL56GJLTGRVB6QOLYDRYGY2XOKDO745RXOCBB4QC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","YDTN6BGI5TFRJFM3N3Y2J463GKFHU5L3DPBQXBDIQJDWXU5ELKMQC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC","QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","K7JPP64SNKZNMB6XJAYYHDC2464I3BQDLVA3IX4YCQZ4P5TXZXRAC","V435QOJRFHNKW3NKJHMVMFOGO3KGAZVSURLSGFUHVKOMHMF4Q2ZQC","OWCCRVO5LMF3AJ6CU76UOT6HS2VNGI6O3LGTTYQBKZLPCCRNETXQC","2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","3FTEGCMRMELPIJRUKNKRTA5TDBXEOTOOVRUTZJ7DWD27ZTKKMV3QC"]},"hunks":[{"Replacement":{"inode":{"change":8,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":132,"ins":{"up_context":[{"change":8,"pos":998}],"down_context":[{"change":8,"pos":5477}],"flag":"BLOCK","start":0,"end":113,"inode":{"change":8,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":998},"to":{"change":8,"start":117,"end":196},"introduced_by":8}],"inode":{"change":8,"pos":95630}},"ins_contents":[{"Add":" txn.write()"},{"Add":" .unwrap()"},{"Add":" .unrecord(&repo.changes, &channel, &hash, 0)?;"}],"del_contents":[{"Del":" txn.write().unwrap().unrecord(&repo.changes, &channel, &hash, 0)?;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":95630},"path":"pijul/src/commands/unrecord.rs","line":151,"ins":{"up_context":[{"change":8,"pos":5939}],"down_context":[{"change":8,"pos":6012}],"flag":"BLOCK","start":114,"end":224,"inode":{"change":8,"pos":95630}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":5939},"to":{"change":8,"start":217,"end":293},"introduced_by":8}],"inode":{"change":8,"pos":95630}},"ins_contents":[{"Add":" txn.write()"},{"Add":" .unwrap()"},{"Add":" .unrecord(&repo.changes, &channel, &h, 0)?;"}],"del_contents":[{"Del":" txn.write().unwrap().unrecord(&repo.changes, &channel, &h, 0)?;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":74},"path":"pijul/src/commands/tag.rs","line":120,"ins":{"up_context":[{"change":5,"pos":268}],"down_context":[{"change":5,"pos":440}],"flag":"BLOCK","start":225,"end":313,"inode":{"change":8,"pos":74}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":268},"to":{"change":5,"start":268,"end":440},"introduced_by":5}],"inode":{"change":8,"pos":74}},"ins_contents":[{"Add":" let channel_name = repo.config.get_current_channel(None).0.to_string();"}],"del_contents":[{"Del":" let channel_name = repo\n .config\n .get_current_channel(None)\n .0\n .to_string();\n"}]}},{"Replacement":{"inode":{"change":8,"pos":101759},"path":"pijul/src/commands/record.rs","line":60,"ins":{"up_context":[{"change":3,"pos":230}],"down_context":[{"change":3,"pos":256}],"flag":"BLOCK","start":314,"end":341,"inode":{"change":8,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":230},"to":{"change":3,"start":230,"end":256},"introduced_by":3}],"inode":{"change":8,"pos":101759}},"ins_contents":[{"Add":" return Ok(());"}],"del_contents":[{"Del":" return Ok(())\n"}]}},{"Replacement":{"inode":{"change":8,"pos":101759},"path":"pijul/src/commands/record.rs","line":117,"ins":{"up_context":[{"change":8,"pos":282}],"down_context":[{"change":8,"pos":103981}],"flag":"BLOCK","start":342,"end":517,"inode":{"change":8,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":282},"to":{"change":8,"start":390,"end":486},"introduced_by":8}],"inode":{"change":8,"pos":101759}},"ins_contents":[{"Add":" txn.unrecord("},{"Add":" &repo.changes,"},{"Add":" &mut channel,"},{"Add":" &h,"},{"Add":" self.timestamp.unwrap_or(0) as u64,"},{"Add":" )?;"}],"del_contents":[{"Del":" txn.unrecord(&repo.changes, &mut channel, &h, self.timestamp.unwrap_or(0) as u64)?;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":101759},"path":"pijul/src/commands/record.rs","line":149,"ins":{"up_context":[{"change":8,"pos":104255}],"down_context":[{"change":2,"pos":24}],"flag":"BLOCK","start":518,"end":541,"inode":{"change":8,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":104255},"to":{"change":2,"start":0,"end":24},"introduced_by":2}],"inode":{"change":8,"pos":101759}},"ins_contents":[{"Add":" match result {"}],"del_contents":[{"Del":" match result {\n"}]}},{"Replacement":{"inode":{"change":8,"pos":101759},"path":"pijul/src/commands/record.rs","line":287,"ins":{"up_context":[{"change":8,"pos":106731}],"down_context":[{"change":8,"pos":13881}],"flag":"BLOCK","start":542,"end":777,"inode":{"change":8,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":106731},"to":{"change":2,"start":2754,"end":2771},"introduced_by":2}],"inode":{"change":8,"pos":101759}},"ins_contents":[{"Add":" Either<"},{"Add":" ("},{"Add":" Arc>,"},{"Add":" Change,"},{"Add":" HashMap,"},{"Add":" Option,"},{"Add":" std::time::SystemTime,"},{"Add":" ),"}],"del_contents":[{"Del":" Either<(\n"}]}},{"Replacement":{"inode":{"change":8,"pos":101759},"path":"pijul/src/commands/record.rs","line":296,"ins":{"up_context":[{"change":8,"pos":13909}],"down_context":[{"change":8,"pos":106877}],"flag":"BLOCK","start":778,"end":789,"inode":{"change":8,"pos":101759}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":132},"to":{"change":8,"start":106748,"end":106819},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":13909},"to":{"change":8,"start":106748,"end":106819},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":106748},"to":{"change":8,"start":106748,"end":106819},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":106819},"to":{"change":8,"start":2267,"end":2303},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2303},"to":{"change":8,"start":714,"end":749},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":749},"to":{"change":2,"start":2772,"end":2800},"introduced_by":2}],"inode":{"change":8,"pos":101759}},"ins_contents":[{"Add":" >,"}],"del_contents":[{"Del":" Change,\n HashMap,\n"},{"Del":" Option,\n"},{"Del":" std::time::SystemTime,\n"},{"Del":" ), Arc>>,\n"}]}},{"Replacement":{"inode":{"change":8,"pos":101759},"path":"pijul/src/commands/record.rs","line":435,"ins":{"up_context":[{"change":2,"pos":2895}],"down_context":[{"change":2,"pos":2904}],"flag":"BLOCK","start":790,"end":800,"inode":{"change":8,"pos":101759}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2895},"to":{"change":2,"start":2895,"end":2904},"introduced_by":2}],"inode":{"change":8,"pos":101759}},"ins_contents":[{"Add":" B(B),"}],"del_contents":[{"Del":" B(B)\n"}]}},{"Edit":{"inode":{"change":8,"pos":137210},"path":"pijul/src/commands/git.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":137210}],"down_context":[{"change":8,"pos":137281}],"flag":"BLOCK","start":801,"end":970,"inode":{"change":8,"pos":137210}}},"contents":[{"Add":"use anyhow::bail;"},{"Add":"use canonical_path::CanonicalPathBuf;"},{"Add":"use clap::{ArgSettings, Clap};"},{"Add":"use libpijul::pristine::*;"},{"Add":"use libpijul::*;"},{"Add":"use log::{debug, error, info, trace};"}]}},{"Edit":{"inode":{"change":8,"pos":137210},"path":"pijul/src/commands/git.rs","line":13,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":843},"to":{"change":8,"start":0,"end":18},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2237},"to":{"change":8,"start":0,"end":18},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":18},"to":{"change":8,"start":160,"end":198},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2237},"to":{"change":8,"start":160,"end":198},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":198},"to":{"change":8,"start":0,"end":31},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2237},"to":{"change":8,"start":0,"end":31},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":31},"to":{"change":8,"start":0,"end":27},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":16},"to":{"change":8,"start":0,"end":27},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":27},"to":{"change":8,"start":2264,"end":2281},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2264},"to":{"change":8,"start":2264,"end":2281},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2281},"to":{"change":8,"start":17,"end":55},"introduced_by":8}],"inode":{"change":8,"pos":137210}}},"contents":[{"Del":"use anyhow::bail;\n"},{"Del":"use canonical_path::CanonicalPathBuf;\n"},{"Del":"use clap::{ArgSettings, Clap};\n"},{"Del":"use libpijul::pristine::*;\n"},{"Del":"use libpijul::*;\n"},{"Del":"use log::{debug, error, info, trace};\n"}]}},{"Replacement":{"inode":{"change":8,"pos":137210},"path":"pijul/src/commands/git.rs","line":329,"ins":{"up_context":[{"change":8,"pos":146777}],"down_context":[{"change":8,"pos":146874}],"flag":"BLOCK","start":971,"end":1094,"inode":{"change":8,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":146777},"to":{"change":8,"start":1369,"end":1472},"introduced_by":8}],"inode":{"change":8,"pos":137210}},"ins_contents":[{"Add":" let state ="},{"Add":" import_commit(git, repo, txn.clone(), channel.clone(), &oid, &mut stats)?;"}],"del_contents":[{"Del":" let state = import_commit(git, repo, txn.clone(), channel.clone(), &oid, &mut stats)?;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":137210},"path":"pijul/src/commands/git.rs","line":571,"ins":{"up_context":[{"change":8,"pos":1756}],"down_context":[{"change":8,"pos":154875}],"flag":"BLOCK","start":1095,"end":1230,"inode":{"change":8,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1756},"to":{"change":8,"start":3118,"end":3221},"introduced_by":8}],"inode":{"change":8,"pos":137210}},"ins_contents":[{"Add":" if let Some(old_path) = libpijul::fs::inode_filename(&*txn, *inode)?"},{"Add":" {"}],"del_contents":[{"Del":" if let Some(old_path) = libpijul::fs::inode_filename(&*txn, *inode)? {\n"}]}},{"Replacement":{"inode":{"change":8,"pos":137210},"path":"pijul/src/commands/git.rs","line":663,"ins":{"up_context":[{"change":8,"pos":158287}],"down_context":[{"change":8,"pos":158352}],"flag":"BLOCK","start":1231,"end":1331,"inode":{"change":8,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":158287},"to":{"change":8,"start":3627,"end":3705},"introduced_by":8}],"inode":{"change":8,"pos":137210}},"ins_contents":[{"Add":" debug!("},{"Add":" \"recording on channel {:?}\","},{"Add":" txn_.name(&channel.read().unwrap())"},{"Add":" );"}],"del_contents":[{"Del":" debug!(\"recording on channel {:?}\", txn_.name(&channel.read().unwrap()));\n"}]}},{"Replacement":{"inode":{"change":8,"pos":137210},"path":"pijul/src/commands/git.rs","line":703,"ins":{"up_context":[{"change":8,"pos":158961}],"down_context":[{"change":8,"pos":158992}],"flag":"BLOCK","start":1332,"end":1476,"inode":{"change":8,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":158961},"to":{"change":4,"start":399,"end":487},"introduced_by":4}],"inode":{"change":8,"pos":137210}},"ins_contents":[{"Add":" description: if description.is_empty() {"},{"Add":" None"},{"Add":" } else {"},{"Add":" Some(description)"},{"Add":" },"}],"del_contents":[{"Del":" description: if description.is_empty() { None } else { Some(description) },\n"}]}},{"Replacement":{"inode":{"change":8,"pos":137210},"path":"pijul/src/commands/git.rs","line":747,"ins":{"up_context":[{"change":8,"pos":160373}],"down_context":[{"change":8,"pos":4382}],"flag":"BLOCK","start":1477,"end":1625,"inode":{"change":8,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":160373},"to":{"change":8,"start":4245,"end":4382},"introduced_by":8}],"inode":{"change":8,"pos":137210}},"ins_contents":[{"Add":"fn record_apply<"},{"Add":" T: TxnT + TxnTExt + MutTxnTExt + Send + Sync + 'static,"},{"Add":" C: libpijul::changestore::ChangeStore + Clone + Send + 'static,"},{"Add":">("}],"del_contents":[{"Del":"fn record_apply(\n"}]}},{"Replacement":{"inode":{"change":8,"pos":137210},"path":"pijul/src/commands/git.rs","line":789,"ins":{"up_context":[{"change":8,"pos":1447}],"down_context":[{"change":8,"pos":1514}],"flag":"BLOCK","start":1626,"end":1717,"inode":{"change":8,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":1447},"to":{"change":8,"start":5038,"end":5112},"introduced_by":8}],"inode":{"change":8,"pos":137210}},"ins_contents":[{"Add":" txn.current_state(&channel.read().unwrap())"},{"Add":" .map_err(TxnErr)?,"}],"del_contents":[{"Del":" txn.current_state(&channel.read().unwrap()).map_err(TxnErr)?,\n"}]}},{"Replacement":{"inode":{"change":8,"pos":169058},"path":"pijul/src/commands/file_operations.rs","line":6,"ins":{"up_context":[{"change":8,"pos":647}],"down_context":[{"change":8,"pos":4127}],"flag":"BLOCK","start":1718,"end":1749,"inode":{"change":8,"pos":169058}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":647},"to":{"change":7,"start":0,"end":31},"introduced_by":7}],"inode":{"change":8,"pos":169058}},"ins_contents":[{"Add":"use clap::{ArgSettings, Clap};"}],"del_contents":[{"Del":"use clap::{Clap, ArgSettings};\n"}]}},{"Replacement":{"inode":{"change":8,"pos":178684},"path":"pijul/src/commands/credit.rs","line":61,"ins":{"up_context":[{"change":8,"pos":58}],"down_context":[{"change":6,"pos":0}],"flag":"BLOCK","start":1750,"end":1774,"inode":{"change":8,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":58},"to":{"change":8,"start":58,"end":83},"introduced_by":8}],"inode":{"change":8,"pos":178684}},"ins_contents":[{"Add":" Ok(_) => {}"}],"del_contents":[{"Del":" Ok(_) => {},\n"}]}},{"Replacement":{"inode":{"change":8,"pos":178684},"path":"pijul/src/commands/credit.rs","line":65,"ins":{"up_context":[{"change":6,"pos":151}],"down_context":[{"change":6,"pos":193}],"flag":"BLOCK","start":1775,"end":1818,"inode":{"change":8,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":151},"to":{"change":6,"start":151,"end":193},"introduced_by":6}],"inode":{"change":8,"pos":178684}},"ins_contents":[{"Add":" return Err(io.into());"}],"del_contents":[{"Del":" return Err(io.into())\n"}]}},{"Replacement":{"inode":{"change":8,"pos":178684},"path":"pijul/src/commands/credit.rs","line":67,"ins":{"up_context":[{"change":6,"pos":211}],"down_context":[{"change":8,"pos":143}],"flag":"BLOCK","start":1819,"end":1833,"inode":{"change":8,"pos":178684}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":211},"to":{"change":6,"start":211,"end":226},"introduced_by":6}],"inode":{"change":8,"pos":178684}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" },\n"}]}},{"Edit":{"inode":{"change":8,"pos":178684},"path":"pijul/src/commands/credit.rs","line":140,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":182206}],"down_context":[{"change":8,"pos":182206}],"flag":"BLOCK","start":1834,"end":1943,"inode":{"change":8,"pos":178684}}},"contents":[{"Add":" let st: u64 = v.start.into();"},{"Add":" write!(self.w, \"{}.{} > \", v.change.to_base32(), st)?;"}]}},{"Edit":{"inode":{"change":8,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1409,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":50063},"to":{"change":8,"start":2889,"end":2997},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":2997},"to":{"change":8,"start":63728,"end":64393},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":63728},"to":{"change":8,"start":63728,"end":64393},"introduced_by":8}],"inode":{"change":8,"pos":531056}}},"contents":[{"Del":" // self.counter += 1;\n // debug!(\"put_graph {:?} {:?}, counter = {:?}\", k, e, self.counter);\n"},{"Del":" /*\n if self.counter >= 12965 {\n let mut x = None;\n let mut cursor = btree::cursor::Cursor::new(&self.txn, graph)?;\n let mut panic = None;\n while let Some((k, v)) = cursor.next(&self.txn)? {\n if let Some((ref k_, ref v_)) = x {\n if k_ > k || (k_== k && v_ > v) {\n panic = Some((*k, *v));\n break\n }\n }\n x = Some((*k, *v))\n }\n self.debug(graph, \".put\");\n if panic.is_some() {\n panic!(\"{:?}\", x);\n }\n }\n */\n"}]}},{"Replacement":{"inode":{"change":8,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1418,"ins":{"up_context":[{"change":8,"pos":50114}],"down_context":[{"change":8,"pos":66261}],"flag":"BLOCK","start":1944,"end":1996,"inode":{"change":8,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":50114},"to":{"change":8,"start":2998,"end":3106},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3106},"to":{"change":8,"start":64496,"end":66261},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":64496},"to":{"change":8,"start":64496,"end":66261},"introduced_by":8}],"inode":{"change":8,"pos":531056}},"ins_contents":[{"Add":" Ok(btree::del(&mut self.txn, graph, k, e)?)"}],"del_contents":[{"Del":" // self.counter += 1;\n // debug!(\"del_graph {:?} {:?}, counter = {:?}\", k, e, self.counter);\n"},{"Del":" /*\n if self.counter >= 12965 {\n let mut x = None;\n let mut cursor = btree::cursor::Cursor::new(&self.txn, graph)?;\n let mut panic = None;\n while let Some((k, v)) = cursor.next(&self.txn)? {\n if let Some((ref k_, ref v_)) = x {\n if k_ > k || (k_== k && v_ > v) {\n panic = Some((*k, *v));\n break\n }\n }\n x = Some((*k, *v))\n }\n self.debug(graph, \".del\");\n if panic.is_some() {\n panic!(\"{:?}\", x);\n }\n }\n\n let change = ChangeId::from_base32(b\"MM6XEY5S32WRA\").unwrap();\n let mm6v = Vertex {\n change,\n start: ChangePosition(L64(1478218)),\n end: ChangePosition(L64(1478229)),\n };\n let mm6e = (Edge {\n flag: EdgeFlags::BLOCK | EdgeFlags::FOLDER | EdgeFlags::PARENT,\n dest: Position {\n change,\n pos: ChangePosition(L64(1466149)),\n },\n introduced_by: change,\n }).into();\n\n let has_mm6 = if let Some((v, e)) = btree::get(&self.txn, graph, &mm6v, Some(&mm6e)).unwrap() {\n v == &mm6v && e == &mm6e\n } else {\n false\n };\n */\n let result = Ok(btree::del(&mut self.txn, graph, k, e)?);\n /*\n if has_mm6 && (k != &mm6v || e != Some(&mm6e)) {\n if let Some((v, e)) = btree::get(&self.txn, graph, &mm6v, Some(&mm6e)).unwrap() {\n assert_eq!(v, &mm6v);\n assert_eq!(e, &mm6e)\n } else {\n panic!(\"Not found\")\n }\n }\n */\n result\n"}]}}],"owner":"irevoire","repo":"pijul","token":"OhK9O9iYEx7ipNkrp5fqN4SXC5LYbiVyMGoZmYhX9J4=","login":null}

…

Dependencies

Change contents