{"header":{"message":"Version bump and cleanup","description":null,"timestamp":"2021-02-25T21:29:12.147573327Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"G65S7FAW4OHBGC6ROVPPZ6PPACKOFEM4KSMAWMYKNQF5OLVDJR2QC","authors":[],"deps":{"hashes":[["G65S7FAW4OHBGC6ROVPPZ6PPACKOFEM4KSMAWMYKNQF5OLVDJR2QC","Version bump and cleanup"],["AA",null],["CUHXXBDZJRSAQD5USKGQACUQL4O7KYDT2T4SB3USCFO3IKMYKFDQC","Fixing a bug in replacements, recently introduced during a fix of a graph corruption bug"],["OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","Version bump"],["BT2ZHPY4LTECZDNPNLX5IUAEA6CYB4RRBGVBXUNK3ARHMWQK7KHAC","Version bumps"],["ZTVNGFNTYSZKPNWG7PGXTWVXKUM4KL2NKEUSMCUQYLCE4CYA6RVQC","Version bump"],["SPA2OL5ITFMLB5P2WL342QAU2FXPKSFS4XHAMW6HYWOGSGLO2MJAC","keep-changes feature (default) to avoid deleting problematic changes"],["YX3VCEOM36NOK6757SD4SZX4FHB7FBAVRKFJH2QFPCYILC4SBRNAC","Version bump"],["TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","1.0.0-alpha.28, with Tokio 1.0"],["3WIQYEISUMGOL5FY4LCWOJS55CTTQA7WMJZXAE3Q4GQUTBFLAE7QC","Fixing conflicts in Cargo.lock"],["SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","Various version bumps"],["ZQXP3HNAQ3LKXJVLEO63OEGZIEVNHUQUW3NT7JLCB25OCAZ5ZVIQC","Version bump"],["CT6FBU57Y4NOFK3ABLTYMXJNW67EJ6MG53FRMPIVXTR7GTRU4HXQC","SDPX license + version bump"],["JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","Reqwest 0.11"],["5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","Cleanup (debugging a crash related to trees/inodes)"],["HW5Q7GGYDMCQQYDBFLDAWCTNQQMIQHJ77UOSPN5BHMSD3KMO2O3AC","Version bump"],["FI3WFMTSNVFWOQWSIWD64UCPRIS6MW4GOADOC6RXPHBSGZBYL5PAC","Simplifying the locks"],["WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","Version bump"],["MBUNDZ3OES7FXMIYBICHRKXWEII5FZO3LFPSP5EDWQUG7KGP2NPQC","Lock: using tokio processes rather than std ones"],["SN7AGY6SLIWVKLBHQQ2MZ7VYY4BBFKROC5F3M6FVVFIGT25QNX7AC","Making `pijul lock` robust to kill signals"],["JACZWIJ6UEL5HWZRNOOXTFXUEG67XJDPC5D72LYUPCVVJ6WB7JQAC","Version bump"],["HSVGP2G4D2F56DS3YKZLSYPS4A5BNGH4NTAXAOZ57OCXFM3E5AYAC","Version bump + formatting"],["UBCBQ5FGH2KASHEUPDLIKGLVVX3GSRQ4F4P2JEJZL2NX2DUSYARAC","Removing pijul/src/commands/checkout.rs (unused file), as well as litorg comments"],["HQ56ADNSNBCCEBNK5PE5ZVBKKBGWY3ATGFWEYPXJKJBJDUJ2XKQQC","Formatting, and version bump"],["HR3WK6A7KKILCHI2CD2BZSZQJUS44MJIT2K3WPKJBHUXGRKAQDRQC","When lock times out, check that there are no more clients before quitting"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["WI5BS6BSRA7T3BCDF6EGB2JZHTZRX4SLT5EG4D67PVRBTZH5YIXAC","New published versions"],["HKEOO4QJ5EACX37IJG76GEUMNSZMFW4VRKA4IVBCGR52ZQSYTN6QC","Version bump"],["64M73LNCB2V57AWAAKHK2NNERXANMV5V3XI3TFC4XR7FLJNCDCRQC","Hide `pijul lock` and avoid panics when used improperly"],["KUMJITTFBIAA7MFVPE6O7ZKIRSX553JNM72LF3KQJ6U3CXZI6MMQC","Version bump in the lockfiles"],["G6YZ7U65AW42M4RSWPXOCJH62XZ5OKVGOQ2UEB6SBNKNJEWYBAEQC","Version bump"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["XL6Y64UPFLIVRV3YVJMTTMZU7VL6SUXVE6BKL6K7DYRKVJ4X727AC","Fixing a panic when iterating over the basenames of a file"],["5YDI33C4QRHATA6H3HHMBYFOBLAMXLLHWSDGJAH57DR6AMWO7AAQC","Fixing pager on OSX"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","Fixing the Git features with the latest Pijul (+ conflicts in Cargo.toml)"],["PJ7T2VFLV5PYG3CV23GC2GIQETXKGC6CO74JBGREV3JC3LG5OXUAC","Do not hang on locked repositories"],["OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","New release: pijul-1.0.0-alpha.8"],["VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","Versions and formatting"],["UFCZKKLXVYQYQBYENCAFHY3ZPPSDAJJAIREZSYNQM4QNXV6G6RXAC","Upgrading to the latest Sanakirja/Rand"],["H565UUPCG3M3BQNQPC4DUYJN2GO3DYTODYSHQYIZ2FT6JVSHBE3AC","Use correct pattern for workspace interdependencies"],["NX5I5H53IWX76GA3MTXTWZXU2HKUDL4ENED7LTGHMPWLHSAHYEAQC","New published versions"],["JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","Implement the Sanakirja concurrency model in a cross-process way"],["B5Z4IMEUYAEJPOU5EIAXI7VYZVUM6CWKV7CTSOXK3F4GXTNNMMAAC","Generating Cargo.nix for pijul 1.0.0-alpha.6"],["XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","Upgrading versions"],["3S4DR77ZU3XFGGDE6XSCUK6TN76IXNOQIKQSLDBM7KUHNILWHS3QC","Version updates"],["23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","Use pager crate for log output"],["6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","Cleanup, and version bump"],["XAY4DYRRPDEQY7XUWJ3OWSXPCEPZ6VFQ6273JPLE3FEGJQAGV6YQC","Version bump"],["N35L72XV5OWBWMEZBKZIKK5K6RMUYQOKGQEQ62N5NJ5N3UCHHWYQC","Versions in Cargo.lock"]],"deps":["CUHXXBDZJRSAQD5USKGQACUQL4O7KYDT2T4SB3USCFO3IKMYKFDQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","3S4DR77ZU3XFGGDE6XSCUK6TN76IXNOQIKQSLDBM7KUHNILWHS3QC","XWETQ4DE4KL2GQWSEBE5NENLTSLIDF7RIWOCCVWJFQOVQJE5P33AC","OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","PJ7T2VFLV5PYG3CV23GC2GIQETXKGC6CO74JBGREV3JC3LG5OXUAC","UBCBQ5FGH2KASHEUPDLIKGLVVX3GSRQ4F4P2JEJZL2NX2DUSYARAC","NX5I5H53IWX76GA3MTXTWZXU2HKUDL4ENED7LTGHMPWLHSAHYEAQC","B5Z4IMEUYAEJPOU5EIAXI7VYZVUM6CWKV7CTSOXK3F4GXTNNMMAAC","23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","3WIQYEISUMGOL5FY4LCWOJS55CTTQA7WMJZXAE3Q4GQUTBFLAE7QC","WI5BS6BSRA7T3BCDF6EGB2JZHTZRX4SLT5EG4D67PVRBTZH5YIXAC","N35L72XV5OWBWMEZBKZIKK5K6RMUYQOKGQEQ62N5NJ5N3UCHHWYQC","OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","SAGSYAPXQ2T6GC3B3TNRPNFTZMS7UMME6YQGSF5MOIM66S5NKB2QC","WIORLB47KYY5ZDKSAQEQ5NV2J3F3RIO5FVGD6LGF73FD5LWJLUAAC","BT2ZHPY4LTECZDNPNLX5IUAEA6CYB4RRBGVBXUNK3ARHMWQK7KHAC","G6YZ7U65AW42M4RSWPXOCJH62XZ5OKVGOQ2UEB6SBNKNJEWYBAEQC","JACZWIJ6UEL5HWZRNOOXTFXUEG67XJDPC5D72LYUPCVVJ6WB7JQAC","XL6Y64UPFLIVRV3YVJMTTMZU7VL6SUXVE6BKL6K7DYRKVJ4X727AC","XAY4DYRRPDEQY7XUWJ3OWSXPCEPZ6VFQ6273JPLE3FEGJQAGV6YQC","SPA2OL5ITFMLB5P2WL342QAU2FXPKSFS4XHAMW6HYWOGSGLO2MJAC","ZTVNGFNTYSZKPNWG7PGXTWVXKUM4KL2NKEUSMCUQYLCE4CYA6RVQC","YX3VCEOM36NOK6757SD4SZX4FHB7FBAVRKFJH2QFPCYILC4SBRNAC","5YDI33C4QRHATA6H3HHMBYFOBLAMXLLHWSDGJAH57DR6AMWO7AAQC","UFCZKKLXVYQYQBYENCAFHY3ZPPSDAJJAIREZSYNQM4QNXV6G6RXAC","6DOXSHWGKJIMIPFCNLASGKBAJCJMJULW5HFRZAZ67EYSMXXGJ3KAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","TPEH2XNBS5RO4IEVKENVF6P65AH7IX64KK2JAYMSJT3J5GXO67EAC","KUMJITTFBIAA7MFVPE6O7ZKIRSX553JNM72LF3KQJ6U3CXZI6MMQC","ZQXP3HNAQ3LKXJVLEO63OEGZIEVNHUQUW3NT7JLCB25OCAZ5ZVIQC","CT6FBU57Y4NOFK3ABLTYMXJNW67EJ6MG53FRMPIVXTR7GTRU4HXQC","H565UUPCG3M3BQNQPC4DUYJN2GO3DYTODYSHQYIZ2FT6JVSHBE3AC","B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC","JRENVH5DF2F4SOV7UNJENFA7VDI3H63XK76R3LFZK6QCW7JIBLSQC","HKEOO4QJ5EACX37IJG76GEUMNSZMFW4VRKA4IVBCGR52ZQSYTN6QC","VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","HW5Q7GGYDMCQQYDBFLDAWCTNQQMIQHJ77UOSPN5BHMSD3KMO2O3AC","JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","64M73LNCB2V57AWAAKHK2NNERXANMV5V3XI3TFC4XR7FLJNCDCRQC","FI3WFMTSNVFWOQWSIWD64UCPRIS6MW4GOADOC6RXPHBSGZBYL5PAC","MBUNDZ3OES7FXMIYBICHRKXWEII5FZO3LFPSP5EDWQUG7KGP2NPQC","SN7AGY6SLIWVKLBHQQ2MZ7VYY4BBFKROC5F3M6FVVFIGT25QNX7AC","HSVGP2G4D2F56DS3YKZLSYPS4A5BNGH4NTAXAOZ57OCXFM3E5AYAC","HR3WK6A7KKILCHI2CD2BZSZQJUS44MJIT2K3WPKJBHUXGRKAQDRQC","HQ56ADNSNBCCEBNK5PE5ZVBKKBGWY3ATGFWEYPXJKJBJDUJ2XKQQC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":21011},"path":"pijul-macros/Cargo.toml","line":4,"ins":{"up_context":[{"change":3,"pos":21091}],"down_context":[{"change":3,"pos":21109}],"flag":"BLOCK","start":0,"end":18,"inode":{"change":3,"pos":21011}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":21091},"to":{"change":3,"start":7647,"end":7665},"introduced_by":3}],"inode":{"change":3,"pos":21011}},"ins_contents":[{"Add":"version = \"0.4.0\""}],"del_contents":[{"Del":"version = \"0.3.0\"\n"}]}},{"FileDel":{"deleted_names":[{"basename":"repository","metadata":1005}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":21414},"to":{"change":3,"start":1927,"end":1939},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":1939},"to":{"change":3,"start":1940,"end":1940},"introduced_by":3}],"inode":{"change":3,"pos":1940}}},"content_edges":null,"content":[]}},{"FileDel":{"deleted_names":[{"basename":"basic_lock.rs","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":1940},"to":{"change":3,"start":3644,"end":3659},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":3659},"to":{"change":3,"start":3660,"end":3660},"introduced_by":3}],"inode":{"change":3,"pos":3660}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3660},"to":{"change":3,"start":3661,"end":4572},"introduced_by":3}],"inode":{"change":3,"pos":3660}},"content":[{"Del":"use fs2::FileExt;\nuse std::fs::OpenOptions;\nuse std::path::Path;\n\npub struct TxnLock {\n file: std::fs::File,\n}\n\npub struct MutTxnLock {\n file: std::fs::File,\n}\n\npub async fn mut_txn>(file: P) -> Result {\n let file = OpenOptions::new().write(true).create(true).open(file)?;\n file.lock_exclusive()?;\n Ok(MutTxnLock { file })\n}\n\npub async fn txn>(file: P) -> Result {\n let file = OpenOptions::new().write(true).create(true).open(file)?;\n file.lock_shared()?;\n Ok(TxnLock { file })\n}\n\nimpl MutTxnLock {\n pub async fn commit(&mut self) -> Result<(), anyhow::Error> {\n Ok(self.file.unlock()?)\n }\n}\n\nimpl Drop for MutTxnLock {\n fn drop(&mut self) {\n self.file.unlock().unwrap_or(())\n }\n}\n\nimpl Drop for TxnLock {\n fn drop(&mut self) {\n self.file.unlock().unwrap_or(())\n }\n}\n"}]}},{"FileDel":{"deleted_names":[{"basename":"unix_lock.rs","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":1940},"to":{"change":3,"start":1941,"end":1955},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":1955},"to":{"change":3,"start":1956,"end":1956},"introduced_by":3}],"inode":{"change":3,"pos":1956}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1956},"to":{"change":3,"start":1957,"end":1975},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1994},"to":{"change":3,"start":1994,"end":2286},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2286},"to":{"change":3,"start":0,"end":227},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":227},"to":{"change":3,"start":0,"end":61},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":61},"to":{"change":3,"start":286,"end":389},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":286},"to":{"change":3,"start":286,"end":389},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":161},"to":{"change":3,"start":389,"end":462},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":389},"to":{"change":3,"start":389,"end":462},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":462},"to":{"change":3,"start":0,"end":129},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":129},"to":{"change":3,"start":491,"end":539},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":203},"to":{"change":3,"start":491,"end":539},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":491},"to":{"change":3,"start":491,"end":539},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":539},"to":{"change":3,"start":2597,"end":2598},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2597},"to":{"change":3,"start":2597,"end":2598},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2598},"to":{"change":3,"start":540,"end":692},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":692},"to":{"change":3,"start":2724,"end":3050},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2724},"to":{"change":3,"start":2724,"end":3050},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3050},"to":{"change":3,"start":693,"end":790},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":790},"to":{"change":3,"start":3267,"end":3643},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3267},"to":{"change":3,"start":3267,"end":3643},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":389},"to":{"change":3,"start":62,"end":161},"introduced_by":3}],"inode":{"change":3,"pos":1956}},"content":[{"Del":"use anyhow::bail;\n"},{"Del":"use std::path::Path;\nuse tokio::io::{AsyncReadExt, AsyncWriteExt};\nuse tokio::net::UnixStream;\n\npub struct TxnLock {\n _stream: UnixStream,\n}\n\npub struct MutTxnLock {\n stream: UnixStream,\n}\n\nconst TXN_BEGIN: u8 = 0;\nconst MUT_TXN_BEGIN: u8 = 1;\nconst COMMIT: u8 = 2;\nconst ACK: u8 = 3;\n\n"},{"Del":"async fn start_stream_if_needed(file: &Path) -> Result {\n if let Ok(stream) = UnixStream::connect(file).await {\n Ok(stream)\n } else {\n let cmd = std::env::args().next().unwrap();\n"},{"Del":" let mut process = tokio::process::Command::new(&cmd)\n"},{"Del":" .args(&[\"lock\", file.to_str().unwrap()])\n .stdout(std::process::Stdio::piped())\n"},{"Del":" .spawn()?;\n let s = process.stdout.as_mut().unwrap();\n"},{"Del":" if let Err(e) = s.read_exact(&mut [0u8]).await {\n process.wait().await?;\n return Err(e);\n }\n"},{"Del":" UnixStream::connect(file).await\n }\n}\n"},{"Del":"\n"},{"Del":"pub async fn mut_txn>(file: P) -> Result {\n let mut stream = start_stream_if_needed(file.as_ref()).await?;\n"},{"Del":" stream.writable().await?;\n stream.write_all(&[MUT_TXN_BEGIN]).await?;\n let mut t = [0u8];\n stream.read_exact(&mut t).await?;\n if t[0] == ACK {\n Ok(MutTxnLock { stream })\n } else {\n bail!(\"Pristine locked\")\n }\n}\n\npub async fn txn>(file: P) -> Result {\n"},{"Del":" let mut stream = start_stream_if_needed(file.as_ref()).await?;\n stream.writable().await?;\n"},{"Del":" stream.write_all(&[TXN_BEGIN]).await?;\n let mut t = [0u8];\n stream.read_exact(&mut t).await?;\n if t[0] == ACK {\n Ok(TxnLock { _stream: stream })\n } else {\n bail!(\"Pristine locked\")\n }\n}\n\nimpl MutTxnLock {\n pub async fn commit(&mut self) -> Result<(), anyhow::Error> {\n self.stream.write_all(&[COMMIT]).await?;\n Ok(())\n }\n}\n"},{"Del":" .stdin(std::process::Stdio::piped())\n .stderr(std::process::Stdio::piped())\n"}]}},{"FileDel":{"deleted_names":[{"basename":"lock.rs","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":93386},"to":{"change":3,"start":7170,"end":7179},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":7179},"to":{"change":3,"start":7180,"end":7180},"introduced_by":3}],"inode":{"change":3,"pos":7180}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7180},"to":{"change":3,"start":130,"end":190},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":190},"to":{"change":3,"start":7245,"end":7365},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7245},"to":{"change":3,"start":7245,"end":7365},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7365},"to":{"change":3,"start":191,"end":230},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":230},"to":{"change":3,"start":7415,"end":7613},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7415},"to":{"change":3,"start":7415,"end":7613},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7613},"to":{"change":3,"start":791,"end":877},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":877},"to":{"change":3,"start":231,"end":546},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":546},"to":{"change":3,"start":7905,"end":7915},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":877},"to":{"change":3,"start":7905,"end":7915},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7905},"to":{"change":3,"start":7905,"end":7915},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":603},"to":{"change":3,"start":878,"end":933},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7915},"to":{"change":3,"start":878,"end":933},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":137},"to":{"change":3,"start":7979,"end":7999},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":933},"to":{"change":3,"start":7979,"end":7999},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7979},"to":{"change":3,"start":7979,"end":7999},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7999},"to":{"change":3,"start":934,"end":1066},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8149},"to":{"change":3,"start":8149,"end":8210},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8210},"to":{"change":3,"start":604,"end":1059},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1059},"to":{"change":3,"start":8419,"end":8434},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8419},"to":{"change":3,"start":8419,"end":8434},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8434},"to":{"change":3,"start":1060,"end":1189},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1189},"to":{"change":3,"start":0,"end":411},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":411},"to":{"change":3,"start":1361,"end":1468},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1361},"to":{"change":3,"start":1361,"end":1468},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1468},"to":{"change":3,"start":13718,"end":13736},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":13718},"to":{"change":3,"start":13718,"end":13736},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":13769},"to":{"change":3,"start":13769,"end":13852},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":13852},"to":{"change":3,"start":1469,"end":1484},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1484},"to":{"change":3,"start":14072,"end":14078},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":14072},"to":{"change":3,"start":14072,"end":14078},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1789},"to":{"change":3,"start":14078,"end":14080},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":14078},"to":{"change":3,"start":14078,"end":14080},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":14080},"to":{"change":3,"start":1790,"end":4166},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":14078},"to":{"change":3,"start":1485,"end":1789},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":7915},"to":{"change":3,"start":547,"end":603},"introduced_by":3}],"inode":{"change":3,"pos":7180}},"content":[{"Del":"use clap::Clap;\nuse fs2::FileExt;\nuse std::fs::OpenOptions;\n"},{"Del":"use std::path::PathBuf;\nuse std::sync::Arc;\nuse tokio::io::{AsyncReadExt, AsyncWriteExt};\nuse tokio::net::UnixListener;\n"},{"Del":"use tokio::sync::{mpsc, watch, Mutex};\n"},{"Del":"\n#[derive(Clap, Debug)]\npub struct Lock {\n path: PathBuf,\n}\n\nconst COMMIT: u8 = 2;\nconst ACK: u8 = 3;\nconst LOCKED: u8 = 4;\n\nimpl Lock {\n pub async fn run(self) -> Result<(), anyhow::Error> {\n"},{"Del":" if let Some(p) = self.path.parent() {\n std::fs::create_dir_all(p)?\n"},{"Del":" }\n self.run_socket().await\n }\n\n async fn run_socket(self) -> Result<(), anyhow::Error> {\n let lock = self.path.with_extension(\"lock\");\n let file = OpenOptions::new().write(true).create(true).open(&lock)?;\n if file.try_lock_exclusive().is_err() {\n return Ok(());\n"},{"Del":" }\n"},{"Del":" let listener = UnixListener::bind(&self.path);\n"},{"Del":" println!();\n"},{"Del":" let listener = if let Ok(listener) = listener {\n listener\n } else {\n return Ok(());\n };\n"},{"Del":" let (tx, active_at_last_commit) = watch::channel(0);\n"},{"Del":" let (done_tx, mut done_rx) = mpsc::channel(1);\n let file = Arc::new(self.path);\n let locks = Locks {\n n_clients: Arc::new(Mutex::new(0usize)),\n muttxn: Arc::new(Mutex::new(())),\n tx: Arc::new(tx),\n active_at_last_commit,\n file: file.clone(),\n clock: Arc::new(Mutex::new(0usize)),\n txn_counter: Arc::new(Mutex::new(0usize)),\n done_tx,\n };\n"},{"Del":" loop {\n"},{"Del":" tokio::select! {\n x = tokio::time::timeout(std::time::Duration::from_secs(1), listener.accept()) => {\n"},{"Del":" match x {\n Err(_) => {\n if *locks.n_clients.lock().await == 0 {\n break\n }\n }\n Ok(Ok((stream, _))) => {\n accept(stream, locks.clone()).await\n }\n Ok(Err(_)) => break\n"},{"Del":" }\n },\n _ = done_rx.recv() => {\n break\n"},{"Del":" }\n"},{"Del":" }\n }\n std::fs::remove_file(file.as_ref()).unwrap_or(());\n"},{"Del":" Ok(())\n"},{"Del":" }\n"},{"Del":"}\n"},{"Del":"\nasync fn accept(mut stream: tokio::net::UnixStream, mut locks: Locks) {\n *locks.n_clients.lock().await += 1;\n tokio::spawn(async move {\n let mut t = [0u8];\n while let Ok(n) = stream.read(&mut t).await {\n if n == 0 {\n break;\n }\n if t[0] == 1 {\n // muttxn\n let lock = if let Ok(guard) = locks.muttxn.try_lock() {\n guard\n } else {\n stream.write_all(&[LOCKED]).await.unwrap_or(());\n locks.muttxn.lock().await\n };\n while *locks.active_at_last_commit.borrow() > 0 {\n stream.write_all(&[LOCKED]).await.unwrap_or(());\n locks.active_at_last_commit.changed().await.unwrap();\n }\n stream.write_all(&[ACK]).await.unwrap_or(());\n if let Ok(n) = stream.read(&mut t).await {\n if n == 0 {\n break;\n }\n if t[0] == COMMIT {\n // commit\n let mut clock = locks.clock.lock().await;\n *clock += 1;\n let counter = *locks.txn_counter.lock().await;\n locks.tx.send(counter).unwrap();\n }\n }\n std::mem::drop(lock)\n } else {\n // txn\n *locks.txn_counter.lock().await += 1;\n let start_date = *locks.clock.lock().await;\n stream.write_all(&[ACK]).await.unwrap_or(());\n let n = stream.read(&mut t).await.unwrap_or(0);\n if n == 0 {\n break;\n }\n *locks.txn_counter.lock().await -= 1;\n if start_date < *locks.clock.lock().await {\n let last = *locks.active_at_last_commit.borrow();\n locks.tx.send(last - 1).unwrap();\n }\n }\n }\n if *locks.n_clients.lock().await == 1 {\n tokio::time::sleep(std::time::Duration::from_secs(1)).await;\n if *locks.n_clients.lock().await == 1 {\n locks.done_tx.send(()).await.unwrap();\n return;\n }\n }\n *locks.n_clients.lock().await -= 1\n });\n}\n"},{"Del":"}\n\n#[derive(Clone)]\nstruct Locks {\n n_clients: Arc>,\n file: Arc,\n muttxn: Arc>,\n clock: Arc>,\n txn_counter: Arc>,\n active_at_last_commit: watch::Receiver,\n tx: Arc>,\n done_tx: mpsc::Sender<()>,\n"},{"Del":" std::fs::remove_file(&self.path).unwrap_or(());\n"}]}},{"Replacement":{"inode":{"change":3,"pos":196374},"path":"pijul/Cargo.toml","line":4,"ins":{"up_context":[{"change":3,"pos":196462}],"down_context":[{"change":3,"pos":196488}],"flag":"BLOCK","start":19,"end":46,"inode":{"change":3,"pos":196374}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":196462},"to":{"change":2,"start":0,"end":27},"introduced_by":2}],"inode":{"change":3,"pos":196374}},"ins_contents":[{"Add":"version = \"1.0.0-alpha.39\""}],"del_contents":[{"Del":"version = \"1.0.0-alpha.38\"\n"}]}},{"Edit":{"inode":{"change":3,"pos":196374},"path":"pijul/Cargo.toml","line":32,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":197171},"to":{"change":3,"start":16765,"end":16789},"introduced_by":3}],"inode":{"change":3,"pos":196374}}},"contents":[{"Del":"\"src/commands/lock.rs\",\n"}]}},{"Edit":{"inode":{"change":3,"pos":196374},"path":"pijul/Cargo.toml","line":35,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":197209},"to":{"change":3,"start":16790,"end":16853},"introduced_by":3}],"inode":{"change":3,"pos":196374}}},"contents":[{"Del":"\"src/repository/unix_lock.rs\",\n\"src/repository/basic_lock.rs\",\n"}]}},{"Replacement":{"inode":{"change":3,"pos":196374},"path":"pijul/Cargo.toml","line":51,"ins":{"up_context":[{"change":3,"pos":197438}],"down_context":[{"change":3,"pos":197523}],"flag":"BLOCK","start":47,"end":137,"inode":{"change":3,"pos":196374}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":197438},"to":{"change":2,"start":28,"end":118},"introduced_by":2}],"inode":{"change":3,"pos":196374}},"ins_contents":[{"Add":"libpijul = { path = \"../libpijul\", version = \"1.0.0-alpha.35\", features = [ \"tarball\" ] }"}],"del_contents":[{"Del":"libpijul = { path = \"../libpijul\", version = \"1.0.0-alpha.34\", features = [ \"tarball\" ] }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":1020742},"path":"libpijul/Cargo.toml","line":4,"ins":{"up_context":[{"change":3,"pos":1020894}],"down_context":[{"change":3,"pos":27}],"flag":"BLOCK","start":138,"end":165,"inode":{"change":3,"pos":1020742}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1020894},"to":{"change":2,"start":146,"end":173},"introduced_by":2}],"inode":{"change":3,"pos":1020742}},"ins_contents":[{"Add":"version = \"1.0.0-alpha.35\""}],"del_contents":[{"Del":"version = \"1.0.0-alpha.34\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":1020742},"path":"libpijul/Cargo.toml","line":107,"ins":{"up_context":[{"change":3,"pos":1023195}],"down_context":[{"change":3,"pos":1023218}],"flag":"BLOCK","start":166,"end":229,"inode":{"change":3,"pos":1020742}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1023195},"to":{"change":3,"start":2127,"end":2190},"introduced_by":3}],"inode":{"change":3,"pos":1020742}},"ins_contents":[{"Add":"pijul-macros = { path = \"../pijul-macros\", version = \"0.4.0\" }"}],"del_contents":[{"Del":"pijul-macros = { path = \"../pijul-macros\", version = \"0.3.0\" }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":1030385},"path":"Cargo.lock","line":948,"ins":{"up_context":[{"change":3,"pos":560}],"down_context":[{"change":3,"pos":729}],"flag":"BLOCK","start":230,"end":257,"inode":{"change":3,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":560},"to":{"change":2,"start":174,"end":201},"introduced_by":2}],"inode":{"change":3,"pos":1030385}},"ins_contents":[{"Add":"version = \"1.0.0-alpha.35\""}],"del_contents":[{"Del":"version = \"1.0.0-alpha.34\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":1030385},"path":"Cargo.lock","line":1310,"ins":{"up_context":[{"change":3,"pos":1064071}],"down_context":[{"change":3,"pos":1064097}],"flag":"BLOCK","start":258,"end":285,"inode":{"change":3,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1064071},"to":{"change":2,"start":202,"end":229},"introduced_by":2}],"inode":{"change":3,"pos":1030385}},"ins_contents":[{"Add":"version = \"1.0.0-alpha.39\""}],"del_contents":[{"Del":"version = \"1.0.0-alpha.38\"\n"}]}},{"Replacement":{"inode":{"change":3,"pos":1030385},"path":"Cargo.lock","line":1355,"ins":{"up_context":[{"change":3,"pos":1064574}],"down_context":[{"change":3,"pos":1064592}],"flag":"BLOCK","start":286,"end":304,"inode":{"change":3,"pos":1030385}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1064574},"to":{"change":3,"start":142288,"end":142306},"introduced_by":3}],"inode":{"change":3,"pos":1030385}},"ins_contents":[{"Add":"version = \"0.4.0\""}],"del_contents":[{"Del":"version = \"0.3.0\"\n"}]}}],"owner":"irevoire","repo":"pijul","token":"6WeIs7s/ei+zIjqhEcdpMu2DIcpNmxGkYO6f64GDw7Y=","login":null}

…

Dependencies

Change contents