Started fixing the tests for parallel record/output
[?]
Apr 28, 2021, 8:13 PM
TIPZ7UXNIZ3UMIXDUP2M33FUP7LY3XM2NX424ZE4EO5V7CZTOGXQCDependencies
- [2]
I24UEJQLVarious post-fire fixes - [3]
CCLLB7OIUpgrading to Sanakirja 0.15 + version bump - [4]
SXEYMYF7Fixing the bad changes in history (unfortunately, by rebooting). - [5]
GHO6DWPIRefactoring iterators - [6]
3M7WBE24Re-adding anyhow in the tests of libpijul - [7]
SPA2OL5Ikeep-changes feature (default) to avoid deleting problematic changes - [8]
YN63NUZOSanakirja 1.0 - [9]
I52XSRUHMassive cleanup, and simplification - [10]
Q45QHPO4Feedback on network stuff - [11]
IIV3EL2XCleanup, formatting, and fixing the Git feature - [12]
NA5I4WYNFixing the inverse of conflict resolutions - [13]
BZSC7VMYaddress clippy lints - [14]
X7OHUPL5Fixing a bug in unrecord, and fixing the tests - [15]
3YDPHBANaddress non-controversial clippy lints - [16]
7UPL3Y2AUnrecord: don't restore the same unrecorded file deletion twice in the inodes and tree tables
Change contents
- edit in libpijul/src/tests/unrecord.rs at line 3
use std::io::Write; - replacement in libpijul/src/tests/unrecord.rs at line 11
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/unrecord.rs at line 17
let mut txn = env.mut_txn_begin().unwrap();txn.add_file("dir/file")?;let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));txn.write().unwrap().add_file("dir/file")?; - replacement in libpijul/src/tests/unrecord.rs at line 20
let mut channel = txn.open_or_create_channel("main")?;let _h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;let channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?;let _h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 23
repo.write_file::<_, std::io::Error, _>("dir/file", |w| {w.write_all(b"a\nx\nb\nd\n")?;Ok(())})?;use std::io::Write;repo.write_file("dir/file")?.write_all(b"a\nx\nb\nd\n")?; - replacement in libpijul/src/tests/unrecord.rs at line 26
let h1 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;let h1 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 28
let channel2 = txn.fork(&channel, "main2")?;crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h1)?;let channel2 = (&mut *txn.write().unwrap()).fork(&channel, "main2")?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h1)?; - replacement in libpijul/src/tests/unrecord.rs at line 31
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 33
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 38
1, - replacement in libpijul/src/tests/unrecord.rs at line 47[3.250161]→[3.3366:3482](∅→∅),[3.3482]→[3.250255:250274](∅→∅),[3.10366]→[3.250255:250274](∅→∅),[3.250255]→[3.250255:250274](∅→∅)
debug_to_file(&txn, &channel.borrow(), "debug_un")?;debug_to_file(&txn, &channel2.borrow(), "debug_un2")?;txn.commit()?;debug_to_file(&*txn.read().unwrap(), &channel, "debug_un")?;debug_to_file(&*txn.read().unwrap(), &channel2, "debug_un2")?;commit(txn)?; - replacement in libpijul/src/tests/unrecord.rs at line 58
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/unrecord.rs at line 64
let mut txn = env.mut_txn_begin().unwrap();txn.add_file("dir/file")?;let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));txn.write().unwrap().add_file("dir/file")?; - replacement in libpijul/src/tests/unrecord.rs at line 67
let mut channel = txn.open_or_create_channel("main")?;let _h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;let channel = txn.write().unwrap().open_or_create_channel("main")?;let _h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 70
repo.write_file::<_, std::io::Error, _>("dir/file", |w| {w.write_all(b"a\nx\ny\nd\n")?;Ok(())})?;repo.write_file("dir/file")?.write_all(b"a\nx\ny\nd\n")?; - replacement in libpijul/src/tests/unrecord.rs at line 72
let h1 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;let h1 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 74[3.250996]→[3.250996:251045](∅→∅),[3.251045]→[3.19339:19397](∅→∅),[3.19397]→[3.251045:251116](∅→∅),[3.251045]→[3.251045:251116](∅→∅),[3.251116]→[3.19398:19456](∅→∅)
let channel2 = txn.fork(&channel, "main2")?;debug_to_file(&txn, &channel.borrow(), "debug_un0")?;crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h1)?;debug_to_file(&txn, &channel.borrow(), "debug_un1")?;let channel2 = txn.write().unwrap().fork(&channel, "main2")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug_un0")?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h1)?;debug_to_file(&*txn.read().unwrap(), &channel, "debug_un1")?; - replacement in libpijul/src/tests/unrecord.rs at line 79
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 81
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 86
1, - replacement in libpijul/src/tests/unrecord.rs at line 95[3.251507]→[3.3483:3599](∅→∅),[3.3599]→[3.251601:251620](∅→∅),[3.10465]→[3.251601:251620](∅→∅),[3.251601]→[3.251601:251620](∅→∅)
debug_to_file(&txn, &channel.borrow(), "debug_un")?;debug_to_file(&txn, &channel2.borrow(), "debug_un2")?;txn.commit()?;debug_to_file(&*txn.read().unwrap(), &channel, "debug_un")?;debug_to_file(&*txn.read().unwrap(), &channel2, "debug_un2")?;commit(txn)?; - replacement in libpijul/src/tests/unrecord.rs at line 106
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/unrecord.rs at line 112
let mut txn = env.mut_txn_begin().unwrap();txn.add_file("file")?;let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));txn.write().unwrap().add_file("file")?; - replacement in libpijul/src/tests/unrecord.rs at line 115
let mut channel = txn.open_or_create_channel("main")?;let _h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;let channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?;let _h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 119
txn.move_file("file", "dir/file")?;txn.write().unwrap().move_file("file", "dir/file")?; - replacement in libpijul/src/tests/unrecord.rs at line 121
let h1 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;let h1 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 123
debug_to_file(&txn, &channel.borrow(), "debug_un")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug_un")?; - replacement in libpijul/src/tests/unrecord.rs at line 125
crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h1)?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h1)?; - replacement in libpijul/src/tests/unrecord.rs at line 127
debug_to_file(&txn, &channel.borrow(), "debug_un2")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug_un2")?; - replacement in libpijul/src/tests/unrecord.rs at line 129
crate::fs::iter_working_copy(&txn, Inode::ROOT)crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT) - replacement in libpijul/src/tests/unrecord.rs at line 137
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 139
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 144
1, - replacement in libpijul/src/tests/unrecord.rs at line 147
crate::fs::iter_working_copy(&txn, Inode::ROOT)crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT) - replacement in libpijul/src/tests/unrecord.rs at line 159
txn.commit()?;commit(txn)?; - replacement in libpijul/src/tests/unrecord.rs at line 177
let mut repo = working_copy::memory::Memory::new();let mut repo2 = working_copy::memory::Memory::new();let mut repo3 = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new());let repo2 = Arc::new(working_copy::memory::Memory::new());let repo3 = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/unrecord.rs at line 187
let mut txn = env.mut_txn_begin().unwrap();let mut txn2 = env2.mut_txn_begin().unwrap();let mut txn3 = env3.mut_txn_begin().unwrap();txn.add_file("file")?;let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));let txn2 = Arc::new(RwLock::new(env2.mut_txn_begin().unwrap()));let txn3 = Arc::new(RwLock::new(env3.mut_txn_begin().unwrap()));txn.write().unwrap().add_file("file")?; - replacement in libpijul/src/tests/unrecord.rs at line 192
let mut channel = txn.open_or_create_channel("main")?;let h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;let channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?;let h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 195
let mut channel2 = txn2.open_or_create_channel("main")?;let mut channel3 = txn3.open_or_create_channel("main")?;let channel2 = (&mut *txn2.write().unwrap()).open_or_create_channel("main")?;let channel3 = (&mut *txn3.write().unwrap()).open_or_create_channel("main")?; - replacement in libpijul/src/tests/unrecord.rs at line 198
apply::apply_change(&changes, &mut txn2, &mut channel2, &h0)?;apply::apply_change(&changes,&mut *txn2.write().unwrap(),&mut *channel2.write().unwrap(),&h0,)?; - replacement in libpijul/src/tests/unrecord.rs at line 205
&mut repo2,repo2.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 207
&mut txn2,&mut channel2,txn2.clone(),channel2.clone(), - edit in libpijul/src/tests/unrecord.rs at line 212
1, - replacement in libpijul/src/tests/unrecord.rs at line 214
apply::apply_change(&changes, &mut txn3, &mut channel3, &h0)?;apply::apply_change(&changes,&mut *txn3.write().unwrap(),&mut *channel3.write().unwrap(),&h0,)?; - replacement in libpijul/src/tests/unrecord.rs at line 221
&mut repo3,repo3.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 223
&mut txn3,&mut channel3,txn3.clone(),channel3.clone(), - edit in libpijul/src/tests/unrecord.rs at line 228
1, - replacement in libpijul/src/tests/unrecord.rs at line 240
repo.write_file::<_, std::io::Error, _>("file", |w| {w.write_all(b"a\nd\n")?;Ok(())})?;repo.write_file("file")?.write_all(b"a\nd\n")?; - replacement in libpijul/src/tests/unrecord.rs at line 242
record_all_output(&mut repo, &changes, &mut txn, &mut channel, "")?;record_all_output(repo.clone(),changes.clone(),txn.clone(),channel.clone(),"",)?; - replacement in libpijul/src/tests/unrecord.rs at line 251
repo2.write_file::<_, std::io::Error, _>("file", |w| {w.write_all(b"a\nb\nx\nc\nd\n")?;Ok(())})?;let h2 = record_all(&mut repo2, &changes, &mut txn2, &mut channel2, "")?;repo2.write_file("file")?.write_all(b"a\nb\nx\nc\nd\n")?;let h2 = record_all(repo2.clone(), &changes, txn2.clone(), channel2.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 254
repo2.write_file::<_, std::io::Error, _>("file", |w| {w.write_all(b"a\nb\nx\nc\ny\nd\n")?;Ok(())})?;let h3 = record_all(&mut repo2, &changes, &mut txn2, &mut channel2, "")?;repo2.write_file("file")?.write_all(b"a\nb\nx\nc\ny\nd\n")?;let h3 = record_all(repo2.clone(), &changes, txn2.clone(), channel2.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 258
apply::apply_change(&changes, &mut txn, &mut channel, &h2)?;apply::apply_change(&changes, &mut txn, &mut channel, &h3)?;apply::apply_change(&changes,&mut *txn.write().unwrap(),&mut *channel.write().unwrap(),&h2,)?;apply::apply_change(&changes,&mut *txn.write().unwrap(),&mut *channel.write().unwrap(),&h3,)?; - replacement in libpijul/src/tests/unrecord.rs at line 271
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 273
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 278
1, - replacement in libpijul/src/tests/unrecord.rs at line 281
debug_to_file(&txn, &channel.borrow(), "debug_un")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug_un")?; - replacement in libpijul/src/tests/unrecord.rs at line 283
crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h2)?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h2)?; - replacement in libpijul/src/tests/unrecord.rs at line 285
debug_to_file(&txn, &channel.borrow(), "debug_un2")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug_un2")?; - replacement in libpijul/src/tests/unrecord.rs at line 302
let mut repo = working_copy::memory::Memory::new();let mut repo2 = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new());let repo2 = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/unrecord.rs at line 310
let mut txn = env.mut_txn_begin().unwrap();let mut txn2 = env2.mut_txn_begin().unwrap();txn.add_file("file")?;let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));let txn2 = Arc::new(RwLock::new(env2.mut_txn_begin().unwrap()));txn.write().unwrap().add_file("file")?; - replacement in libpijul/src/tests/unrecord.rs at line 314
let mut channel = txn.open_or_create_channel("main")?;let h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;let mut channel2 = txn2.open_or_create_channel("main")?;let channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?;let h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?;let channel2 = (&mut *txn2.write().unwrap()).open_or_create_channel("main")?; - replacement in libpijul/src/tests/unrecord.rs at line 318
apply::apply_change(&changes, &mut txn2, &mut channel2, &h0)?;apply::apply_change(&changes,&mut *txn2.write().unwrap(),&mut *channel2.write().unwrap(),&h0,)?; - replacement in libpijul/src/tests/unrecord.rs at line 325
&mut repo2,repo2.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 327
&mut txn2,&mut channel2,txn2.clone(),channel2.clone(), - edit in libpijul/src/tests/unrecord.rs at line 332
1, - replacement in libpijul/src/tests/unrecord.rs at line 337
repo.write_file::<_, std::io::Error, _>("file", |w| {w.write_all(file)?;Ok(())})?;repo.write_file("file")?.write_all(file)?; - replacement in libpijul/src/tests/unrecord.rs at line 341
let h1 = record_all_output(&mut repo, &changes, &mut txn, &mut channel, "")?;debug_to_file(&txn, &channel.borrow(), "debug_a")?;let h1 = record_all_output(repo.clone(),changes.clone(),txn.clone(),channel.clone(),"",)?;debug_to_file(&*txn.read().unwrap(), &channel, "debug_a")?; - replacement in libpijul/src/tests/unrecord.rs at line 352[3.257356]→[3.372:431](∅→∅),[3.431]→[3.257391:257542](∅→∅),[3.257391]→[3.257391:257542](∅→∅),[3.257542]→[3.3891:3949](∅→∅)
repo2.write_file::<_, std::io::Error, _>("file", |w| {w.write_all(b"a\nb\nx\nc\nd\n")?;Ok(())})?;let h2 = record_all_output(&mut repo2, &changes, &mut txn2, &mut channel2, "")?;debug_to_file(&txn2, &channel2.borrow(), "debug_b")?;repo2.write_file("file")?.write_all(b"a\nb\nx\nc\nd\n")?;let h2 = record_all_output(repo2.clone(),changes.clone(),txn2.clone(),channel2.clone(),"",)?;debug_to_file(&*txn2.read().unwrap(), &channel2, "debug_b")?; - replacement in libpijul/src/tests/unrecord.rs at line 363
apply::apply_change(&changes, &mut txn, &mut channel, &h2)?;apply::apply_change(&changes,&mut *txn.write().unwrap(),&mut *channel.write().unwrap(),&h2,)?; - replacement in libpijul/src/tests/unrecord.rs at line 370
debug_to_file(&txn, &channel.borrow(), "debug_un")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug_un")?; - replacement in libpijul/src/tests/unrecord.rs at line 372
crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h2)?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h2)?; - replacement in libpijul/src/tests/unrecord.rs at line 374
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 376
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 381
1, - replacement in libpijul/src/tests/unrecord.rs at line 383
debug_to_file(&txn, &channel.borrow(), "debug_un2")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug_un2")?; - replacement in libpijul/src/tests/unrecord.rs at line 401
let (alive_, reachable_) = check_alive(&txn, &channel.borrow().graph);let (alive_, reachable_) = check_alive(&*txn.read().unwrap(), &channel.read().unwrap().graph); - replacement in libpijul/src/tests/unrecord.rs at line 409
txn.commit()?;commit(txn)?; - replacement in libpijul/src/tests/unrecord.rs at line 412
apply::apply_change(&changes, &mut txn2, &mut channel2, &h1)?;debug_to_file(&txn2, &channel2.borrow(), "debug_un3")?;apply::apply_change(&changes,&mut *txn2.write().unwrap(),&mut *channel2.write().unwrap(),&h1,)?;debug_to_file(&*txn2.read().unwrap(), &channel2, "debug_un3")?; - replacement in libpijul/src/tests/unrecord.rs at line 421
crate::unrecord::unrecord(&mut txn2, &mut channel2, &changes, &h1)?;debug_to_file(&txn2, &channel2.borrow(), "debug_un4")?;crate::unrecord::unrecord(&mut *txn2.write().unwrap(), &channel2, &changes, &h1)?;debug_to_file(&*txn2.read().unwrap(), &channel2, "debug_un4")?; - replacement in libpijul/src/tests/unrecord.rs at line 424
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 426
&mut txn2,&mut channel,txn2.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 431
1, - replacement in libpijul/src/tests/unrecord.rs at line 445
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/unrecord.rs at line 450
let mut txn = env.mut_txn_begin().unwrap();txn.add_file("a/b/c/d")?;let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));txn.write().unwrap().add_file("a/b/c/d")?; - replacement in libpijul/src/tests/unrecord.rs at line 453
let mut channel = txn.open_or_create_channel("main")?;record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;let channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?;record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 457
let h1 = record_all_output(&mut repo, &changes, &mut txn, &mut channel, "")?;let h1 = record_all_output(repo.clone(),changes.clone(),txn.clone(),channel.clone(),"",)?; - replacement in libpijul/src/tests/unrecord.rs at line 466
let _h2 = record_all_output(&mut repo, &changes, &mut txn, &mut channel, "")?;let _h2 = record_all_output(repo.clone(),changes.clone(),txn.clone(),channel.clone(),"",)?; - replacement in libpijul/src/tests/unrecord.rs at line 474
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 476
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 481
1, - replacement in libpijul/src/tests/unrecord.rs at line 487[3.260384]→[3.4189:4246](∅→∅),[3.4246]→[3.260430:260501](∅→∅),[3.11074]→[3.260430:260501](∅→∅),[3.260430]→[3.260430:260501](∅→∅)
debug_to_file(&txn, &channel.borrow(), "debug_un")?;crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h1)?;debug_to_file(&*txn.read().unwrap(), &channel, "debug_un")?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h1)?; - replacement in libpijul/src/tests/unrecord.rs at line 490
debug_to_file(&txn, &channel.borrow(), "debug_un2")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug_un2")?; - replacement in libpijul/src/tests/unrecord.rs at line 493
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 495
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 500
1, - replacement in libpijul/src/tests/unrecord.rs at line 516
let (alive_, reachable_) = check_alive(&txn, &channel.borrow().graph);let (alive_, reachable_) = check_alive(&*txn.read().unwrap(), &channel.read().unwrap().graph); - replacement in libpijul/src/tests/unrecord.rs at line 524
txn.commit()?;commit(txn)?; - replacement in libpijul/src/tests/unrecord.rs at line 533
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/unrecord.rs at line 539[3.261703]→[2.30689:30737](∅→∅),[2.30737]→[3.261742:261773](∅→∅),[3.261742]→[3.261742:261773](∅→∅),[3.261773]→[3.11186:11210](∅→∅)
let mut txn = env.mut_txn_begin().unwrap();txn.add_file("dir/file")?;debug_inodes(&txn);let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));txn.write().unwrap().add_file("dir/file")?;debug_inodes(&*txn.read().unwrap()); - replacement in libpijul/src/tests/unrecord.rs at line 543
let mut channel = txn.open_or_create_channel("main")?;let h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;let channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?;let h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 546
repo.write_file::<_, std::io::Error, _>("dir/file", |w| {w.write_all(b"a\nx\nb\nd\n")?;Ok(())})?;repo.write_file("dir/file")?.write_all(b"a\nx\nb\nd\n")?; - replacement in libpijul/src/tests/unrecord.rs at line 548
let h1 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;debug_inodes(&txn);let h1 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?;debug_inodes(&*txn.read().unwrap()); - replacement in libpijul/src/tests/unrecord.rs at line 551
match crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h0) {match crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h0) { - replacement in libpijul/src/tests/unrecord.rs at line 556
debug_inodes(&txn);let mut channel2 = txn.open_or_create_channel("main2")?;match crate::unrecord::unrecord(&mut txn, &mut channel2, &changes, &h0) {debug_inodes(&*txn.read().unwrap());let channel2 = (&mut *txn.write().unwrap()).open_or_create_channel("main2")?;match crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel2, &changes, &h0) { - replacement in libpijul/src/tests/unrecord.rs at line 563
for p in txn.log(&channel.borrow(), 0).unwrap() {for p in txn.read().unwrap().log(&*channel.read().unwrap(), 0).unwrap(){ - replacement in libpijul/src/tests/unrecord.rs at line 572[3.262968]→[3.11261:11285](∅→∅),[3.11285]→[3.4306:4360](∅→∅),[3.4360]→[3.263035:263106](∅→∅),[3.11330]→[3.263035:263106](∅→∅),[3.263035]→[3.263035:263106](∅→∅)
debug_inodes(&txn);debug_to_file(&txn, &channel.borrow(), "debug")?;crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h1)?;debug_inodes(&*txn.read().unwrap());debug_to_file(&*txn.read().unwrap(), &channel, "debug")?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h1)?; - replacement in libpijul/src/tests/unrecord.rs at line 576
for p in txn.log(&channel.borrow(), 0).unwrap() {for p in txn.read().unwrap().log(&*channel.read().unwrap(), 0).unwrap(){ - replacement in libpijul/src/tests/unrecord.rs at line 585[3.263190]→[3.11331:11355](∅→∅),[3.11355]→[3.4361:4416](∅→∅),[3.4416]→[3.263258:263329](∅→∅),[3.11401]→[3.263258:263329](∅→∅),[3.263258]→[3.263258:263329](∅→∅),[3.263329]→[3.4417:4472](∅→∅)
debug_inodes(&txn);debug_to_file(&txn, &channel.borrow(), "debug2")?;crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h0)?;debug_to_file(&txn, &channel.borrow(), "debug3")?;debug_inodes(&*txn.read().unwrap());debug_to_file(&*txn.read().unwrap(), &channel, "debug2")?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h0)?;debug_to_file(&*txn.read().unwrap(), &channel, "debug3")?; - replacement in libpijul/src/tests/unrecord.rs at line 591
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 593
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 598
1, - replacement in libpijul/src/tests/unrecord.rs at line 606
assert!(crate::fs::iter_working_copy(&txn, Inode::ROOT).next().is_none());txn.commit()?;assert!(crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT).next().is_none());commit(txn)?; - replacement in libpijul/src/tests/unrecord.rs at line 620
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/unrecord.rs at line 625
let mut txn = env.mut_txn_begin().unwrap();let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap())); - replacement in libpijul/src/tests/unrecord.rs at line 627
let mut channel = txn.open_or_create_channel("main")?;let channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?; - replacement in libpijul/src/tests/unrecord.rs at line 630
txn.add_file("file")?;let h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;txn.write().unwrap().add_file("file")?;let h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 634
let h = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;let h = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 636
debug_to_file(&txn, &channel.borrow(), "debug")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug")?; - replacement in libpijul/src/tests/unrecord.rs at line 639
crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h)?;debug_to_file(&txn, &channel.borrow(), "debug2")?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h)?;debug_to_file(&*txn.read().unwrap(), &channel, "debug2")?; - replacement in libpijul/src/tests/unrecord.rs at line 642
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 644
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 649
1, - replacement in libpijul/src/tests/unrecord.rs at line 658
crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h0)?;debug_to_file(&txn, &channel.borrow(), "debug3")?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h0)?;debug_to_file(&*txn.read().unwrap(), &channel, "debug3")?; - replacement in libpijul/src/tests/unrecord.rs at line 661
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 663
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 668
1, - replacement in libpijul/src/tests/unrecord.rs at line 676
txn.commit()?;commit(txn)?; - replacement in libpijul/src/tests/unrecord.rs at line 685
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/unrecord.rs at line 690
let mut txn = env.mut_txn_begin().unwrap();let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap())); - replacement in libpijul/src/tests/unrecord.rs at line 692
let mut channel = txn.open_or_create_channel("main")?;let mut channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?; - replacement in libpijul/src/tests/unrecord.rs at line 695
txn.add_file("file")?;record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;txn.write().unwrap().add_file("file")?;record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 698
let mut channel2 = txn.fork(&channel, "main2")?;let channel2 = (&mut *txn.write().unwrap()).fork(&channel, "main2")?; - replacement in libpijul/src/tests/unrecord.rs at line 700[3.266093]→[3.653:743](∅→∅),[3.743]→[3.266159:266225](∅→∅),[3.266159]→[3.266159:266225](∅→∅),[3.266225]→[3.744:834](∅→∅),[3.834]→[3.266291:266366](∅→∅),[3.266291]→[3.266291:266366](∅→∅)
repo.write_file::<_, std::io::Error, _>("file", |w| Ok(w.write_all(b"a\nx\nb\n")?))?;record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;repo.write_file::<_, std::io::Error, _>("file", |w| Ok(w.write_all(b"a\ny\nb\n")?))?;let b = record_all(&mut repo, &changes, &mut txn, &mut channel2, "")?;repo.write_file("file")?.write_all(b"a\nx\nb\n")?;record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?;repo.write_file("file")?.write_all(b"a\ny\nb\n")?;let b = record_all(repo.clone(), &changes, txn.clone(), channel2.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 705
apply::apply_change(&changes, &mut txn, &mut channel, &b)?;debug_to_file(&txn, &channel.borrow(), "debug")?;apply::apply_change(&changes,&mut *txn.write().unwrap(),&mut *channel.write().unwrap(),&b,)?;debug_to_file(&*txn.read().unwrap(), &channel, "debug")?; - replacement in libpijul/src/tests/unrecord.rs at line 713
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 715
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 720
1, - edit in libpijul/src/tests/unrecord.rs at line 723
let mut buf = Vec::new();repo.read_file("file", &mut buf)?;debug!("buf = {:?}", std::str::from_utf8(&buf)); - replacement in libpijul/src/tests/unrecord.rs at line 735
repo.write_file::<_, std::io::Error, _>("file", |w| {{let mut w = repo.write_file("file")?; - replacement in libpijul/src/tests/unrecord.rs at line 744
Ok(())})?;let c = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;debug_to_file(&txn, &channel.borrow(), "debug2")?;}let c = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug2")?; - replacement in libpijul/src/tests/unrecord.rs at line 748
crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &c)?;debug_to_file(&txn, &channel.borrow(), "debug3")?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &mut channel, &changes, &c)?;debug_to_file(&*txn.read().unwrap(), &channel, "debug3")?; - replacement in libpijul/src/tests/unrecord.rs at line 752
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 754
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 759
1, - replacement in libpijul/src/tests/unrecord.rs at line 784
txn.commit()?;commit(txn)?; - replacement in libpijul/src/tests/unrecord.rs at line 802
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/unrecord.rs at line 807
let mut txn = env.mut_txn_begin().unwrap();let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap())); - replacement in libpijul/src/tests/unrecord.rs at line 809
let mut channel = txn.open_or_create_channel("main")?;let channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?; - replacement in libpijul/src/tests/unrecord.rs at line 813
txn.add_file("file")?;record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;txn.write().unwrap().add_file("file")?;record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 820
repo.write_file::<_, std::io::Error, _>("file", |w| {w.write_all(b"a\nd\n")?;Ok(())})?;repo.write_file("file")?.write_all(b"a\nd\n")?; - replacement in libpijul/src/tests/unrecord.rs at line 822
let h_del = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;let h_del = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 838
apply::apply_change(&changes, &mut txn, &mut channel, &h_inv)?;apply::apply_change(&changes,&mut *txn.write().unwrap(),&mut *channel.write().unwrap(),&h_inv,)?; - replacement in libpijul/src/tests/unrecord.rs at line 845
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 847
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 852
1, - replacement in libpijul/src/tests/unrecord.rs at line 854
debug_to_file(&txn, &channel.borrow(), "debug")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug")?; - replacement in libpijul/src/tests/unrecord.rs at line 863
crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h_inv)?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h_inv)?; - replacement in libpijul/src/tests/unrecord.rs at line 865
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 867
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 872
1, - replacement in libpijul/src/tests/unrecord.rs at line 874
debug_to_file(&txn, &channel.borrow(), "debug2")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug2")?; - replacement in libpijul/src/tests/unrecord.rs at line 886
txn.commit()?;commit(txn)?; - replacement in libpijul/src/tests/unrecord.rs at line 897
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/unrecord.rs at line 901
let mut txn = env.mut_txn_begin().unwrap();let mut channel = txn.open_or_create_channel("main")?;let mut channel2 = txn.open_or_create_channel("main2")?;let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));let channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?;let channel2 = (&mut *txn.write().unwrap()).open_or_create_channel("main2")?; - replacement in libpijul/src/tests/unrecord.rs at line 906
txn.add_file("file")?;let h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;txn.write().unwrap().add_file("file")?;let h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 910
apply::apply_change(&changes, &mut txn, &mut channel2, &h0)?;apply::apply_change(&changes,&mut *txn.write().unwrap(),&mut *channel2.write().unwrap(),&h0,)?; - replacement in libpijul/src/tests/unrecord.rs at line 918
repo.write_file::<_, std::io::Error, _>("file", |w| {{let mut w = repo.write_file("file")?; - replacement in libpijul/src/tests/unrecord.rs at line 921
Ok(())})?;let h1 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;}let h1 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 925
debug_to_file(&txn, &channel.borrow(), "debug0")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug0")?; - replacement in libpijul/src/tests/unrecord.rs at line 928
let h2 = record_all(&mut repo, &changes, &mut txn, &mut channel2, "")?;let h2 = record_all(repo.clone(), &changes, txn.clone(), channel2.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 933
apply::apply_change(&changes, &mut txn, &mut channel, &h2)?;apply::apply_change(&changes,&mut *txn.write().unwrap(),&mut *channel.write().unwrap(),&h2,)?; - replacement in libpijul/src/tests/unrecord.rs at line 940
debug_to_file(&txn, &channel.borrow(), "debug1a")?;debug_to_file(&txn, &channel2.borrow(), "debug1b")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug1a")?;debug_to_file(&*txn.read().unwrap(), &channel2, "debug1b")?; - replacement in libpijul/src/tests/unrecord.rs at line 943
crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h2)?;debug_to_file(&txn, &channel.borrow(), "debug2")?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h2)?;debug_to_file(&*txn.read().unwrap(), &channel, "debug2")?; - replacement in libpijul/src/tests/unrecord.rs at line 947
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 949
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 954
1, - replacement in libpijul/src/tests/unrecord.rs at line 960
txn.commit()?;commit(txn)?; - replacement in libpijul/src/tests/unrecord.rs at line 971
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/unrecord.rs at line 975
let mut txn = env.mut_txn_begin().unwrap();let mut channel = txn.open_or_create_channel("main")?;let mut channel2 = txn.open_or_create_channel("main2")?;let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));let mut channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?;let mut channel2 = (&mut *txn.write().unwrap()).open_or_create_channel("main2")?; - replacement in libpijul/src/tests/unrecord.rs at line 980
txn.add_file("file")?;let h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;txn.write().unwrap().add_file("file")?;let h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 984
apply::apply_change(&changes, &mut txn, &mut channel2, &h0)?;apply::apply_change(&changes,&mut *txn.write().unwrap(),&mut *channel2.write().unwrap(),&h0,)?; - replacement in libpijul/src/tests/unrecord.rs at line 992
repo.write_file::<_, std::io::Error, _>("file", |w| {{let mut w = repo.write_file("file")?; - replacement in libpijul/src/tests/unrecord.rs at line 995
Ok(())})?;let h1 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;}let h1 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 999
debug_to_file(&txn, &channel.borrow(), "debug0")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug0")?; - replacement in libpijul/src/tests/unrecord.rs at line 1002
repo.write_file::<_, std::io::Error, _>("file", |w| {{let mut w = repo.write_file("file")?; - replacement in libpijul/src/tests/unrecord.rs at line 1005
Ok(())})?;let h2 = record_all(&mut repo, &changes, &mut txn, &mut channel2, "")?;}let h2 = record_all(repo.clone(), &changes, txn.clone(), channel2.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 1011
apply::apply_change(&changes, &mut txn, &mut channel, &h2)?;apply::apply_change(&changes,&mut *txn.write().unwrap(),&mut *channel.write().unwrap(),&h2,)?; - replacement in libpijul/src/tests/unrecord.rs at line 1018
debug_to_file(&txn, &channel.borrow(), "debug1a")?;debug_to_file(&txn, &channel2.borrow(), "debug1b")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug1a")?;debug_to_file(&*txn.read().unwrap(), &channel2, "debug1b")?; - replacement in libpijul/src/tests/unrecord.rs at line 1021
crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h2)?;debug_to_file(&txn, &channel.borrow(), "debug2")?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &mut channel, &changes, &h2)?;debug_to_file(&*txn.read().unwrap(), &channel, "debug2")?; - replacement in libpijul/src/tests/unrecord.rs at line 1025
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 1027
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 1032
1, - replacement in libpijul/src/tests/unrecord.rs at line 1040
apply::apply_change(&changes, &mut txn, &mut channel2, &h1)?;apply::apply_change(&changes,&mut *txn.write().unwrap(),&mut *channel2.write().unwrap(),&h1,)?; - replacement in libpijul/src/tests/unrecord.rs at line 1064
apply::apply_change(&changes, &mut txn, &mut channel2, &r).unwrap();debug_to_file(&txn, &channel2.borrow(), format!("debug_{}", i))?;apply::apply_change(&changes,&mut *txn.write().unwrap(),&mut *channel2.write().unwrap(),&r,).unwrap();debug_to_file(&*txn.read().unwrap(), &channel2, format!("debug_{}", i))?; - replacement in libpijul/src/tests/unrecord.rs at line 1074
crate::unrecord::unrecord(&mut txn, &mut channel2, &changes, &h1)?;debug_to_file(&txn, &channel2.borrow(), "debug_final")?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &mut channel2, &changes, &h1)?;debug_to_file(&*txn.read().unwrap(), &channel2, "debug_final")?; - replacement in libpijul/src/tests/unrecord.rs at line 1078
&mut repo,repo.clone(), - replacement in libpijul/src/tests/unrecord.rs at line 1080
&mut txn,&mut channel,txn.clone(),channel.clone(), - edit in libpijul/src/tests/unrecord.rs at line 1085
1, - replacement in libpijul/src/tests/unrecord.rs at line 1091
txn.commit()?;commit(txn)?; - replacement in libpijul/src/tests/unrecord.rs at line 1101
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/unrecord.rs at line 1105
let mut txn = env.mut_txn_begin().unwrap();let mut channel = txn.open_or_create_channel("main")?;let mut channel2 = txn.open_or_create_channel("main2")?;let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));let channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?;let channel2 = (&mut *txn.write().unwrap()).open_or_create_channel("main2")?; - replacement in libpijul/src/tests/unrecord.rs at line 1110
txn.add_file("file")?;let h0 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;txn.write().unwrap().add_file("file")?;let h0 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 1114
apply::apply_change(&changes, &mut txn, &mut channel2, &h0)?;apply::apply_change(&changes,&mut *txn.write().unwrap(),&mut *channel2.write().unwrap(),&h0,)?; - replacement in libpijul/src/tests/unrecord.rs at line 1123
let h1 = record_all(&mut repo, &changes, &mut txn, &mut channel, "")?;let h1 = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 1126
let h2 = record_all(&mut repo, &changes, &mut txn, &mut channel2, "")?;let h2 = record_all(repo.clone(), &changes, txn.clone(), channel2.clone(), "")?; - replacement in libpijul/src/tests/unrecord.rs at line 1131
apply::apply_change(&changes, &mut txn, &mut channel, &h2)?;apply::apply_change(&changes,&mut *txn.write().unwrap(),&mut *channel.write().unwrap(),&h2,)?; - replacement in libpijul/src/tests/unrecord.rs at line 1138
crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h1)?;crate::unrecord::unrecord(&mut txn, &mut channel, &changes, &h2)?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h1)?;crate::unrecord::unrecord(&mut *txn.write().unwrap(), &channel, &changes, &h2)?; - edit in libpijul/src/tests/unrecord.rs at line 1141
let txn = txn.read().unwrap(); - file addition: text.rs[3.248792]
use super::*;use crate::working_copy::WorkingCopy;#[test]fn add_non_utf8_file_test() -> Result<(), anyhow::Error> {env_logger::try_init().unwrap_or(());let mut buf = Vec::new();use std::io::Read;let mut fh = std::fs::File::open("src/tests/data/1252.1")?;fh.read_to_end(&mut buf)?;let mut repo = working_copy::memory::Memory::new();repo.add_file("file", buf);let env = pristine::sanakirja::Pristine::new_anon()?;let mut txn = env.mut_txn_begin();let mut channel = txn.open_or_create_channel("main")?;txn.add_file("file")?;let store = changestore::memory::Memory::new();let (h, change) = record_all_change(&mut repo, &store, &mut txn, &mut channel, "")?;let mut v = Vec::new();change.write(&store,Some(h),|l, _p| format!("{}:{}", l.path, l.line),true,&mut v,).unwrap();let lines: Vec<&str> = std::str::from_utf8(&v).unwrap().lines().filter(|l| l.starts_with("+")).collect();assert_eq!(vec!["+ French / Français (Windows CP 1252)", "+ €‚ƒ„…†‡, Salut"],lines);Ok(())}/// Change a non-utf-8 text file.#[test]fn change_non_utf8_file_test() -> Result<(), anyhow::Error> {env_logger::try_init().unwrap_or(());let mut buf = Vec::new();use std::io::Read;let mut fh = std::fs::File::open("src/tests/data/8859-1.1")?;fh.read_to_end(&mut buf)?;let mut repo = working_copy::memory::Memory::new();repo.add_file("file", buf);let env = pristine::sanakirja::Pristine::new_anon()?;let mut txn = env.mut_txn_begin();let mut channel = txn.open_or_create_channel("main")?;txn.add_file("file")?;let store = changestore::memory::Memory::new();record_all(&mut repo, &store, &mut txn, &mut channel, "")?;let mut buf = Vec::new();{use std::io::Read;let mut fh = std::fs::File::open("src/tests/data/8859-1.2")?;fh.read_to_end(&mut buf)?;}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, "")?;// only one line was changedlet mut v = Vec::new();change1.write(&store,Some(h1),|l, _p| format!("{}:{}", l.path, l.line),true,&mut v,).unwrap();let lines: Vec<&str> = std::str::from_utf8(&v).unwrap().lines().filter(|l| l.starts_with(|c| c == '-' || c == '+')).collect();assert_eq!(vec!["- French / Français (ISO Latin-1 / ISO 8859-1)","+ Français / French (ISO Latin-1 / ISO 8859-1)"],lines);Ok(())} - edit in libpijul/src/tests/mod.rs at line 11
/* - edit in libpijul/src/tests/mod.rs at line 22
*/ - replacement in libpijul/src/tests/mod.rs at line 25
fn record_all<T: MutTxnT, R: WorkingCopy, P: ChangeStore>(repo: &R,fn record_all<T: MutTxnT + Send + Sync + 'static,R: WorkingCopy + Send + Sync + 'static,P: ChangeStore + Clone + Send + Sync + 'static,>(repo: Arc<R>, - replacement in libpijul/src/tests/mod.rs at line 32
txn: &mut T,channel: &ChannelRef<T>,txn: Arc<RwLock<T>>,channel: ChannelRef<T>, - replacement in libpijul/src/tests/mod.rs at line 41
txn,txn.clone(), - replacement in libpijul/src/tests/mod.rs at line 43
&mut *channel.lock().unwrap(),channel.clone(), - edit in libpijul/src/tests/mod.rs at line 47
1, - replacement in libpijul/src/tests/mod.rs at line 54
.map(|rec| rec.globalize(txn).unwrap()).map(|rec| rec.globalize(&*txn.read().unwrap()).unwrap()) - replacement in libpijul/src/tests/mod.rs at line 57
txn,&channel,&*txn.read().unwrap(),&channel.clone(), - replacement in libpijul/src/tests/mod.rs at line 60
rec.contents,std::mem::take(&mut *rec.contents.lock().unwrap()), - replacement in libpijul/src/tests/mod.rs at line 85
apply::apply_local_change(txn, channel, &change0, &hash, &rec.updatables)?;apply::apply_local_change(&mut *txn.write().unwrap(),&channel,&change0,&hash,&rec.updatables,)?; - replacement in libpijul/src/tests/mod.rs at line 101
changes: Arc<P>,changes: P, - replacement in libpijul/src/tests/mod.rs at line 103
channel: &ChannelRef<T>,channel: ChannelRef<T>, - replacement in libpijul/src/tests/mod.rs at line 110[3.1785]→[2.31958:31985](∅→∅),[2.31985]→[2.31985:32070](∅→∅),[2.32070]→[2.32070:32111](∅→∅),[2.32111]→[2.32111:32208](∅→∅),[2.32208]→[2.32208:32227](∅→∅)
let hash = record_all(repo.as_ref(),changes.as_ref(),&mut *txn.write().unwrap(),channel,prefix,)?;output::output_repository_no_pending(repo, changes, txn, channel.clone(), "", true, None, 1).unwrap();let hash = record_all(repo.clone(), &changes, txn.clone(), channel.clone(), prefix)?;output::output_repository_no_pending(repo.clone(),&changes,txn,channel.clone(),"",true,None,1,).unwrap(); - file addition: data[3.248792]
- file addition: gb.2[0.2941]
- file addition: gb.1[0.2941]
- file addition: 8859-1.2[0.2941]
- file addition: 8859-1.1[0.2941]
- file addition: 1252.2[0.2941]
- file addition: 1252.1[0.2941]
- file addition: 1252-dos.2[0.2941]
- file addition: 1252-dos.1[0.2941]
- edit in libpijul/src/tests/add_file.rs at line 2
use std::io::Write; - replacement in libpijul/src/tests/add_file.rs at line 9
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 16
let mut txn = env.mut_txn_begin().unwrap();txn.add_file("dir/file").unwrap();let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));txn.write().unwrap().add_file("dir/file").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 19
let mut channel = txn.open_or_create_channel("main").unwrap();record_all(&mut repo, &changes, &mut txn, &mut channel, "").unwrap();let channel = txn.write().unwrap().open_or_create_channel("main").unwrap();record_all(repo, &changes, txn.clone(), channel.clone(), "").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 23[3.454793]→[3.454793:454845](∅→∅),[3.454845]→[2.35811:35868](∅→∅),[3.25544]→[3.454900:454931](∅→∅),[3.31733]→[3.454900:454931](∅→∅),[2.35868]→[3.454900:454931](∅→∅),[3.454900]→[3.454900:454931](∅→∅)
assert!(txn.add_file("dir/file").is_err());debug_to_file(&txn, &channel, "debug").unwrap();txn.commit().unwrap();assert!(txn.write().unwrap().add_file("dir/file").is_err());debug_to_file(&*txn.read().unwrap(), &channel, "debug").unwrap();commit(txn).unwrap() - replacement in libpijul/src/tests/add_file.rs at line 35
let channel = channel_.lock().unwrap();let channel = channel_.read().unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 70
let mut repo = working_copy::memory::Memory::new();let repo = working_copy::memory::Memory::new(); - replacement in libpijul/src/tests/add_file.rs at line 102
let mut repo = Arc::new(working_copy::memory::Memory::new());let changes = Arc::new(changestore::memory::Memory::new());let repo = Arc::new(working_copy::memory::Memory::new());let changes = changestore::memory::Memory::new(); - replacement in libpijul/src/tests/add_file.rs at line 107
let mut txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap())); - replacement in libpijul/src/tests/add_file.rs at line 109
let mut channel = txn.write().unwrap().open_or_create_channel("main").unwrap();let channel = txn.write().unwrap().open_or_create_channel("main").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 116
&channel.clone(),channel.clone(), - replacement in libpijul/src/tests/add_file.rs at line 135
record_all_output(repo, changes, txn, &channel, "").unwrap();record_all_output(repo, changes, txn.clone(), channel.clone(), "").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 152
txn.write().unwrap().commit().unwrap();commit(txn).unwrap() - replacement in libpijul/src/tests/add_file.rs at line 170
let mut repo = Arc::new(working_copy::memory::Memory::new());let changes = Arc::new(changestore::memory::Memory::new());let repo = Arc::new(working_copy::memory::Memory::new());let changes = changestore::memory::Memory::new(); - replacement in libpijul/src/tests/add_file.rs at line 174
let mut txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap())); - replacement in libpijul/src/tests/add_file.rs at line 176
let mut channel = txn.write().unwrap().open_or_create_channel("main")?;let channel = txn.write().unwrap().open_or_create_channel("main")?; - replacement in libpijul/src/tests/add_file.rs at line 179
record_all_output(repo.clone(), changes.clone(), txn.clone(), &channel, "")?;record_all_output(repo.clone(),changes.clone(),txn.clone(),channel.clone(),"",)?; - replacement in libpijul/src/tests/add_file.rs at line 194
record_all_output(repo.clone(), changes.clone(), txn.clone(), &channel, "")?;record_all_output(repo.clone(),changes.clone(),txn.clone(),channel.clone(),"",)?; - replacement in libpijul/src/tests/add_file.rs at line 203
let mut repo2 = Arc::new(working_copy::memory::Memory::new());let repo2 = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 205
repo2,changes,repo2.clone(),&changes, - edit in libpijul/src/tests/add_file.rs at line 214
debug!("output done"); - replacement in libpijul/src/tests/add_file.rs at line 230
let mut repo = Arc::new(working_copy::memory::Memory::new());let changes = Arc::new(changestore::memory::Memory::new());let repo = Arc::new(working_copy::memory::Memory::new());let changes = changestore::memory::Memory::new(); - replacement in libpijul/src/tests/add_file.rs at line 234
let mut txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap())); - replacement in libpijul/src/tests/add_file.rs at line 236
let mut channel = txn.write().unwrap().open_or_create_channel("main")?;let channel = txn.write().unwrap().open_or_create_channel("main")?; - replacement in libpijul/src/tests/add_file.rs at line 239
record_all_output(repo.clone(), changes.clone(), txn.clone(), &channel, "").unwrap();record_all_output(repo.clone(),changes.clone(),txn.clone(),channel.clone(),"",).unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 253
record_all_output(repo.clone(), changes.clone(), txn.clone(), &channel, "").unwrap();record_all_output(repo.clone(),changes.clone(),txn.clone(),channel.clone(),"",).unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 264
debug_to_file(&txn, &channel.borrow(), "debug").unwrap();txn.write().unwrap().commit()?;debug_to_file(&*txn.read().unwrap(), &channel, "debug").unwrap();commit(txn).unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 274
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 278
let mut txn = env.mut_txn_begin().unwrap();let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap())); - replacement in libpijul/src/tests/add_file.rs at line 280
let mut channel = txn.write().unwrap().open_or_create_channel("main")?;let channel = txn.write().unwrap().open_or_create_channel("main")?; - replacement in libpijul/src/tests/add_file.rs at line 283
record_all_output(&mut repo, &changes, &mut txn, &mut channel, "")?;record_all_output(repo.clone(),changes.clone(),txn.clone(),channel.clone(),"",)?; - replacement in libpijul/src/tests/add_file.rs at line 291[3.460858]→[3.7945:8007](∅→∅),[3.8007]→[3.460896:461035](∅→∅),[3.460896]→[3.460896:461035](∅→∅),[3.461035]→[3.8008:8070](∅→∅),[3.8070]→[3.461073:461136](∅→∅),[3.461073]→[3.461073:461136](∅→∅),[3.461136]→[3.26002:26065](∅→∅),[3.26065]→[3.461188:461261](∅→∅),[3.32111]→[3.461188:461261](∅→∅),[3.461188]→[3.461188:461261](∅→∅),[3.461261]→[3.26066:26129](∅→∅),[3.26129]→[3.8071:8133](∅→∅),[3.32166]→[3.8071:8133](∅→∅),[3.8133]→[3.461351:461484](∅→∅),[3.461351]→[3.461351:461484](∅→∅)
repo.write_file::<_, std::io::Error, _>("dir/file", |w| {w.write_all(b"a\nb\nc\ne\nf\n")?;Ok(())})?;record_all_output(&mut repo, &changes, &mut txn, &mut channel, "")?;repo.write_file::<_, std::io::Error, _>("dir/file", |w| {w.write_all(b"a\nb\nc\nf\n")?;Ok(())})?;debug_to_file(&txn, &channel.borrow(), "debug0").unwrap();record_all_output(&mut repo, &changes, &mut txn, &mut channel, "")?;debug_to_file(&txn, &channel.borrow(), "debug1").unwrap();repo.write_file::<_, std::io::Error, _>("dir/file", |w| {w.write_all(b"a\nb\nc\n")?;Ok(())})?;record_all_output(&mut repo, &changes, &mut txn, &mut channel, "")?;repo.write_file("dir/file")?.write_all(b"a\nb\nc\ne\nf\n")?;record_all_output(repo.clone(),changes.clone(),txn.clone(),channel.clone(),"",)?;repo.write_file("dir/file")?.write_all(b"a\nb\nc\nf\n")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug0").unwrap();record_all_output(repo.clone(),changes.clone(),txn.clone(),channel.clone(),"",)?;debug_to_file(&*txn.read().unwrap(), &channel, "debug1").unwrap();repo.write_file("dir/file")?.write_all(b"a\nb\nc\n")?;record_all_output(repo.clone(),changes.clone(),txn.clone(),channel.clone(),"",)?; - replacement in libpijul/src/tests/add_file.rs at line 320
debug_to_file(&txn, &channel.borrow(), "debug2").unwrap();txn.write().unwrap().commit()?;debug_to_file(&*txn.read().unwrap(), &channel, "debug2").unwrap();commit(txn).unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 330
let mut repo_alice = working_copy::memory::Memory::new();let repo_alice = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 336
let mut txn_alice = env_alice.mut_txn_begin().unwrap();txn_alice.add_file("file")?;let txn_alice = Arc::new(RwLock::new(env_alice.mut_txn_begin().unwrap()));txn_alice.write().unwrap().add_file("file")?; - replacement in libpijul/src/tests/add_file.rs at line 339
let mut channel = txn_alice.open_or_create_channel("main")?;let alice0 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, "")?;debug_to_file(&txn_alice, &channel.borrow(), "debug0").unwrap();let channel = (&mut *txn_alice.write().unwrap()).open_or_create_channel("main")?;let alice0 = record_all(repo_alice.clone(),&changes,txn_alice.clone(),channel.clone(),"",)?;debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug0").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 350
let alice1 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, "")?;debug_to_file(&txn_alice, &channel.borrow(), "debug1").unwrap();let alice1 = record_all(repo_alice.clone(),&changes,txn_alice.clone(),channel.clone(),"",)?;debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug1").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 359
let mut repo_bob = working_copy::memory::Memory::new();let repo_bob = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 361[3.462723]→[2.39550:39606](∅→∅),[2.39606]→[3.462770:462833](∅→∅),[3.462770]→[3.462770:462833](∅→∅),[3.462833]→[3.44381:44454](∅→∅)
let mut txn_bob = env_bob.mut_txn_begin().unwrap();let mut channel = txn_bob.open_or_create_channel("main")?;apply::apply_change(&changes, &mut txn_bob, &mut channel, &alice0)?;let txn_bob = Arc::new(RwLock::new(env_bob.mut_txn_begin().unwrap()));let channel = (&mut *txn_bob.write().unwrap()).open_or_create_channel("main")?;apply::apply_change(&changes,&mut *txn_bob.write().unwrap(),&mut *channel.write().unwrap(),&alice0,)?; - replacement in libpijul/src/tests/add_file.rs at line 370
&mut repo_bob,repo_bob.clone(), - replacement in libpijul/src/tests/add_file.rs at line 372
&mut txn_bob,&mut channel,txn_bob.clone(),channel.clone(), - edit in libpijul/src/tests/add_file.rs at line 377
1, - replacement in libpijul/src/tests/add_file.rs at line 379
debug_to_file(&txn_bob, &channel.borrow(), "debug_bob1").unwrap();debug_to_file(&*txn_bob.read().unwrap(), &channel, "debug_bob1").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 383
apply::apply_change(&changes, &mut txn_bob, &mut channel, &alice1)?;apply::apply_change(&changes,&mut *txn_bob.write().unwrap(),&mut *channel.write().unwrap(),&alice1,)?; - replacement in libpijul/src/tests/add_file.rs at line 390
&mut repo_bob,repo_bob.clone(), - replacement in libpijul/src/tests/add_file.rs at line 392
&mut txn_bob,&mut channel,txn_bob.clone(),channel.clone(), - edit in libpijul/src/tests/add_file.rs at line 397
1, - replacement in libpijul/src/tests/add_file.rs at line 399
debug_to_file(&txn_bob, &channel.borrow(), "debug_bob2").unwrap();debug_to_file(&*txn_bob.read().unwrap(), &channel, "debug_bob2").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 412
let mut repo_alice = working_copy::memory::Memory::new();let repo_alice = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 418
let mut txn_alice = env_alice.mut_txn_begin().unwrap();txn_alice.add_file("file")?;let txn_alice = Arc::new(RwLock::new(env_alice.mut_txn_begin().unwrap()));txn_alice.write().unwrap().add_file("file")?; - replacement in libpijul/src/tests/add_file.rs at line 421
let mut channel = txn_alice.open_or_create_channel("main")?;let alice0 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, "")?;let channel = (&mut *txn_alice.write().unwrap()).open_or_create_channel("main")?;let alice0 = record_all(repo_alice.clone(),&changes,txn_alice.clone(),channel.clone(),"",)?; - replacement in libpijul/src/tests/add_file.rs at line 430[3.464408]→[3.26478:26547](∅→∅),[3.26547]→[3.464466:464544](∅→∅),[3.32530]→[3.464466:464544](∅→∅),[3.464466]→[3.464466:464544](∅→∅)
debug_to_file(&txn_alice, &channel.borrow(), "debug0").unwrap();txn_alice.add_dir("dir")?;txn_alice.move_file("file", "dir/file2")?;debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug0").unwrap();txn_alice.write().unwrap().add_dir("dir")?;txn_alice.write().unwrap().move_file("file", "dir/file2")?; - replacement in libpijul/src/tests/add_file.rs at line 436
debug_tree(&txn_alice, "debug_tree")?;let alice1 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, "")?;debug_tree(&*txn_alice.read().unwrap(), "debug_tree")?;let alice1 = record_all(repo_alice.clone(),&changes,txn_alice.clone(),channel.clone(),"",)?; - replacement in libpijul/src/tests/add_file.rs at line 445
debug_to_file(&txn_alice, &channel.borrow(), "debug1").unwrap();debug_tree(&txn_alice, "debug_tree")?;debug_inodes(&txn_alice);debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug1").unwrap();debug_tree(&*txn_alice.read().unwrap(), "debug_tree")?;debug_inodes(&*txn_alice.read().unwrap()); - replacement in libpijul/src/tests/add_file.rs at line 452[3.465026]→[3.465026:465117](∅→∅),[3.465117]→[3.26618:26687](∅→∅),[3.26687]→[3.465175:465200](∅→∅),[3.32769]→[3.465175:465200](∅→∅),[3.465175]→[3.465175:465200](∅→∅)
let alice2 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, "")?;debug_to_file(&txn_alice, &channel.borrow(), "debug2").unwrap();txn_alice.commit()?;let alice2 = record_all(repo_alice.clone(),&changes,txn_alice.clone(),channel.clone(),"",)?;debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug2").unwrap();commit(txn_alice).unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 462
let mut repo_bob = working_copy::memory::Memory::new();let repo_bob = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 464[3.465323]→[2.39668:39724](∅→∅),[2.39724]→[3.465370:465433](∅→∅),[3.465370]→[3.465370:465433](∅→∅),[3.465433]→[3.44559:44632](∅→∅)
let mut txn_bob = env_bob.mut_txn_begin().unwrap();let mut channel = txn_bob.open_or_create_channel("main")?;apply::apply_change(&changes, &mut txn_bob, &mut channel, &alice0)?;let txn_bob = Arc::new(RwLock::new(env_bob.mut_txn_begin().unwrap()));let channel = (&mut *txn_bob.write().unwrap()).open_or_create_channel("main")?;apply::apply_change(&changes,&mut *txn_bob.write().unwrap(),&mut *channel.write().unwrap(),&alice0,)?; - replacement in libpijul/src/tests/add_file.rs at line 473
&mut repo_bob,repo_bob.clone(), - replacement in libpijul/src/tests/add_file.rs at line 475
&mut txn_bob,&mut channel,txn_bob.clone(),channel.clone(), - edit in libpijul/src/tests/add_file.rs at line 480
1, - replacement in libpijul/src/tests/add_file.rs at line 484
apply::apply_change(&changes, &mut txn_bob, &mut channel, &alice1)?;apply::apply_change(&changes,&mut *txn_bob.write().unwrap(),&mut *channel.write().unwrap(),&alice1,)?; - replacement in libpijul/src/tests/add_file.rs at line 491
&mut repo_bob,repo_bob.clone(), - replacement in libpijul/src/tests/add_file.rs at line 493
&mut txn_bob,&mut channel,txn_bob.clone(),channel.clone(), - edit in libpijul/src/tests/add_file.rs at line 498
1, - replacement in libpijul/src/tests/add_file.rs at line 504
apply::apply_change(&changes, &mut txn_bob, &mut channel, &alice2)?;apply::apply_change(&changes,&mut *txn_bob.write().unwrap(),&mut *channel.write().unwrap(),&alice2,)?; - replacement in libpijul/src/tests/add_file.rs at line 511
&mut repo_bob,repo_bob.clone(), - replacement in libpijul/src/tests/add_file.rs at line 513
&mut txn_bob,&mut channel,txn_bob,channel, - edit in libpijul/src/tests/add_file.rs at line 518
1, - replacement in libpijul/src/tests/add_file.rs at line 530
let mut repo_alice = working_copy::memory::Memory::new();let repo_alice = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 537
let mut txn_alice = env_alice.mut_txn_begin().unwrap();txn_alice.add_file("file")?;txn_alice.add_file("file2")?;let txn_alice = Arc::new(RwLock::new(env_alice.mut_txn_begin().unwrap()));txn_alice.write().unwrap().add_file("file")?;txn_alice.write().unwrap().add_file("file2")?; - replacement in libpijul/src/tests/add_file.rs at line 541
let mut channel = txn_alice.open_or_create_channel("main")?;record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, "")?;txn_alice.move_file("file", "file2")?;let channel = (&mut *txn_alice.write().unwrap()).open_or_create_channel("main")?;record_all(repo_alice.clone(),&changes,txn_alice.clone(),channel.clone(),"",)?;txn_alice.write().unwrap().move_file("file", "file2")?; - replacement in libpijul/src/tests/add_file.rs at line 551
record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, "")?;debug_to_file(&txn_alice, &channel.borrow(), "debug1").unwrap();record_all(repo_alice.clone(),&changes,txn_alice.clone(),channel.clone(),"",)?;debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug1").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 578
let mut repo_alice = working_copy::memory::Memory::new();let repo_alice = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 584
let mut txn_alice = env_alice.mut_txn_begin().unwrap();txn_alice.add_file("a")?;let txn_alice = Arc::new(RwLock::new(env_alice.mut_txn_begin().unwrap()));txn_alice.write().unwrap().add_file("a")?; - replacement in libpijul/src/tests/add_file.rs at line 587
let mut channel = txn_alice.open_or_create_channel("main")?;let alice1 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, "")?;let channel = txn_alice.write().unwrap().open_or_create_channel("main")?;let alice1 = record_all(repo_alice.clone(),&changes,txn_alice.clone(),channel.clone(),"",)?; - replacement in libpijul/src/tests/add_file.rs at line 596
txn_alice.move_file("a", "b")?;txn_alice.write().unwrap().move_file("a", "b")?; - replacement in libpijul/src/tests/add_file.rs at line 598
let alice2 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, "")?;debug_to_file(&txn_alice, &channel.borrow(), "debug1").unwrap();let alice2 = record_all(repo_alice.clone(),&changes,txn_alice.clone(),channel.clone(),"",)?;debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug1").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 608
txn_alice.move_file("b", "a")?;txn_alice.write().unwrap().move_file("b", "a")?; - replacement in libpijul/src/tests/add_file.rs at line 610
let alice3 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, "")?;debug_to_file(&txn_alice, &channel.borrow(), "debug2").unwrap();let alice3 = record_all(repo_alice.clone(),&changes,txn_alice.clone(),channel.clone(),"",)?;debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug2").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 620
let mut repo_bob = working_copy::memory::Memory::new();let repo_bob = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 622
let mut txn_bob = env_bob.mut_txn_begin().unwrap();let mut channel_bob = txn_bob.open_or_create_channel("main")?;let txn_bob = Arc::new(RwLock::new(env_bob.mut_txn_begin().unwrap()));let channel_bob = (&mut *txn_bob.write().unwrap()).open_or_create_channel("main")?; - replacement in libpijul/src/tests/add_file.rs at line 625
.apply_change(&changes, &mut channel_bob, &alice1).write().unwrap().apply_change(&changes, &mut *channel_bob.write().unwrap(), &alice1) - replacement in libpijul/src/tests/add_file.rs at line 630
&mut repo_bob,repo_bob.clone(), - replacement in libpijul/src/tests/add_file.rs at line 632
&mut txn_bob,&mut channel_bob,txn_bob.clone(),channel_bob.clone(), - edit in libpijul/src/tests/add_file.rs at line 637
1, - replacement in libpijul/src/tests/add_file.rs at line 640[3.469266]→[3.469266:469355](∅→∅),[3.469355]→[3.26898:26973](∅→∅),[3.26973]→[3.469419:469431](∅→∅),[3.33019]→[3.469419:469431](∅→∅),[3.469419]→[3.469419:469431](∅→∅),[3.469431]→[3.44901:44960](∅→∅)
let bob1 = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, "")?;debug_to_file(&txn_bob, &channel_bob.borrow(), "debug_bob1").unwrap();txn_bob.apply_change(&changes, &mut channel_bob, &alice2)let bob1 = record_all(repo_bob.clone(),&changes,txn_bob.clone(),channel_bob.clone(),"",)?;debug_to_file(&*txn_bob.read().unwrap(), &channel_bob, "debug_bob1").unwrap();(&mut *txn_bob.write().unwrap()).apply_change(&changes, &mut *channel_bob.write().unwrap(), &alice2) - replacement in libpijul/src/tests/add_file.rs at line 651
debug_to_file(&txn_bob, &channel_bob.borrow(), "debug_bob2").unwrap();debug_to_file(&*txn_bob.read().unwrap(), &channel_bob, "debug_bob2").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 653
&mut repo_bob,repo_bob.clone(), - replacement in libpijul/src/tests/add_file.rs at line 655
&mut txn_bob,&mut channel,txn_bob.clone(),channel.clone(), - edit in libpijul/src/tests/add_file.rs at line 660
1, - replacement in libpijul/src/tests/add_file.rs at line 664
.apply_change(&changes, &mut channel_bob, &alice3).write().unwrap().apply_change(&changes, &mut *channel_bob.write().unwrap(), &alice3) - replacement in libpijul/src/tests/add_file.rs at line 668
debug_to_file(&txn_bob, &channel_bob.borrow(), "debug_bob3").unwrap();debug_to_file(&*txn_bob.read().unwrap(), &channel_bob, "debug_bob3").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 670
&mut repo_bob,repo_bob.clone(), - replacement in libpijul/src/tests/add_file.rs at line 672
&mut txn_bob,&mut channel,txn_bob.clone(),channel.clone(), - edit in libpijul/src/tests/add_file.rs at line 677
1, - replacement in libpijul/src/tests/add_file.rs at line 682
let bob2 = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, "")?;debug_to_file(&txn_bob, &channel_bob.borrow(), "debug_bob4").unwrap();let bob2 = record_all(repo_bob.clone(),&changes,txn_bob.clone(),channel_bob.clone(),"",)?;debug_to_file(&*txn_bob.read().unwrap(), &channel_bob, "debug_bob4").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 693
.apply_change(&changes, &mut channel, &bob1).write().unwrap().apply_change(&changes, &mut *channel.write().unwrap(), &bob1) - replacement in libpijul/src/tests/add_file.rs at line 697
debug_to_file(&txn_alice, &channel.borrow(), "debug_alice2").unwrap();debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug_alice2").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 700
&mut repo_alice,repo_alice.clone(), - replacement in libpijul/src/tests/add_file.rs at line 702
&mut txn_alice,&mut channel,txn_alice.clone(),channel.clone(), - edit in libpijul/src/tests/add_file.rs at line 707
1, - replacement in libpijul/src/tests/add_file.rs at line 714
.apply_change(&changes, &mut channel, &bob2).write().unwrap().apply_change(&changes, &mut *channel.write().unwrap(), &bob2) - replacement in libpijul/src/tests/add_file.rs at line 718
debug_to_file(&txn_alice, &channel.borrow(), "debug_alice3").unwrap();debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug_alice3").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 720
&mut repo_alice,repo_alice.clone(), - replacement in libpijul/src/tests/add_file.rs at line 722
&mut txn_alice,&mut channel,txn_alice.clone(),channel.clone(), - edit in libpijul/src/tests/add_file.rs at line 727
1, - replacement in libpijul/src/tests/add_file.rs at line 734
&mut repo_bob,repo_bob.clone(), - replacement in libpijul/src/tests/add_file.rs at line 736
&mut txn_bob,&mut channel_bob,txn_bob.clone(),channel_bob.clone(), - edit in libpijul/src/tests/add_file.rs at line 741
1, - replacement in libpijul/src/tests/add_file.rs at line 743
debug_to_file(&txn_bob, &channel_bob.borrow(), "debug_bob4").unwrap();debug_to_file(&*txn_bob.read().unwrap(), &channel_bob, "debug_bob4").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 748
&mut repo_bob,repo_bob.clone(), - replacement in libpijul/src/tests/add_file.rs at line 750
&mut txn_bob,&mut channel_bob,txn_bob.clone(),channel_bob.clone(), - edit in libpijul/src/tests/add_file.rs at line 755
1, - replacement in libpijul/src/tests/add_file.rs at line 759
let bob2 = record_all(&mut repo_bob, &changes, &mut txn_bob, &mut channel_bob, "")?;let bob2 = record_all(repo_bob.clone(),&changes,txn_bob.clone(),channel_bob.clone(),"",)?; - replacement in libpijul/src/tests/add_file.rs at line 769
.apply_change(&changes, &mut channel, &bob1).write().unwrap().apply_change(&changes, &mut *channel.write().unwrap(), &bob1) - replacement in libpijul/src/tests/add_file.rs at line 773
debug_to_file(&txn_alice, &channel.borrow(), "debug_alice2").unwrap();debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug_alice2").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 776
&mut repo_alice,repo_alice.clone(), - replacement in libpijul/src/tests/add_file.rs at line 778
&mut txn_alice,&mut channel,txn_alice.clone(),channel.clone(), - edit in libpijul/src/tests/add_file.rs at line 783
1, - replacement in libpijul/src/tests/add_file.rs at line 794
.apply_change(&changes, &mut channel, &bob2).write().unwrap().apply_change(&changes, &mut *channel.write().unwrap(), &bob2) - replacement in libpijul/src/tests/add_file.rs at line 799
&mut repo_alice,repo_alice.clone(), - replacement in libpijul/src/tests/add_file.rs at line 801
&mut txn_alice,&mut channel,txn_alice.clone(),channel.clone(), - edit in libpijul/src/tests/add_file.rs at line 806
1, - replacement in libpijul/src/tests/add_file.rs at line 813
&mut repo_bob,repo_bob, - replacement in libpijul/src/tests/add_file.rs at line 815
&mut txn_bob,&mut channel_bob,txn_bob,channel_bob, - edit in libpijul/src/tests/add_file.rs at line 820
1, - replacement in libpijul/src/tests/add_file.rs at line 833
let mut repo_alice = working_copy::memory::Memory::new();let repo_alice = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 840
let mut txn_alice = env_alice.mut_txn_begin().unwrap();txn_alice.add_file("dir/file")?;txn_alice.add_file("dir/file2")?;let txn_alice = Arc::new(RwLock::new(env_alice.mut_txn_begin().unwrap()));txn_alice.write().unwrap().add_file("dir/file")?;txn_alice.write().unwrap().add_file("dir/file2")?; - replacement in libpijul/src/tests/add_file.rs at line 844
let mut channel = txn_alice.open_or_create_channel("main")?;let alice0 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, "")?;let channel = (&mut *txn_alice.write().unwrap()).open_or_create_channel("main")?;let alice0 = record_all(repo_alice.clone(),&changes,txn_alice.clone(),channel.clone(),"",)?; - replacement in libpijul/src/tests/add_file.rs at line 853
debug_to_file(&txn_alice, &channel.borrow(), "debug0").unwrap();debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug0").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 858
txn_alice.move_file("dir/file", "dir2/file")?;txn_alice.move_file("dir/file2", "dir2/file2")?;txn_alice.write().unwrap().move_file("dir/file", "dir2/file")?;txn_alice.write().unwrap().move_file("dir/file2", "dir2/file2")?; - replacement in libpijul/src/tests/add_file.rs at line 867
let alice1 = record_all(&mut repo_alice, &changes, &mut txn_alice, &mut channel, "")?;let alice1 = record_all(repo_alice.clone(),&changes,txn_alice.clone(),channel.clone(),"",)?; - replacement in libpijul/src/tests/add_file.rs at line 875
debug_to_file(&txn_alice, &channel.borrow(), "debug1").unwrap();debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug1").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 877
&mut repo_alice,repo_alice.clone(), - replacement in libpijul/src/tests/add_file.rs at line 879
&mut txn_alice,&mut channel,txn_alice.clone(),channel.clone(), - edit in libpijul/src/tests/add_file.rs at line 884
1, - replacement in libpijul/src/tests/add_file.rs at line 886
debug_to_file(&txn_alice, &channel.borrow(), "debug2").unwrap();debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug2").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 890
txn_alice.move_file("dir2/file", "dir/file").unwrap_or(());txn_alice.move_file("dir2/file2", "dir/file2").unwrap_or(());txn_alice.write().unwrap().move_file("dir2/file", "dir/file").unwrap_or(());txn_alice.write().unwrap().move_file("dir2/file2", "dir/file2").unwrap_or(()); - replacement in libpijul/src/tests/add_file.rs at line 905
&mut txn_alice,txn_alice.clone(), - replacement in libpijul/src/tests/add_file.rs at line 907
&mut channel.borrow_mut(),&mut repo_alice,channel.clone(),repo_alice.clone(), - edit in libpijul/src/tests/add_file.rs at line 911
1, - replacement in libpijul/src/tests/add_file.rs at line 915
&mut txn_alice,txn_alice.clone(), - replacement in libpijul/src/tests/add_file.rs at line 917
&mut channel.borrow_mut(),&mut repo_alice,channel.clone(),repo_alice.clone(), - edit in libpijul/src/tests/add_file.rs at line 921
1, - replacement in libpijul/src/tests/add_file.rs at line 928
.map(|rec| rec.globalize(&txn_alice).unwrap()).map(|rec| rec.globalize(&*txn_alice.read().unwrap()).unwrap()) - replacement in libpijul/src/tests/add_file.rs at line 931
&txn_alice,&*txn_alice.read().unwrap(), - replacement in libpijul/src/tests/add_file.rs at line 934
rec.contents,std::mem::take(&mut rec.contents.lock().unwrap()), - replacement in libpijul/src/tests/add_file.rs at line 946
&mut txn_alice,&mut channel,&mut *txn_alice.write().unwrap(),&channel, - replacement in libpijul/src/tests/add_file.rs at line 954
debug_to_file(&txn_alice, &channel.borrow(), "debug3").unwrap();debug_to_file(&*txn_alice.read().unwrap(), &channel, "debug3").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 956
let (alive, reachable) = check_alive(&txn_alice, &channel.borrow().graph);let (alive, reachable) =check_alive(&*txn_alice.read().unwrap(), &channel.read().unwrap().graph); - replacement in libpijul/src/tests/add_file.rs at line 976
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 981
let mut txn = env.mut_txn_begin().unwrap();let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap())); - replacement in libpijul/src/tests/add_file.rs at line 984
let mut channel = txn.write().unwrap().open_or_create_channel("main").unwrap();record_all(&mut repo, &changes, &mut txn, &mut channel, "").unwrap();let channel = (&mut *txn.write().unwrap()).open_or_create_channel("main").unwrap();record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 992
record_all(&mut repo, &changes, &mut txn, &mut channel, "").unwrap();debug_to_file(&txn, &channel.borrow(), "debug").unwrap();record_all(repo.clone(), &changes, txn.clone(), channel.clone(), "").unwrap();debug_to_file(&*txn.read().unwrap(), &channel, "debug").unwrap(); - replacement in libpijul/src/tests/add_file.rs at line 1002
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 1007
let mut txn = env.mut_txn_begin().unwrap();let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap())); - replacement in libpijul/src/tests/add_file.rs at line 1009[2.40319]→[2.40319:40399](∅→∅),[2.40399]→[3.478270:478347](∅→∅),[3.478270]→[3.478270:478347](∅→∅),[3.478347]→[3.27869:27935](∅→∅),[3.27935]→[3.478402:478478](∅→∅),[3.33929]→[3.478402:478478](∅→∅),[3.478402]→[3.478402:478478](∅→∅)
let mut channel = txn.write().unwrap().open_or_create_channel("main")?;record_all_output(&mut repo, &changes, &mut txn, &mut channel, "")?;debug_to_file(&txn, &channel.borrow(), "debug").unwrap();let files: Vec<_> = crate::fs::iter_working_copy(&txn, Inode::ROOT)let channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?;record_all_output(repo, changes.clone(), txn.clone(), channel.clone(), "")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug").unwrap();let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT) - replacement in libpijul/src/tests/add_file.rs at line 1024
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 1029[3.478868]→[2.40400:40532](∅→∅),[2.40532]→[3.478974:479051](∅→∅),[3.478974]→[3.478974:479051](∅→∅),[3.479051]→[3.27936:28002](∅→∅),[3.28002]→[3.479106:479182](∅→∅),[3.33987]→[3.479106:479182](∅→∅),[3.479106]→[3.479106:479182](∅→∅)
let mut txn = env.mut_txn_begin().unwrap();let mut channel = txn.write().unwrap().open_or_create_channel("main")?;record_all_output(&mut repo, &changes, &mut txn, &mut channel, "")?;debug_to_file(&txn, &channel.borrow(), "debug").unwrap();let files: Vec<_> = crate::fs::iter_working_copy(&txn, Inode::ROOT)let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));let channel = txn.write().unwrap().open_or_create_channel("main")?;record_all_output(repo.clone(), changes, txn.clone(), channel.clone(), "")?;debug_to_file(&*txn.read().unwrap(), &channel, "debug").unwrap();let files: Vec<_> = crate::fs::iter_working_copy(&*txn.read().unwrap(), Inode::ROOT) - replacement in libpijul/src/tests/add_file.rs at line 1045
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 1049
let mut txn = env.mut_txn_begin().unwrap();let mut channel = txn.write().unwrap().open_or_create_channel("main")?;assert!(record_all_output(&mut repo, &changes, &mut txn, &mut channel, "dir").is_err());let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));let channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?;assert!(record_all_output(repo, changes, txn, channel, "dir").is_err()); - replacement in libpijul/src/tests/add_file.rs at line 1059
let mut repo = working_copy::memory::Memory::new();let repo = Arc::new(working_copy::memory::Memory::new()); - replacement in libpijul/src/tests/add_file.rs at line 1063
let mut txn = env.mut_txn_begin().unwrap();let mut channel = txn.write().unwrap().open_or_create_channel("main")?;let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));let channel = (&mut *txn.write().unwrap()).open_or_create_channel("main")?; - replacement in libpijul/src/tests/add_file.rs at line 1068
record_all_output(&mut repo, &changes, &mut txn, &mut channel, "")?;record_all_output(repo.clone(),changes.clone(),txn.clone(),channel.clone(),"",)?; - replacement in libpijul/src/tests/add_file.rs at line 1076
record_all_output(&mut repo, &changes, &mut txn, &mut channel, "")?;record_all_output(repo, changes, txn, channel, "")?;