replacement in libflorescence/src/repo.rs at line 4
− use libpijul::pristine::sanakirja::MutTxn;
+ use libpijul::pristine::sanakirja;
replacement in libflorescence/src/repo.rs at line 675
[15.4784]→[15.4784:4812](∅→∅) replacement in libflorescence/src/repo.rs at line 1275
[16.3864]→[16.3864:3952](∅→∅) − async fn to_upload(
− txn: &mut MutTxn<()>,
− channel: &mut ChannelRef<MutTxn<()>>,
+ async fn to_upload<T: sanakirja::RawMutTxnT + 'static>(
+ txn: &mut sanakirja::MutTxn<T>,
+ channel: &mut ChannelRef<sanakirja::MutTxn<T>>,
replacement in libflorescence/src/repo.rs at line 1360
[18.1688]→[18.1688:1745](∅→∅) − .unrecord(&repo.changes, &channel, h, 0)
+ .unrecord(&repo.changes, &channel, h, 0, &repo.working_copy)
replacement in libflorescence/src/repo.rs at line 1469
[18.2890]→[17.5171:5219](∅→∅),
[17.5171]→[17.5171:5219](∅→∅) − touched_paths.insert(path);
+ touched_paths.insert(path.join("/"));
replacement in libflorescence/src/repo.rs at line 1519
[18.3135]→[18.3135:3189](∅→∅) − .unrecord(&repo.changes, &channel, &h, 0)
+ .unrecord(&repo.changes, &channel, &h, 0, &repo.working_copy)
replacement in libflorescence/src/repo.rs at line 1530
[17.6935]→[17.6935:7025](∅→∅) − async fn to_download(
− txn: &mut MutTxn<()>,
− channel: &mut ChannelRef<MutTxn<()>>,
+ async fn to_download<T: sanakirja::RawMutTxnT + 'static>(
+ txn: &mut sanakirja::MutTxn<T>,
+ channel: &mut ChannelRef<sanakirja::MutTxn<T>>,
replacement in libflorescence/src/repo.rs at line 1535
[17.7088]→[17.7088:7142](∅→∅) − ) -> Result<RemoteDelta<MutTxn<()>>, anyhow::Error> {
+ ) -> Result<RemoteDelta<sanakirja::MutTxn<T>>, anyhow::Error> {
replacement in libflorescence/src/repo.rs at line 1639
[8.2758]→[8.2758:2801](∅→∅) − txn: &pijul::pristine::sanakirja::Txn,
replacement in libflorescence/src/repo.rs at line 1735
[13.1981]→[13.1981:2150](∅→∅) − fn has_unrecorded_changes(
− txn: pijul::ArcTxn<libpijul::pristine::sanakirja::MutTxn<()>>,
− channel: pijul::ChannelRef<libpijul::pristine::sanakirja::MutTxn<()>>,
+ fn has_unrecorded_changes<T: sanakirja::RawMutTxnT + 'static + Sync>(
+ txn: pijul::ArcTxn<sanakirja::MutTxn<T>>,
+ channel: pijul::ChannelRef<sanakirja::MutTxn<T>>,
replacement in Cargo.toml at line 95
[7.5692]→[7.5692:5740](∅→∅) − version = "0.8" # has to match libpijul version
+ version = "0.9" # has to match libpijul version
edit in Cargo.lock at line 1069
+ "subtle",
+ "zeroize",
+ ]
+
+ [[package]]
+ name = "curve25519-dalek"
+ version = "4.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
+ dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "fiat-crypto",
+ "rustc_version",
edit in Cargo.lock at line 1090
+ name = "curve25519-dalek-derive"
+ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+ dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.102",
+ ]
+
+ [[package]]
replacement in Cargo.lock at line 1334
[4.8574]→[4.8574:8595](∅→∅) + "curve25519-dalek 3.2.1",
edit in Cargo.lock at line 1512
+
+ [[package]]
+ name = "fiat-crypto"
+ version = "0.2.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
replacement in Cargo.lock at line 1661
[6.8499]→[4.9401:9432](∅→∅),
[4.9401]→[4.9401:9432](∅→∅) − name = "fs2"
− version = "0.4.3"
+ name = "fs4"
+ version = "0.6.6"
replacement in Cargo.lock at line 1664
[4.9497]→[4.9497:9575](∅→∅) − checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+ checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47"
replacement in Cargo.lock at line 1666
[4.9592]→[4.9592:9612](∅→∅) + "rustix 0.38.44",
+ "windows-sys 0.48.0",
replacement in Cargo.lock at line 2898
[4.12294]→[9.1123:1138](∅→∅) replacement in Cargo.lock at line 2939
[4.12365]→[4.12365:12391](∅→∅) − version = "1.0.0-beta.10"
+ version = "1.0.0-beta.11"
replacement in Cargo.lock at line 2951
[4.12568]→[4.12568:12589](∅→∅) + "curve25519-dalek 4.1.3",
replacement in Cargo.lock at line 2970
[4.12833]→[4.12833:12848](∅→∅) replacement in Cargo.lock at line 4122
[4.14617]→[12.4431:4457](∅→∅) − version = "1.0.0-beta.10"
+ version = "1.0.0-beta.11"
replacement in Cargo.lock at line 4136
[6.19555]→[12.4468:4494](∅→∅) − version = "1.0.0-beta.10"
+ version = "1.0.0-beta.11"
replacement in Cargo.lock at line 4158
[6.19854]→[12.4555:4581](∅→∅) − version = "1.0.0-beta.10"
+ version = "1.0.0-beta.11"
replacement in Cargo.lock at line 4170
[4.14799]→[12.4604:4630](∅→∅) − version = "1.0.0-beta.10"
+ version = "1.0.0-beta.11"
replacement in Cargo.lock at line 4179
[16.9598]→[16.9598:9624](∅→∅) − version = "1.0.0-beta.10"
+ version = "1.0.0-beta.11"
replacement in Cargo.lock at line 4209
[4.14913]→[12.4648:4674](∅→∅) − version = "1.0.0-beta.10"
+ version = "1.0.0-beta.11"
edit in Cargo.lock at line 4481
+ name = "rand"
+ version = "0.9.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+ dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.5",
+ ]
+
+ [[package]]
edit in Cargo.lock at line 4508
+ ]
+
+ [[package]]
+ name = "rand_chacha"
+ version = "0.9.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+ dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.5",
edit in Cargo.lock at line 4539
+ name = "rand_core"
+ version = "0.9.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
+ dependencies = [
+ "getrandom 0.3.3",
+ ]
+
+ [[package]]
edit in Cargo.lock at line 4846
+ name = "rustc_version"
+ version = "0.4.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+ dependencies = [
+ "semver",
+ ]
+
+ [[package]]
replacement in Cargo.lock at line 4912
[4.17365]→[4.17365:17383](∅→∅) replacement in Cargo.lock at line 4914
[4.17448]→[4.17448:17526](∅→∅) − checksum = "81aaf70d064e2122209f04d01fd91e8908e7a327b516236e1cbc0c3f34ac6d11"
+ checksum = "4fc53a1e7a19d27c070749c0d2717427d1612c9b100274b205dbb438e605e34a"
replacement in Cargo.lock at line 4917
[4.17557]→[4.17557:17565](∅→∅) edit in Cargo.lock at line 4919
replacement in Cargo.lock at line 4930
[4.17713]→[4.17713:17731](∅→∅) replacement in Cargo.lock at line 4932
[4.17796]→[4.17796:17874](∅→∅) − checksum = "8376db34ae3eac6e7bd91168bc638450073b708ce9fb46940de676f552238bf5"
+ checksum = "48a8500bcb79fe605b1433c30e8c5c078810b24dc4d04ffda35e88d712ff16f0"
edit in Cargo.lock at line 5014
+ name = "semver"
+ version = "1.0.27"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+
+ [[package]]
file addition: .ignore (----------)