Renaming "Record" to "Hunk" in the changes

Dependencies

• [2] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
• [3] CIEUBH46 Fixing an index-out-of-bounds error when serialising bad changes
• [4] 73NW2X2M Returning a parse error instead of panicking when parsing a text change
• [5] UBCBQ5FG Removing pijul/src/commands/checkout.rs (unused file), as well as litorg comments
• [6] UNZXTNSJ Change text format: order dependencies in the order they were on the channel at record time
• [7] ZXTHL45O address clippy lints
• [8] NE4A4WUK Parsing of file addition metadata
• [9] QNJBR73K don't return Result for infallible functions
• [10] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [11] YDKNUL6B Add `diff --short` that lists changes without showing them
• [12] I52XSRUH Massive cleanup, and simplification
• [13] 7A2TSC4P Conflict solving code (FOLDER edges)
• [14] BZSC7VMY address clippy lints
• [15] MU5GSJAW Partial push and pull (WARNING: breaks the existing protocol)
• [16] NA5I4WYN Fixing the inverse of conflict resolutions
• [17] 65S67T3E Parsing \\ for empty additions (rare problem)
• [18] JRSBH6HT Identification of line numbers in replacements
• [19] 7FFFKQZU add 'Default' implementations
• [20] IYJZVLET Cleaning up the literate programming bits
• [21] VO5OQW4W Removing anyhow in libpijul
• [22] CFNFIUJV Parsing the correct flags for new vertices
• [23] KJDQ2WOM Fixing the parsing of section headers in the text change format
• [24] O4DNWMPD Cleaunp and proofreading of libpijul::record
• [25] NZIK34IM Fixing a bug in diff, where some changes were ignored for no reason
• [26] PSKXR4QE Do not load the entire change in memory in log
• [27] KVBLRDOU Concatenating edits with order conflict resolutions (if relevant), and parsing the text format of the result
• [28] 6YMDOZIB Refactoring apply

Change contents

• replacement in pijul/src/commands/diff.rs at line 99
  [4.817]→[4.817:1663](∅→∅)
  − Record::FileMove { .. } => "file move",

  − Record::FileDel { .. } => "file del",

  − Record::FileUndel { .. } => "file undel",

  − Record::SolveNameConflict { .. } => "solve name conflict",

  − Record::UnsolveNameConflict { .. } => "unsolve name conflict",

  − Record::FileAdd { .. } => "file add",

  − Record::Edit { .. } => "edit",

  − Record::Replacement { .. } => "replacement",

  − Record::SolveOrderConflict { .. } => "solve order conflict",

  − Record::UnsolveOrderConflict { .. } => "unsolve order conflict",

  − Record::ResurrectZombies { .. } => "resurrect zombies",
  [4.817]

  [4.1663]
  + Hunk::FileMove { .. } => "file move",

  + Hunk::FileDel { .. } => "file del",

  + Hunk::FileUndel { .. } => "file undel",

  + Hunk::SolveNameConflict { .. } => "solve name conflict",

  + Hunk::UnsolveNameConflict { .. } => "unsolve name conflict",

  + Hunk::FileAdd { .. } => "file add",

  + Hunk::Edit { .. } => "edit",

  + Hunk::Replacement { .. } => "replacement",

  + Hunk::SolveOrderConflict { .. } => "solve order conflict",

  + Hunk::UnsolveOrderConflict { .. } => "unsolve order conflict",

  + Hunk::ResurrectZombies { .. } => "resurrect zombies",
• replacement in pijul/src/commands/diff.rs at line 120
  [4.209]→[4.4212:4734](∅→∅)
  − Record::FileMove { path, .. } => format!("MV {}\n", path),

  − Record::FileDel { path, .. } => format!("D {}\n", path),

  − Record::FileUndel { path, .. } => format!("UD {}\n", path),

  − Record::FileAdd { path, .. } => format!("A {}", path),

  − Record::SolveNameConflict { path, .. } => format!("SC {}", path),

  − Record::UnsolveNameConflict { path, .. } => format!("UC {}", path),

  − Record::Edit {
  [4.209]

  [4.4734]
  + Hunk::FileMove { path, .. } => format!("MV {}\n", path),

  + Hunk::FileDel { path, .. } => format!("D {}\n", path),

  + Hunk::FileUndel { path, .. } => format!("UD {}\n", path),

  + Hunk::FileAdd { path, .. } => format!("A {}", path),

  + Hunk::SolveNameConflict { path, .. } => format!("SC {}", path),

  + Hunk::UnsolveNameConflict { path, .. } => format!("UC {}", path),

  + Hunk::Edit {
• replacement in pijul/src/commands/diff.rs at line 130
  [4.4861]→[4.4861:4903](∅→∅)
  − Record::Replacement {
  [4.4861]

  [4.4903]
  + Hunk::Replacement {
• replacement in pijul/src/commands/diff.rs at line 134
  [4.5030]→[4.5030:5079](∅→∅)
  − Record::SolveOrderConflict {
  [4.5030]

  [4.5079]
  + Hunk::SolveOrderConflict {
• replacement in pijul/src/commands/diff.rs at line 138
  [4.5206]→[4.5206:5257](∅→∅)
  − Record::UnsolveOrderConflict {
  [4.5206]

  [4.5257]
  + Hunk::UnsolveOrderConflict {
• replacement in pijul/src/commands/diff.rs at line 142
  [4.5384]→[4.5384:5431](∅→∅)
  − Record::ResurrectZombies {
  [4.5384]

  [4.5431]
  + Hunk::ResurrectZombies {
• replacement in libpijul/src/record.rs at line 1
  [4.488880]→[4.488881:488937](∅→∅)
  − //! Record a change from a pristine and a working copy.
  [4.488880]

  [4.488937]
  + //! Hunk a change from a pristine and a working copy.
• replacement in libpijul/src/record.rs at line 47
  [4.489333]→[4.489333:489371](∅→∅)
  − /// created using `RecordState::new`.
  [4.489333]

  [4.489371]
  + /// created using `Builder::new`.
• replacement in libpijul/src/record.rs at line 70
  [4.489987]→[4.489987:490042](∅→∅)
  − pub actions: Vec<Record<Option<ChangeId>, Local>>,
  [4.489987]

  [4.490042]
  + pub actions: Vec<Hunk<Option<ChangeId>, Local>>,
• replacement in libpijul/src/record.rs at line 293
  [4.497975]→[4.497975:498023](∅→∅)
  − self.rec.actions.push(Record::FileAdd {
  [4.497912]

  [4.498023]
  + self.rec.actions.push(Hunk::FileAdd {
• replacement in libpijul/src/record.rs at line 647
  [4.6391]→[4.508937:508991](∅→∅),[4.508937]→[4.508937:508991](∅→∅)
  − self.rec.actions.push(Record::FileUndel {
  [4.6391]

  [4.508991]
  + self.rec.actions.push(Hunk::FileUndel {
• replacement in libpijul/src/record.rs at line 658
  [4.509321]→[4.509321:509378](∅→∅)
  − self.rec.actions.push(Record::FileMove {
  [4.509321]

  [4.509378]
  + self.rec.actions.push(Hunk::FileMove {
• replacement in libpijul/src/record.rs at line 674
  [4.510020]→[4.510020:510086](∅→∅)
  − self.rec.actions.push(Record::SolveNameConflict {
  [4.510020]

  [4.510086]
  + self.rec.actions.push(Hunk::SolveNameConflict {
• replacement in libpijul/src/record.rs at line 1024
  [4.523440]→[4.523440:523492](∅→∅)
  − self.rec.actions.push(Record::FileDel {
  [4.523440]

  [4.523492]
  + self.rec.actions.push(Hunk::FileDel {
• replacement in libpijul/src/record.rs at line 1043
  [2.38596]→[4.523914:523952](∅→∅),[4.523914]→[4.523914:523952](∅→∅)
  − if let Some(Record::FileDel {
  [2.38596]

  [4.523952]
  + if let Some(Hunk::FileDel {
• replacement in libpijul/src/diff/replace.rs at line 4
  [4.780074]→[4.780074:780127](∅→∅)
  − use crate::change::{Atom, Local, NewVertex, Record};
  [4.780074]

  [4.780127]
  + use crate::change::{Atom, Local, NewVertex, Hunk};
• replacement in libpijul/src/diff/replace.rs at line 74
  [4.782229]→[4.782229:782290](∅→∅)
  − Some(Record::Edit { change: c, local }) => {
  [4.782229]

  [4.0]
  + Some(Hunk::Edit { change: c, local }) => {
• replacement in libpijul/src/diff/replace.rs at line 76
  [4.52]→[4.782338:782406](∅→∅),[4.782338]→[4.782338:782406](∅→∅)
  − self.rec.actions.push(Record::Replacement {
  [4.52]

  [4.782406]
  + self.rec.actions.push(Hunk::Replacement {
• replacement in libpijul/src/diff/replace.rs at line 83
  [4.782625]→[4.782625:782706](∅→∅)
  − self.rec.actions.push(Record::Edit { change: c, local })
  [4.782625]

  [4.782706]
  + self.rec.actions.push(Hunk::Edit { change: c, local })
• replacement in libpijul/src/diff/replace.rs at line 90
  [4.782847]→[4.782847:782892](∅→∅)
  − self.rec.actions.push(Record::Edit {
  [4.782847]

  [4.782892]
  + self.rec.actions.push(Hunk::Edit {
• replacement in libpijul/src/diff/mod.rs at line 150
  [4.797638]→[4.797638:797717](∅→∅)
  − use crate::change::{Atom, EdgeMap, Local, NewEdge, NewVertex, Record};
  [4.797638]

  [4.797717]
  + use crate::change::{Atom, EdgeMap, Local, NewEdge, NewVertex, Hunk};
• replacement in libpijul/src/diff/mod.rs at line 198
  [4.799869]→[4.799869:799918](∅→∅)
  − self.rec.actions.push(Record::Edit {
  [4.799869]

  [4.799918]
  + self.rec.actions.push(Hunk::Edit {
• replacement in libpijul/src/diff/mod.rs at line 209
  [4.800193]→[4.800193:800245](∅→∅)
  − self.rec.actions.push(Record::Replacement {
  [4.800193]

  [4.548]
  + self.rec.actions.push(Hunk::Replacement {
• replacement in libpijul/src/diff/delete.rs at line 6
  [4.805588]→[4.805588:805650](∅→∅)
  − use crate::change::{Atom, EdgeMap, Local, NewVertex, Record};
  [4.805588]

  [4.805650]
  + use crate::change::{Atom, EdgeMap, Local, NewVertex, Hunk};
• replacement in libpijul/src/diff/delete.rs at line 58
  [4.807024]→[4.807024:807073](∅→∅)
  − self.rec.actions.push(Record::Edit {
  [4.807024]

  [4.807073]
  + self.rec.actions.push(Hunk::Edit {
• replacement in libpijul/src/diff/delete.rs at line 70
  [4.807902]→[4.807902:807963](∅→∅)
  − self.rec.actions.push(Record::ResurrectZombies {
  [4.807902]

  [4.807963]
  + self.rec.actions.push(Hunk::ResurrectZombies {
• replacement in libpijul/src/diff/delete.rs at line 248
  [4.813947]→[4.813947:814006](∅→∅)
  − self.rec.actions.push(Record::SolveOrderConflict {
  [4.813947]

  [4.814006]
  + self.rec.actions.push(Hunk::SolveOrderConflict {
• replacement in libpijul/src/changestore/mod.rs at line 50
  [4.15428]→[4.15428:15523](∅→∅)
  − ) -> Result<Vec<crate::change::Record<Option<Hash>, crate::change::Local>>, Self::Error> {
  [4.15428]

  [4.15523]
  + ) -> Result<Vec<crate::change::Hunk<Option<Hash>, crate::change::Local>>, Self::Error> {
• replacement in libpijul/src/change.rs at line 187
  [4.835524]→[4.835524:835575](∅→∅)
  − pub changes: Vec<Record<Option<Hash>, Local>>,
  [4.835524]

  [4.835575]
  + pub changes: Vec<Hunk<Option<Hash>, Local>>,
• replacement in libpijul/src/change.rs at line 198
  [2.117726]→[2.117726:117783](∅→∅)
  − I: Iterator<Item = &'a Record<Option<Hash>, Local>>,
  [2.117726]

  [2.117783]
  + I: Iterator<Item = &'a Hunk<Option<Hash>, Local>>,
• replacement in libpijul/src/change.rs at line 555
  [4.847396]→[4.847396:847437](∅→∅)
  − impl<L: Clone> Record<Option<Hash>, L> {
  [4.847396]

  [4.847437]
  + impl<L: Clone> Hunk<Option<Hash>, L> {
• replacement in libpijul/src/change.rs at line 558
  [4.847507]→[4.847507:847577](∅→∅)
  − Record::FileMove { del, add, path } => Record::FileMove {
  [4.847507]

  [4.847577]
  + Hunk::FileMove { del, add, path } => Hunk::FileMove {
• replacement in libpijul/src/change.rs at line 563
  [4.847708]→[4.847708:847738](∅→∅)
  − Record::FileDel {
  [4.847708]

  [4.847738]
  + Hunk::FileDel {
• replacement in libpijul/src/change.rs at line 567
  [4.847807]→[4.847807:847844](∅→∅)
  − } => Record::FileUndel {
  [4.847807]

  [4.847844]
  + } => Hunk::FileUndel {
• replacement in libpijul/src/change.rs at line 572
  [4.848007]→[4.848007:848039](∅→∅)
  − Record::FileUndel {
  [4.848007]

  [4.848039]
  + Hunk::FileUndel {
• replacement in libpijul/src/change.rs at line 576
  [4.848110]→[4.848110:848145](∅→∅)
  − } => Record::FileDel {
  [4.848110]

  [4.848145]
  + } => Hunk::FileDel {
• replacement in libpijul/src/change.rs at line 581
  [4.848308]→[4.848308:848338](∅→∅)
  − Record::FileAdd {
  [4.848308]

  [4.848338]
  + Hunk::FileAdd {
• replacement in libpijul/src/change.rs at line 591
  [4.848694]→[4.848694:848728](∅→∅)
  − Record::FileDel {
  [4.848694]

  [4.848728]
  + Hunk::FileDel {
• replacement in libpijul/src/change.rs at line 597
  [4.848899]→[4.848899:848985](∅→∅)
  − Record::SolveNameConflict { name, path } => Record::UnsolveNameConflict {
  [4.848899]

  [4.848985]
  + Hunk::SolveNameConflict { name, path } => Hunk::UnsolveNameConflict {
• replacement in libpijul/src/change.rs at line 601
  [4.849078]→[4.849078:849164](∅→∅)
  − Record::UnsolveNameConflict { name, path } => Record::SolveNameConflict {
  [4.849078]

  [4.849164]
  + Hunk::UnsolveNameConflict { name, path } => Hunk::SolveNameConflict {
• replacement in libpijul/src/change.rs at line 605
  [4.849257]→[4.849257:849318](∅→∅)
  − Record::Edit { change, local } => Record::Edit {
  [4.849257]

  [4.849318]
  + Hunk::Edit { change, local } => Hunk::Edit {
• replacement in libpijul/src/change.rs at line 609
  [4.849417]→[4.849417:849451](∅→∅)
  − Record::Replacement {
  [4.849417]

  [4.849451]
  + Hunk::Replacement {
• replacement in libpijul/src/change.rs at line 613
  [4.849527]→[4.849527:849566](∅→∅)
  − } => Record::Replacement {
  [4.849527]

  [4.849566]
  + } => Hunk::Replacement {
• replacement in libpijul/src/change.rs at line 618
  [4.849721]→[4.849721:849812](∅→∅)
  − Record::SolveOrderConflict { change, local } => Record::UnsolveOrderConflict {
  [4.849721]

  [4.849812]
  + Hunk::SolveOrderConflict { change, local } => Hunk::UnsolveOrderConflict {
• replacement in libpijul/src/change.rs at line 622
  [4.849911]→[4.849911:850002](∅→∅)
  − Record::UnsolveOrderConflict { change, local } => Record::SolveOrderConflict {
  [4.849911]

  [4.850002]
  + Hunk::UnsolveOrderConflict { change, local } => Hunk::SolveOrderConflict {
• replacement in libpijul/src/change.rs at line 626
  [4.850101]→[4.850101:850174](∅→∅)
  − Record::ResurrectZombies { change, local } => Record::Edit {
  [4.850101]

  [4.850174]
  + Hunk::ResurrectZombies { change, local } => Hunk::Edit {
• replacement in libpijul/src/change.rs at line 662
  [4.851191]→[4.851191:851222](∅→∅)
  − pub enum Record<Hash, Local> {
  [4.851191]

  [4.851222]
  + pub enum Hunk<Hash, Local> {
• replacement in libpijul/src/change.rs at line 716
  [4.852329]→[4.852329:852359](∅→∅)
  − pub struct RecordIter<R, C> {
  [4.852329]

  [4.852359]
  + pub struct HunkIter<R, C> {
• replacement in libpijul/src/change.rs at line 722
  [4.852427]→[4.852427:852561](∅→∅)
  − impl<Context, Local> IntoIterator for Record<Context, Local> {

  − type IntoIter = RecordIter<Record<Context, Local>, Atom<Context>>;
  [4.852427]

  [4.852561]
  + impl<Context, Local> IntoIterator for Hunk<Context, Local> {

  + type IntoIter = HunkIter<Hunk<Context, Local>, Atom<Context>>;
• replacement in libpijul/src/change.rs at line 726
  [4.852635]→[4.852635:852656](∅→∅)
  − RecordIter {
  [4.852635]

  [4.852656]
  + HunkIter {
• replacement in libpijul/src/change.rs at line 734
  [4.852755]→[4.852755:852902](∅→∅)
  − impl<Context, Local> Record<Context, Local> {

  − pub fn iter(&self) -> RecordIter<&Record<Context, Local>, &Atom<Context>> {

  − RecordIter {
  [4.852755]

  [4.852902]
  + impl<Context, Local> Hunk<Context, Local> {

  + pub fn iter(&self) -> HunkIter<&Hunk<Context, Local>, &Atom<Context>> {

  + HunkIter {
• replacement in libpijul/src/change.rs at line 742
  [4.852998]→[4.852998:853109](∅→∅)
  − pub fn rev_iter(&self) -> RevRecordIter<&Record<Context, Local>, &Atom<Context>> {

  − RevRecordIter {
  [4.852998]

  [4.853109]
  + pub fn rev_iter(&self) -> RevHunkIter<&Hunk<Context, Local>, &Atom<Context>> {

  + RevHunkIter {
• replacement in libpijul/src/change.rs at line 751
  [4.853208]→[4.853208:853294](∅→∅)
  − impl<Context, Local> Iterator for RecordIter<Record<Context, Local>, Atom<Context>> {
  [4.853208]

  [4.853294]
  + impl<Context, Local> Iterator for HunkIter<Hunk<Context, Local>, Atom<Context>> {
• replacement in libpijul/src/change.rs at line 760
  [4.853602]→[4.853602:853657](∅→∅)
  − Record::FileMove { del, add, .. } => {
  [4.853602]

  [4.853657]
  + Hunk::FileMove { del, add, .. } => {
• replacement in libpijul/src/change.rs at line 764
  [4.853749]→[4.853749:853808](∅→∅)
  − Record::FileDel { del, contents, .. } => {
  [4.853749]

  [4.853808]
  + Hunk::FileDel { del, contents, .. } => {
• replacement in libpijul/src/change.rs at line 768
  [4.853899]→[4.853899:853935](∅→∅)
  − Record::FileUndel {
  [4.853899]

  [4.853935]
  + Hunk::FileUndel {
• replacement in libpijul/src/change.rs at line 774
  [4.854091]→[4.854091:854125](∅→∅)
  − Record::FileAdd {
  [4.854091]

  [4.854125]
  + Hunk::FileAdd {
• replacement in libpijul/src/change.rs at line 784
  [4.854409]→[4.854409:854650](∅→∅)
  − Record::SolveNameConflict { name, .. } => Some(name),

  − Record::UnsolveNameConflict { name, .. } => Some(name),

  − Record::Edit { change, .. } => Some(change),

  − Record::Replacement {
  [4.854409]

  [4.854650]
  + Hunk::SolveNameConflict { name, .. } => Some(name),

  + Hunk::UnsolveNameConflict { name, .. } => Some(name),

  + Hunk::Edit { change, .. } => Some(change),

  + Hunk::Replacement {
• replacement in libpijul/src/change.rs at line 795
  [4.854860]→[4.854860:855085](∅→∅)
  − Record::SolveOrderConflict { change, .. } => Some(change),

  − Record::UnsolveOrderConflict { change, .. } => Some(change),

  − Record::ResurrectZombies { change, .. } => Some(change),
  [4.854860]

  [4.855085]
  + Hunk::SolveOrderConflict { change, .. } => Some(change),

  + Hunk::UnsolveOrderConflict { change, .. } => Some(change),

  + Hunk::ResurrectZombies { change, .. } => Some(change),
• replacement in libpijul/src/change.rs at line 805
  [4.855152]→[4.855152:855250](∅→∅)
  − impl<'a, Context, Local> Iterator for RecordIter<&'a Record<Context, Local>, &'a Atom<Context>> {
  [4.855152]

  [4.855250]
  + impl<'a, Context, Local> Iterator for HunkIter<&'a Hunk<Context, Local>, &'a Atom<Context>> {
• replacement in libpijul/src/change.rs at line 814
  [4.855563]→[4.855563:855598](∅→∅)
  − Record::FileMove {
  [4.855563]

  [4.855598]
  + Hunk::FileMove {
• replacement in libpijul/src/change.rs at line 820
  [4.855754]→[4.855754:855788](∅→∅)
  − Record::FileDel {
  [4.855754]

  [4.855788]
  + Hunk::FileDel {
• replacement in libpijul/src/change.rs at line 828
  [4.855997]→[4.855997:856033](∅→∅)
  − Record::FileUndel {
  [4.855997]

  [4.856033]
  + Hunk::FileUndel {
• replacement in libpijul/src/change.rs at line 836
  [4.856246]→[4.856246:856280](∅→∅)
  − Record::FileAdd {
  [4.856246]

  [4.856280]
  + Hunk::FileAdd {
• replacement in libpijul/src/change.rs at line 846
  [4.856586]→[4.856586:856839](∅→∅)
  − Record::SolveNameConflict { ref name, .. } => Some(&name),

  − Record::UnsolveNameConflict { ref name, .. } => Some(&name),

  − Record::Edit { change: ref c, .. } => Some(c),

  − Record::Replacement {
  [4.856586]

  [4.856839]
  + Hunk::SolveNameConflict { ref name, .. } => Some(&name),

  + Hunk::UnsolveNameConflict { ref name, .. } => Some(&name),

  + Hunk::Edit { change: ref c, .. } => Some(c),

  + Hunk::Replacement {
• replacement in libpijul/src/change.rs at line 857
  [4.857048]→[4.857048:857285](∅→∅)
  − Record::SolveOrderConflict { ref change, .. } => Some(change),

  − Record::UnsolveOrderConflict { ref change, .. } => Some(change),

  − Record::ResurrectZombies { ref change, .. } => Some(change),
  [4.857048]

  [4.857285]
  + Hunk::SolveOrderConflict { ref change, .. } => Some(change),

  + Hunk::UnsolveOrderConflict { ref change, .. } => Some(change),

  + Hunk::ResurrectZombies { ref change, .. } => Some(change),
• replacement in libpijul/src/change.rs at line 867
  [4.857352]→[4.857352:857385](∅→∅)
  − pub struct RevRecordIter<R, C> {
  [4.857352]

  [4.857385]
  + pub struct RevHunkIter<R, C> {
• replacement in libpijul/src/change.rs at line 873
  [4.857453]→[4.857453:857554](∅→∅)
  − impl<'a, Context, Local> Iterator for RevRecordIter<&'a Record<Context, Local>, &'a Atom<Context>> {
  [4.857453]

  [4.857554]
  + impl<'a, Context, Local> Iterator for RevHunkIter<&'a Hunk<Context, Local>, &'a Atom<Context>> {
• replacement in libpijul/src/change.rs at line 882
  [4.857867]→[4.857867:857902](∅→∅)
  − Record::FileMove {
  [4.857867]

  [4.857902]
  + Hunk::FileMove {
• replacement in libpijul/src/change.rs at line 888
  [4.858058]→[4.858058:858092](∅→∅)
  − Record::FileDel {
  [4.858058]

  [4.858092]
  + Hunk::FileDel {
• replacement in libpijul/src/change.rs at line 900
  [4.858436]→[4.858436:858472](∅→∅)
  − Record::FileUndel {
  [4.858436]

  [4.858472]
  + Hunk::FileUndel {
• replacement in libpijul/src/change.rs at line 912
  [4.858822]→[4.858822:858856](∅→∅)
  − Record::FileAdd {
  [4.858822]

  [4.858856]
  + Hunk::FileAdd {
• replacement in libpijul/src/change.rs at line 927
  [4.859359]→[4.859359:859612](∅→∅)
  − Record::SolveNameConflict { ref name, .. } => Some(&name),

  − Record::UnsolveNameConflict { ref name, .. } => Some(&name),

  − Record::Edit { change: ref c, .. } => Some(c),

  − Record::Replacement {
  [4.859359]

  [4.859612]
  + Hunk::SolveNameConflict { ref name, .. } => Some(&name),

  + Hunk::UnsolveNameConflict { ref name, .. } => Some(&name),

  + Hunk::Edit { change: ref c, .. } => Some(c),

  + Hunk::Replacement {
• replacement in libpijul/src/change.rs at line 938
  [4.859821]→[4.859821:860058](∅→∅)
  − Record::SolveOrderConflict { ref change, .. } => Some(change),

  − Record::UnsolveOrderConflict { ref change, .. } => Some(change),

  − Record::ResurrectZombies { ref change, .. } => Some(change),
  [4.859821]

  [4.860058]
  + Hunk::SolveOrderConflict { ref change, .. } => Some(change),

  + Hunk::UnsolveOrderConflict { ref change, .. } => Some(change),

  + Hunk::ResurrectZombies { ref change, .. } => Some(change),
• replacement in libpijul/src/change.rs at line 1014
  [4.862666]→[4.862666:862693](∅→∅)
  − impl<H> Record<H, Local> {
  [4.862666]

  [4.862693]
  + impl<H> Hunk<H, Local> {
• replacement in libpijul/src/change.rs at line 1017
  [4.862747]→[4.862747:863349](∅→∅)
  − Record::FileMove { ref path, .. }

  − | Record::FileDel { ref path, .. }

  − | Record::FileUndel { ref path, .. }

  − | Record::SolveNameConflict { ref path, .. }

  − | Record::UnsolveNameConflict { ref path, .. }

  − | Record::FileAdd { ref path, .. } => path,

  − Record::Edit { ref local, .. }

  − | Record::Replacement { ref local, .. }

  − | Record::SolveOrderConflict { ref local, .. }

  − | Record::UnsolveOrderConflict { ref local, .. }

  − | Record::ResurrectZombies { ref local, .. } => &local.path,
  [4.862747]

  [4.863349]
  + Hunk::FileMove { ref path, .. }

  + | Hunk::FileDel { ref path, .. }

  + | Hunk::FileUndel { ref path, .. }

  + | Hunk::SolveNameConflict { ref path, .. }

  + | Hunk::UnsolveNameConflict { ref path, .. }

  + | Hunk::FileAdd { ref path, .. } => path,

  + Hunk::Edit { ref local, .. }

  + | Hunk::Replacement { ref local, .. }

  + | Hunk::SolveOrderConflict { ref local, .. }

  + | Hunk::UnsolveOrderConflict { ref local, .. }

  + | Hunk::ResurrectZombies { ref local, .. } => &local.path,
• replacement in libpijul/src/change.rs at line 1033
  [4.863429]→[4.863429:863976](∅→∅)
  − Record::FileMove { .. }

  − | Record::FileDel { .. }

  − | Record::FileUndel { .. }

  − | Record::SolveNameConflict { .. }

  − | Record::UnsolveNameConflict { .. }

  − | Record::FileAdd { .. } => None,

  − Record::Edit { ref local, .. }

  − | Record::Replacement { ref local, .. }

  − | Record::SolveOrderConflict { ref local, .. }

  − | Record::UnsolveOrderConflict { ref local, .. }

  − | Record::ResurrectZombies { ref local, .. } => Some(local.line),
  [4.863429]

  [4.863976]
  + Hunk::FileMove { .. }

  + | Hunk::FileDel { .. }

  + | Hunk::FileUndel { .. }

  + | Hunk::SolveNameConflict { .. }

  + | Hunk::UnsolveNameConflict { .. }

  + | Hunk::FileAdd { .. } => None,

  + Hunk::Edit { ref local, .. }

  + | Hunk::Replacement { ref local, .. }

  + | Hunk::SolveOrderConflict { ref local, .. }

  + | Hunk::UnsolveOrderConflict { ref local, .. }

  + | Hunk::ResurrectZombies { ref local, .. } => Some(local.line),
• replacement in libpijul/src/change.rs at line 1048
  [4.863995]→[4.863995:864041](∅→∅)
  − impl<Local> Record<Option<ChangeId>, Local> {
  [4.863995]

  [2.121412]
  + impl<Local> Hunk<Option<ChangeId>, Local> {
• replacement in libpijul/src/change.rs at line 1052
  [2.121479]→[2.121479:121541](∅→∅)
  − ) -> Result<Record<Option<Hash>, Local>, T::GraphError> {
  [2.121479]

  [2.121541]
  + ) -> Result<Hunk<Option<Hash>, Local>, T::GraphError> {
• replacement in libpijul/src/change.rs at line 1054
  [2.121565]→[4.864140:864210](∅→∅),[4.864140]→[4.864140:864210](∅→∅)
  − Record::FileMove { del, add, path } => Record::FileMove {
  [2.121565]

  [2.121566]
  + Hunk::FileMove { del, add, path } => Hunk::FileMove {
• replacement in libpijul/src/change.rs at line 1059
  [4.864329]→[4.864329:864359](∅→∅)
  − Record::FileDel {
  [4.864329]

  [4.864359]
  + Hunk::FileDel {
• replacement in libpijul/src/change.rs at line 1063
  [4.864428]→[4.864428:864463](∅→∅)
  − } => Record::FileDel {
  [4.864428]

  [2.121651]
  + } => Hunk::FileDel {
• replacement in libpijul/src/change.rs at line 1068
  [4.864616]→[4.864616:864648](∅→∅)
  − Record::FileUndel {
  [4.864616]

  [4.864648]
  + Hunk::FileUndel {
• replacement in libpijul/src/change.rs at line 1072
  [4.864719]→[4.864719:864756](∅→∅)
  − } => Record::FileUndel {
  [4.864719]

  [2.121778]
  + } => Hunk::FileUndel {
• replacement in libpijul/src/change.rs at line 1077
  [4.864913]→[4.864913:864997](∅→∅)
  − Record::SolveNameConflict { name, path } => Record::SolveNameConflict {
  [4.864913]

  [2.121909]
  + Hunk::SolveNameConflict { name, path } => Hunk::SolveNameConflict {
• replacement in libpijul/src/change.rs at line 1081
  [4.865077]→[4.865077:865165](∅→∅)
  − Record::UnsolveNameConflict { name, path } => Record::UnsolveNameConflict {
  [4.865077]

  [2.121954]
  + Hunk::UnsolveNameConflict { name, path } => Hunk::UnsolveNameConflict {
• replacement in libpijul/src/change.rs at line 1085
  [4.865245]→[4.865245:865275](∅→∅)
  − Record::FileAdd {
  [4.865245]

  [4.865275]
  + Hunk::FileAdd {
• replacement in libpijul/src/change.rs at line 1090
  [4.865376]→[4.865376:865411](∅→∅)
  − } => Record::FileAdd {
  [4.865376]

  [2.121999]
  + } => Hunk::FileAdd {
• replacement in libpijul/src/change.rs at line 1096
  [4.865627]→[4.865627:865688](∅→∅)
  − Record::Edit { change, local } => Record::Edit {
  [4.865627]

  [2.122190]
  + Hunk::Edit { change, local } => Hunk::Edit {
• replacement in libpijul/src/change.rs at line 1100
  [4.865773]→[4.865773:865807](∅→∅)
  − Record::Replacement {
  [4.865773]

  [4.865807]
  + Hunk::Replacement {
• replacement in libpijul/src/change.rs at line 1104
  [4.865883]→[4.865883:865922](∅→∅)
  − } => Record::Replacement {
  [4.865883]

  [2.122239]
  + } => Hunk::Replacement {
• replacement in libpijul/src/change.rs at line 1109
  [4.866064]→[4.866064:866153](∅→∅)
  − Record::SolveOrderConflict { change, local } => Record::SolveOrderConflict {
  [4.866064]

  [2.122346]
  + Hunk::SolveOrderConflict { change, local } => Hunk::SolveOrderConflict {
• replacement in libpijul/src/change.rs at line 1113
  [4.866238]→[4.866238:866331](∅→∅)
  − Record::UnsolveOrderConflict { change, local } => Record::UnsolveOrderConflict {
  [4.866238]

  [2.122395]
  + Hunk::UnsolveOrderConflict { change, local } => Hunk::UnsolveOrderConflict {
• replacement in libpijul/src/change.rs at line 1117
  [4.866416]→[4.866416:866501](∅→∅)
  − Record::ResurrectZombies { change, local } => Record::ResurrectZombies {
  [4.866416]

  [2.122444]
  + Hunk::ResurrectZombies { change, local } => Hunk::ResurrectZombies {
• replacement in libpijul/src/change.rs at line 1145
  [4.867256]→[4.867256:867303](∅→∅)
  − changes: Vec<Record<Option<Hash>, L>>,
  [4.867256]

  [4.867303]
  + changes: Vec<Hunk<Option<Hash>, L>>,
• replacement in libpijul/src/change/text_changes.rs at line 38
  [4.38813]→[4.38813:38867](∅→∅)
  − const CHANGES_LINE: &'static str = "# Changes\n";
  [4.38813]

  [4.38867]
  + const HUNKS_LINE: &'static str = "# Hunks\n";
• replacement in libpijul/src/change/text_changes.rs at line 146
  [4.42592]→[4.42592:42649](∅→∅)
  − w.write_all(Self::CHANGES_LINE.as_bytes())?;
  [4.42592]

  [4.42649]
  + w.write_all(Self::HUNKS_LINE.as_bytes())?;
• replacement in libpijul/src/change/text_changes.rs at line 244
  [4.45994]→[4.45994:46042](∅→∅)
  − } else if h == Self::CHANGES_LINE {
  [4.45994]

  [4.46042]
  + } else if h == Self::HUNKS_LINE {
• replacement in libpijul/src/change/text_changes.rs at line 283
  [4.47781]→[4.47781:47879](∅→∅)
  − Record::read(updatables, current, &mut contents, &deps, offsets, &h)?
  [4.47781]

  [4.47879]
  + Hunk::read(updatables, current, &mut contents, &deps, offsets, &h)?
• replacement in libpijul/src/change/text_changes.rs at line 304
  [4.48444]→[4.48444:48479](∅→∅)
  − impl Record<Option<Hash>, Local> {
  [4.48444]

  [4.48479]
  + impl Hunk<Option<Hash>, Local> {
• replacement in libpijul/src/change/text_changes.rs at line 319
  [4.48864]→[4.48864:48927](∅→∅)
  − Record::FileMove { del, add, path } => match add {
  [4.48864]

  [4.48927]
  + Hunk::FileMove { del, add, path } => match add {
• replacement in libpijul/src/change/text_changes.rs at line 354
  [4.50402]→[4.50402:50432](∅→∅)
  − Record::FileDel {
  [4.50402]

  [4.50432]
  + Hunk::FileDel {
• replacement in libpijul/src/change/text_changes.rs at line 372
  [4.51044]→[4.51044:51076](∅→∅)
  − Record::FileUndel {
  [4.51044]

  [4.51076]
  + Hunk::FileUndel {
• replacement in libpijul/src/change/text_changes.rs at line 389
  [4.51663]→[4.51663:51693](∅→∅)
  − Record::FileAdd {
  [4.51663]

  [4.51693]
  + Hunk::FileAdd {
• replacement in libpijul/src/change/text_changes.rs at line 432
  [4.53410]→[4.53410:53458](∅→∅)
  − Record::Edit { change, local } => {
  [4.53410]

  [3.309]
  + Hunk::Edit { change, local } => {
• replacement in libpijul/src/change/text_changes.rs at line 440
  [4.53776]→[4.53776:53810](∅→∅)
  − Record::Replacement {
  [4.53776]

  [4.53810]
  + Hunk::Replacement {
• replacement in libpijul/src/change/text_changes.rs at line 454
  [4.54376]→[4.54376:54434](∅→∅)
  − Record::SolveNameConflict { name, path } => {
  [4.54376]

  [4.54434]
  + Hunk::SolveNameConflict { name, path } => {
• replacement in libpijul/src/change/text_changes.rs at line 462
  [4.54753]→[4.54753:54813](∅→∅)
  − Record::UnsolveNameConflict { name, path } => {
  [4.54753]

  [4.54813]
  + Hunk::UnsolveNameConflict { name, path } => {
• replacement in libpijul/src/change/text_changes.rs at line 470
  [4.55135]→[4.55135:55197](∅→∅)
  − Record::SolveOrderConflict { change, local } => {
  [4.55135]

  [3.382]
  + Hunk::SolveOrderConflict { change, local } => {
• replacement in libpijul/src/change/text_changes.rs at line 482
  [4.55614]→[4.55614:55678](∅→∅)
  − Record::UnsolveOrderConflict { change, local } => {
  [4.55614]

  [3.431]
  + Hunk::UnsolveOrderConflict { change, local } => {
• replacement in libpijul/src/change/text_changes.rs at line 494
  [4.56098]→[4.56098:56158](∅→∅)
  − Record::ResurrectZombies { change, local } => {
  [4.56098]

  [3.482]
  + Hunk::ResurrectZombies { change, local } => {
• replacement in libpijul/src/change/text_changes.rs at line 511
  [4.56603]→[4.56603:56638](∅→∅)
  − impl Record<Option<Hash>, Local> {
  [4.56603]

  [4.56638]
  + impl Hunk<Option<Hash>, Local> {
• replacement in libpijul/src/change/text_changes.rs at line 598
  [4.60645]→[4.60645:60684](∅→∅)
  − Some(Record::FileAdd {
  [4.60645]

  [4.60684]
  + Some(Hunk::FileAdd {
• replacement in libpijul/src/change/text_changes.rs at line 615
  [4.61196]→[4.61196:61232](∅→∅)
  − Some(Record::Edit {
  [4.61196]

  [4.61232]
  + Some(Hunk::Edit {
• replacement in libpijul/src/change/text_changes.rs at line 632
  [4.61783]→[4.61783:61826](∅→∅)
  − Some(Record::Replacement {
  [4.61783]

  [4.61826]
  + Some(Hunk::Replacement {
• replacement in libpijul/src/change/text_changes.rs at line 649
  [4.62442]→[4.62442:62481](∅→∅)
  − Some(Record::FileDel {
  [4.62442]

  [4.62481]
  + Some(Hunk::FileDel {
• replacement in libpijul/src/change/text_changes.rs at line 663
  [4.62958]→[4.62958:62999](∅→∅)
  − Some(Record::FileUndel {
  [4.62958]

  [4.62999]
  + Some(Hunk::FileUndel {
• replacement in libpijul/src/change/text_changes.rs at line 679
  [4.63557]→[4.63557:63610](∅→∅)
  − Some(Record::SolveNameConflict {
  [4.63557]

  [4.63610]
  + Some(Hunk::SolveNameConflict {
• replacement in libpijul/src/change/text_changes.rs at line 684
  [4.63759]→[4.63759:63814](∅→∅)
  − Some(Record::UnsolveNameConflict {
  [4.63759]

  [4.63814]
  + Some(Hunk::UnsolveNameConflict {
• replacement in libpijul/src/change/text_changes.rs at line 713
  [4.64934]→[4.64934:64974](∅→∅)
  − Some(Record::FileMove {
  [4.64934]

  [4.64974]
  + Some(Hunk::FileMove {
• replacement in libpijul/src/change/text_changes.rs at line 729
  [4.65528]→[4.65528:65568](∅→∅)
  − Some(Record::FileMove {
  [4.65528]

  [4.65568]
  + Some(Hunk::FileMove {
• replacement in libpijul/src/change/text_changes.rs at line 745
  [4.600]→[4.66111:66160](∅→∅),[4.66111]→[4.66111:66160](∅→∅)
  − Record::SolveOrderConflict {
  [4.600]

  [4.66160]
  + Hunk::SolveOrderConflict {
• replacement in libpijul/src/change/text_changes.rs at line 755
  [4.661]→[4.66548:66599](∅→∅),[4.66548]→[4.66548:66599](∅→∅)
  − Record::UnsolveOrderConflict {
  [4.661]

  [4.66599]
  + Hunk::UnsolveOrderConflict {
• replacement in libpijul/src/change/text_changes.rs at line 772
  [4.67212]→[4.67212:67260](∅→∅)
  − Some(Record::ResurrectZombies {
  [4.67212]

  [4.67260]
  + Some(Hunk::ResurrectZombies {
• replacement in libpijul/src/change/text_changes.rs at line 782
  [4.67610]→[4.67610:67649](∅→∅)
  − Some(Record::FileAdd {
  [4.67610]

  [4.67649]
  + Some(Hunk::FileAdd {
• replacement in libpijul/src/change/text_changes.rs at line 830
  [4.69999]→[4.69999:70038](∅→∅)
  − Some(Record::FileDel {
  [4.69999]

  [4.70038]
  + Some(Hunk::FileDel {
• replacement in libpijul/src/change/text_changes.rs at line 852
  [4.70904]→[4.70904:70945](∅→∅)
  − Some(Record::FileUndel {
  [4.70904]

  [4.70945]
  + Some(Hunk::FileUndel {
• replacement in libpijul/src/change/text_changes.rs at line 874
  [4.71815]→[4.71815:71855](∅→∅)
  − Some(Record::FileMove {
  [4.71815]

  [4.71855]
  + Some(Hunk::FileMove {
• replacement in libpijul/src/change/text_changes.rs at line 906
  [4.73304]→[4.73304:73367](∅→∅)
  − Some(Record::Edit { ref mut change, .. }) => {
  [4.73304]

  [4.73367]
  + Some(Hunk::Edit { ref mut change, .. }) => {
• replacement in libpijul/src/change/text_changes.rs at line 941
  [4.75063]→[4.75063:75106](∅→∅)
  − Some(Record::Replacement {
  [4.75063]

  [4.75106]
  + Some(Hunk::Replacement {
• replacement in libpijul/src/change/text_changes.rs at line 978
  [4.76884]→[4.76884:77031](∅→∅)
  − Some(Record::SolveNameConflict { ref mut name, .. })

  − | Some(Record::UnsolveNameConflict { ref mut name, .. }) => {
  [4.76884]

  [4.1103]
  + Some(Hunk::SolveNameConflict { ref mut name, .. })

  + | Some(Hunk::UnsolveNameConflict { ref mut name, .. }) => {
• replacement in libpijul/src/change/text_changes.rs at line 988
  [4.77334]→[4.77334:77411](∅→∅)
  − Some(Record::SolveOrderConflict { ref mut change, .. }) => {
  [4.77334]

  [4.77411]
  + Some(Hunk::SolveOrderConflict { ref mut change, .. }) => {
• replacement in libpijul/src/change/text_changes.rs at line 1016
  [4.79025]→[4.79025:79104](∅→∅)
  − Some(Record::UnsolveOrderConflict { ref mut change, .. }) => {
  [4.79025]

  [4.1172]
  + Some(Hunk::UnsolveOrderConflict { ref mut change, .. }) => {
• replacement in libpijul/src/change/text_changes.rs at line 1024
  [4.79387]→[4.79387:79462](∅→∅)
  − Some(Record::ResurrectZombies { ref mut change, .. }) => {
  [4.79387]

  [4.1241]
  + Some(Hunk::ResurrectZombies { ref mut change, .. }) => {
• replacement in libpijul/src/change/text_changes.rs at line 1072
  [4.80828]→[4.80828:80907](∅→∅)
  − pub fn has_newvertices<L>(current: &Option<Record<Option<Hash>, L>>) -> bool {
  [4.80828]

  [4.80907]
  + pub fn has_newvertices<L>(current: &Option<Hunk<Option<Hash>, L>>) -> bool {
• replacement in libpijul/src/change/text_changes.rs at line 1074
  [4.80927]→[4.80927:80997](∅→∅)
  − Some(Record::FileAdd { contents: None, .. }) | None => false,
  [4.80927]

  [4.80997]
  + Some(Hunk::FileAdd { contents: None, .. }) | None => false,
• replacement in libpijul/src/change/text_changes.rs at line 1376
  [4.89960]→[4.89960:90065](∅→∅)
  − changes: Vec<Record<Option<Hash>, Local>>,

  − current: Option<Record<Option<Hash>, Local>>,
  [4.89960]

  [4.90065]
  + changes: Vec<Hunk<Option<Hash>, Local>>,

  + current: Option<Hunk<Option<Hash>, Local>>,