Fixing a bug with double-quotes in the text format serialisation

pmeunier

Sep 9, 2021, 12:54 PM

LWBBN2IBFFW2UIQIP7XL3J2QOK76EJI3P4MO5D543UAATAYW66XAC

Dependencies

• [2] SFJ3XRTF Proper escaping of UTF-8 filenames in the patch text format
• [3] CCFJ7VO3 Renaming "Record" to "Hunk" in the changes
• [4] VO5OQW4W Removing anyhow in libpijul
• [5] VYHHOEYH Versions and formatting
• [6] XR7MNOMU file encoding in updates
• [7] CIEUBH46 Fixing an index-out-of-bounds error when serialising bad changes
• [8] ZRUPLBBT Colours in diff and change: separating concerns and dependencies

Change contents

• replacement in ""libpijul/src/change/text_changes.rs"" at line 88
  [3.40602]→[3.1395:1465](∅→∅),[3.1525]→[3.1525:1532](∅→∅)
  − pub fn write<

  − W: WriteChangeLine,

  − C: ChangeStore,

  − >(
  [3.40602]

  [3.40698]
  + pub fn write<W: WriteChangeLine, C: ChangeStore>(
• replacement in ""libpijul/src/change/text_changes.rs"" at line 351
  [3.8723]→[3.48479:48493](∅→∅),[3.48479]→[3.48479:48493](∅→∅),[3.48493]→[3.2661:2689](∅→∅),[3.2689]→[3.48520:48544](∅→∅),[3.48520]→[3.48520:48544](∅→∅),[3.48604]→[3.48604:48611](∅→∅)
  − fn write<

  − W: WriteChangeLine,

  − C: ChangeStore,

  − >(
  [3.8723]

  [3.48611]
  + fn write<W: WriteChangeLine, C: ChangeStore>(
• replacement in ""libpijul/src/change/text_changes.rs"" at line 502
  [3.341]→[2.1694:1778](∅→∅)
  − write!(w, "Edit in \"{}\":{} ", Escaped(&local.path), local.line)?;
  [3.341]

  [3.53536]
  + write!(w, "Edit in {}:{} ", Escaped(&local.path), local.line)?;
• replacement in ""libpijul/src/change/text_changes.rs"" at line 516
  [3.381]→[2.1779:1870](∅→∅)
  − write!(w, "Replacement in \"{}\":{} ", Escaped(&local.path), local.line)?;
  [3.381]

  [3.53990]
  + write!(w, "Replacement in {}:{} ", Escaped(&local.path), local.line)?;
• replacement in ""libpijul/src/change/text_changes.rs"" at line 545
  [3.55244]→[2.2030:2093](∅→∅)
  − "Solving an order conflict in \"{}\":{} ",
  [3.55244]

  [2.2093]
  + "Solving an order conflict in {}:{} ",
• replacement in ""libpijul/src/change/text_changes.rs"" at line 558
  [3.55725]→[2.2168:2234](∅→∅)
  − "Un-solving an order conflict in \"{}\":{} ",
  [3.55725]

  [2.2234]
  + "Un-solving an order conflict in {}:{} ",
• replacement in ""libpijul/src/change/text_changes.rs"" at line 576
  [2.2368]→[2.2368:2421](∅→∅)
  − Escaped(&local.path), local.line
  [2.2368]

  [3.56309]
  + Escaped(&local.path),

  + local.line