Fixing more tests

Dependencies

• [2] TIPZ7UXN Started fixing the tests for parallel record/output
• [3] TVVW53HZ Conflict resolution
• [4] 6HNRL5RT detect non-utf8 text files
• [5] I52XSRUH Massive cleanup, and simplification
• [6] Q3GU26WD merge with changes from sanakirja v1.1.2
• [7] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [8] BZSC7VMY address clippy lints
• [9] GHO6DWPI Refactoring iterators
• [10] Q45QHPO4 Feedback on network stuff
• [11] I24UEJQL Various post-fire fixes
• [12] GDDYJH7A fix encoded file add
• [13] 3M7WBE24 Re-adding anyhow in the tests of libpijul
• [14] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
• [15] NA5I4WYN Fixing the inverse of conflict resolutions
• [16] YN63NUZO Sanakirja 1.0
• [*] IIV3EL2X Cleanup, formatting, and fixing the Git feature

Change contents

• replacement in libpijul/src/tests/text.rs at line 12
  [2.322]→[2.322:378](∅→∅)
  − let mut repo = working_copy::memory::Memory::new();
  [2.322]

  [2.378]
  + let repo = Arc::new(working_copy::memory::Memory::new());
• replacement in libpijul/src/tests/text.rs at line 16
  [2.469]→[2.469:594](∅→∅)
  − let mut txn = env.mut_txn_begin();

  − let mut channel = txn.open_or_create_channel("main")?;

  − txn.add_file("file")?;
  [2.469]

  [2.594]
  + let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));

  + let channel = txn.write().unwrap().open_or_create_channel("main")?;

  + txn.write().unwrap().add_file("file", 0)?;
• replacement in libpijul/src/tests/text.rs at line 21
  [2.647]→[2.647:736](∅→∅)
  − let (h, change) = record_all_change(&mut repo, &store, &mut txn, &mut channel, "")?;
  [2.647]

  [2.736]
  + let (h, change) = record_all_change(repo, &store, txn, channel, "")?;
• replacement in libpijul/src/tests/text.rs at line 56
  [2.1539]→[2.1539:1595](∅→∅)
  − let mut repo = working_copy::memory::Memory::new();
  [2.1539]

  [2.1595]
  + let repo = Arc::new(working_copy::memory::Memory::new());
• replacement in libpijul/src/tests/text.rs at line 60
  [2.1686]→[2.1686:1811](∅→∅)
  − let mut txn = env.mut_txn_begin();

  − let mut channel = txn.open_or_create_channel("main")?;

  − txn.add_file("file")?;
  [2.1686]

  [2.1811]
  + let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));

  + let channel = txn.write().unwrap().open_or_create_channel("main")?;

  + txn.write().unwrap().add_file("file", 0)?;
• replacement in libpijul/src/tests/text.rs at line 65
  [2.1864]→[2.1864:1928](∅→∅)
  − record_all(&mut repo, &store, &mut txn, &mut channel, "")?;
  [2.1864]

  [2.1928]
  + record_all(repo.clone(), &store, txn.clone(), channel.clone(), "")?;
• replacement in libpijul/src/tests/text.rs at line 73
  [2.2103]→[2.2103:2312](∅→∅)
  − repo.write_file::<_, std::io::Error, _>("file", |w| {

  − w.write_all(&buf).unwrap();

  − Ok(())

  − })?;

  − let (h1, change1) = record_all_change(&mut repo, &store, &mut txn, &mut channel, "")?;
  [2.2103]

  [2.2312]
  + use std::io::Write;

  + repo.write_file("file").unwrap().write_all(&buf).unwrap();

  + let (h1, change1) = record_all_change(repo, &store, txn.clone(), channel.clone(), "")?;
• edit in libpijul/src/tests/mod.rs at line 23
  [4.14]→[2.22025:22029](∅→∅),[4.14]→[4.224:224](∅→∅),[4.224]→[4.4357:4367](∅→∅),[4.289715]→[4.4357:4367](∅→∅)
  − */

  −

  − mod text;
• edit in libpijul/src/tests/mod.rs at line 24
  [4.289729]

  [4.289729]
  + */

  + mod text;
• replacement in libpijul/src/tests/mod.rs at line 27
  [4.289730]→[2.22030:22045](∅→∅)
  − fn record_all<
  [4.289730]

  [2.22045]
  + fn record_all_change<
• edit in libpijul/src/tests/mod.rs at line 33
  [4.289730]→[4.225:291](∅→∅),[4.289730]→[4.225:291](∅→∅)
  − fn record_all_change<T: MutTxnT, R: WorkingCopy, P: ChangeStore>(
• resolve order conflict in libpijul/src/tests/mod.rs at line 33
  [2.22202]

  [4.289813]
• resurrect zombie in "libpijul/src/tests/mod.rs" at line 94
  [4.25832]→[4.348:434](∅→∅),[4.25832]→[4.348:434](∅→∅)
  + Ok((hash, change0))

  + }

  +

  + fn record_all<T: MutTxnT, R: WorkingCopy, P: ChangeStore>(
• resolve order conflict in libpijul/src/tests/mod.rs at line 94
  [2.22654]

  [4.348]
• replacement in libpijul/src/tests/mod.rs at line 98
  [4.434]→[4.434:452](∅→∅),[4.434]→[4.434:452](∅→∅)
  − repo: &mut R,
  [4.434]

  [4.452]
  + repo: Arc<R>,
• replacement in libpijul/src/tests/mod.rs at line 100
  [4.467]→[4.467:517](∅→∅),[4.467]→[4.467:517](∅→∅)
  − txn: &mut T,

  − channel: &mut ChannelRef<T>,
  [4.467]

  [4.517]
  + txn: Arc<RwLock<T>>,

  + channel: ChannelRef<T>,
• edit in libpijul/src/tests/mod.rs at line 105
  [4.574]

  [4.574]
  + T: MutTxnT + Send + Sync + 'static,

  + R: WorkingCopy + Send + Sync + 'static,

  + P: ChangeStore + Clone + Send + Sync + 'static,
• edit in libpijul/src/tests/mod.rs at line 110
  [4.613]→[3.642:708](∅→∅)
  − <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

  − >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
• resurrect zombie in "libpijul/src/tests/mod.rs" at line 110
  [3.708]→[4.0:83](∅→∅),[4.613]→[4.0:83](∅→∅),[4.613]→[4.0:83](∅→∅)
  + let (hash, _) = record_all_change(repo, store, txn, channel, prefix).unwrap();
• edit in libpijul/src/tests/mod.rs at line 126
  [4.1746]

  [4.1746]
  + T: MutTxnT + Send + Sync + 'static,

  + R: WorkingCopy + Send + Sync + 'static,

  + P: ChangeStore + Clone + Send + Sync + 'static,
• edit in libpijul/src/tests/mod.rs at line 130
  [4.1783]→[4.31918:31957](∅→∅)
  − T::Channel: Send + Sync + 'static,
• edit in libpijul/src/tests/mod.rs at line 141
  [2.22962]

  [2.22962]
  + 0,
• replacement in libpijul/src/tests/add_file.rs at line 17
  [2.23139]→[2.23139:23199](∅→∅)
  − txn.write().unwrap().add_file("dir/file").unwrap();
  [2.23139]

  [4.454600]
  + txn.write().unwrap().add_file("dir/file", 0).unwrap();
• replacement in libpijul/src/tests/add_file.rs at line 23
  [4.454793]→[2.23364:23433](∅→∅)
  − assert!(txn.write().unwrap().add_file("dir/file").is_err());
  [4.454793]

  [2.23433]
  + assert!(txn.write().unwrap().add_file("dir/file", 0).is_err());
• replacement in libpijul/src/tests/add_file.rs at line 76
  [4.36098]→[4.456639:456669](∅→∅),[4.456639]→[4.456639:456669](∅→∅)
  − txn.add_dir("dir/file")?;
  [4.36098]

  [4.30866]
  + txn.add_dir("dir/file", 0)?;
• replacement in libpijul/src/tests/add_file.rs at line 108
  [2.23827]→[4.36305:36365](∅→∅),[4.36305]→[4.36305:36365](∅→∅)
  − txn.write().unwrap().add_file("dir/file").unwrap();
  [2.23827]

  [2.23828]
  + txn.write().unwrap().add_file("dir/file", 0).unwrap();
• replacement in libpijul/src/tests/add_file.rs at line 145
  [4.458708]→[4.37197:37258](∅→∅)
  − txn.write().unwrap().add_file("dir2/file").unwrap();
  [4.458708]

  [4.37258]
  + txn.write().unwrap().add_file("dir2/file", 0).unwrap();
• replacement in libpijul/src/tests/add_file.rs at line 175
  [2.24243]→[4.37790:37839](∅→∅),[4.37790]→[4.37790:37839](∅→∅)
  − txn.write().unwrap().add_file("a/b/c/d/e")?;
  [2.24243]

  [2.24244]
  + txn.write().unwrap().add_file("a/b/c/d/e", 0)?;
• edit in libpijul/src/tests/add_file.rs at line 213
  [4.38470]

  [18.5546]
  + 0,
• replacement in libpijul/src/tests/add_file.rs at line 236
  [2.24909]→[4.38763:38811](∅→∅),[4.38763]→[4.38763:38811](∅→∅)
  − txn.write().unwrap().add_file("dir/file")?;
  [2.24909]

  [2.24910]
  + txn.write().unwrap().add_file("dir/file", 0)?;
• replacement in libpijul/src/tests/add_file.rs at line 280
  [2.25510]→[4.39327:39375](∅→∅),[4.39327]→[4.39327:39375](∅→∅)
  − txn.write().unwrap().add_file("dir/file")?;
  [2.25510]

  [2.25511]
  + txn.write().unwrap().add_file("dir/file", 0)?;
• replacement in libpijul/src/tests/add_file.rs at line 338
  [2.26704]→[2.26704:26754](∅→∅)
  − txn_alice.write().unwrap().add_file("file")?;
  [2.26704]

  [4.462187]
  + txn_alice.write().unwrap().add_file("file", 0)?;
• edit in libpijul/src/tests/add_file.rs at line 379
  [2.27755]

  [4.463058]
  + 0,
• edit in libpijul/src/tests/add_file.rs at line 400
  [2.28074]

  [4.463439]
  + 0,
• replacement in libpijul/src/tests/add_file.rs at line 422
  [2.28303]→[2.28303:28353](∅→∅)
  − txn_alice.write().unwrap().add_file("file")?;
  [2.28303]

  [4.464214]
  + txn_alice.write().unwrap().add_file("file", 0)?;
• replacement in libpijul/src/tests/add_file.rs at line 434
  [2.28665]→[2.28665:28777](∅→∅)
  − txn_alice.write().unwrap().add_dir("dir")?;

  − txn_alice.write().unwrap().move_file("file", "dir/file2")?;
  [2.28665]

  [4.464544]
  + txn_alice.write().unwrap().add_dir("dir", 0)?;

  + txn_alice

  + .write()

  + .unwrap()

  + .move_file("file", "dir/file2", 0)?;
• edit in libpijul/src/tests/add_file.rs at line 487
  [2.29892]

  [4.465658]
  + 0,
• edit in libpijul/src/tests/add_file.rs at line 506
  [2.30131]

  [4.465942]
  + 0,
• edit in libpijul/src/tests/add_file.rs at line 527
  [2.30354]

  [4.466283]
  + 0,
• replacement in libpijul/src/tests/add_file.rs at line 547
  [2.30503]→[2.30503:30604](∅→∅)
  − txn_alice.write().unwrap().add_file("file")?;

  − txn_alice.write().unwrap().add_file("file2")?;
  [2.30503]

  [4.466931]
  + txn_alice.write().unwrap().add_file("file", 0)?;

  + txn_alice.write().unwrap().add_file("file2", 0)?;
• replacement in libpijul/src/tests/add_file.rs at line 558
  [2.30825]→[2.30825:30885](∅→∅)
  − txn_alice.write().unwrap().move_file("file", "file2")?;
  [2.30825]

  [4.467118]
  + txn_alice.write().unwrap().move_file("file", "file2", 0)?;
• replacement in libpijul/src/tests/add_file.rs at line 594
  [2.31246]→[2.31246:31293](∅→∅)
  − txn_alice.write().unwrap().add_file("a")?;
  [2.31246]

  [4.468036]
  + txn_alice.write().unwrap().add_file("a", 0)?;
• replacement in libpijul/src/tests/add_file.rs at line 605
  [4.468219]→[2.31520:31573](∅→∅)
  − txn_alice.write().unwrap().move_file("a", "b")?;
  [4.468219]

  [4.468255]
  + txn_alice.write().unwrap().move_file("a", "b", 0)?;
• replacement in libpijul/src/tests/add_file.rs at line 617
  [4.468470]→[2.31799:31852](∅→∅)
  − txn_alice.write().unwrap().move_file("b", "a")?;
  [4.468470]

  [4.468506]
  + txn_alice.write().unwrap().move_file("b", "a", 0)?;
• edit in libpijul/src/tests/add_file.rs at line 647
  [2.32515]

  [4.469226]
  + 0,
• edit in libpijul/src/tests/add_file.rs at line 671
  [2.33032]

  [4.469725]
  + 0,
• edit in libpijul/src/tests/add_file.rs at line 689
  [2.33319]

  [4.470076]
  + 0,
• edit in libpijul/src/tests/add_file.rs at line 720
  [2.33897]

  [4.470723]
  + 0,
• edit in libpijul/src/tests/add_file.rs at line 741
  [2.34214]

  [4.471231]
  + 0,
• edit in libpijul/src/tests/add_file.rs at line 756
  [2.34324]

  [4.471575]
  + 0,
• edit in libpijul/src/tests/add_file.rs at line 771
  [2.34522]

  [4.471939]
  + 0,
• edit in libpijul/src/tests/add_file.rs at line 800
  [2.35013]

  [4.472493]
  + 0,
• edit in libpijul/src/tests/add_file.rs at line 824
  [2.35242]

  [4.473105]
  + 0,
• edit in libpijul/src/tests/add_file.rs at line 839
  [2.35328]

  [4.473449]
  + 0,
• replacement in libpijul/src/tests/add_file.rs at line 860
  [2.35477]→[2.35477:35586](∅→∅)
  − txn_alice.write().unwrap().add_file("dir/file")?;

  − txn_alice.write().unwrap().add_file("dir/file2")?;
  [2.35477]

  [4.474200]
  + txn_alice.write().unwrap().add_file("dir/file", 0)?;

  + txn_alice.write().unwrap().add_file("dir/file2", 0)?;
• replacement in libpijul/src/tests/add_file.rs at line 880
  [2.35948]→[2.35948:35994](∅→∅)
  − .move_file("dir/file", "dir2/file")?;
  [2.35948]

  [2.35994]
  + .move_file("dir/file", "dir2/file", 0)?;
• replacement in libpijul/src/tests/add_file.rs at line 884
  [2.36043]→[2.36043:36091](∅→∅)
  − .move_file("dir/file2", "dir2/file2")?;
  [2.36043]

  [4.474724]
  + .move_file("dir/file2", "dir2/file2", 0)?;
• edit in libpijul/src/tests/add_file.rs at line 904
  [2.36411]

  [4.475068]
  + 0,
• replacement in libpijul/src/tests/add_file.rs at line 913
  [2.36539]→[2.36539:36583](∅→∅)
  − .move_file("dir2/file", "dir/file")
  [2.36539]

  [2.36583]
  + .move_file("dir2/file", "dir/file", 0)
• replacement in libpijul/src/tests/add_file.rs at line 918
  [2.36656]→[2.36656:36702](∅→∅)
  − .move_file("dir2/file2", "dir/file2")
  [2.36656]

  [2.36702]
  + .move_file("dir2/file2", "dir/file2", 0)
• replacement in libpijul/src/tests/add_file.rs at line 1002
  [2.37467]→[4.40013:40068](∅→∅),[4.40013]→[4.40013:40068](∅→∅)
  − txn.write().unwrap().add_file("filedir").unwrap();
  [2.37467]

  [4.477412]
  + txn.write().unwrap().add_file("filedir", 0).unwrap();
• replacement in libpijul/src/tests/add_file.rs at line 1011
  [4.477664]→[4.40154:40214](∅→∅)
  − txn.write().unwrap().add_file("filedir/file").unwrap();
  [4.477664]

  [2.37658]
  + txn.write().unwrap().add_file("filedir/file", 0).unwrap();
• replacement in libpijul/src/tests/add_file.rs at line 1028
  [2.37946]→[4.40267:40319](∅→∅),[4.40267]→[4.40267:40319](∅→∅)
  − txn.write().unwrap().add_file("dir/file")?;
  [2.37946]

  [2.37947]
  + txn.write().unwrap().add_file("dir/file", 0)?;
• replacement in libpijul/src/tests/add_file.rs at line 1087
  [4.480210]→[4.40783:40827](∅→∅)
  − txn.write().unwrap().add_file("file")?;
  [4.480210]

  [2.39246]
  + txn.write().unwrap().add_file("file", 0)?;