{"header":{"message":"Fix most clippy warnings","description":"The one warning that's left is a warning about large size differences\nfor some Error enums.\n","timestamp":"2023-10-10T19:49:35.854055512Z","authors":[{}]},"hash":"CV3S2Z2RTSL5F3RW3CZTGABGF7R6TRTO24LH45V6H2JHOWYZKJUAC","authors":[{"login":"laumann","key":"3hFDodmFeE2ctGSdVvGCMGGumCr5RyZx83fRqEiTgwJg"}],"deps":{"hashes":[["CV3S2Z2RTSL5F3RW3CZTGABGF7R6TRTO24LH45V6H2JHOWYZKJUAC","Fix most clippy warnings"],["AA",null],["KPGRBRHS3HGVO3FTJQ33GATP75TO4CE6DL567YZTXTWGLELRZYKQC","export only the files touched by each change"],["EBE4NGXWTXMGB6B7M4AWJRMVQE2QYR2GODPPRWE67RKQLFAW7KBAC","Add progress-interval flag"],["IKID4WPYXHXUMGHLHTU4ADY6WNJNZM2OAHQ5DYNDLB2SFFECR4SAC","Include \"state\" for each change."],["VK2ZYIOFG4GKELXWPKYWB33P3G6BEDP4CQAW6GY6YFIKTINVOSLAC","deduplicate blobs"],["R3XMFPCYGXT5CNHYRNVZDGD2TDTCK6XGQ55SPJW56UEQQNV4R64AC","import and export marks"],["RVRUZGHUCMZO2UAXMT5NVJM62XK3B3TZWXZFWZKKGIX6RI7LPLCQC","Factor out load_channel function"],["FRQZB7LJV6PBJV66QJ52NYFFTV4TFTBRSQRAD46REZJW6BL4W7UAC","quote and escape filenames"],["ATRA7XTTN62JZQOI7A4JI3Z7L3XVTAEEW2U4AX6UQKEQ6USOXQDQC","RIIR: factor out Repository struct"],["W7HZ5VFMEFVJIPYZJXOSMWTQ7DOZOOHT4QZTMDCT63AKIWB3TCZQC","RIIR: list changes"],["YNZMKRJDWYOQ3R3XHA2G47YG2SDI7FT7AEXH3OLB3BJGB6ALTRQAC","include more information in log"],["UFSP7C7B2ERFJ2XVVVNXGZRXUEMFSMRABC5YXXLK6ONMFG6QBNHAC","Export metadata"],["D467LQZ62MTKWYPTMRBYTTR63CZDCE5WGBIGLQMSWAQYPHC3XITAC","Load identities"],["OZUZ5H6DJUXJ2MEHQK6FQ7LTSPUHHGZSFZ3SPBV26A2KBE4TQKQQC","Use marks for commits"],["T3IX7GG7BIFN3AX3QQWRPS5CKFZVRU5TRQAMJSYN4FEJXQL75PJQC","Pass deletions and renames to Git"],["QWLMNP5FOCONNJDNVKZFHJIM7WHLF7QCJI67YSV5VT2SXEOPZ6TQC","new ChangeStore implementation"],["FIIUZR4LJOB5DPB4CBMPJHMO7C5Q4ZINUVM52UK6SIM5WM7R7ZLAC","Include file content"],["YELSOJNY37FRQ4CVX6UWZW2DZ47BHJZZELAJIW4GEJEQVGCMNE2AC","Avoid exporting files twice"],["TQBJZLD7Q223IFEBR7SU4FJWPWQWVBCSRPYYYEHXNSDM6DC7UWRAC","RIIR: hello, world"]],"deps":["KPGRBRHS3HGVO3FTJQ33GATP75TO4CE6DL567YZTXTWGLELRZYKQC","EBE4NGXWTXMGB6B7M4AWJRMVQE2QYR2GODPPRWE67RKQLFAW7KBAC"],"known":["W7HZ5VFMEFVJIPYZJXOSMWTQ7DOZOOHT4QZTMDCT63AKIWB3TCZQC","ATRA7XTTN62JZQOI7A4JI3Z7L3XVTAEEW2U4AX6UQKEQ6USOXQDQC","RVRUZGHUCMZO2UAXMT5NVJM62XK3B3TZWXZFWZKKGIX6RI7LPLCQC","YNZMKRJDWYOQ3R3XHA2G47YG2SDI7FT7AEXH3OLB3BJGB6ALTRQAC","D467LQZ62MTKWYPTMRBYTTR63CZDCE5WGBIGLQMSWAQYPHC3XITAC","IKID4WPYXHXUMGHLHTU4ADY6WNJNZM2OAHQ5DYNDLB2SFFECR4SAC","UFSP7C7B2ERFJ2XVVVNXGZRXUEMFSMRABC5YXXLK6ONMFG6QBNHAC","OZUZ5H6DJUXJ2MEHQK6FQ7LTSPUHHGZSFZ3SPBV26A2KBE4TQKQQC","FIIUZR4LJOB5DPB4CBMPJHMO7C5Q4ZINUVM52UK6SIM5WM7R7ZLAC","VK2ZYIOFG4GKELXWPKYWB33P3G6BEDP4CQAW6GY6YFIKTINVOSLAC","R3XMFPCYGXT5CNHYRNVZDGD2TDTCK6XGQ55SPJW56UEQQNV4R64AC","FRQZB7LJV6PBJV66QJ52NYFFTV4TFTBRSQRAD46REZJW6BL4W7UAC","QWLMNP5FOCONNJDNVKZFHJIM7WHLF7QCJI67YSV5VT2SXEOPZ6TQC","T3IX7GG7BIFN3AX3QQWRPS5CKFZVRU5TRQAMJSYN4FEJXQL75PJQC","YELSOJNY37FRQ4CVX6UWZW2DZ47BHJZZELAJIW4GEJEQVGCMNE2AC"]},"hunks":[{"Edit":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":32}],"down_context":[{"change":2,"pos":0}],"flag":"BLOCK","start":0,"end":24,"inode":{"change":4,"pos":32}}},"contents":[{"Add":"use std::cmp::Ordering;"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":99,"ins":{"up_context":[{"change":4,"pos":818}],"down_context":[{"change":4,"pos":818}],"flag":"BLOCK","start":25,"end":92,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":818},"to":{"change":4,"start":81,"end":149},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" let change_store = EagerChangeStore::from_root(repo_path);"}],"del_contents":[{"Del":" let change_store = EagerChangeStore::from_root(&repo_path);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":103,"ins":{"up_context":[{"change":4,"pos":481}],"down_context":[{"change":4,"pos":778}],"flag":"BLOCK","start":93,"end":316,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":481},"to":{"change":4,"start":481,"end":778},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" if let Ok(home) = env::var(\"HOME\") {"},{"Add":" Self::load_identities("},{"Add":" &mut identities,"},{"Add":" &Path::new(&home).join(\".config/pijul/identities\"),"},{"Add":" )"},{"Add":" .unwrap_or(());"}],"del_contents":[{"Del":" match env::var(\"HOME\") {\n Ok(home) => {\n Self::load_identities(\n &mut identities,\n &Path::new(&home).join(\".config/pijul/identities\"),\n )\n .unwrap_or(());\n }\n Err(..) => {}\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":111,"ins":{"up_context":[{"change":4,"pos":789}],"down_context":[{"change":4,"pos":610}],"flag":"BLOCK","start":317,"end":341,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":789},"to":{"change":4,"start":443,"end":474},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":819},"to":{"change":4,"start":443,"end":474},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" Ok(Repository {"}],"del_contents":[{"Del":" return Ok(Repository {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":116,"ins":{"up_context":[{"change":4,"pos":814}],"down_context":[{"change":4,"pos":121}],"flag":"BLOCK","start":342,"end":353,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":814},"to":{"change":4,"start":522,"end":534},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":522},"to":{"change":4,"start":522,"end":534},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" })"}],"del_contents":[{"Del":" });\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":125,"ins":{"up_context":[{"change":4,"pos":1015}],"down_context":[{"change":4,"pos":1423}],"flag":"BLOCK","start":354,"end":676,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1015},"to":{"change":4,"start":1015,"end":1423},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" if let Ok(content) = fs::read_to_string(dir.join(file?.path()).join(\"identity.toml\")) {"},{"Add":" let id: Identity = toml::from_str(&content)?;"},{"Add":" identities.insert("},{"Add":" id.public_key.key,"},{"Add":" format!(\"{} <{}>\", id.display_name, id.email),"},{"Add":" );"}],"del_contents":[{"Del":" match fs::read_to_string(dir.join(file?.path()).join(\"identity.toml\")) {\n Ok(content) => {\n let id: Identity = toml::from_str(&content)?;\n identities.insert(\n id.public_key.key,\n format!(\"{} <{}>\", id.display_name, id.email),\n );\n }\n Err(..) => {}\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":133,"ins":{"up_context":[{"change":4,"pos":1447}],"down_context":[{"change":4,"pos":1470}],"flag":"BLOCK","start":677,"end":692,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1447},"to":{"change":4,"start":1447,"end":1470},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" Ok(())"}],"del_contents":[{"Del":" return Ok(());\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":154,"ins":{"up_context":[{"change":4,"pos":1522}],"down_context":[{"change":4,"pos":1770}],"flag":"BLOCK","start":693,"end":839,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1522},"to":{"change":4,"start":1522,"end":1770},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" return self"},{"Add":" .identities"},{"Add":" .get(key)"},{"Add":" .map_or_else(|| format!(\"{} <>\", key), Into::into);"}],"del_contents":[{"Del":" match self.identities.get(key) {\n Some(name) => {\n return name.to_string();\n }\n None => {\n return format!(\"{} <>\", key);\n }\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":161,"ins":{"up_context":[{"change":4,"pos":633}],"down_context":[{"change":4,"pos":798}],"flag":"BLOCK","start":840,"end":999,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":633},"to":{"change":4,"start":633,"end":798},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" return format!("},{"Add":" \"{} <{}>\","},{"Add":" name,"},{"Add":" a.0.get(\"email\").map(|e| e.as_str()).unwrap_or(\"\")"},{"Add":" );"}],"del_contents":[{"Del":" if let Some(email) = a.0.get(\"email\") {\n return format!(\"{} <{}>\", name, email);\n }\n return format!(\"{} <>\", name);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":172,"ins":{"up_context":[{"change":4,"pos":1008}],"down_context":[{"change":4,"pos":1041}],"flag":"BLOCK","start":1000,"end":1020,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1008},"to":{"change":4,"start":1008,"end":1041},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" \"<>\".into()"}],"del_contents":[{"Del":" return \"<>\".to_string();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":188,"ins":{"up_context":[{"change":4,"pos":1260}],"down_context":[{"change":4,"pos":1309}],"flag":"BLOCK","start":1021,"end":1069,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1260},"to":{"change":4,"start":1260,"end":1309},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" .map(|a| self.author_string(a))"}],"del_contents":[{"Del":" .map(|a| self.author_string(&a))\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":201,"ins":{"up_context":[{"change":4,"pos":1434}],"down_context":[{"change":4,"pos":647}],"flag":"BLOCK","start":1070,"end":1090,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1434},"to":{"change":4,"start":1434,"end":1462},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" Ok(changes)"}],"del_contents":[{"Del":" return Ok(changes);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":205,"ins":{"up_context":[{"change":4,"pos":725}],"down_context":[{"change":4,"pos":851}],"flag":"BLOCK","start":1091,"end":1170,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":725},"to":{"change":4,"start":150,"end":230},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" let change_store = EagerChangeStore::from_root(Path::new(&self.path));"}],"del_contents":[{"Del":" let change_store = EagerChangeStore::from_root(&Path::new(&self.path));\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":208,"ins":{"up_context":[{"change":4,"pos":984}],"down_context":[{"change":4,"pos":1012}],"flag":"BLOCK","start":1171,"end":1192,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":984},"to":{"change":4,"start":984,"end":1012},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" Ok(Sandbox {"}],"del_contents":[{"Del":" return Ok(Sandbox {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":212,"ins":{"up_context":[{"change":4,"pos":1076}],"down_context":[{"change":4,"pos":1088}],"flag":"BLOCK","start":1193,"end":1204,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1076},"to":{"change":4,"start":1076,"end":1088},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" })"}],"del_contents":[{"Del":" });\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":237,"ins":{"up_context":[{"change":4,"pos":1912}],"down_context":[{"change":4,"pos":1935}],"flag":"BLOCK","start":1205,"end":1220,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1912},"to":{"change":4,"start":1912,"end":1935},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" Ok(())"}],"del_contents":[{"Del":" return Ok(());\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":250,"ins":{"up_context":[{"change":2,"pos":433}],"down_context":[{"change":2,"pos":561}],"flag":"BLOCK","start":1221,"end":1927,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":433},"to":{"change":2,"start":433,"end":561},"introduced_by":2}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" match int_.cmp(int) {"},{"Add":" Ordering::Less => continue,"},{"Add":" Ordering::Greater => break,"},{"Add":" Ordering::Equal => {"},{"Add":" if let Some((path, _)) = libpijul::fs::find_path("},{"Add":" &self.change_store,"},{"Add":" &*txn,"},{"Add":" &*self.channel.read(),"},{"Add":" false,"},{"Add":" *inode,"},{"Add":" )? {"},{"Add":" touched_paths.insert(path);"},{"Add":" } else {"},{"Add":" touched_paths.clear();"},{"Add":" break;"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" if int_ < int {\n continue;\n } else if int_ > int {\n break;\n"}]}},{"Edit":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":268,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":579},"to":{"change":2,"start":579,"end":992},"introduced_by":2}],"inode":{"change":4,"pos":32}}},"contents":[{"Del":" if let Some((path, _)) = libpijul::fs::find_path(\n &self.change_store,\n &*txn,\n &*self.channel.read(),\n false,\n *inode,\n )? {\n touched_paths.insert(path);\n } else {\n touched_paths.clear();\n break;\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":280,"ins":{"up_context":[{"change":2,"pos":1232}],"down_context":[{"change":2,"pos":1664}],"flag":"BLOCK","start":1928,"end":2296,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1232},"to":{"change":2,"start":1232,"end":1664},"introduced_by":2}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" if let Some(last_path) = last {"},{"Add":" // If `last_path` is a prefix (in the path sense) of `path`, skip."},{"Add":" if last_path.len() < path.len() {"},{"Add":" let (pre_last, post_last) = path.split_at(last_path.len());"},{"Add":" if pre_last == last_path && post_last.starts_with('/') {"},{"Add":" continue;"}],"del_contents":[{"Del":" match last {\n Some(last_path) => {\n // If `last_path` is a prefix (in the path sense) of `path`, skip.\n if last_path.len() < path.len() {\n let (pre_last, post_last) = path.split_at(last_path.len());\n if pre_last == last_path && post_last.starts_with(\"/\") {\n continue;\n }\n"}]}},{"Edit":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":288,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1704},"to":{"change":2,"start":1704,"end":1729},"introduced_by":2}],"inode":{"change":4,"pos":32}}},"contents":[{"Del":" _ => (),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":303,"ins":{"up_context":[{"change":2,"pos":2080}],"down_context":[{"change":4,"pos":1462}],"flag":"BLOCK","start":2297,"end":2312,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":2080},"to":{"change":4,"start":129,"end":152},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2355},"to":{"change":4,"start":129,"end":152},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" Ok(fs)"}],"del_contents":[{"Del":" return Ok(fs);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":32},"path":"src/repo.rs","line":402,"ins":{"up_context":[{"change":4,"pos":817}],"down_context":[{"change":4,"pos":5634}],"flag":"BLOCK","start":2313,"end":2327,"inode":{"change":4,"pos":32}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":817},"to":{"change":4,"start":5612,"end":5634},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5612},"to":{"change":4,"start":5612,"end":5634},"introduced_by":4}],"inode":{"change":4,"pos":32}},"ins_contents":[{"Add":" Ok(f)"}],"del_contents":[{"Del":" return Ok(f);\n"}]}},{"Replacement":{"inode":{"change":20,"pos":67},"path":"src/main.rs","line":39,"ins":{"up_context":[{"change":4,"pos":121}],"down_context":[{"change":4,"pos":239}],"flag":"BLOCK","start":2328,"end":2418,"inode":{"change":20,"pos":67}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":121},"to":{"change":3,"start":733,"end":823},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":823},"to":{"change":4,"start":219,"end":239},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":219},"to":{"change":4,"start":219,"end":239},"introduced_by":4}],"inode":{"change":20,"pos":67}},"ins_contents":[{"Add":" if let Some(ref filename) = cli.marks {"},{"Add":" stream.load_marks(filename).unwrap();"}],"del_contents":[{"Del":" match cli.marks {\n Some(ref filename) => stream.load_marks(filename).unwrap(),\n"},{"Del":" None => (),\n"}]}},{"Replacement":{"inode":{"change":20,"pos":67},"path":"src/main.rs","line":69,"ins":{"up_context":[{"change":4,"pos":573}],"down_context":[{"change":4,"pos":939}],"flag":"BLOCK","start":2419,"end":2509,"inode":{"change":20,"pos":67}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":573},"to":{"change":3,"start":1190,"end":1280},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1280},"to":{"change":4,"start":671,"end":691},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":671},"to":{"change":4,"start":671,"end":691},"introduced_by":4}],"inode":{"change":20,"pos":67}},"ins_contents":[{"Add":" if let Some(ref filename) = cli.marks {"},{"Add":" stream.save_marks(filename).unwrap();"}],"del_contents":[{"Del":" match cli.marks {\n Some(ref filename) => stream.save_marks(filename).unwrap(),\n"},{"Del":" None => (),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"src/fast_export.rs","line":25,"ins":{"up_context":[{"change":4,"pos":317}],"down_context":[{"change":4,"pos":336}],"flag":"BLOCK","start":2510,"end":2521,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":317},"to":{"change":4,"start":317,"end":336},"introduced_by":4}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":" result"}],"del_contents":[{"Del":" return result;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"src/fast_export.rs","line":40,"ins":{"up_context":[{"change":4,"pos":426}],"down_context":[{"change":4,"pos":499}],"flag":"BLOCK","start":2522,"end":2595,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":426},"to":{"change":4,"start":407,"end":499},"introduced_by":4}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":" pub fn new(branch_name: String) -> Self {"},{"Add":" FastExportStream {"}],"del_contents":[{"Del":" pub fn new(branch_name: String) -> FastExportStream {\n return FastExportStream {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"src/fast_export.rs","line":50,"ins":{"up_context":[{"change":4,"pos":79}],"down_context":[{"change":4,"pos":610}],"flag":"BLOCK","start":2596,"end":2606,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":79},"to":{"change":4,"start":599,"end":610},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":6007},"to":{"change":4,"start":599,"end":610},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":599},"to":{"change":4,"start":599,"end":610},"introduced_by":4}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":" }"}],"del_contents":[{"Del":" };\n"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"src/fast_export.rs","line":56,"ins":{"up_context":[{"change":4,"pos":1070}],"down_context":[{"change":4,"pos":1970}],"flag":"BLOCK","start":2607,"end":3400,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1070},"to":{"change":4,"start":1070,"end":1970},"introduced_by":4}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":" if let FileOp::Modify { fw } = &op {"},{"Add":" let ct = fw.content.lock().unwrap();"},{"Add":" let content: &[u8] = &ct;"},{"Add":" let h = sha256::digest(content);"},{"Add":" let mut new_blob = false;"},{"Add":" let blob_mark = *self.blob_marks.entry(h).or_insert_with(|| {"},{"Add":" new_blob = true;"},{"Add":" self.max_blob_mark += 1;"},{"Add":" self.max_blob_mark"},{"Add":" });"},{"Add":" file_marks.insert(fw.name.clone(), blob_mark);"},{"Add":" if new_blob {"},{"Add":" println!(\"blob\");"},{"Add":" println!(\"mark :{}\", blob_mark);"},{"Add":" println!(\"data {}\", content.len());"},{"Add":" std::io::stdout().write_all(content).unwrap();"},{"Add":" println!();"}],"del_contents":[{"Del":" match &op {\n FileOp::Modify { fw } => {\n let ct = fw.content.lock().unwrap();\n let content: &[u8] = &*ct;\n let h = sha256::digest(content);\n let mut new_blob = false;\n let blob_mark = *self.blob_marks.entry(h).or_insert_with(|| {\n new_blob = true;\n self.max_blob_mark += 1;\n self.max_blob_mark\n });\n file_marks.insert(fw.name.clone(), blob_mark);\n if new_blob {\n println!(\"blob\");\n println!(\"mark :{}\", blob_mark);\n println!(\"data {}\", content.len());\n std::io::stdout().write_all(content).unwrap();\n println!(\"\");\n }\n"}]}},{"Edit":{"inode":{"change":4,"pos":313},"path":"src/fast_export.rs","line":74,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1988},"to":{"change":4,"start":1988,"end":2013},"introduced_by":4}],"inode":{"change":4,"pos":313}}},"contents":[{"Del":" _ => (),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"src/fast_export.rs","line":90,"ins":{"up_context":[{"change":4,"pos":893}],"down_context":[{"change":4,"pos":606}],"flag":"BLOCK","start":3401,"end":3485,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":893},"to":{"change":4,"start":557,"end":606},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":557},"to":{"change":4,"start":557,"end":606},"introduced_by":4}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":" let committer = if c.authors.is_empty() {"},{"Add":" \"<>\""},{"Add":" } else {"}],"del_contents":[{"Del":" let committer = if c.authors.len() > 0 {\n"}]}},{"Edit":{"inode":{"change":4,"pos":313},"path":"src/fast_export.rs","line":94,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":632},"to":{"change":4,"start":632,"end":666},"introduced_by":4}],"inode":{"change":4,"pos":313}}},"contents":[{"Del":" } else {\n \"<>\"\n"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"src/fast_export.rs","line":102,"ins":{"up_context":[{"change":4,"pos":1010}],"down_context":[{"change":4,"pos":6700}],"flag":"BLOCK","start":3486,"end":3642,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1010},"to":{"change":4,"start":894,"end":917},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":917},"to":{"change":4,"start":6530,"end":6676},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":6676},"to":{"change":4,"start":1108,"end":1123},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1108},"to":{"change":4,"start":1108,"end":1123},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1123},"to":{"change":4,"start":6677,"end":6700},"introduced_by":4}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":" if let Some(p) = parent {"},{"Add":" if let Some(p_mark) = self.commit_marks.get(&p) {"},{"Add":" println!(\"from :{}\", p_mark);"},{"Add":" }"}],"del_contents":[{"Del":" match parent {\n"},{"Del":" Some(p) => match self.commit_marks.get(&p) {\n Some(p_mark) => println!(\"from :{}\", p_mark),\n None => {}\n"},{"Del":" },\n"},{"Del":" None => {}\n"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"src/fast_export.rs","line":114,"ins":{"up_context":[{"change":4,"pos":2302}],"down_context":[{"change":4,"pos":2389}],"flag":"BLOCK","start":3643,"end":3729,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2302},"to":{"change":4,"start":2302,"end":2389},"introduced_by":4}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":" FileOp::Delete { path } => println!(\"D \\\"{}\\\"\", escape_string(path)),"}],"del_contents":[{"Del":" FileOp::Delete { path } => println!(\"D \\\"{}\\\"\", escape_string(&path)),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"src/fast_export.rs","line":116,"ins":{"up_context":[{"change":4,"pos":2438}],"down_context":[{"change":4,"pos":2528}],"flag":"BLOCK","start":3730,"end":3818,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2438},"to":{"change":4,"start":2438,"end":2528},"introduced_by":4}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":" println!(\"R \\\"{}\\\" \\\"{}\\\"\", escape_string(old), escape_string(new))"}],"del_contents":[{"Del":" println!(\"R \\\"{}\\\" \\\"{}\\\"\", escape_string(&old), escape_string(&new))\n"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"src/fast_export.rs","line":120,"ins":{"up_context":[{"change":4,"pos":1157}],"down_context":[{"change":4,"pos":1093}],"flag":"BLOCK","start":3819,"end":3839,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1082},"to":{"change":4,"start":1082,"end":1104},"introduced_by":4}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":" println!();"}],"del_contents":[{"Del":" println!(\"\");\n"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"src/fast_export.rs","line":126,"ins":{"up_context":[{"change":4,"pos":1265}],"down_context":[{"change":4,"pos":1338}],"flag":"BLOCK","start":3840,"end":3912,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1265},"to":{"change":4,"start":1265,"end":1338},"introduced_by":4}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":" let state = libpijul::Merkle::from_base32(caps[2].as_bytes())?;"}],"del_contents":[{"Del":" let state = libpijul::Merkle::from_base32(&caps[2].as_bytes())?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"src/fast_export.rs","line":150,"ins":{"up_context":[{"change":4,"pos":2225}],"down_context":[{"change":4,"pos":2248}],"flag":"BLOCK","start":3913,"end":3928,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2225},"to":{"change":4,"start":2225,"end":2248},"introduced_by":4}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":" Ok(())"}],"del_contents":[{"Del":" return Ok(());\n"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"src/fast_export.rs","line":154,"ins":{"up_context":[{"change":4,"pos":2332}],"down_context":[{"change":4,"pos":2385}],"flag":"BLOCK","start":3929,"end":3981,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2332},"to":{"change":4,"start":2332,"end":2385},"introduced_by":4}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":" std::fs::write(filename, &self.mark_file)?;"}],"del_contents":[{"Del":" std::fs::write(&filename, &self.mark_file)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":326},"path":"src/changestore.rs","line":49,"ins":{"up_context":[{"change":4,"pos":1738}],"down_context":[{"change":4,"pos":1778}],"flag":"BLOCK","start":3982,"end":4018,"inode":{"change":4,"pos":326}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1738},"to":{"change":4,"start":1738,"end":1778},"introduced_by":4}],"inode":{"change":4,"pos":326}},"ins_contents":[{"Add":" if r.get(h).is_some() {"}],"del_contents":[{"Del":" if let Some(_) = r.get(h) {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":326},"path":"src/changestore.rs","line":56,"ins":{"up_context":[{"change":4,"pos":1919}],"down_context":[{"change":4,"pos":1978}],"flag":"BLOCK","start":4019,"end":4077,"inode":{"change":4,"pos":326}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1919},"to":{"change":4,"start":1919,"end":1978},"introduced_by":4}],"inode":{"change":4,"pos":326}},"ins_contents":[{"Add":" let p = Change::deserialize(file_name, Some(h))?;"}],"del_contents":[{"Del":" let p = Change::deserialize(&file_name, Some(h))?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":326},"path":"src/changestore.rs","line":83,"ins":{"up_context":[{"change":4,"pos":2693}],"down_context":[{"change":4,"pos":2730}],"flag":"BLOCK","start":4078,"end":4114,"inode":{"change":4,"pos":326}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2693},"to":{"change":4,"start":2693,"end":2730},"introduced_by":4}],"inode":{"change":4,"pos":326}},"ins_contents":[{"Add":" if let Some(t) = r.get(h) {"}],"del_contents":[{"Del":" if let Some(t) = r.get(&h) {\n"}]}}],"owner":"andybalholm","repo":"pijul-export","token":"w4EMKQ22Q9qtTZP3qrf0JIC9qfEd1adwwdQCnrbERzo=","login":null}

…

Dependencies

Change contents