{"header":{"message":"Test new changes against the old code. Fix several small bugs.","description":null,"timestamp":"2021-09-14T07:42:15.731169168Z","authors":[{}]},"hash":"UN2M77YUIQZMPH5CQARPUUK2Q66RHN5J6BIIQQFEJ35DSFSKFFPQC","authors":[{"key":"FHRXP5Jnb2MWLDrPrnLnkN2ryWcGCo6CRr1dXR9FW2YA"}],"deps":{"hashes":[["UN2M77YUIQZMPH5CQARPUUK2Q66RHN5J6BIIQQFEJ35DSFSKFFPQC","Test new changes against the old code. Fix several small bugs."],["AA",null],["5FI6SBEZ6RERERUAIWQJVAY66BEZ7YQOYOUNK2DPOLRGS2X326RAC","Re-implement change printing and parsing"],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","Renaming \"Record\" to \"Hunk\" in the changes"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["73NW2X2MI767RYNTKS67ZB5QUWYEAA4SCORLD52K36ZU3JAK67AQC","Returning a parse error instead of panicking when parsing a text change"],["ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","Colours in diff and change: separating concerns and dependencies"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["NG3Z3DOKDZQDQ7UNQEOMXWX2NJKKLM7DKRWW3KIUD7QEECTNQIZQC","roundtrip text encoding when recording"],["ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","encoded file deletion"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["YDMAIJ5VGDZFON7VD76EHNERLCJQL3OK6EPSNU552JKQWMDVEW7AC","Fixing the format of text changes (file additions under a new directory were not always accepted by the parser)"]],"deps":["5FI6SBEZ6RERERUAIWQJVAY66BEZ7YQOYOUNK2DPOLRGS2X326RAC"],"known":["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","73NW2X2MI767RYNTKS67ZB5QUWYEAA4SCORLD52K36ZU3JAK67AQC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","NG3Z3DOKDZQDQ7UNQEOMXWX2NJKKLM7DKRWW3KIUD7QEECTNQIZQC","ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC"]},"hunks":[{"Edit":{"inode":{"change":2,"pos":550},"path":"libpijul/src/tests/text_changes.rs","line":4,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":624},"to":{"change":2,"start":624,"end":646},"introduced_by":2}],"inode":{"change":2,"pos":550}}},"contents":[{"Del":"use crate::record::*;\n"}]}},{"Edit":{"inode":{"change":2,"pos":550},"path":"libpijul/src/tests/text_changes.rs","line":9,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":723},"to":{"change":2,"start":723,"end":1467},"introduced_by":2}],"inode":{"change":2,"pos":550}}},"contents":[{"Del":"\nfn hash_mismatch(change: &Change) -> Result<(), anyhow::Error> {\n env_logger::try_init().unwrap_or(());\n use crate::change::*;\n let mut buf = tempfile::NamedTempFile::new()?;\n let mut h = change.serialize(&mut buf)?;\n match h {\n crate::pristine::Hash::Blake3(ref mut h) => h[0] = h[0].wrapping_add(1),\n _ => unreachable!(),\n }\n match Change::deserialize(buf.path().to_str().unwrap(), Some(&h)) {\n Err(ChangeError::ChangeHashMismatch { .. }) => {}\n _ => unreachable!(),\n }\n\n let f = ChangeFile::open(h, buf.path().to_str().unwrap())?;\n assert_eq!(f.hashed(), &change.hashed);\n Ok(())\n}\n\n#[test]\nfn hash_mism() -> Result<(), anyhow::Error> {\n env_logger::try_init().unwrap_or(());\n"}]}},{"Edit":{"inode":{"change":2,"pos":550},"path":"libpijul/src/tests/text_changes.rs","line":10,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1468},"to":{"change":2,"start":1468,"end":1707},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1707},"to":{"change":2,"start":1707,"end":1708},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1708},"to":{"change":2,"start":1708,"end":3049},"introduced_by":2}],"inode":{"change":2,"pos":550}}},"contents":[{"Del":" let contents = b\"a\\nb\\nc\\nd\\ne\\nf\\n\";\n let repo = working_copy::memory::Memory::new();\n let store = changestore::memory::Memory::new();\n repo.add_file(\"file\", contents.to_vec());\n repo.add_file(\"file2\", contents.to_vec());\n"},{"Del":"\n"},{"Del":" let env = pristine::sanakirja::Pristine::new_anon()?;\n let txn = env.arc_txn_begin().unwrap();\n let mut channel = txn.write().open_or_create_channel(\"main\")?;\n txn.write().add_file(\"file\", 0)?;\n txn.write().add_file(\"file2\", 0)?;\n\n let mut state = Builder::new();\n state\n .record(\n txn.clone(),\n Algorithm::Myers,\n channel.clone(),\n &repo,\n &store,\n \"\",\n 0,\n )\n .unwrap();\n let rec = state.finish();\n let changes: Vec<_> = rec\n .actions\n .into_iter()\n .map(|rec| rec.globalize(&*txn.read()).unwrap())\n .collect();\n info!(\"changes = {:?}\", changes);\n let change0 = crate::change::Change::make_change(\n &*txn.read(),\n &channel,\n changes,\n std::mem::take(&mut *rec.contents.lock()),\n crate::change::ChangeHeader {\n message: \"test\".to_string(),\n authors: vec![],\n description: None,\n timestamp: chrono::Utc::now(),\n },\n Vec::new(),\n )\n .unwrap();\n let hash0 = store.save_change(&change0)?;\n apply::apply_local_change(\n &mut *txn.write(),\n &mut channel,\n &change0,\n &hash0,\n &rec.updatables,\n )?;\n\n hash_mismatch(&change0)?;\n\n Ok(())\n}\n\n"}]}},{"Edit":{"inode":{"change":2,"pos":550},"path":"libpijul/src/tests/text_changes.rs","line":12,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3090}],"down_context":[{"change":2,"pos":3090}],"flag":"BLOCK","start":0,"end":113,"inode":{"change":2,"pos":550}}},"contents":[{"Add":"/// Test the new text_changes.rs against the old text_changes.rs"},{"Add":"/// TODO: add test-cases for all kinds of hunks"}]}},{"Edit":{"inode":{"change":2,"pos":550},"path":"libpijul/src/tests/text_changes.rs","line":30,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3775}],"down_context":[{"change":2,"pos":3775}],"flag":"BLOCK","start":114,"end":115,"inode":{"change":2,"pos":550}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":2,"pos":550},"path":"libpijul/src/tests/text_changes.rs","line":74,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":5618}],"down_context":[{"change":2,"pos":5618}],"flag":"BLOCK","start":116,"end":148,"inode":{"change":2,"pos":550}}},"contents":[{"Add":" let mut v_old = Vec::new();"}]}},{"Edit":{"inode":{"change":2,"pos":550},"path":"libpijul/src/tests/text_changes.rs","line":76,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":5657}],"down_context":[{"change":2,"pos":5657}],"flag":"BLOCK","start":149,"end":211,"inode":{"change":2,"pos":550}}},"contents":[{"Add":" change0.write_old(c, Some(h), true, &mut v_old).unwrap();"}]}},{"Replacement":{"inode":{"change":2,"pos":550},"path":"libpijul/src/tests/text_changes.rs","line":79,"ins":{"up_context":[{"change":2,"pos":5712}],"down_context":[{"change":2,"pos":5761}],"flag":"BLOCK","start":212,"end":265,"inode":{"change":2,"pos":550}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":5712},"to":{"change":2,"start":5712,"end":5761},"introduced_by":2}],"inode":{"change":2,"pos":550}},"ins_contents":[{"Add":" println!(\"{}\", String::from_utf8_lossy(&v_old));"}],"del_contents":[{"Del":" println!(\"{}\", String::from_utf8_lossy(&v));\n"}]}},{"Edit":{"inode":{"change":2,"pos":550},"path":"libpijul/src/tests/text_changes.rs","line":84,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":5849}],"down_context":[{"change":2,"pos":5849}],"flag":"BLOCK","start":266,"end":370,"inode":{"change":2,"pos":550}}},"contents":[{"Add":" let change0 = Change::read_old(std::io::Cursor::new(&v_old[..]), &mut HashMap::default()).unwrap();"}]}},{"Replacement":{"inode":{"change":2,"pos":550},"path":"libpijul/src/tests/text_changes.rs","line":125,"ins":{"up_context":[{"change":2,"pos":7407}],"down_context":[{"change":2,"pos":7442}],"flag":"BLOCK","start":371,"end":405,"inode":{"change":2,"pos":550}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":7407},"to":{"change":2,"start":7407,"end":7442},"introduced_by":2}],"inode":{"change":2,"pos":550}},"ins_contents":[{"Add":" assert_eq!(change0, change1);"}],"del_contents":[{"Del":" assert_eq!(change0, &change1);\n"}]}},{"Edit":{"inode":{"change":13,"pos":831311},"path":"libpijul/src/change.rs","line":17,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":36136}],"down_context":[{"change":2,"pos":10057}],"flag":"BLOCK","start":406,"end":461,"inode":{"change":13,"pos":831311}}},"contents":[{"Add":"#[cfg(feature = \"text-changes\")]"},{"Add":"mod text_changes_old;"}]}},{"FileAdd":{"meta":{"basename":"text_changes_old.rs","metadata":0},"context":[{"change":13,"pos":931000}],"contents":[{"Add":"use crate::HashMap;"},{"Add":"use std::collections::hash_map::Entry;"},{"Add":"use std::io::BufRead;"},{"Add":""},{"Add":"use regex::Captures;"},{"Add":""},{"Add":"use super::*;"},{"Add":"use crate::changestore::*;"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum TextDeError {"},{"Add":" #[error(transparent)]"},{"Add":" Io(#[from] std::io::Error),"},{"Add":" #[error(transparent)]"},{"Add":" TomlDe(#[from] toml::de::Error),"},{"Add":" #[error(\"Missing dependency [{0}]\")]"},{"Add":" MissingChange(usize),"},{"Add":" #[error(\"Byte position {0} from this change missing\")]"},{"Add":" MissingPosition(u64),"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum TextSerError {"},{"Add":" #[error(transparent)]"},{"Add":" C(C),"},{"Add":" #[error(transparent)]"},{"Add":" Io(#[from] std::io::Error),"},{"Add":" #[error(transparent)]"},{"Add":" TomlSer(#[from] toml::ser::Error),"},{"Add":" #[error(\"Missing contents in change {:?}\", h)]"},{"Add":" MissingContents { h: Hash },"},{"Add":" #[error(transparent)]"},{"Add":" Change(#[from] ChangeError),"},{"Add":" #[error(\"Invalid change\")]"},{"Add":" InvalidChange,"},{"Add":"}"},{"Add":""},{"Add":"impl LocalChange, Local>, Author> {"},{"Add":" const DEPS_LINE_: &'static str = \"# Dependencies\\n\";"},{"Add":" const HUNKS_LINE_: &'static str = \"# Hunks\\n\";"},{"Add":""},{"Add":" pub fn write_all_deps Result<(), ChangeError>>("},{"Add":" &self,"},{"Add":" mut f: F,"},{"Add":" ) -> Result<(), ChangeError> {"},{"Add":" for c in self.changes.iter() {"},{"Add":" for c in c.iter() {"},{"Add":" match *c {"},{"Add":" Atom::NewVertex(ref n) => {"},{"Add":" for change in n"},{"Add":" .up_context"},{"Add":" .iter()"},{"Add":" .chain(n.down_context.iter())"},{"Add":" .map(|c| c.change)"},{"Add":" .chain(std::iter::once(n.inode.change))"},{"Add":" {"},{"Add":" if let Some(change) = change {"},{"Add":" if let Hash::None = change {"},{"Add":" continue;"},{"Add":" }"},{"Add":" f(change)?"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Atom::EdgeMap(ref e) => {"},{"Add":" for edge in e.edges.iter() {"},{"Add":" for change in &["},{"Add":" edge.from.change,"},{"Add":" edge.to.change,"},{"Add":" edge.introduced_by,"},{"Add":" e.inode.change,"},{"Add":" ] {"},{"Add":" if let Some(change) = *change {"},{"Add":" if let Hash::None = change {"},{"Add":" continue;"},{"Add":" }"},{"Add":" f(change)?"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" pub fn write_old("},{"Add":" &self,"},{"Add":" changes: &C,"},{"Add":" hash: Option,"},{"Add":" write_header: bool,"},{"Add":" mut w: W,"},{"Add":" ) -> Result<(), TextSerError> {"},{"Add":" if let Some(h) = hash {"},{"Add":" // Check if we have the full contents"},{"Add":" let mut hasher = Hasher::default();"},{"Add":" hasher.update(&self.contents);"},{"Add":" let hash = hasher.finish();"},{"Add":" if hash != self.contents_hash {"},{"Add":" return Err((TextSerError::MissingContents { h }).into());"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" if write_header {"},{"Add":" let s = toml::ser::to_string_pretty(&self.header)?;"},{"Add":" writeln!(w, \"{}\", s)?;"},{"Add":" }"},{"Add":" let mut hashes = HashMap::default();"},{"Add":" let mut i = 2;"},{"Add":" let mut needs_newline = false;"},{"Add":" if !self.dependencies.is_empty() {"},{"Add":" w.write_all(Self::DEPS_LINE_.as_bytes())?;"},{"Add":" needs_newline = true;"},{"Add":" for dep in self.dependencies.iter() {"},{"Add":" hashes.insert(*dep, i);"},{"Add":" writeln!(w, \"[{}] {}\", i, dep.to_base32())?;"},{"Add":" i += 1;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" self.write_all_deps(|change| {"},{"Add":" if let Entry::Vacant(e) = hashes.entry(change) {"},{"Add":" e.insert(i);"},{"Add":" if !needs_newline {"},{"Add":" w.write_all(Self::DEPS_LINE_.as_bytes())?;"},{"Add":" needs_newline = true;"},{"Add":" }"},{"Add":" writeln!(w, \"[{}]+{}\", i, change.to_base32())?;"},{"Add":" i += 1;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":""},{"Add":" if !self.extra_known.is_empty() {"},{"Add":" needs_newline = true;"},{"Add":" for dep in self.extra_known.iter() {"},{"Add":" writeln!(w, \"[*] {}\", dep.to_base32())?;"},{"Add":" i += 1;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" if !self.changes.is_empty() {"},{"Add":" if needs_newline {"},{"Add":" w.write_all(b\"\\n\")?"},{"Add":" }"},{"Add":" w.write_all(Self::HUNKS_LINE_.as_bytes())?;"},{"Add":" for (n, rec) in self.changes.iter().enumerate() {"},{"Add":" write!(w, \"\\n{}. \", n + 1)?;"},{"Add":" rec.write_old(changes, &hashes, &self.contents, &mut w)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Change {"},{"Add":" pub fn read_and_deps_old<"},{"Add":" R: BufRead,"},{"Add":" T: ChannelTxnT + DepsTxnT::GraphError>,"},{"Add":" >("},{"Add":" r: R,"},{"Add":" updatables: &mut HashMap,"},{"Add":" txn: &T,"},{"Add":" channel: &ChannelRef,"},{"Add":" ) -> Result {"},{"Add":" let (mut change, extra_dependencies) = Self::read_(r, updatables)?;"},{"Add":" let (mut deps, extra) ="},{"Add":" dependencies(txn, &channel.read(), change.hashed.changes.iter()).unwrap();"},{"Add":" deps.extend(extra_dependencies.into_iter());"},{"Add":" change.hashed.dependencies = deps;"},{"Add":" change.hashed.extra_known = extra;"},{"Add":" Ok(change)"},{"Add":" }"},{"Add":""},{"Add":" pub fn read_old("},{"Add":" r: R,"},{"Add":" updatables: &mut HashMap,"},{"Add":" ) -> Result {"},{"Add":" Ok(Self::read_(r, updatables)?.0)"},{"Add":" }"},{"Add":""},{"Add":" fn read_("},{"Add":" mut r: R,"},{"Add":" updatables: &mut HashMap,"},{"Add":" ) -> Result<(Self, HashSet), TextDeError> {"},{"Add":" use self::text_changes_old::*;"},{"Add":" let mut section = Section::Header(String::new());"},{"Add":" let mut change = Change {"},{"Add":" offsets: Offsets::default(),"},{"Add":" hashed: Hashed {"},{"Add":" version: VERSION,"},{"Add":" header: ChangeHeader {"},{"Add":" authors: Vec::new(),"},{"Add":" message: String::new(),"},{"Add":" description: None,"},{"Add":" timestamp: chrono::Utc::now(),"},{"Add":" },"},{"Add":" dependencies: Vec::new(),"},{"Add":" extra_known: Vec::new(),"},{"Add":" metadata: Vec::new(),"},{"Add":" changes: Vec::new(),"},{"Add":" contents_hash: Hasher::default().finish(),"},{"Add":" },"},{"Add":" unhashed: None,"},{"Add":" contents: Vec::new(),"},{"Add":" };"},{"Add":" let conclude_section = |change: &mut Change,"},{"Add":" section: Section,"},{"Add":" contents: &mut Vec|"},{"Add":" -> Result<(), TextDeError> {"},{"Add":" match section {"},{"Add":" Section::Header(ref s) => {"},{"Add":" debug!(\"header = {:?}\", s);"},{"Add":" change.header = toml::de::from_str(&s)?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" Section::Deps => Ok(()),"},{"Add":" Section::Changes {"},{"Add":" mut changes,"},{"Add":" current,"},{"Add":" .."},{"Add":" } => {"},{"Add":" if has_newvertices(¤t) {"},{"Add":" contents.push(0)"},{"Add":" }"},{"Add":" if let Some(c) = current {"},{"Add":" debug!(\"next action = {:?}\", c);"},{"Add":" changes.push(c)"},{"Add":" }"},{"Add":" change.changes = changes;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" }"},{"Add":" };"},{"Add":" let mut h = String::new();"},{"Add":" let mut contents = Vec::new();"},{"Add":" let mut deps = HashMap::default();"},{"Add":" let mut extra_dependencies = HashSet::default();"},{"Add":" while r.read_line(&mut h)? > 0 {"},{"Add":" debug!(\"h = {:?}\", h);"},{"Add":" if h == Self::DEPS_LINE_ {"},{"Add":" let section = std::mem::replace(&mut section, Section::Deps);"},{"Add":" conclude_section(&mut change, section, &mut contents)?;"},{"Add":" } else if h == Self::HUNKS_LINE_ {"},{"Add":" let section = std::mem::replace("},{"Add":" &mut section,"},{"Add":" Section::Changes {"},{"Add":" changes: Vec::new(),"},{"Add":" current: None,"},{"Add":" offsets: HashMap::default(),"},{"Add":" },"},{"Add":" );"},{"Add":" conclude_section(&mut change, section, &mut contents)?;"},{"Add":" } else {"},{"Add":" use regex::Regex;"},{"Add":" lazy_static! {"},{"Add":" static ref DEPS: Regex = Regex::new(r#\"\\[(\\d*|\\*)\\](\\+| ) *(\\S*)\"#).unwrap();"},{"Add":" static ref KNOWN: Regex = Regex::new(r#\"(\\S*)\"#).unwrap();"},{"Add":" }"},{"Add":" match section {"},{"Add":" Section::Header(ref mut s) => s.push_str(&h),"},{"Add":" Section::Deps => {"},{"Add":" if let Some(d) = DEPS.captures(&h) {"},{"Add":" let hash = Hash::from_base32(d[3].as_bytes()).unwrap();"},{"Add":" if let Ok(n) = d[1].parse() {"},{"Add":" if &d[2] == \" \" {"},{"Add":" change.hashed.dependencies.push(hash);"},{"Add":" }"},{"Add":" deps.insert(n, hash);"},{"Add":" } else if &d[1] == \"*\" {"},{"Add":" change.hashed.extra_known.push(hash);"},{"Add":" } else {"},{"Add":" extra_dependencies.insert(hash);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Section::Changes {"},{"Add":" ref mut current,"},{"Add":" ref mut changes,"},{"Add":" ref mut offsets,"},{"Add":" } => {"},{"Add":" if let Some(next) ="},{"Add":" Hunk::read(updatables, current, &mut contents, &deps, offsets, &h)?"},{"Add":" {"},{"Add":" debug!(\"next action = {:?}\", next);"},{"Add":" changes.push(next)"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" h.clear();"},{"Add":" }"},{"Add":" conclude_section(&mut change, section, &mut contents)?;"},{"Add":" change.contents = contents;"},{"Add":" change.contents_hash = {"},{"Add":" let mut hasher = Hasher::default();"},{"Add":" hasher.update(&change.contents);"},{"Add":" hasher.finish()"},{"Add":" };"},{"Add":" Ok((change, extra_dependencies))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"const BINARY_LABEL: &str = \"binary\";"},{"Add":""},{"Add":"struct Escaped<'a>(&'a str);"},{"Add":""},{"Add":"impl<'a> std::fmt::Display for Escaped<'a> {"},{"Add":" fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {"},{"Add":" write!(fmt, \"\\\"\")?;"},{"Add":" for c in self.0.chars() {"},{"Add":" if c == '\"' {"},{"Add":" write!(fmt, \"\\\\{}\", c)?"},{"Add":" } else if c == '\\\\' {"},{"Add":" write!(fmt, \"\\\\\\\\\")?"},{"Add":" } else {"},{"Add":" write!(fmt, \"{}\", c)?"},{"Add":" }"},{"Add":" }"},{"Add":" write!(fmt, \"\\\"\")?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn unescape(s: &str) -> std::borrow::Cow {"},{"Add":" let mut b = 0;"},{"Add":" let mut result = String::new();"},{"Add":" let mut ch = s.chars();"},{"Add":" while let Some(c) = ch.next() {"},{"Add":" if c == '\\\\' {"},{"Add":" if result.is_empty() {"},{"Add":" result = s.split_at(b).0.to_string();"},{"Add":" }"},{"Add":" if let Some(c) = ch.next() {"},{"Add":" result.push(c)"},{"Add":" }"},{"Add":" } else if !result.is_empty() {"},{"Add":" result.push(c)"},{"Add":" }"},{"Add":" b += c.len_utf8()"},{"Add":" }"},{"Add":" if result.is_empty() {"},{"Add":" s.into()"},{"Add":" } else {"},{"Add":" result.into()"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Hunk, Local> {"},{"Add":" fn write_old("},{"Add":" &self,"},{"Add":" changes: &C,"},{"Add":" hashes: &HashMap,"},{"Add":" change_contents: &[u8],"},{"Add":" mut w: &mut W,"},{"Add":" ) -> Result<(), TextSerError> {"},{"Add":" use self::text_changes_old::*;"},{"Add":" match self {"},{"Add":" Hunk::FileMove { del, add, path } => match add {"},{"Add":" Atom::NewVertex(ref add) => {"},{"Add":" let FileMetadata {"},{"Add":" basename: name,"},{"Add":" metadata: perms,"},{"Add":" .."},{"Add":" } = FileMetadata::read(&change_contents[add.start.0.into()..add.end.0.into()]);"},{"Add":" write!("},{"Add":" w,"},{"Add":" \"Moved: {} {} {}\","},{"Add":" Escaped(&path),"},{"Add":" Escaped(&name),"},{"Add":" if perms.0 & 0o1000 == 0o1000 {"},{"Add":" \"+dx \""},{"Add":" } else if perms.0 & 0o100 == 0o100 {"},{"Add":" \"+x \""},{"Add":" } else {"},{"Add":" \"\""},{"Add":" }"},{"Add":" )?;"},{"Add":" write_pos(&mut w, hashes, del.inode())?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &del)?;"},{"Add":""},{"Add":" write!(w, \"up\")?;"},{"Add":" for c in add.up_context.iter() {"},{"Add":" write!(w, \" \")?;"},{"Add":" write_pos(&mut w, hashes, *c)?"},{"Add":" }"},{"Add":" write!(w, \", down\")?;"},{"Add":" for c in add.down_context.iter() {"},{"Add":" write!(w, \" \")?;"},{"Add":" write_pos(&mut w, hashes, *c)?"},{"Add":" }"},{"Add":" w.write_all(b\"\\n\")?;"},{"Add":" }"},{"Add":" Atom::EdgeMap(_) => {"},{"Add":" write!(w, \"Moved: {:?} \", path)?;"},{"Add":" write_pos(&mut w, hashes, del.inode())?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &add)?;"},{"Add":" write_atom(&mut w, hashes, &del)?;"},{"Add":" }"},{"Add":" },"},{"Add":" Hunk::FileDel {"},{"Add":" del,"},{"Add":" contents,"},{"Add":" path,"},{"Add":" encoding,"},{"Add":" } => {"},{"Add":" debug!(\"file del\");"},{"Add":" write!(w, \"File deletion: {} \", Escaped(path))?;"},{"Add":" write_pos(&mut w, hashes, del.inode())?;"},{"Add":" writeln!(w, \" {:?}\", encoding_label(encoding))?;"},{"Add":""},{"Add":" write_atom(&mut w, hashes, &del)?;"},{"Add":" if let Some(ref contents) = contents {"},{"Add":" write_atom(&mut w, hashes, &contents)?;"},{"Add":" writeln!(w)?;"},{"Add":" print_change_contents(w, changes, contents, change_contents, encoding)?;"},{"Add":" } else {"},{"Add":" writeln!(w)?;"},{"Add":" }"},{"Add":" }"},{"Add":" Hunk::FileUndel {"},{"Add":" undel,"},{"Add":" contents,"},{"Add":" path,"},{"Add":" encoding,"},{"Add":" } => {"},{"Add":" debug!(\"file undel\");"},{"Add":" write!(w, \"File un-deletion: {} \", Escaped(path))?;"},{"Add":" write_pos(&mut w, hashes, undel.inode())?;"},{"Add":" writeln!(w, \" {:?}\", encoding_label(encoding))?;"},{"Add":" write_atom(&mut w, hashes, &undel)?;"},{"Add":" if let Some(ref contents) = contents {"},{"Add":" write_atom(&mut w, hashes, &contents)?;"},{"Add":" print_change_contents(w, changes, contents, change_contents, encoding)?;"},{"Add":" } else {"},{"Add":" writeln!(w)?;"},{"Add":" }"},{"Add":" }"},{"Add":" Hunk::FileAdd {"},{"Add":" add_name,"},{"Add":" contents,"},{"Add":" path,"},{"Add":" encoding,"},{"Add":" .."},{"Add":" } => {"},{"Add":" if let Atom::NewVertex(ref n) = add_name {"},{"Add":" debug!(\"add_name {:?}\", n);"},{"Add":" let FileMetadata {"},{"Add":" basename: name,"},{"Add":" metadata: perms,"},{"Add":" .."},{"Add":" } = FileMetadata::read(&change_contents[n.start.0.into()..n.end.0.into()]);"},{"Add":" let parent = if let Some(p) = crate::path::parent(&path) {"},{"Add":" if p.is_empty() {"},{"Add":" \"/\""},{"Add":" } else {"},{"Add":" p"},{"Add":" }"},{"Add":" } else {"},{"Add":" \"/\""},{"Add":" };"},{"Add":" write!("},{"Add":" w,"},{"Add":" \"File addition: {} in {}{} \\\"{}\\\"\\n up\","},{"Add":" Escaped(name),"},{"Add":" Escaped(parent),"},{"Add":" if perms.0 & 0o1000 == 0o1000 {"},{"Add":" \" +dx\""},{"Add":" } else if perms.0 & 0o100 == 0o100 {"},{"Add":" \" +x\""},{"Add":" } else {"},{"Add":" \"\""},{"Add":" },"},{"Add":" encoding_label(encoding)"},{"Add":" )?;"},{"Add":" assert!(n.down_context.is_empty());"},{"Add":" for c in n.up_context.iter() {"},{"Add":" write!(w, \" \")?;"},{"Add":" write_pos(&mut w, hashes, *c)?"},{"Add":" }"},{"Add":" writeln!(w, \", new {}:{}\", n.start.0, n.end.0)?;"},{"Add":" }"},{"Add":" if let Some(Atom::NewVertex(ref n)) = contents {"},{"Add":" let c = &change_contents[n.start.us()..n.end.us()];"},{"Add":" print_contents(w, \"+\", c, encoding)?;"},{"Add":" if !c.ends_with(b\"\\n\") {"},{"Add":" writeln!(w, \"\\n\\\\\")?"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Hunk::Edit {"},{"Add":" change,"},{"Add":" local,"},{"Add":" encoding,"},{"Add":" } => {"},{"Add":" debug!(\"edit\");"},{"Add":" write!(w, \"Edit in {}:{} \", Escaped(&local.path), local.line)?;"},{"Add":" write_pos(&mut w, hashes, change.inode())?;"},{"Add":" write!(w, \" {:?}\", encoding_label(encoding))?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &change)?;"},{"Add":" print_change_contents(w, changes, change, change_contents, encoding)?;"},{"Add":" }"},{"Add":" Hunk::Replacement {"},{"Add":" change,"},{"Add":" replacement,"},{"Add":" local,"},{"Add":" encoding,"},{"Add":" } => {"},{"Add":" debug!(\"replacement\");"},{"Add":" write!(w, \"Replacement in {}:{} \", Escaped(&local.path), local.line)?;"},{"Add":" write_pos(&mut w, hashes, change.inode())?;"},{"Add":" write!(w, \" {:?}\", encoding_label(encoding))?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &change)?;"},{"Add":" write_atom(&mut w, hashes, &replacement)?;"},{"Add":" print_change_contents(w, changes, change, change_contents, encoding)?;"},{"Add":" print_change_contents(w, changes, replacement, change_contents, encoding)?;"},{"Add":" }"},{"Add":" Hunk::SolveNameConflict { name, path } => {"},{"Add":" write!(w, \"Solving a name conflict in {} \", Escaped(path))?;"},{"Add":" write_pos(&mut w, hashes, name.inode())?;"},{"Add":" write!(w, \": \")?;"},{"Add":" write_deleted_names(&mut w, changes, name)?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &name)?;"},{"Add":" }"},{"Add":" Hunk::UnsolveNameConflict { name, path } => {"},{"Add":" write!(w, \"Un-solving a name conflict in {} \", Escaped(path))?;"},{"Add":" write_pos(&mut w, hashes, name.inode())?;"},{"Add":" write!(w, \": \")?;"},{"Add":" write_deleted_names(&mut w, changes, name)?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &name)?;"},{"Add":" }"},{"Add":" Hunk::SolveOrderConflict { change, local } => {"},{"Add":" debug!(\"solve order conflict\");"},{"Add":" write!("},{"Add":" w,"},{"Add":" \"Solving an order conflict in {}:{} \","},{"Add":" Escaped(&local.path),"},{"Add":" local.line,"},{"Add":" )?;"},{"Add":" write_pos(&mut w, hashes, change.inode())?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &change)?;"},{"Add":" print_change_contents(w, changes, change, change_contents, &None)?;"},{"Add":" }"},{"Add":" Hunk::UnsolveOrderConflict { change, local } => {"},{"Add":" debug!(\"unsolve order conflict\");"},{"Add":" write!("},{"Add":" w,"},{"Add":" \"Un-solving an order conflict in {}:{} \","},{"Add":" Escaped(&local.path),"},{"Add":" local.line,"},{"Add":" )?;"},{"Add":" write_pos(&mut w, hashes, change.inode())?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &change)?;"},{"Add":" print_change_contents(w, changes, change, change_contents, &None)?;"},{"Add":" }"},{"Add":" Hunk::ResurrectZombies {"},{"Add":" change,"},{"Add":" local,"},{"Add":" encoding,"},{"Add":" } => {"},{"Add":" debug!(\"resurrect zombies\");"},{"Add":" write!("},{"Add":" w,"},{"Add":" \"Resurrecting zombie lines in {}:{} \","},{"Add":" Escaped(&local.path),"},{"Add":" local.line"},{"Add":" )?;"},{"Add":" write_pos(&mut w, hashes, change.inode())?;"},{"Add":" write!(w, \" \\\"{}\\\"\", encoding_label(encoding))?;"},{"Add":" writeln!(w)?;"},{"Add":" write_atom(&mut w, hashes, &change)?;"},{"Add":" print_change_contents(w, changes, change, change_contents, encoding)?;"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn encoding_label(encoding: &Option) -> &str {"},{"Add":" match encoding {"},{"Add":" Some(encoding) => encoding.label(),"},{"Add":" _ => BINARY_LABEL,"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Hunk, Local> {"},{"Add":" fn read("},{"Add":" updatables: &mut HashMap,"},{"Add":" current: &mut Option,"},{"Add":" contents_: &mut Vec,"},{"Add":" changes: &HashMap,"},{"Add":" offsets: &mut HashMap,"},{"Add":" h: &str,"},{"Add":" ) -> Result, TextDeError> {"},{"Add":" use self::text_changes_old::*;"},{"Add":" use regex::Regex;"},{"Add":" lazy_static! {"},{"Add":" static ref FILE_ADDITION: Regex ="},{"Add":" Regex::new(r#\"^(?P\\d+)\\. File addition: \"(?P[^\"]*)\" in \"(?P[^\"]*)\"(?P \\S+)? \"(?P[^\"]*)\"\"#).unwrap();"},{"Add":" static ref EDIT: Regex ="},{"Add":" Regex::new(r#\"^([0-9]+)\\. Edit in \"([^:]+)\":(\\d+) (\\d+\\.\\d+) \"(?P[^\"]*)\"\"#).unwrap();"},{"Add":" static ref REPLACEMENT: Regex ="},{"Add":" Regex::new(r#\"^([0-9]+)\\. Replacement in \"([^:]+)\":(\\d+) (\\d+\\.\\d+) \"(?P[^\"]*)\"\"#).unwrap();"},{"Add":" static ref FILE_DELETION: Regex ="},{"Add":" Regex::new(r#\"^([0-9]+)\\. File deletion: \"([^\"]*)\" (\\d+\\.\\d+) \"(?P[^\"]*)\"\"#).unwrap();"},{"Add":" static ref FILE_UNDELETION: Regex ="},{"Add":" Regex::new(r#\"^([0-9]+)\\. File un-deletion: \"([^\"]*)\" (\\d+\\.\\d+) \"(?P[^\"]*)\"\"#).unwrap();"},{"Add":" static ref MOVE: Regex ="},{"Add":" Regex::new(r#\"^([0-9]+)\\. Moved: \"(?P[^\"]*)\" \"(?P[^\"]*)\" (?P[^ ]+ )?(?P.*)\"#).unwrap();"},{"Add":" static ref MOVE_: Regex = Regex::new(r#\"^([0-9]+)\\. Moved: \"([^\"]*)\" (.*)\"#).unwrap();"},{"Add":" static ref NAME_CONFLICT: Regex = Regex::new("},{"Add":" r#\"^([0-9]+)\\. ((Solving)|(Un-solving)) a name conflict in \"([^\"]*)\" (.*): .*\"#"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" static ref ORDER_CONFLICT: Regex = Regex::new("},{"Add":" r#\"^([0-9]+)\\. ((Solving)|(Un-solving)) an order conflict in (.*):(\\d+) (\\d+\\.\\d+)\"#"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" static ref ZOMBIE: Regex ="},{"Add":" Regex::new(r#\"^([0-9]+)\\. Resurrecting zombie lines in (?P\"[^\"]+\"):(?P\\d+) (?P\\d+\\.\\d+) \"(?P[^\"]*)\"\"#)"},{"Add":" .unwrap();"},{"Add":" static ref CONTEXT: Regex = Regex::new("},{"Add":" r#\"up ((\\d+\\.\\d+ )*\\d+\\.\\d+)(, new (\\d+):(\\d+))?(, down ((\\d+\\.\\d+ )*\\d+\\.\\d+))?\"#"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" }"},{"Add":" if let Some(cap) = FILE_ADDITION.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut add_name = default_newvertex();"},{"Add":" add_name.start = ChangePosition(contents_.len().into());"},{"Add":" add_name.flag = EdgeFlags::FOLDER | EdgeFlags::BLOCK;"},{"Add":" let name = unescape(&cap.name(\"name\").unwrap().as_str());"},{"Add":" let path = {"},{"Add":" let parent = cap.name(\"parent\").unwrap().as_str();"},{"Add":" (if parent == \"/\" {"},{"Add":" String::new()"},{"Add":" } else {"},{"Add":" unescape(&parent).to_string() + \"/\""},{"Add":" }) + &name"},{"Add":" };"},{"Add":" debug!(\"cap = {:?}\", cap);"},{"Add":" let meta = if let Some(perm) = cap.name(\"perm\") {"},{"Add":" if perm.as_str() == \" +dx\" {"},{"Add":" 0o1100"},{"Add":" } else if perm.as_str() == \" +x\" {"},{"Add":" 0o100"},{"Add":" } else {"},{"Add":" 0"},{"Add":" }"},{"Add":" } else {"},{"Add":" 0"},{"Add":" };"},{"Add":" let n = cap.name(\"n\").unwrap().as_str().parse().unwrap();"},{"Add":" let encoding = encoding_from_label(cap);"},{"Add":" let meta = FileMetadata {"},{"Add":" metadata: InodeMetadata(meta),"},{"Add":" basename: &name,"},{"Add":" encoding: encoding.clone(),"},{"Add":" };"},{"Add":" meta.write(contents_);"},{"Add":" add_name.end = ChangePosition(contents_.len().into());"},{"Add":""},{"Add":" let mut add_inode = default_newvertex();"},{"Add":" add_inode.flag = EdgeFlags::FOLDER | EdgeFlags::BLOCK;"},{"Add":" add_inode.up_context.push(Position {"},{"Add":" change: None,"},{"Add":" pos: ChangePosition(contents_.len().into()),"},{"Add":" });"},{"Add":""},{"Add":" contents_.push(0);"},{"Add":" add_inode.start = ChangePosition(contents_.len().into());"},{"Add":" add_inode.end = ChangePosition(contents_.len().into());"},{"Add":" contents_.push(0);"},{"Add":" if let Entry::Occupied(mut e) = updatables.entry(n) {"},{"Add":" if let crate::InodeUpdate::Add { ref mut pos, .. } = e.get_mut() {"},{"Add":" offsets.insert(pos.0.into(), add_inode.start);"},{"Add":""},{"Add":" *pos = add_inode.start"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Hunk::FileAdd {"},{"Add":" add_name: Atom::NewVertex(add_name),"},{"Add":" add_inode: Atom::NewVertex(add_inode),"},{"Add":" contents: None,"},{"Add":" path,"},{"Add":" encoding,"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = EDIT.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":""},{"Add":" let mut v = default_newvertex();"},{"Add":" v.inode = parse_pos(changes, &cap[4])?;"},{"Add":" v.flag = EdgeFlags::BLOCK;"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Hunk::Edit {"},{"Add":" change: Atom::NewVertex(v),"},{"Add":" local: Local {"},{"Add":" path: unescape(&cap[2]).to_string(),"},{"Add":" line: cap[3].parse().unwrap(),"},{"Add":" },"},{"Add":" encoding: encoding_from_label(cap),"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = REPLACEMENT.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut v = default_newvertex();"},{"Add":" v.inode = parse_pos(changes, &cap[4])?;"},{"Add":" v.flag = EdgeFlags::BLOCK;"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Hunk::Replacement {"},{"Add":" change: Atom::NewVertex(v.clone()),"},{"Add":" replacement: Atom::NewVertex(v),"},{"Add":" local: Local {"},{"Add":" path: unescape(&cap[2]).to_string(),"},{"Add":" line: cap[3].parse().unwrap(),"},{"Add":" },"},{"Add":" encoding: encoding_from_label(cap),"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = FILE_DELETION.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut del = default_edgemap();"},{"Add":" del.inode = parse_pos(changes, &cap[3])?;"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Hunk::FileDel {"},{"Add":" del: Atom::EdgeMap(del),"},{"Add":" contents: None,"},{"Add":" path: cap[2].to_string(),"},{"Add":" encoding: encoding_from_label(cap),"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = FILE_UNDELETION.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut undel = default_edgemap();"},{"Add":" undel.inode = parse_pos(changes, &cap[3])?;"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Hunk::FileUndel {"},{"Add":" undel: Atom::EdgeMap(undel),"},{"Add":" contents: None,"},{"Add":" path: cap[2].to_string(),"},{"Add":" encoding: encoding_from_label(cap),"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = NAME_CONFLICT.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut name = default_edgemap();"},{"Add":" debug!(\"cap = {:?}\", cap);"},{"Add":" name.inode = parse_pos(changes, &cap[6])?;"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" if &cap[2] == \"Solving\" {"},{"Add":" Some(Hunk::SolveNameConflict {"},{"Add":" name: Atom::EdgeMap(name),"},{"Add":" path: cap[5].to_string(),"},{"Add":" })"},{"Add":" } else {"},{"Add":" Some(Hunk::UnsolveNameConflict {"},{"Add":" name: Atom::EdgeMap(name),"},{"Add":" path: cap[5].to_string(),"},{"Add":" })"},{"Add":" },"},{"Add":" ))"},{"Add":" } else if let Some(cap) = MOVE.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut add = default_newvertex();"},{"Add":" add.start = ChangePosition(contents_.len().into());"},{"Add":" add.flag = EdgeFlags::FOLDER | EdgeFlags::BLOCK;"},{"Add":" let name = unescape(cap.name(\"new\").unwrap().as_str());"},{"Add":" let meta = if let Some(perm) = cap.name(\"perm\") {"},{"Add":" debug!(\"perm = {:?}\", perm.as_str());"},{"Add":" if perm.as_str() == \"+dx \" {"},{"Add":" 0o1100"},{"Add":" } else if perm.as_str() == \"+x \" {"},{"Add":" 0o100"},{"Add":" } else {"},{"Add":" 0"},{"Add":" }"},{"Add":" } else {"},{"Add":" 0"},{"Add":" };"},{"Add":" let meta = FileMetadata {"},{"Add":" metadata: InodeMetadata(meta),"},{"Add":" basename: &name,"},{"Add":" encoding: None,"},{"Add":" };"},{"Add":" meta.write(contents_);"},{"Add":" add.end = ChangePosition(contents_.len().into());"},{"Add":""},{"Add":" let mut del = default_edgemap();"},{"Add":" del.inode = parse_pos(changes, cap.name(\"inode\").unwrap().as_str())?;"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Hunk::FileMove {"},{"Add":" del: Atom::EdgeMap(del),"},{"Add":" add: Atom::NewVertex(add),"},{"Add":" path: cap[2].to_string(),"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = MOVE_.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut add = default_edgemap();"},{"Add":" let mut del = default_edgemap();"},{"Add":" add.inode = parse_pos(changes, &cap[3])?;"},{"Add":" del.inode = add.inode;"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Hunk::FileMove {"},{"Add":" del: Atom::EdgeMap(del),"},{"Add":" add: Atom::EdgeMap(add),"},{"Add":" path: cap[2].to_string(),"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = ORDER_CONFLICT.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":""},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(if &cap[2] == \"Solving\" {"},{"Add":" let mut v = default_newvertex();"},{"Add":" v.inode = parse_pos(changes, &cap[7])?;"},{"Add":" Hunk::SolveOrderConflict {"},{"Add":" change: Atom::NewVertex(v),"},{"Add":" local: Local {"},{"Add":" path: cap[5].to_string(),"},{"Add":" line: cap[6].parse().unwrap(),"},{"Add":" },"},{"Add":" }"},{"Add":" } else {"},{"Add":" let mut v = default_edgemap();"},{"Add":" v.inode = parse_pos(changes, &cap[7])?;"},{"Add":" Hunk::UnsolveOrderConflict {"},{"Add":" change: Atom::EdgeMap(v),"},{"Add":" local: Local {"},{"Add":" path: cap[5].to_string(),"},{"Add":" line: cap[6].parse().unwrap(),"},{"Add":" },"},{"Add":" }"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else if let Some(cap) = ZOMBIE.captures(h) {"},{"Add":" if has_newvertices(current) {"},{"Add":" contents_.push(0)"},{"Add":" }"},{"Add":" let mut v = default_edgemap();"},{"Add":" v.inode = parse_pos(changes, &cap.name(\"inode\").unwrap().as_str())?;"},{"Add":" Ok(std::mem::replace("},{"Add":" current,"},{"Add":" Some(Hunk::ResurrectZombies {"},{"Add":" change: Atom::EdgeMap(v),"},{"Add":" local: Local {"},{"Add":" path: cap.name(\"path\").unwrap().as_str().parse().unwrap(),"},{"Add":" line: cap.name(\"line\").unwrap().as_str().parse().unwrap(),"},{"Add":" },"},{"Add":" encoding: encoding_from_label(cap),"},{"Add":" }),"},{"Add":" ))"},{"Add":" } else {"},{"Add":" match current {"},{"Add":" Some(Hunk::FileAdd {"},{"Add":" ref mut contents,"},{"Add":" ref mut add_name,"},{"Add":" encoding,"},{"Add":" .."},{"Add":" }) => {"},{"Add":" if h.starts_with('+') {"},{"Add":" if contents.is_none() {"},{"Add":" let mut v = default_newvertex();"},{"Add":" // The `-1` here comes from the extra 0"},{"Add":" // padding bytes pushed onto `contents_`."},{"Add":" let inode = Position {"},{"Add":" change: None,"},{"Add":" pos: ChangePosition((contents_.len() - 1).into()),"},{"Add":" };"},{"Add":" v.up_context.push(inode);"},{"Add":" v.inode = inode;"},{"Add":" v.flag = EdgeFlags::BLOCK;"},{"Add":" v.start = ChangePosition(contents_.len().into());"},{"Add":" *contents = Some(Atom::NewVertex(v));"},{"Add":" }"},{"Add":" if let Some(Atom::NewVertex(ref mut contents)) = contents {"},{"Add":" if h.starts_with('+') {"},{"Add":" text_changes_old::parse_line_add(h, contents, contents_, encoding)"},{"Add":" }"},{"Add":" }"},{"Add":" } else if h.starts_with('\\\\') {"},{"Add":" if let Some(Atom::NewVertex(mut c)) = contents.take() {"},{"Add":" if c.end > c.start {"},{"Add":" if contents_[c.end.us() - 1] == b'\\n' {"},{"Add":" assert_eq!(c.end.us(), contents_.len());"},{"Add":" contents_.pop();"},{"Add":" c.end.0 -= 1;"},{"Add":" }"},{"Add":" *contents = Some(Atom::NewVertex(c))"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Some(cap) = CONTEXT.captures(h) {"},{"Add":" if let Atom::NewVertex(ref mut name) = add_name {"},{"Add":" name.up_context = parse_pos_vec(changes, offsets, &cap[1])?;"},{"Add":" if let (Some(new_start), Some(new_end)) = (cap.get(4), cap.get(5)) {"},{"Add":" offsets.insert(new_start.as_str().parse().unwrap(), name.start);"},{"Add":" offsets.insert(new_end.as_str().parse().unwrap(), name.end);"},{"Add":" offsets.insert("},{"Add":" new_end.as_str().parse::().unwrap() + 1,"},{"Add":" name.end + 1,"},{"Add":" );"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Hunk::FileDel {"},{"Add":" ref mut del,"},{"Add":" ref mut contents,"},{"Add":" .."},{"Add":" }) => {"},{"Add":" if let Some(edges) = parse_edges(changes, h)? {"},{"Add":" if let Atom::EdgeMap(ref mut e) = del {"},{"Add":" if edges[0].flag.contains(EdgeFlags::FOLDER) {"},{"Add":" *e = EdgeMap {"},{"Add":" inode: e.inode,"},{"Add":" edges,"},{"Add":" }"},{"Add":" } else {"},{"Add":" *contents = Some(Atom::EdgeMap(EdgeMap {"},{"Add":" inode: e.inode,"},{"Add":" edges,"},{"Add":" }))"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Hunk::FileUndel {"},{"Add":" ref mut undel,"},{"Add":" ref mut contents,"},{"Add":" .."},{"Add":" }) => {"},{"Add":" if let Some(edges) = parse_edges(changes, h)? {"},{"Add":" if let Atom::EdgeMap(ref mut e) = undel {"},{"Add":" if edges[0].flag.contains(EdgeFlags::FOLDER) {"},{"Add":" *e = EdgeMap {"},{"Add":" inode: e.inode,"},{"Add":" edges,"},{"Add":" }"},{"Add":" } else {"},{"Add":" *contents = Some(Atom::EdgeMap(EdgeMap {"},{"Add":" inode: e.inode,"},{"Add":" edges,"},{"Add":" }))"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Hunk::FileMove {"},{"Add":" ref mut del,"},{"Add":" ref mut add,"},{"Add":" .."},{"Add":" }) => {"},{"Add":" if let Some(edges) = parse_edges(changes, h)? {"},{"Add":" if edges[0].flag.contains(EdgeFlags::DELETED) {"},{"Add":" *del = Atom::EdgeMap(EdgeMap {"},{"Add":" inode: del.inode(),"},{"Add":" edges,"},{"Add":" });"},{"Add":" return Ok(None);"},{"Add":" } else if let Atom::EdgeMap(ref mut add) = add {"},{"Add":" if add.edges.is_empty() {"},{"Add":" *add = EdgeMap {"},{"Add":" inode: add.inode,"},{"Add":" edges,"},{"Add":" };"},{"Add":" return Ok(None);"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Some(cap) = CONTEXT.captures(h) {"},{"Add":" if let Atom::NewVertex(ref mut c) = add {"},{"Add":" debug!(\"cap = {:?}\", cap);"},{"Add":" c.up_context = parse_pos_vec(changes, offsets, &cap[1])?;"},{"Add":" if let Some(cap) = cap.get(7) {"},{"Add":" c.down_context = parse_pos_vec(changes, offsets, cap.as_str())?;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Hunk::Edit {"},{"Add":" ref mut change,"},{"Add":" encoding,"},{"Add":" .."},{"Add":" }) => {"},{"Add":" debug!(\"edit {:?}\", h);"},{"Add":" if h.starts_with(\"+ \") {"},{"Add":" if let Atom::NewVertex(ref mut change) = change {"},{"Add":" if change.start == change.end {"},{"Add":" change.start = ChangePosition(contents_.len().into());"},{"Add":" }"},{"Add":" text_changes_old::parse_line_add(h, change, contents_, encoding)"},{"Add":" }"},{"Add":" } else if h.starts_with('\\\\') {"},{"Add":" if let Atom::NewVertex(ref mut change) = change {"},{"Add":" if change.end > change.start && contents_[change.end.us() - 1] == b'\\n'"},{"Add":" {"},{"Add":" assert_eq!(change.end.us(), contents_.len());"},{"Add":" contents_.pop();"},{"Add":" change.end.0 -= 1;"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Some(cap) = CONTEXT.captures(h) {"},{"Add":" if let Atom::NewVertex(ref mut c) = change {"},{"Add":" debug!(\"cap = {:?}\", cap);"},{"Add":" c.up_context = parse_pos_vec(changes, offsets, &cap[1])?;"},{"Add":" if let Some(cap) = cap.get(7) {"},{"Add":" c.down_context = parse_pos_vec(changes, offsets, cap.as_str())?;"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Some(edges) = parse_edges(changes, h)? {"},{"Add":" *change = Atom::EdgeMap(EdgeMap {"},{"Add":" inode: change.inode(),"},{"Add":" edges,"},{"Add":" });"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Hunk::Replacement {"},{"Add":" ref mut change,"},{"Add":" ref mut replacement,"},{"Add":" encoding,"},{"Add":" .."},{"Add":" }) => {"},{"Add":" if h.starts_with(\"+ \") {"},{"Add":" if let Atom::NewVertex(ref mut repl) = replacement {"},{"Add":" if repl.start == repl.end {"},{"Add":" repl.start = ChangePosition(contents_.len().into());"},{"Add":" }"},{"Add":" text_changes_old::parse_line_add(h, repl, contents_, encoding)"},{"Add":" }"},{"Add":" } else if h.starts_with('\\\\') {"},{"Add":" if let Atom::NewVertex(ref mut repl) = replacement {"},{"Add":" if repl.end > repl.start && contents_[repl.end.us() - 1] == b'\\n' {"},{"Add":" assert_eq!(repl.end.us(), contents_.len());"},{"Add":" contents_.pop();"},{"Add":" repl.end.0 -= 1;"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Some(cap) = CONTEXT.captures(h) {"},{"Add":" debug!(\"cap = {:?}\", cap);"},{"Add":" if let Atom::NewVertex(ref mut repl) = replacement {"},{"Add":" repl.up_context = parse_pos_vec(changes, offsets, &cap[1])?;"},{"Add":" if let Some(cap) = cap.get(7) {"},{"Add":" repl.down_context = parse_pos_vec(changes, offsets, cap.as_str())?;"},{"Add":" }"},{"Add":" }"},{"Add":" } else if let Some(edges) = parse_edges(changes, h)? {"},{"Add":" *change = Atom::EdgeMap(EdgeMap {"},{"Add":" inode: change.inode(),"},{"Add":" edges,"},{"Add":" });"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Hunk::SolveNameConflict { ref mut name, .. })"},{"Add":" | Some(Hunk::UnsolveNameConflict { ref mut name, .. }) => {"},{"Add":" if let Some(edges) = parse_edges(changes, h)? {"},{"Add":" *name = Atom::EdgeMap(EdgeMap {"},{"Add":" edges,"},{"Add":" inode: name.inode(),"},{"Add":" })"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Hunk::SolveOrderConflict { ref mut change, .. }) => {"},{"Add":" if h.starts_with(\"+ \") {"},{"Add":" if let Atom::NewVertex(ref mut change) = change {"},{"Add":" if change.start == change.end {"},{"Add":" change.start = ChangePosition(contents_.len().into());"},{"Add":" }"},{"Add":" // TODO encoding"},{"Add":" text_changes_old::parse_line_add(h, change, contents_, &None)"},{"Add":" }"},{"Add":" } else if let Some(cap) = CONTEXT.captures(h) {"},{"Add":" debug!(\"cap = {:?}\", cap);"},{"Add":" if let Atom::NewVertex(ref mut change) = change {"},{"Add":" change.up_context = parse_pos_vec(changes, offsets, &cap[1])?;"},{"Add":" if let Some(cap) = cap.get(7) {"},{"Add":" change.down_context ="},{"Add":" parse_pos_vec(changes, offsets, cap.as_str())?;"},{"Add":" }"},{"Add":" if let (Some(new_start), Some(new_end)) = (cap.get(4), cap.get(5)) {"},{"Add":" let new_start = new_start.as_str().parse::().unwrap();"},{"Add":" let new_end = new_end.as_str().parse::().unwrap();"},{"Add":" change.start = ChangePosition(contents_.len().into());"},{"Add":" change.end = ChangePosition("},{"Add":" (contents_.len() as u64 + new_end - new_start).into(),"},{"Add":" );"},{"Add":" offsets.insert(new_end, change.end);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Hunk::UnsolveOrderConflict { ref mut change, .. }) => {"},{"Add":" if let Some(edges) = parse_edges(changes, h)? {"},{"Add":" if let Atom::EdgeMap(ref mut change) = change {"},{"Add":" change.edges = edges"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" Some(Hunk::ResurrectZombies { ref mut change, .. }) => {"},{"Add":" if let Some(edges) = parse_edges(changes, h)? {"},{"Add":" if let Atom::EdgeMap(ref mut change) = change {"},{"Add":" change.edges = edges"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" None => {"},{"Add":" debug!(\"current = {:#?}\", current);"},{"Add":" debug!(\"h = {:?}\", h);"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn encoding_from_label(cap: Captures) -> Option {"},{"Add":" let encoding_label = cap.name(\"encoding\").unwrap().as_str();"},{"Add":" if encoding_label != BINARY_LABEL {"},{"Add":" Some(Encoding::for_label(encoding_label))"},{"Add":" } else {"},{"Add":" None"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"lazy_static! {"},{"Add":" static ref POS: regex::Regex = regex::Regex::new(r#\"(\\d+)\\.(\\d+)\"#).unwrap();"},{"Add":" static ref EDGE: regex::Regex ="},{"Add":" regex::Regex::new(r#\"\\s*(?P[BFD]*):(?P[BFD]*)\\s+(?P\\d+)\\.(?P\\d+)\\s*->\\s*(?P\\d+)\\.(?P\\d+):(?P\\d+)/(?P\\d+)\\s*\"#).unwrap();"},{"Add":"}"},{"Add":""},{"Add":"pub fn default_newvertex() -> NewVertex> {"},{"Add":" NewVertex {"},{"Add":" start: ChangePosition(L64(0)),"},{"Add":" end: ChangePosition(L64(0)),"},{"Add":" flag: EdgeFlags::empty(),"},{"Add":" up_context: Vec::new(),"},{"Add":" down_context: Vec::new(),"},{"Add":" inode: Position {"},{"Add":" change: Some(Hash::None),"},{"Add":" pos: ChangePosition(L64(0)),"},{"Add":" },"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn default_edgemap() -> EdgeMap> {"},{"Add":" EdgeMap {"},{"Add":" edges: Vec::new(),"},{"Add":" inode: Position {"},{"Add":" change: Some(Hash::None),"},{"Add":" pos: ChangePosition(L64(0)),"},{"Add":" },"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn has_newvertices(current: &Option, L>>) -> bool {"},{"Add":" match current {"},{"Add":" Some(Hunk::FileAdd { contents: None, .. }) | None => false,"},{"Add":" Some(rec) => rec.iter().any(|e| matches!(e, Atom::NewVertex(_))),"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn parse_pos_vec("},{"Add":" changes: &HashMap,"},{"Add":" offsets: &HashMap,"},{"Add":" s: &str,"},{"Add":") -> Result>>, TextDeError> {"},{"Add":" let mut v = Vec::new();"},{"Add":" for pos in POS.captures_iter(s) {"},{"Add":" let change: usize = (&pos[1]).parse().unwrap();"},{"Add":" let pos: u64 = (&pos[2]).parse().unwrap();"},{"Add":" let pos = if change == 0 {"},{"Add":" if let Some(&pos) = offsets.get(&pos) {"},{"Add":" pos"},{"Add":" } else {"},{"Add":" debug!(\"inconsistent change: {:?} {:?}\", s, offsets);"},{"Add":" return Err(TextDeError::MissingPosition(pos));"},{"Add":" }"},{"Add":" } else {"},{"Add":" ChangePosition(L64(pos.to_le()))"},{"Add":" };"},{"Add":" v.push(Position {"},{"Add":" change: change_ref(changes, change)?,"},{"Add":" pos,"},{"Add":" })"},{"Add":" }"},{"Add":" Ok(v)"},{"Add":"}"},{"Add":""},{"Add":"fn change_ref(changes: &HashMap, change: usize) -> Result, TextDeError> {"},{"Add":" debug!(\"change_ref {:?} {:?}\", changes, change);"},{"Add":" if change == 0 {"},{"Add":" Ok(None)"},{"Add":" } else if change == 1 {"},{"Add":" Ok(Some(Hash::None))"},{"Add":" } else if let Some(&c) = changes.get(&change) {"},{"Add":" Ok(Some(c))"},{"Add":" } else {"},{"Add":" Err(TextDeError::MissingChange(change))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn parse_pos("},{"Add":" changes: &HashMap,"},{"Add":" s: &str,"},{"Add":") -> Result>, TextDeError> {"},{"Add":" let pos = POS.captures(s).unwrap();"},{"Add":" let change: usize = (&pos[1]).parse().unwrap();"},{"Add":" let pos: u64 = (&pos[2]).parse().unwrap();"},{"Add":" Ok(Position {"},{"Add":" change: change_ref(changes, change)?,"},{"Add":" pos: ChangePosition(L64(pos.to_le())),"},{"Add":" })"},{"Add":"}"},{"Add":""},{"Add":"pub fn parse_edges("},{"Add":" changes: &HashMap,"},{"Add":" s: &str,"},{"Add":") -> Result>>>, TextDeError> {"},{"Add":" debug!(\"parse_edges {:?}\", s);"},{"Add":" let mut result = Vec::new();"},{"Add":" for edge in s.split(',') {"},{"Add":" debug!(\"parse edge {:?}\", edge);"},{"Add":" if let Some(cap) = EDGE.captures(edge) {"},{"Add":" let previous = read_flag(cap.name(\"prev\").unwrap().as_str());"},{"Add":" let flag = read_flag(cap.name(\"flag\").unwrap().as_str());"},{"Add":" let change0: usize = cap.name(\"up_c\").unwrap().as_str().parse().unwrap();"},{"Add":" let pos0: u64 = cap.name(\"up_l\").unwrap().as_str().parse().unwrap();"},{"Add":" let change1: usize = cap.name(\"c\").unwrap().as_str().parse().unwrap();"},{"Add":" let start1: u64 = cap.name(\"l0\").unwrap().as_str().parse().unwrap();"},{"Add":" let end1: u64 = cap.name(\"l1\").unwrap().as_str().parse().unwrap();"},{"Add":" let introduced_by: usize = cap.name(\"intro\").unwrap().as_str().parse().unwrap();"},{"Add":" result.push(NewEdge {"},{"Add":" previous,"},{"Add":" flag,"},{"Add":" from: Position {"},{"Add":" change: change_ref(changes, change0)?,"},{"Add":" pos: ChangePosition(L64(pos0.to_le())),"},{"Add":" },"},{"Add":" to: Vertex {"},{"Add":" change: change_ref(changes, change1)?,"},{"Add":" start: ChangePosition(L64(start1.to_le())),"},{"Add":" end: ChangePosition(L64(end1.to_le())),"},{"Add":" },"},{"Add":" introduced_by: change_ref(changes, introduced_by)?,"},{"Add":" })"},{"Add":" } else {"},{"Add":" debug!(\"not parsed\");"},{"Add":" return Ok(None);"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(Some(result))"},{"Add":"}"},{"Add":""},{"Add":"pub fn parse_line_add("},{"Add":" h: &str,"},{"Add":" change: &mut NewVertex>,"},{"Add":" contents_: &mut Vec,"},{"Add":" encoding: &Option,"},{"Add":") {"},{"Add":" let h = match encoding {"},{"Add":" Some(encoding) => encoding.encode(h),"},{"Add":" None => std::borrow::Cow::Borrowed(h.as_bytes()),"},{"Add":" };"},{"Add":" debug!(\"parse_line_add {:?} {:?}\", change.end, change.start);"},{"Add":" debug!(\"parse_line_add {:?}\", h);"},{"Add":" if h.len() > 2 {"},{"Add":" let h = &h[2..h.len()];"},{"Add":" contents_.extend(h);"},{"Add":" } else if h.len() > 1 {"},{"Add":" contents_.push(b'\\n');"},{"Add":" }"},{"Add":" debug!(\"contents_.len() = {:?}\", contents_.len());"},{"Add":" trace!(\"contents_ = {:?}\", contents_);"},{"Add":" change.end = ChangePosition(contents_.len().into());"},{"Add":"}"},{"Add":""},{"Add":"pub trait WriteChangeLine: std::io::Write {"},{"Add":" fn write_change_line(&mut self, pref: &str, contents: &str) -> Result<(), std::io::Error> {"},{"Add":" writeln!(self, \"{} {}\", pref, contents)"},{"Add":" }"},{"Add":" fn write_change_line_binary("},{"Add":" &mut self,"},{"Add":" pref: &str,"},{"Add":" contents: &[u8],"},{"Add":" ) -> Result<(), std::io::Error> {"},{"Add":" write!(self, \"{}b{}\", pref, data_encoding::BASE64.encode(contents))"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl WriteChangeLine for &mut Vec {}"},{"Add":"impl WriteChangeLine for &mut std::io::Stderr {}"},{"Add":"impl WriteChangeLine for &mut std::io::Stdout {}"},{"Add":""},{"Add":"pub fn print_contents("},{"Add":" w: &mut W,"},{"Add":" pref: &str,"},{"Add":" contents: &[u8],"},{"Add":" encoding: &Option,"},{"Add":") -> Result<(), std::io::Error> {"},{"Add":" if let Some(encoding) = encoding {"},{"Add":" let dec = encoding.decode(&contents);"},{"Add":" let dec = if dec.ends_with(\"\\n\") {"},{"Add":" &dec[..dec.len() - 1]"},{"Add":" } else {"},{"Add":" &dec"},{"Add":" };"},{"Add":" for a in dec.split('\\n') {"},{"Add":" w.write_change_line(pref, a)?"},{"Add":" }"},{"Add":" } else {"},{"Add":" writeln!(w, \"{}b{}\", pref, data_encoding::BASE64.encode(contents))?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"pub fn print_change_contents("},{"Add":" w: &mut W,"},{"Add":" changes: &C,"},{"Add":" change: &Atom>,"},{"Add":" change_contents: &[u8],"},{"Add":" encoding: &Option,"},{"Add":") -> Result<(), TextSerError> {"},{"Add":" debug!(\"print_change_contents {:?}\", change);"},{"Add":" match change {"},{"Add":" Atom::NewVertex(ref n) => {"},{"Add":" let c = &change_contents[n.start.us()..n.end.us()];"},{"Add":" print_contents(w, \"+\", c, encoding)?;"},{"Add":" if !c.ends_with(b\"\\n\") {"},{"Add":" debug!(\"print_change_contents {:?}\", c);"},{"Add":" writeln!(w, \"\\n\\\\\")?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" Atom::EdgeMap(ref n) if n.edges.is_empty() => return Err(TextSerError::InvalidChange),"},{"Add":" Atom::EdgeMap(ref n) if n.edges[0].flag.contains(EdgeFlags::DELETED) => {"},{"Add":" let mut buf = Vec::new();"},{"Add":" let mut current = None;"},{"Add":" for e in n.edges.iter() {"},{"Add":" if Some(e.to) == current {"},{"Add":" continue;"},{"Add":" }"},{"Add":" buf.clear();"},{"Add":" changes"},{"Add":" .get_contents_ext(e.to, &mut buf)"},{"Add":" .map_err(TextSerError::C)?;"},{"Add":" print_contents(w, \"-\", &buf[..], &encoding)?;"},{"Add":" if !buf.ends_with(b\"\\n\") {"},{"Add":" debug!(\"print_change_contents {:?}\", buf);"},{"Add":" writeln!(w)?;"},{"Add":" }"},{"Add":" current = Some(e.to)"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":" _ => Ok(()),"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn write_deleted_names("},{"Add":" w: &mut W,"},{"Add":" changes: &C,"},{"Add":" del: &Atom>,"},{"Add":") -> Result<(), TextSerError> {"},{"Add":" if let Atom::EdgeMap(ref e) = del {"},{"Add":" let mut buf = Vec::new();"},{"Add":" let mut is_first = true;"},{"Add":" for d in e.edges.iter() {"},{"Add":" buf.clear();"},{"Add":" changes"},{"Add":" .get_contents_ext(d.to, &mut buf)"},{"Add":" .map_err(TextSerError::C)?;"},{"Add":" if !buf.is_empty() {"},{"Add":" let FileMetadata { basename: name, .. } = FileMetadata::read(&buf);"},{"Add":" write!(w, \"{}{:?}\", if is_first { \"\" } else { \", \" }, name)?;"},{"Add":" is_first = false;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"pub fn write_flag(mut w: W, flag: EdgeFlags) -> Result<(), std::io::Error> {"},{"Add":" if flag.contains(EdgeFlags::BLOCK) {"},{"Add":" w.write_all(b\"B\")?;"},{"Add":" }"},{"Add":" if flag.contains(EdgeFlags::FOLDER) {"},{"Add":" w.write_all(b\"F\")?;"},{"Add":" }"},{"Add":" if flag.contains(EdgeFlags::DELETED) {"},{"Add":" w.write_all(b\"D\")?;"},{"Add":" }"},{"Add":" assert!(!flag.contains(EdgeFlags::PARENT));"},{"Add":" assert!(!flag.contains(EdgeFlags::PSEUDO));"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"pub fn read_flag(s: &str) -> EdgeFlags {"},{"Add":" let mut f = EdgeFlags::empty();"},{"Add":" for i in s.chars() {"},{"Add":" match i {"},{"Add":" 'B' => f |= EdgeFlags::BLOCK,"},{"Add":" 'F' => f |= EdgeFlags::FOLDER,"},{"Add":" 'D' => f |= EdgeFlags::DELETED,"},{"Add":" c => panic!(\"read_flag: {:?}\", c),"},{"Add":" }"},{"Add":" }"},{"Add":" f"},{"Add":"}"},{"Add":""},{"Add":"pub fn write_pos("},{"Add":" mut w: W,"},{"Add":" hashes: &HashMap,"},{"Add":" pos: Position>,"},{"Add":") -> Result<(), std::io::Error> {"},{"Add":" let change = if let Some(Hash::None) = pos.change {"},{"Add":" 1"},{"Add":" } else if let Some(ref c) = pos.change {"},{"Add":" *hashes.get(c).unwrap()"},{"Add":" } else {"},{"Add":" 0"},{"Add":" };"},{"Add":" write!(w, \"{}.{}\", change, pos.pos.0)?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"pub fn write_atom("},{"Add":" w: &mut W,"},{"Add":" hashes: &HashMap,"},{"Add":" atom: &Atom>,"},{"Add":") -> Result<(), std::io::Error> {"},{"Add":" match atom {"},{"Add":" Atom::NewVertex(ref n) => write_newvertex(w, hashes, n),"},{"Add":" Atom::EdgeMap(ref n) => write_edgemap(w, hashes, n),"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub fn write_newvertex("},{"Add":" mut w: W,"},{"Add":" hashes: &HashMap,"},{"Add":" n: &NewVertex>,"},{"Add":") -> Result<(), std::io::Error> {"},{"Add":" write!(w, \" up\")?;"},{"Add":" for c in n.up_context.iter() {"},{"Add":" write!(w, \" \")?;"},{"Add":" write_pos(&mut w, hashes, *c)?"},{"Add":" }"},{"Add":" write!(w, \", new {}:{}\", n.start.0, n.end.0)?;"},{"Add":" if !n.down_context.is_empty() {"},{"Add":" write!(w, \", down\")?;"},{"Add":" for c in n.down_context.iter() {"},{"Add":" write!(w, \" \")?;"},{"Add":" write_pos(&mut w, hashes, *c)?"},{"Add":" }"},{"Add":" }"},{"Add":" w.write_all(b\"\\n\")?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"pub fn write_edgemap("},{"Add":" mut w: W,"},{"Add":" hashes: &HashMap,"},{"Add":" n: &EdgeMap>,"},{"Add":") -> Result<(), std::io::Error> {"},{"Add":" let mut is_first = true;"},{"Add":" for c in n.edges.iter() {"},{"Add":" if !is_first {"},{"Add":" write!(w, \", \")?;"},{"Add":" }"},{"Add":" is_first = false;"},{"Add":" write_flag(&mut w, c.previous)?;"},{"Add":" write!(w, \":\")?;"},{"Add":" write_flag(&mut w, c.flag)?;"},{"Add":" write!(w, \" \")?;"},{"Add":" write_pos(&mut w, hashes, c.from)?;"},{"Add":" write!(w, \" -> \")?;"},{"Add":" write_pos(&mut w, hashes, c.to.start_pos())?;"},{"Add":" let h = if let Some(h) = hashes.get(c.introduced_by.as_ref().unwrap()) {"},{"Add":" h"},{"Add":" } else {"},{"Add":" panic!(\"introduced_by = {:?}, not found\", c.introduced_by);"},{"Add":" };"},{"Add":" write!(w, \":{}/{}\", c.to.end.0, h)?;"},{"Add":" }"},{"Add":" writeln!(w)?;"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Clone, PartialEq, Eq)]"},{"Add":"pub enum Section {"},{"Add":" Header(String),"},{"Add":" Deps,"},{"Add":" Changes {"},{"Add":" changes: Vec, Local>>,"},{"Add":" current: Option, Local>>,"},{"Add":" offsets: HashMap,"},{"Add":" },"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":44,"ins":{"up_context":[{"change":3,"pos":38868}],"down_context":[{"change":3,"pos":38938}],"flag":"BLOCK","start":58942,"end":59016,"inode":{"change":3,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":38868},"to":{"change":3,"start":38868,"end":38938},"introduced_by":3}],"inode":{"change":3,"pos":37976}},"ins_contents":[{"Add":" pub fn write_all_deps_old Result<(), ChangeError>>("}],"del_contents":[{"Del":" pub fn write_all_deps Result<(), ChangeError>>(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":169,"ins":{"up_context":[{"change":3,"pos":43112}],"down_context":[{"change":3,"pos":122912}],"flag":"BLOCK","start":59017,"end":59097,"inode":{"change":3,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":43112},"to":{"change":2,"start":10272,"end":10351},"introduced_by":2}],"inode":{"change":3,"pos":37976}},"ins_contents":[{"Add":" let (mut change, extra_dependencies) = Self::read_impl(r, updatables)?;"}],"del_contents":[{"Del":" let (mut change, extra_dependencies) = Self::read_new(r, updatables)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":182,"ins":{"up_context":[{"change":3,"pos":43584}],"down_context":[{"change":3,"pos":43626}],"flag":"BLOCK","start":59098,"end":59144,"inode":{"change":3,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":43584},"to":{"change":2,"start":10352,"end":10397},"introduced_by":2}],"inode":{"change":3,"pos":37976}},"ins_contents":[{"Add":" Ok(Self::read_impl(r, updatables)?.0)"}],"del_contents":[{"Del":" Ok(Self::read_new(r, updatables)?.0)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":185,"ins":{"up_context":[{"change":3,"pos":43633}],"down_context":[{"change":3,"pos":43659}],"flag":"BLOCK","start":59145,"end":59175,"inode":{"change":3,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":43633},"to":{"change":2,"start":10398,"end":10427},"introduced_by":2}],"inode":{"change":3,"pos":37976}},"ins_contents":[{"Add":" fn read_impl("}],"del_contents":[{"Del":" fn read_new(\n"}]}},{"Edit":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":575,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":21697},"to":{"change":2,"start":21697,"end":21766},"introduced_by":2}],"inode":{"change":3,"pos":37976}}},"contents":[{"Del":" // TODO: should we push, or not?\n contents_.push(0);\n\n"}]}},{"Edit":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":602,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":22933}],"down_context":[{"change":2,"pos":22933}],"flag":"BLOCK","start":59176,"end":59211,"inode":{"change":3,"pos":37976}}},"contents":[{"Add":" contents_.push(0);"}]}},{"Replacement":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":652,"ins":{"up_context":[{"change":2,"pos":24583}],"down_context":[{"change":2,"pos":24616}],"flag":"BLOCK","start":59212,"end":59249,"inode":{"change":3,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":24583},"to":{"change":2,"start":24583,"end":24616},"introduced_by":2}],"inode":{"change":3,"pos":37976}},"ins_contents":[{"Add":" let mut add_name = {"}],"del_contents":[{"Del":" let add_name = {\n"}]}},{"Edit":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":658,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":24917},"to":{"change":2,"start":24917,"end":25016},"introduced_by":2}],"inode":{"change":3,"pos":37976}}},"contents":[{"Del":" x.up_context = from_printable_pos_vec_offsets(changes, offsets, &up_context)?;\n"}]}},{"Edit":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":684,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":25991}],"down_context":[{"change":2,"pos":25991}],"flag":"BLOCK","start":59250,"end":59352,"inode":{"change":3,"pos":37976}}},"contents":[{"Add":" add_name.up_context = from_printable_pos_vec_offsets(changes, offsets, &up_context)?;"}]}},{"Edit":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":707,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":26986}],"down_context":[{"change":14,"pos":67}],"flag":"BLOCK","start":59353,"end":59388,"inode":{"change":3,"pos":37976}}},"contents":[{"Add":" contents_.push(0);"}]}},{"Replacement":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":713,"ins":{"up_context":[{"change":2,"pos":27090}],"down_context":[{"change":3,"pos":5933}],"flag":"BLOCK","start":59389,"end":59471,"inode":{"change":3,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":27090},"to":{"change":2,"start":27090,"end":27138},"introduced_by":2}],"inode":{"change":3,"pos":37976}},"ins_contents":[{"Add":" path: if parent == \"\" { name } else { parent + \"/\" + &name },"}],"del_contents":[{"Del":" path: parent + \"/\" + &name,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":769,"ins":{"up_context":[{"change":2,"pos":29063}],"down_context":[{"change":2,"pos":29261}],"flag":"BLOCK","start":59472,"end":59704,"inode":{"change":3,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":29063},"to":{"change":2,"start":29063,"end":29261},"introduced_by":2}],"inode":{"change":3,"pos":37976}},"ins_contents":[{"Add":" x.up_context = from_printable_pos_vec_offsets(changes, offsets, &new_vertex.up_context)?;"},{"Add":" x.down_context = from_printable_pos_vec_offsets(changes, offsets, &new_vertex.down_context)?;"}],"del_contents":[{"Del":" x.up_context = from_printable_pos_vec(changes, &new_vertex.up_context)?;\n x.down_context = from_printable_pos_vec(changes, &new_vertex.down_context)?;\n"}]}},{"Edit":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":774,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":29460}],"down_context":[{"change":2,"pos":29460}],"flag":"BLOCK","start":59705,"end":59748,"inode":{"change":3,"pos":37976}}},"contents":[{"Add":" contents_.push(0);"}]}},{"Replacement":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":805,"ins":{"up_context":[{"change":2,"pos":30426}],"down_context":[{"change":2,"pos":30618}],"flag":"BLOCK","start":59749,"end":59975,"inode":{"change":3,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":30426},"to":{"change":2,"start":30426,"end":30618},"introduced_by":2}],"inode":{"change":3,"pos":37976}},"ins_contents":[{"Add":" x.up_context = from_printable_pos_vec_offsets(changes, offsets, &replacement.up_context)?;"},{"Add":" x.down_context = from_printable_pos_vec_offsets(changes, offsets, &replacement.down_context)?;"}],"del_contents":[{"Del":" x.up_context = from_printable_pos_vec(changes, &replacement.up_context)?;\n x.down_context = from_printable_pos_vec(changes, &replacement.down_context)?;\n"}]}},{"Edit":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":812,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":30875}],"down_context":[{"change":2,"pos":30875}],"flag":"BLOCK","start":59976,"end":60011,"inode":{"change":3,"pos":37976}}},"contents":[{"Add":" contents_.push(0);"}]}},{"Replacement":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":859,"ins":{"up_context":[{"change":2,"pos":32463}],"down_context":[{"change":2,"pos":32637}],"flag":"BLOCK","start":60012,"end":60220,"inode":{"change":3,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":32463},"to":{"change":2,"start":32463,"end":32637},"introduced_by":2}],"inode":{"change":3,"pos":37976}},"ins_contents":[{"Add":" c.up_context = from_printable_pos_vec_offsets(changes, offsets, &change.up_context)?;"},{"Add":" c.down_context = from_printable_pos_vec_offsets(changes, offsets, &change.down_context)?;"}],"del_contents":[{"Del":" c.up_context = from_printable_pos_vec(changes, &change.up_context)?;\n c.down_context = from_printable_pos_vec(changes, &change.down_context)?;\n"}]}},{"Edit":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":868,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":33104}],"down_context":[{"change":3,"pos":65892}],"flag":"BLOCK","start":60221,"end":60256,"inode":{"change":3,"pos":37976}}},"contents":[{"Add":" contents_.push(0);"}]}},{"Edit":{"inode":{"change":3,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":971,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":82496},"to":{"change":2,"start":34704,"end":34735},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":34735},"to":{"change":3,"start":1907,"end":1943},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1907},"to":{"change":3,"start":1907,"end":1943},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1943},"to":{"change":2,"start":34736,"end":34919},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":34919},"to":{"change":3,"start":84043,"end":84049},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":84043},"to":{"change":3,"start":84043,"end":84049},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":84049},"to":{"change":2,"start":34920,"end":34932},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2260},"to":{"change":3,"start":84066,"end":84068},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":34932},"to":{"change":3,"start":84066,"end":84068},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":84066},"to":{"change":3,"start":84066,"end":84068},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":84068},"to":{"change":3,"start":84068,"end":84069},"introduced_by":3}],"inode":{"change":3,"pos":37976}}},"contents":[{"Del":"pub fn from_printable_pos_vec(\n"},{"Del":" changes: &HashMap,\n"},{"Del":" pos: &[PrintablePos],\n) -> Result>>, TextDeError> {\n let mut buf = Vec::new();\n for p in pos {\n buf.push(from_printable_pos(changes, *p)?);\n"},{"Del":" }\n"},{"Del":" Ok(buf)\n"},{"Del":"}\n"},{"Del":"\n"}]}}],"owner":"irevoire","repo":"pijul","token":"4Tr2Y34dQw2iHaPCi7aFxkT2o4afqVqlM8BXAEWRNz0=","login":null}

…

Dependencies

Change contents