edit in pijul-repository/src/lib.rs at line 8
[232.28]→[4.0:23](∅→∅),
[25.7684]→[4.0:23](∅→∅),
[2.21541]→[4.0:23](∅→∅) edit in pijul-repository/src/lib.rs at line 10
+ use pijul_core::DOT_DIR;
replacement in pijul-repository/src/lib.rs at line 13
[44.921]→[2.21565:21688](∅→∅),
[2.21565]→[2.21565:21688](∅→∅),
[2.21688]→[83.0:70](∅→∅) − pub pristine: libpijul::pristine::sanakirja::Pristine,
− pub changes: libpijul::changestore::filesystem::FileSystem,
− pub working_copy: libpijul::working_copy::filesystem::FileSystem,
+ pub pristine: pijul_core::pristine::sanakirja::Pristine,
+ pub changes: pijul_core::changestore::filesystem::FileSystem,
+ pub working_copy: pijul_core::working_copy::filesystem::FileSystem,
replacement in pijul-repository/src/lib.rs at line 81
[232.1216]→[45.5811:5906](∅→∅),
[2.23883]→[45.5811:5906](∅→∅),
[45.5906]→[83.71:156](∅→∅) − pristine: libpijul::pristine::sanakirja::Pristine::new(&pristine_dir.join("db"))?,
− working_copy: libpijul::working_copy::filesystem::FileSystem::from_root(
+ pristine: pijul_core::pristine::sanakirja::Pristine::new(&pristine_dir.join("db"))?,
+ working_copy: pijul_core::working_copy::filesystem::FileSystem::from_root(
replacement in pijul-repository/src/lib.rs at line 85
[83.172]→[93.307:386](∅→∅) − changes: libpijul::changestore::filesystem::FileSystem::from_root(
+ changes: pijul_core::changestore::filesystem::FileSystem::from_root(
replacement in pijul-repository/src/lib.rs at line 130
[2.24885]→[45.5907:6006](∅→∅),
[45.6006]→[83.173:268](∅→∅),
[83.268]→[93.485:568](∅→∅) − pristine: libpijul::pristine::sanakirja::Pristine::new(&pristine_dir.join("db"))?,
− working_copy: libpijul::working_copy::filesystem::FileSystem::from_root(&cur),
− changes: libpijul::changestore::filesystem::FileSystem::from_root(
+ pristine: pijul_core::pristine::sanakirja::Pristine::new(&pristine_dir.join("db"))?,
+ working_copy: pijul_core::working_copy::filesystem::FileSystem::from_root(&cur),
+ changes: pijul_core::changestore::filesystem::FileSystem::from_root(
replacement in pijul-repository/Cargo.toml at line 11
[176.1015]→[193.0:26](∅→∅) − libpijul.workspace = true
+ pijul-core.workspace = true
edit in pijul-remote/src/ssh.rs at line 11
[4.156]→[23.32:66](∅→∅),
[23.66]→[78.0:38](∅→∅) − use libpijul::pristine::Position;
− use libpijul::{Base32, Hash, Merkle};
edit in pijul-remote/src/ssh.rs at line 12
+ use pijul_core::pristine::Position;
+ use pijul_core::{Base32, Hash, Merkle};
replacement in pijul-remote/src/ssh.rs at line 345
[75.589]→[75.589:681](∅→∅) − sender: Option<tokio::sync::oneshot::Sender<Option<libpijul::pristine::RemoteId>>>,
+ sender: Option<tokio::sync::oneshot::Sender<Option<pijul_core::pristine::RemoteId>>>,
replacement in pijul-remote/src/ssh.rs at line 368
[75.701]→[75.701:735](∅→∅) − key: libpijul::key::SKey,
+ key: pijul_core::key::SKey,
replacement in pijul-remote/src/ssh.rs at line 517
[78.201]→[75.1373:1468](∅→∅),
[75.1373]→[75.1373:1468](∅→∅) − libpijul::pristine::RemoteId::from_base32(&data[..data.len() - 1])
+ pijul_core::pristine::RemoteId::from_base32(&data[..data.len() - 1])
replacement in pijul-remote/src/ssh.rs at line 557
[125.692]→[125.692:793](∅→∅) − libpijul::changestore::filesystem::push_filename(final_path, h);
+ pijul_core::changestore::filesystem::push_filename(
+ final_path, h,
+ );
replacement in pijul-remote/src/ssh.rs at line 563
[125.1052]→[125.1052:1149](∅→∅) − libpijul::changestore::filesystem::pop_filename(final_path);
+ pijul_core::changestore::filesystem::pop_filename(final_path);
replacement in pijul-remote/src/ssh.rs at line 567
[125.1273]→[125.1273:1363](∅→∅) − libpijul::changestore::filesystem::push_tag_filename(
+ pijul_core::changestore::filesystem::push_tag_filename(
replacement in pijul-remote/src/ssh.rs at line 573
[125.1717]→[125.1717:1814](∅→∅) − libpijul::changestore::filesystem::pop_filename(final_path);
+ pijul_core::changestore::filesystem::pop_filename(final_path);
replacement in pijul-remote/src/ssh.rs at line 799
[2.37998]→[92.0:100](∅→∅) − pub async fn get_id(&mut self) -> Result<Option<libpijul::pristine::RemoteId>, anyhow::Error> {
+ pub async fn get_id(
+ &mut self,
+ ) -> Result<Option<pijul_core::pristine::RemoteId>, anyhow::Error> {
replacement in pijul-remote/src/ssh.rs at line 813
[75.4355]→[75.4355:4446](∅→∅) − pub async fn prove(&mut self, key: libpijul::key::SKey) -> Result<(), anyhow::Error> {
+ pub async fn prove(&mut self, key: pijul_core::key::SKey) -> Result<(), anyhow::Error> {
replacement in pijul-remote/src/ssh.rs at line 908
− F: FnMut(&mut A, u64, Hash, libpijul::Merkle, bool) -> Result<(), anyhow::Error>,
+ F: FnMut(&mut A, u64, Hash, pijul_core::Merkle, bool) -> Result<(), anyhow::Error>,
replacement in pijul-remote/src/ssh.rs at line 968
[125.2148]→[125.2148:2234](∅→∅) − libpijul::changestore::filesystem::push_filename(&mut local, &c);
+ pijul_core::changestore::filesystem::push_filename(&mut local, &c);
replacement in pijul-remote/src/ssh.rs at line 981
[125.2875]→[125.2875:2956](∅→∅) − libpijul::changestore::filesystem::pop_filename(&mut local);
+ pijul_core::changestore::filesystem::pop_filename(&mut local);
replacement in pijul-remote/src/ssh.rs at line 984
[125.3008]→[125.3008:3184](∅→∅) − libpijul::changestore::filesystem::push_tag_filename(&mut local, &c);
− let mut tag_file = libpijul::tag::OpenTagFile::open(&local, &c)?;
+ pijul_core::changestore::filesystem::push_tag_filename(&mut local, &c);
+ let mut tag_file = pijul_core::tag::OpenTagFile::open(&local, &c)?;
replacement in pijul-remote/src/ssh.rs at line 995
[125.3575]→[125.3575:3656](∅→∅) − libpijul::changestore::filesystem::pop_filename(&mut local);
+ pijul_core::changestore::filesystem::pop_filename(&mut local);
edit in pijul-remote/src/local.rs at line 6
[72.425]→[25.9780:9862](∅→∅),
[4.535]→[25.9780:9862](∅→∅) − use libpijul::pristine::{Hash, Merkle, MutTxnT, Position, TxnT};
− use libpijul::*;
edit in pijul-remote/src/local.rs at line 7
+ use pijul_core::pristine::{Hash, Merkle, MutTxnT, Position, TxnT};
+ use pijul_core::*;
replacement in pijul-remote/src/local.rs at line 18
[2.80020]→[6.11626:11690](∅→∅) − pub pristine: Arc<libpijul::pristine::sanakirja::Pristine>,
+ pub pristine: Arc<pijul_core::pristine::sanakirja::Pristine>,
replacement in pijul-remote/src/local.rs at line 24
[3.3035]→[3.3035:3084](∅→∅) − channel: &libpijul::pristine::ChannelRef<T>,
+ channel: &pijul_core::pristine::ChannelRef<T>,
replacement in pijul-remote/src/local.rs at line 53
[2.80605]→[88.565:647](∅→∅) − pub fn get_id(&self) -> Result<libpijul::pristine::RemoteId, anyhow::Error> {
+ pub fn get_id(&self) -> Result<pijul_core::pristine::RemoteId, anyhow::Error> {
replacement in pijul-remote/src/local.rs at line 91
[191.149]→[191.149:246](∅→∅) − T: libpijul::ChannelTxnT + libpijul::TxnTExt + libpijul::DepsTxnT + libpijul::GraphTxnT,
+ T: pijul_core::ChannelTxnT
+ + pijul_core::TxnTExt
+ + pijul_core::DepsTxnT
+ + pijul_core::GraphTxnT,
replacement in pijul-remote/src/local.rs at line 105
[191.556]→[191.556:634](∅→∅) − let store = libpijul::changestore::filesystem::FileSystem::from_root(
+ let store = pijul_core::changestore::filesystem::FileSystem::from_root(
replacement in pijul-remote/src/local.rs at line 116
[188.52]→[191.714:772](∅→∅) − libpijul::fs::iter_graph_descendants(
+ pijul_core::fs::iter_graph_descendants(
replacement in pijul-remote/src/local.rs at line 220
[2.82268]→[93.1182:1260](∅→∅) − let store = libpijul::changestore::filesystem::FileSystem::from_root(
+ let store = pijul_core::changestore::filesystem::FileSystem::from_root(
replacement in pijul-remote/src/local.rs at line 231
[125.21611]→[125.21611:21794](∅→∅) − libpijul::changestore::filesystem::push_filename(&mut local, &c);
− libpijul::changestore::filesystem::push_filename(&mut self.changes_dir, &c);
+ pijul_core::changestore::filesystem::push_filename(&mut local, &c);
+ pijul_core::changestore::filesystem::push_filename(&mut self.changes_dir, &c);
replacement in pijul-remote/src/local.rs at line 235
[125.21846]→[125.21846:22037](∅→∅) − libpijul::changestore::filesystem::push_tag_filename(&mut local, &c);
− libpijul::changestore::filesystem::push_tag_filename(&mut self.changes_dir, &c);
+ pijul_core::changestore::filesystem::push_tag_filename(&mut local, &c);
+ pijul_core::changestore::filesystem::push_tag_filename(
+ &mut self.changes_dir,
+ &c,
+ );
replacement in pijul-remote/src/local.rs at line 250
[125.22108]→[125.22108:22265](∅→∅) − libpijul::changestore::filesystem::pop_filename(&mut local);
− libpijul::changestore::filesystem::pop_filename(&mut self.changes_dir);
+ pijul_core::changestore::filesystem::pop_filename(&mut local);
+ pijul_core::changestore::filesystem::pop_filename(&mut self.changes_dir);
replacement in pijul-remote/src/local.rs at line 253
[2.83228]→[53.1034:1124](∅→∅) − let repo = libpijul::working_copy::filesystem::FileSystem::from_root(&self.root);
+ let repo = pijul_core::working_copy::filesystem::FileSystem::from_root(&self.root);
replacement in pijul-remote/src/local.rs at line 255
[87.910]→[53.1204:1260](∅→∅),
[83.1424]→[53.1204:1260](∅→∅),
[172.3545]→[53.1204:1260](∅→∅),
[53.1204]→[53.1204:1260](∅→∅) − libpijul::output::output_repository_no_pending(
+ pijul_core::output::output_repository_no_pending(
replacement in pijul-remote/src/local.rs at line 280
[130.658]→[130.658:840](∅→∅) − libpijul::changestore::filesystem::push_filename(&mut self.changes_dir, &c);
− libpijul::changestore::filesystem::push_filename(&mut path, &c);
+ pijul_core::changestore::filesystem::push_filename(&mut self.changes_dir, &c);
+ pijul_core::changestore::filesystem::push_filename(&mut path, &c);
replacement in pijul-remote/src/local.rs at line 284
[130.875]→[130.875:1065](∅→∅) − libpijul::changestore::filesystem::push_tag_filename(&mut self.changes_dir, &c);
− libpijul::changestore::filesystem::push_tag_filename(&mut path, &c);
+ pijul_core::changestore::filesystem::push_tag_filename(
+ &mut self.changes_dir,
+ &c,
+ );
+ pijul_core::changestore::filesystem::push_tag_filename(&mut path, &c);
replacement in pijul-remote/src/local.rs at line 295
[130.1245]→[191.3316:3404](∅→∅),
[130.1245]→[6.12157:12233](∅→∅),
[191.3404]→[6.12157:12233](∅→∅),
[125.23250]→[6.12157:12233](∅→∅),
[6.12157]→[6.12157:12233](∅→∅) − libpijul::changestore::filesystem::pop_filename(&mut self.changes_dir);
− libpijul::changestore::filesystem::pop_filename(&mut path);
+ pijul_core::changestore::filesystem::pop_filename(&mut self.changes_dir);
+ pijul_core::changestore::filesystem::pop_filename(&mut path);
replacement in pijul-remote/src/local.rs at line 304
[130.1517]→[130.1517:1673](∅→∅) − libpijul::changestore::filesystem::pop_filename(&mut self.changes_dir);
− libpijul::changestore::filesystem::pop_filename(&mut path);
+ pijul_core::changestore::filesystem::pop_filename(&mut self.changes_dir);
+ pijul_core::changestore::filesystem::pop_filename(&mut path);
replacement in pijul-remote/src/local.rs at line 347
[3.3753]→[116.5007:5094](∅→∅) − pub fn upload_changes<T: MutTxnTExt + 'static, C: libpijul::changestore::ChangeStore>(
+ pub fn upload_changes<T: MutTxnTExt + 'static, C: pijul_core::changestore::ChangeStore>(
replacement in pijul-remote/src/local.rs at line 351
[3.3935]→[54.345:394](∅→∅) − channel: &libpijul::pristine::ChannelRef<T>,
+ channel: &pijul_core::pristine::ChannelRef<T>,
replacement in pijul-remote/src/local.rs at line 354
[3.4043]→[3.4043:4093](∅→∅) − let mut ws = libpijul::ApplyWorkspace::new();
+ let mut ws = pijul_core::ApplyWorkspace::new();
replacement in pijul-remote/src/lib.rs at line 7
[19.393]→[194.707:730](∅→∅),
[194.730]→[89.0:26](∅→∅),
[19.393]→[89.0:26](∅→∅) − use libpijul::DOT_DIR;
− use libpijul::pristine::{
+ use log::{debug, info};
+ use pijul_core::DOT_DIR;
+ use pijul_core::pristine::{
replacement in pijul-remote/src/lib.rs at line 13
[2.52622]→[89.138:209](∅→∅),
[89.209]→[9.549:573](∅→∅),
[2.52659]→[9.549:573](∅→∅) − use libpijul::{ChannelTxnT, DepsTxnT, GraphTxnT, MutTxnTExt, TxnTExt};
− use log::{debug, info};
+ use pijul_core::{ChannelTxnT, DepsTxnT, GraphTxnT, MutTxnTExt, TxnTExt};
replacement in pijul-remote/src/lib.rs at line 98
[233.1721]→[233.1721:1756](∅→∅) − libpijul::DEFAULT_CHANNEL,
+ pijul_core::DEFAULT_CHANNEL,
replacement in pijul-remote/src/lib.rs at line 237
[2.54479]→[108.669:751](∅→∅) − match libpijul::pristine::sanakirja::Pristine::new(&dot_dir.join("db")) {
+ match pijul_core::pristine::sanakirja::Pristine::new(&dot_dir.join("db")) {
replacement in pijul-remote/src/lib.rs at line 248
[108.1143]→[108.1143:1217](∅→∅) − Err(libpijul::pristine::sanakirja::SanakirjaError::Sanakirja(
+ Err(pijul_core::pristine::sanakirja::SanakirjaError::Sanakirja(
replacement in pijul-remote/src/lib.rs at line 280
− libpijul::fs::iter_graph_descendants(txn, &channel.read(), p)?.map(|x| x.unwrap()),
+ pijul_core::fs::iter_graph_descendants(txn, &channel.read(), p)?.map(|x| x.unwrap()),
replacement in pijul-remote/src/lib.rs at line 520
[89.8641]→[89.8641:8717](∅→∅) − inodes.extend(inodes_.iter().map(|x| libpijul::pristine::Position {
+ inodes.extend(inodes_.iter().map(|x| pijul_core::pristine::Position {
replacement in pijul-remote/src/lib.rs at line 595
[2.56131]→[39.899:977](∅→∅) − if let Some(name) = libpijul::path::file_name(h.url.path()) {
+ if let Some(name) = pijul_core::path::file_name(h.url.path()) {
replacement in pijul-remote/src/lib.rs at line 748
[89.12028]→[89.12028:12099](∅→∅) − (k, libpijul::pristine::Pair { a: hash, .. }) => {
+ (k, pijul_core::pristine::Pair { a: hash, .. }) => {
replacement in pijul-remote/src/lib.rs at line 792
[89.13637]→[125.11788:11830](∅→∅) − use libpijul::ChannelMutTxnT;
+ use pijul_core::ChannelMutTxnT;
replacement in pijul-remote/src/lib.rs at line 893
[125.14012]→[125.14012:14062](∅→∅) − use libpijul::ChannelMutTxnT;
+ use pijul_core::ChannelMutTxnT;
replacement in pijul-remote/src/lib.rs at line 942
[2.57606]→[125.14394:14442](∅→∅) − remote: &libpijul::pristine::Remote<T>,
+ remote: &pijul_core::pristine::Remote<T>,
replacement in pijul-remote/src/lib.rs at line 1005
[2.59045]→[3.1861:1907](∅→∅) − async fn get_state<T: libpijul::TxnTExt>(
+ async fn get_state<T: pijul_core::TxnTExt>(
replacement in pijul-remote/src/lib.rs at line 1028
[92.1242]→[116.4478:4531](∅→∅) − async fn get_id<T: libpijul::TxnTExt + 'static>(
+ async fn get_id<T: pijul_core::TxnTExt + 'static>(
replacement in pijul-remote/src/lib.rs at line 1031
[75.6730]→[92.1243:1314](∅→∅) − ) -> Result<Option<libpijul::pristine::RemoteId>, anyhow::Error> {
+ ) -> Result<Option<pijul_core::pristine::RemoteId>, anyhow::Error> {
replacement in pijul-remote/src/lib.rs at line 1059
[2.61025]→[93.647:735](∅→∅) − let changes = libpijul::changestore::filesystem::FileSystem::from_root(
+ let changes = pijul_core::changestore::filesystem::FileSystem::from_root(
replacement in pijul-remote/src/lib.rs at line 1064
[223.35]→[222.39:127](∅→∅),
[222.39]→[222.39:127](∅→∅),
[222.127]→[52.21:105](∅→∅),
[93.835]→[52.21:105](∅→∅),
[2.61122]→[52.21:105](∅→∅) − libpijul::working_copy::filesystem::FileSystem::from_root(&l.root);
− let mut tarball = libpijul::output::Tarball::new(w, prefix, umask);
+ pijul_core::working_copy::filesystem::FileSystem::from_root(&l.root);
+ let mut tarball = pijul_core::output::Tarball::new(w, prefix, umask);
replacement in pijul-remote/src/lib.rs at line 1087
[134.551]→[223.76:165](∅→∅) − txn.archive::<_, _, libpijul::working_copy::filesystem::FileSystem>(
+ txn.archive::<_, _, pijul_core::working_copy::filesystem::FileSystem>(
replacement in pijul-remote/src/lib.rs at line 1155
[3.2569]→[93.836:925](∅→∅) − let store = libpijul::changestore::filesystem::FileSystem::from_changes(
+ let store = pijul_core::changestore::filesystem::FileSystem::from_changes(
replacement in pijul-remote/src/lib.rs at line 1219
[2.68736]→[158.228:319](∅→∅) − pub async fn prove(&mut self, key: libpijul::key::SKey) -> Result<(), anyhow::Error> {
+ pub async fn prove(&mut self, key: pijul_core::key::SKey) -> Result<(), anyhow::Error> {
replacement in pijul-remote/src/lib.rs at line 1276
[130.57]→[130.57:149](∅→∅) − libpijul::changestore::filesystem::push_filename(&mut change_path_, h);
+ pijul_core::changestore::filesystem::push_filename(&mut change_path_, h);
replacement in pijul-remote/src/lib.rs at line 1279
[130.201]→[130.201:297](∅→∅) − libpijul::changestore::filesystem::push_tag_filename(&mut change_path_, h);
+ pijul_core::changestore::filesystem::push_tag_filename(&mut change_path_, h);
replacement in pijul-remote/src/lib.rs at line 1285
[157.178]→[130.449:529](∅→∅),
[20.454]→[130.449:529](∅→∅) − libpijul::changestore::filesystem::pop_filename(&mut change_path_);
+ pijul_core::changestore::filesystem::pop_filename(&mut change_path_);
replacement in pijul-remote/src/lib.rs at line 1300
[2.69755]→[2.69755:69809](∅→∅) − let mut ws = libpijul::ApplyWorkspace::new();
+ let mut ws = pijul_core::ApplyWorkspace::new();
replacement in pijul-remote/src/lib.rs at line 1307
[23.1581]→[23.1581:1641](∅→∅) − use libpijul::changestore::ChangeStore;
+ use pijul_core::changestore::ChangeStore;
replacement in pijul-remote/src/lib.rs at line 1382
[155.1702]→[155.1702:1766](∅→∅) − use libpijul::changestore::ChangeStore;
+ use pijul_core::changestore::ChangeStore;
replacement in pijul-remote/src/lib.rs at line 1385
[155.1887]→[155.1887:1956](∅→∅) − let dep: libpijul::pristine::Hash = dep;
+ let dep: pijul_core::pristine::Hash = dep;
replacement in pijul-remote/src/lib.rs at line 1387
[155.1957]→[155.1957:2056](∅→∅) − libpijul::changestore::filesystem::push_filename(&mut dep_path, &dep);
+ pijul_core::changestore::filesystem::push_filename(&mut dep_path, &dep);
replacement in pijul-remote/src/lib.rs at line 1389
[155.2136]→[155.2136:2228](∅→∅) − libpijul::changestore::filesystem::pop_filename(&mut dep_path);
+ pijul_core::changestore::filesystem::pop_filename(&mut dep_path);
replacement in pijul-remote/src/lib.rs at line 1474
[2.72752]→[2.72752:72806](∅→∅) − let mut ws = libpijul::ApplyWorkspace::new();
+ let mut ws = pijul_core::ApplyWorkspace::new();
replacement in pijul-remote/src/lib.rs at line 1538
[48.2107]→[2.75038:75086](∅→∅),
[2.75038]→[2.75038:75086](∅→∅) − use libpijul::changestore::ChangeStore;
+ use pijul_core::changestore::ChangeStore;
replacement in pijul-remote/src/lib.rs at line 1583
[2.76665]→[2.76665:76714](∅→∅) − let v = libpijul::pristine::Vertex {
+ let v = pijul_core::pristine::Vertex {
replacement in pijul-remote/src/lib.rs at line 1585
[2.76738]→[45.8172:8314](∅→∅) − start: libpijul::pristine::ChangePosition(0u64.into()),
− end: libpijul::pristine::ChangePosition(0u64.into()),
+ start: pijul_core::pristine::ChangePosition(0u64.into()),
+ end: pijul_core::pristine::ChangePosition(0u64.into()),
edit in pijul-remote/src/http.rs at line 2
[78.2254]→[78.2254:2274](∅→∅),
[78.2274]→[194.1280:1324](∅→∅) − use libpijul::Hash;
− use libpijul::pristine::{Base32, Position};
edit in pijul-remote/src/http.rs at line 3
+ use pijul_core::Hash;
+ use pijul_core::pristine::{Base32, Position};
replacement in pijul-remote/src/http.rs at line 31
[125.24055]→[125.24055:24132](∅→∅) − libpijul::changestore::filesystem::push_filename(&mut path, &c);
+ pijul_core::changestore::filesystem::push_filename(&mut path, &c);
replacement in pijul-remote/src/http.rs at line 35
[125.24206]→[125.24206:24287](∅→∅) − libpijul::changestore::filesystem::push_tag_filename(&mut path, &c);
+ pijul_core::changestore::filesystem::push_tag_filename(&mut path, &c);
replacement in pijul-remote/src/http.rs at line 249
[125.24954]→[125.24954:25040](∅→∅) − libpijul::changestore::filesystem::push_filename(&mut local, &c);
+ pijul_core::changestore::filesystem::push_filename(&mut local, &c);
replacement in pijul-remote/src/http.rs at line 256
[125.25277]→[125.25277:25453](∅→∅) − libpijul::changestore::filesystem::push_tag_filename(&mut local, &c);
− let mut tag_file = libpijul::tag::OpenTagFile::open(&local, &c)?;
+ pijul_core::changestore::filesystem::push_tag_filename(&mut local, &c);
+ let mut tag_file = pijul_core::tag::OpenTagFile::open(&local, &c)?;
replacement in pijul-remote/src/http.rs at line 265
[125.25698]→[125.25698:25771](∅→∅) − libpijul::changestore::filesystem::pop_filename(&mut local);
+ pijul_core::changestore::filesystem::pop_filename(&mut local);
replacement in pijul-remote/src/http.rs at line 297
[78.2324]→[122.2979:3069](∅→∅) − F: FnMut(&mut A, u64, Hash, libpijul::Merkle, bool) -> Result<(), anyhow::Error>,
+ F: FnMut(&mut A, u64, Hash, pijul_core::Merkle, bool) -> Result<(), anyhow::Error>,
replacement in pijul-remote/src/http.rs at line 332
− match serde_json::from_slice::<libpijul::RemoteError>(&*res.bytes().await?) {
+ match serde_json::from_slice::<pijul_core::RemoteError>(&*res.bytes().await?) {
replacement in pijul-remote/src/http.rs at line 368
[28.242]→[125.25891:25975](∅→∅) − ) -> Result<Option<(u64, libpijul::Merkle, libpijul::Merkle)>, anyhow::Error> {
+ ) -> Result<Option<(u64, pijul_core::Merkle, pijul_core::Merkle)>, anyhow::Error> {
replacement in pijul-remote/src/http.rs at line 399
[28.1138]→[28.1138:1214](∅→∅) − .and_then(|m| libpijul::Merkle::from_base32(m.as_bytes())),
+ .and_then(|m| pijul_core::Merkle::from_base32(m.as_bytes())),
replacement in pijul-remote/src/http.rs at line 401
[125.26046]→[125.26046:26122](∅→∅) − .and_then(|m| libpijul::Merkle::from_base32(m.as_bytes())),
+ .and_then(|m| pijul_core::Merkle::from_base32(m.as_bytes())),
replacement in pijul-remote/src/http.rs at line 409
[28.1310]→[92.1568:1664](∅→∅) − pub async fn get_id(&self) -> Result<Option<libpijul::pristine::RemoteId>, anyhow::Error> {
+ pub async fn get_id(&self) -> Result<Option<pijul_core::pristine::RemoteId>, anyhow::Error> {
replacement in pijul-remote/src/http.rs at line 428
[75.11088]→[92.1665:1725](∅→∅) − Ok(libpijul::pristine::RemoteId::from_bytes(&resp))
+ Ok(pijul_core::pristine::RemoteId::from_bytes(&resp))
replacement in pijul-remote/src/http.rs at line 434
[28.1423]→[28.1423:1475](∅→∅) − state: Option<(libpijul::Merkle, &[Hash])>,
+ state: Option<(pijul_core::Merkle, &[Hash])>,
replacement in pijul-remote/src/http.rs at line 542
[158.1930]→[172.4061:4152](∅→∅) − pub async fn prove(&mut self, key: libpijul::key::SKey) -> Result<(), anyhow::Error> {
+ pub async fn prove(&mut self, key: pijul_core::key::SKey) -> Result<(), anyhow::Error> {
replacement in pijul-remote/Cargo.toml at line 15
[180.889]→[226.985:1043](∅→∅) − libpijul = { workspace = true, features = [ "tarball" ] }
+ pijul-core = { workspace = true, features = [ "tarball" ] }
replacement in pijul-macros/Cargo.toml at line 3
[2.21044]→[2.21044:21091](∅→∅) − description = "Macros used to write libpijul."
+ description = "Macros used to write pijul-core."
edit in pijul-identity/src/repair.rs at line 3
[233.2654]→[140.191:234](∅→∅),
[140.191]→[140.191:234](∅→∅) − use libpijul::key::{PublicKey, SecretKey};
edit in pijul-identity/src/repair.rs at line 5
+ use pijul_core::key::{PublicKey, SecretKey};
replacement in pijul-identity/src/load.rs at line 4
[140.22508]→[140.22508:22551](∅→∅) − use libpijul::key::{PublicKey, SecretKey};
+ use pijul_core::key::{PublicKey, SecretKey};
replacement in pijul-identity/src/lib.rs at line 54
[195.115]→[195.115:164](∅→∅) − use libpijul::key::{PublicKey, SKey, SecretKey};
+ use pijul_core::key::{PublicKey, SKey, SecretKey};
replacement in pijul-identity/Cargo.toml at line 15
[179.502]→[193.1189:1215](∅→∅) − libpijul.workspace = true
+ pijul-core.workspace = true
file move: libpijul (d--r------) → pijul-core (d--r------)
replacement in pijul-core/src/working_copy/memory.rs at line 65
[2.200692]→[2.200692:200759](∅→∅) − Inode::Directory { ref children, .. } => {
+ Inode::Directory { children, .. } => {
replacement in pijul-core/src/working_copy/memory.rs at line 151
[2.203478]→[2.203478:203561](∅→∅) − Some(Inode::Directory { ref children, .. }) => t = Some(children),
+ Some(Inode::Directory { children, .. }) => t = Some(children),
replacement in pijul-core/src/working_copy/memory.rs at line 173
[2.204289]→[2.204289:204330](∅→∅) replacement in pijul-core/src/working_copy/memory.rs at line 202
[2.205254]→[2.205254:205295](∅→∅) replacement in pijul-core/src/working_copy/memory.rs at line 232
[2.206547]→[2.206547:206603](∅→∅) − Some(Inode::File { ref contents, .. }) => {
+ Some(Inode::File { contents, .. }) => {
replacement in pijul-core/src/working_copy/memory.rs at line 293
[53.26787]→[2.207567:207623](∅→∅),
[2.207567]→[2.207567:207623](∅→∅) − Some(Inode::File { ref mut meta, .. }) => {
+ Some(Inode::File { meta, .. }) => {
replacement in pijul-core/src/working_copy/memory.rs at line 296
[2.207710]→[2.207710:207771](∅→∅) − Some(Inode::Directory { ref mut meta, .. }) => {
+ Some(Inode::Directory { meta, .. }) => {
replacement in pijul-core/src/working_copy/memory.rs at line 309
[72.538]→[72.538:575](∅→∅) replacement in pijul-core/src/working_copy/memory.rs at line 338
[222.1424]→[222.1424:1463](∅→∅) replacement in pijul-core/src/unrecord/mod.rs at line 776
[192.1881]→[192.1881:1919](∅→∅) − Atom::EdgeMap(ref n) => {
replacement in pijul-core/src/tests/text_changes.rs at line 123
[116.13774]→[116.13774:13845](∅→∅) − if let PrintableAtom::Edges(ref mut change) = change {
+ if let PrintableAtom::Edges(change) = change {
replacement in pijul-core/src/tests/text_changes.rs at line 161
[101.8768]→[101.8768:8814](∅→∅) − .gen(quickcheck::Gen::new(3))
+ .r#gen(quickcheck::Gen::new(3))
replacement in pijul-core/src/tests/file_conflicts.rs at line 1111
[115.554]→[147.542:624](∅→∅) − Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "a/b/c/alice"),
+ Conflict::ZombieFile { path, .. } => assert_eq!(path, "a/b/c/alice"),
replacement in pijul-core/src/tests/file_conflicts.rs at line 1196
[115.600]→[147.625:707](∅→∅) − Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "a/b/c/alice"),
+ Conflict::ZombieFile { path, .. } => assert_eq!(path, "a/b/c/alice"),
replacement in pijul-core/src/tests/file_conflicts.rs at line 1216
[115.646]→[170.3185:3236](∅→∅) − Conflict::ZombieFile { ref path, .. } => {
+ Conflict::ZombieFile { path, .. } => {
replacement in pijul-core/src/tests/file_conflicts.rs at line 1238
[115.692]→[170.3314:3365](∅→∅) − Conflict::ZombieFile { ref path, .. } => {
+ Conflict::ZombieFile { path, .. } => {
replacement in pijul-core/src/tests/file_conflicts.rs at line 1312
[115.738]→[147.920:1001](∅→∅) − Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "alice/file"),
+ Conflict::ZombieFile { path, .. } => assert_eq!(path, "alice/file"),
replacement in pijul-core/src/tests/file_conflicts.rs at line 1356
[115.784]→[147.1002:1083](∅→∅) − Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "alice/file"),
+ Conflict::ZombieFile { path, .. } => assert_eq!(path, "alice/file"),
replacement in pijul-core/src/tests/file_conflicts.rs at line 1547
[115.830]→[147.1084:1158](∅→∅) − Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "dir"),
+ Conflict::ZombieFile { path, .. } => assert_eq!(path, "dir"),
replacement in pijul-core/src/tests/file_conflicts.rs at line 1585
[115.876]→[147.1159:1233](∅→∅) − Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "dir"),
+ Conflict::ZombieFile { path, .. } => assert_eq!(path, "dir"),
replacement in pijul-core/src/tests/add_file.rs at line 572
[115.1094]→[147.1234:1310](∅→∅) − Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "a"),
+ Conflict::ZombieFile { path, .. } => assert_eq!(path, "a"),
replacement in pijul-core/src/small_string.rs at line 177
[2.483436]→[2.483436:483475](∅→∅) − /// use libpijul::small_string::*;
+ /// use pijul_core::small_string::*;
replacement in pijul-core/src/small_string.rs at line 186
[2.483670]→[2.483670:483709](∅→∅) − /// use libpijul::small_string::*;
+ /// use pijul_core::small_string::*;
replacement in pijul-core/src/small_string.rs at line 210
[2.484294]→[2.484294:484333](∅→∅) − /// use libpijul::small_string::*;
+ /// use pijul_core::small_string::*;
replacement in pijul-core/src/small_string.rs at line 245
[2.485541]→[2.485541:485580](∅→∅) − /// use libpijul::small_string::*;
+ /// use pijul_core::small_string::*;
replacement in pijul-core/src/small_string.rs at line 256
[2.485846]→[2.485846:485885](∅→∅) − /// use libpijul::small_string::*;
+ /// use pijul_core::small_string::*;
replacement in pijul-core/src/small_string.rs at line 314
[2.487787]→[229.0:49](∅→∅) − unsafe fn write_to_page(&self, p: *mut u8) {
+ unsafe fn write_to_page(&self, p: *mut u8) { unsafe {
replacement in pijul-core/src/small_string.rs at line 320
[46.6296]→[45.47741:47816](∅→∅),
[45.47741]→[45.47741:47816](∅→∅) − }
− unsafe fn from_raw_ptr<'a, T>(_: &T, p: *const u8) -> &'a Self {
+ }}
+ unsafe fn from_raw_ptr<'a, T>(_: &T, p: *const u8) -> &'a Self { unsafe {
replacement in pijul-core/src/small_string.rs at line 323
[45.47849]→[45.47849:47906](∅→∅) − }
− unsafe fn onpage_size(p: *const u8) -> usize {
+ }}
+ unsafe fn onpage_size(p: *const u8) -> usize { unsafe {
replacement in pijul-core/src/small_string.rs at line 331
[45.48036]→[45.48036:48042](∅→∅) replacement in pijul-core/src/small_string.rs at line 346
[2.488072]→[45.48303:48371](∅→∅) − unsafe fn smallstr_from_raw_ptr<'a>(p: *const u8) -> &'a SmallStr {
+ unsafe fn smallstr_from_raw_ptr<'a>(p: *const u8) -> &'a SmallStr { unsafe {
replacement in pijul-core/src/small_string.rs at line 349
[45.48471]→[45.48471:48473](∅→∅) replacement in pijul-core/src/record.rs at line 862
[53.55162]→[53.55162:55233](∅→∅) − if let Ok(meta) = working_copy.file_metadata(&full_path) {
+ match working_copy.file_metadata(&full_path) { Ok(meta) => {
replacement in pijul-core/src/record.rs at line 875
[53.55614]→[116.16923:17017](∅→∅) − } else if let Some(vertex) = get_inodes::<_, C, W>(txn, &channel, child_inode)? {
+ } _ => if let Some(vertex) = get_inodes::<_, C, W>(txn, &channel, child_inode)? {
replacement in pijul-core/src/record.rs at line 886
[71.898]→[53.55892:55906](∅→∅),
[72.1903]→[53.55892:55906](∅→∅),
[53.55892]→[53.55892:55906](∅→∅) replacement in pijul-core/src/record.rs at line 903
[53.56307]→[53.56307:56375](∅→∅) − if let Ok(last_modified) = working_copy.modified_time(prefix) {
+ match working_copy.modified_time(prefix) { Ok(last_modified) => {
replacement in pijul-core/src/record.rs at line 924
[113.285]→[53.56751:56764](∅→∅),
[114.853]→[53.56751:56764](∅→∅),
[53.56751]→[53.56751:56764](∅→∅) replacement in pijul-core/src/record.rs at line 926
[53.56781]→[53.56781:56787](∅→∅) replacement in pijul-core/src/record.rs at line 1124
[53.58887]→[2.501402:501478](∅→∅),
[2.501402]→[2.501402:501478](∅→∅) − if let Ok(new_meta) = working_copy.file_metadata(&item.full_path) {
+ match working_copy.file_metadata(&item.full_path) { Ok(new_meta) => {
replacement in pijul-core/src/record.rs at line 1141
[100.7229]→[2.503118:503135](∅→∅),
[2.503118]→[2.503118:503135](∅→∅) replacement in pijul-core/src/record.rs at line 1153
[100.7270]→[100.7270:7280](∅→∅) replacement in pijul-core/src/record.rs at line 1953
[32.1971]→[2.523952:523985](∅→∅),
[2.523952]→[2.523952:523985](∅→∅) replacement in pijul-core/src/pristine/sanakirja.rs at line 78
[159.1247]→[17.13003:13091](∅→∅),
[2.531623]→[17.13003:13091](∅→∅) − pub unsafe fn new_nolock<P: AsRef<Path>>(name: P) -> Result<Self, SanakirjaError> {
+ pub unsafe fn new_nolock<P: AsRef<Path>>(name: P) -> Result<Self, SanakirjaError> { unsafe {
replacement in pijul-core/src/pristine/sanakirja.rs at line 80
[2.531760]→[2.531760:531766](∅→∅) replacement in pijul-core/src/pristine/sanakirja.rs at line 101
[2.532052]→[17.13380:13420](∅→∅) − ) -> Result<Self, SanakirjaError> {
+ ) -> Result<Self, SanakirjaError> { unsafe {
replacement in pijul-core/src/pristine/sanakirja.rs at line 105
[2.532192]→[2.532192:532198](∅→∅) replacement in pijul-core/src/pristine/sanakirja.rs at line 167
[170.12498]→[2.533977:534017](∅→∅),
[2.533977]→[2.533977:534017](∅→∅) − if let Some(txn) = begin(txn) {
+ match begin(txn) { Some(txn) => {
replacement in pijul-core/src/pristine/sanakirja.rs at line 169
[2.534037]→[2.534037:534054](∅→∅) replacement in pijul-core/src/pristine/sanakirja.rs at line 171
[17.13665]→[2.534108:534118](∅→∅),
[2.534108]→[2.534108:534118](∅→∅) replacement in pijul-core/src/pristine/sanakirja.rs at line 1222
[26.44151]→[26.44151:44210](∅→∅) − ) -> Result<Option<Channel>, TxnErr<SanakirjaError>> {
+ ) -> Result<Option<Channel>, TxnErr<SanakirjaError>> { unsafe {
replacement in pijul-core/src/pristine/sanakirja.rs at line 1244
[26.44879]→[25.44451:44457](∅→∅),
[25.44451]→[25.44451:44457](∅→∅) replacement in pijul-core/src/pristine/sanakirja.rs at line 2523
[2.579208]→[45.95434:95485](∅→∅) − unsafe fn onpage_size(p: *const u8) -> usize {
+ unsafe fn onpage_size(p: *const u8) -> usize { unsafe {
replacement in pijul-core/src/pristine/sanakirja.rs at line 2526
[45.95541]→[2.579553:579559](∅→∅),
[2.579553]→[2.579553:579559](∅→∅),
[2.579559]→[45.95542:95611](∅→∅) − }
− unsafe fn from_raw_ptr<'a, T>(_: &T, p: *const u8) -> &'a Self {
+ }}
+ unsafe fn from_raw_ptr<'a, T>(_: &T, p: *const u8) -> &'a Self { unsafe {
replacement in pijul-core/src/pristine/sanakirja.rs at line 2529
[45.95643]→[2.580108:580114](∅→∅),
[2.580108]→[2.580108:580114](∅→∅),
[2.580114]→[225.0:49](∅→∅) − }
− unsafe fn write_to_page(&self, p: *mut u8) {
+ }}
+ unsafe fn write_to_page(&self, p: *mut u8) { unsafe {
replacement in pijul-core/src/pristine/sanakirja.rs at line 2533
[225.96]→[2.580261:580267](∅→∅),
[183.228]→[2.580261:580267](∅→∅),
[170.34262]→[2.580261:580267](∅→∅),
[45.95791]→[2.580261:580267](∅→∅),
[2.580261]→[2.580261:580267](∅→∅) replacement in pijul-core/src/pristine/sanakirja.rs at line 2536
[2.580399]→[45.95792:95857](∅→∅) − unsafe fn path_id_from_raw_ptr<'a>(p: *const u8) -> &'a PathId {
+ unsafe fn path_id_from_raw_ptr<'a>(p: *const u8) -> &'a PathId { unsafe {
replacement in pijul-core/src/pristine/sanakirja.rs at line 2539
[45.95966]→[2.580704:580706](∅→∅),
[2.580704]→[2.580704:580706](∅→∅) replacement in pijul-core/src/pristine/sanakirja.rs at line 2600
[2.583994]→[45.97254:97305](∅→∅) − unsafe fn onpage_size(p: *const u8) -> usize {
+ unsafe fn onpage_size(p: *const u8) -> usize { unsafe {
replacement in pijul-core/src/pristine/sanakirja.rs at line 2605
[45.97517]→[2.584693:584699](∅→∅),
[2.584693]→[2.584693:584699](∅→∅),
[2.584699]→[45.97518:97587](∅→∅) − }
− unsafe fn from_raw_ptr<'a, T>(_: &T, p: *const u8) -> &'a Self {
+ }}
+ unsafe fn from_raw_ptr<'a, T>(_: &T, p: *const u8) -> &'a Self { unsafe {
replacement in pijul-core/src/pristine/sanakirja.rs at line 2608
[45.97616]→[2.584816:584822](∅→∅),
[2.584816]→[2.584816:584822](∅→∅),
[2.584822]→[183.229:320](∅→∅) − }
− unsafe fn write_to_page_alloc<T: sanakirja::AllocPage>(&self, t: &mut T, p: *mut u8) {
+ }}
+ unsafe fn write_to_page_alloc<T: sanakirja::AllocPage>(&self, t: &mut T, p: *mut u8) { unsafe {
replacement in pijul-core/src/pristine/sanakirja.rs at line 2613
[183.414]→[2.584945:584951](∅→∅),
[170.34430]→[2.584945:584951](∅→∅),
[45.97811]→[2.584945:584951](∅→∅),
[2.584945]→[2.584945:584951](∅→∅) replacement in pijul-core/src/pristine/sanakirja.rs at line 2635
[75.33483]→[75.33483:33534](∅→∅) − unsafe fn onpage_size(p: *const u8) -> usize {
+ unsafe fn onpage_size(p: *const u8) -> usize { unsafe {
replacement in pijul-core/src/pristine/sanakirja.rs at line 2637
[125.43612]→[75.33569:33644](∅→∅),
[75.33569]→[75.33569:33644](∅→∅) − }
− unsafe fn from_raw_ptr<'a, T>(_: &T, p: *const u8) -> &'a Self {
+ }}
+ unsafe fn from_raw_ptr<'a, T>(_: &T, p: *const u8) -> &'a Self { unsafe {
replacement in pijul-core/src/pristine/sanakirja.rs at line 2643
[75.33810]→[75.33810:33816](∅→∅),
[75.33816]→[183.415:506](∅→∅) − }
− unsafe fn write_to_page_alloc<T: sanakirja::AllocPage>(&self, _: &mut T, p: *mut u8) {
+ }}
+ unsafe fn write_to_page_alloc<T: sanakirja::AllocPage>(&self, _: &mut T, p: *mut u8) { unsafe {
replacement in pijul-core/src/pristine/sanakirja.rs at line 2654
[75.34128]→[75.34128:34134](∅→∅) replacement in pijul-core/src/pristine/mod.rs at line 102
[84.100720]→[84.100720:100771](∅→∅) − if let Ok(txn) = Arc::try_unwrap(self.0) {
+ match Arc::try_unwrap(self.0) { Ok(txn) => {
replacement in pijul-core/src/pristine/mod.rs at line 104
[84.100809]→[84.100809:100826](∅→∅) replacement in pijul-core/src/pristine/mod.rs at line 106
[135.80]→[84.100853:100863](∅→∅),
[84.100853]→[84.100853:100863](∅→∅) replacement in pijul-core/src/pristine/mod.rs at line 853
[25.62652]→[25.62652:62677](∅→∅) replacement in pijul-core/src/pristine/mod.rs at line 856
[7.40327]→[25.62739:62745](∅→∅) replacement in pijul-core/src/pristine/mod.rs at line 858
[45.104161]→[25.62789:62802](∅→∅),
[25.62789]→[25.62789:62802](∅→∅) replacement in pijul-core/src/pristine/mod.rs at line 860
[25.62829]→[25.62829:62835](∅→∅) replacement in pijul-core/src/pristine/mod.rs at line 967
[25.65135]→[67.3156:3219](∅→∅) − Hash::Blake3(ref s) => LittleEndian::read_u64(&s[..]),
+ Hash::Blake3(s) => LittleEndian::read_u64(&s[..]),
replacement in pijul-core/src/pristine/mod.rs at line 1301
[2.618235]→[45.106796:106870](∅→∅) − } else if let Ok(&dest) = txn.find_block_end(channel, v.dest()) {
+ } else { match txn.find_block_end(channel, v.dest()) { Ok(&dest) => {
replacement in pijul-core/src/pristine/mod.rs at line 1303
[26.54690]→[2.618235:618252](∅→∅),
[2.618235]→[2.618235:618252](∅→∅) replacement in pijul-core/src/pristine/mod.rs at line 1305
[7.49840]→[2.618309:618320](∅→∅),
[26.54718]→[2.618309:618320](∅→∅),
[2.618309]→[2.618309:618320](∅→∅) replacement in pijul-core/src/pristine/mod.rs at line 1329
[2.618942]→[45.107022:107088](∅→∅) − } else if let Ok(dest) = txn.find_block(&channel, v.dest()) {
+ } else { match txn.find_block(&channel, v.dest()) { Ok(dest) => {
replacement in pijul-core/src/pristine/mod.rs at line 1353
[2.619628]→[2.619628:619641](∅→∅) replacement in pijul-core/src/pristine/mod.rs at line 1376
[2.620238]→[2.620238:620244](∅→∅) replacement in pijul-core/src/pristine/mod.rs at line 1989
[35.976]→[33.3867:3892](∅→∅),
[45.111692]→[33.3867:3892](∅→∅),
[33.3867]→[33.3867:3892](∅→∅) replacement in pijul-core/src/pristine/mod.rs at line 1992
[33.3968]→[33.3968:3974](∅→∅) replacement in pijul-core/src/pristine/mod.rs at line 1996
[45.111794]→[33.4037:4050](∅→∅),
[33.4037]→[33.4037:4050](∅→∅) replacement in pijul-core/src/pristine/mod.rs at line 1998
[33.4067]→[33.4067:4073](∅→∅) replacement in pijul-core/src/pristine/merkle.rs at line 85
[2.639463]→[2.639463:639504](∅→∅) − Merkle::Ed25519(ref h0) => {
+ Merkle::Ed25519(h0) => {
replacement in pijul-core/src/pristine/hash.rs at line 27
[2.645161]→[2.645161:645204](∅→∅) − Hasher::Blake3(ref mut h) => {
replacement in pijul-core/src/pristine/hash.rs at line 34
[2.645330]→[2.645330:645369](∅→∅) − Hasher::Blake3(ref h) => {
replacement in pijul-core/src/pristine/hash.rs at line 275
[53.73142]→[53.73142:73199](∅→∅) − pub unsafe fn size_from_ptr(b: *const u8) -> usize {
+ pub unsafe fn size_from_ptr(b: *const u8) -> usize { unsafe {
replacement in pijul-core/src/pristine/hash.rs at line 283
[53.73422]→[53.73422:73428](∅→∅) replacement in pijul-core/src/path.rs at line 11
[2.668023]→[2.668023:668055](∅→∅) − /// use libpijul::path::parent;
+ /// use pijul_core::path::parent;
replacement in pijul-core/src/path.rs at line 41
[2.668895]→[2.668895:668930](∅→∅) − /// use libpijul::path::file_name;
+ /// use pijul_core::path::file_name;
replacement in pijul-core/src/path.rs at line 117
[2.670981]→[2.670981:671011](∅→∅) − /// use libpijul::path::push;
+ /// use pijul_core::path::push;
replacement in pijul-core/src/path.rs at line 134
[2.671448]→[2.671448:671477](∅→∅) − /// use libpijul::path::pop;
+ /// use pijul_core::path::pop;
replacement in pijul-core/src/output/output.rs at line 62
[137.2448]→[137.2448:2822](∅→∅) − Conflict::Name { ref changes, .. } => changes,
− Conflict::ZombieFile { ref changes, .. } => changes,
− Conflict::MultipleNames { ref changes, .. } => changes,
− Conflict::Zombie { ref changes, .. } => changes,
− Conflict::Cyclic { ref changes, .. } => changes,
− Conflict::Order { ref changes, .. } => changes,
+ Conflict::Name { changes, .. } => changes,
+ Conflict::ZombieFile { changes, .. } => changes,
+ Conflict::MultipleNames { changes, .. } => changes,
+ Conflict::Zombie { changes, .. } => changes,
+ Conflict::Cyclic { changes, .. } => changes,
+ Conflict::Order { changes, .. } => changes,
replacement in pijul-core/src/output/output.rs at line 73
[137.2912]→[137.2912:3090](∅→∅) − Conflict::Name { ref inodes, .. } => inodes,
− Conflict::ZombieFile { ref inode, .. } => inode,
− Conflict::MultipleNames { ref pos, .. } => pos,
+ Conflict::Name { inodes, .. } => inodes,
+ Conflict::ZombieFile { inode, .. } => inode,
+ Conflict::MultipleNames { pos, .. } => pos,
replacement in pijul-core/src/output/output.rs at line 77
[137.3121]→[137.3121:3158](∅→∅) replacement in pijul-core/src/output/output.rs at line 80
[137.3220]→[137.3220:3257](∅→∅) replacement in pijul-core/src/output/output.rs at line 83
[137.3318]→[137.3318:3355](∅→∅) replacement in pijul-core/src/output/output.rs at line 448
[100.17397]→[137.4415:4475](∅→∅) − let name = if let Some(ref inode) = is_first_name {
+ let name = if let &mut Some(ref inode) = is_first_name {
replacement in pijul-core/src/output/output.rs at line 666
[67.3961]→[57.1185:1234](∅→∅),
[17.21451]→[57.1185:1234](∅→∅) − if let Some(ref mut tmp) = tmp {
+ if let Some(tmp) = tmp {
replacement in pijul-core/src/output/output.rs at line 905
[150.372]→[2.685577:685630](∅→∅),
[86.413]→[2.685577:685630](∅→∅),
[17.22934]→[2.685577:685630](∅→∅),
[25.85107]→[2.685577:685630](∅→∅),
[2.685577]→[2.685577:685630](∅→∅) − for (fileid, (inode, ref name)) in dead.iter() {
+ for (fileid, (inode, name)) in dead.iter() {
replacement in pijul-core/src/output/mod.rs at line 111
[116.30554]→[116.30554:30762](∅→∅) − FileError::Changestore(ref c) => std::fmt::Debug::fmt(c, fmt),
− FileError::Txn(ref c) => std::fmt::Debug::fmt(c, fmt),
− FileError::Io(ref c) => std::fmt::Debug::fmt(c, fmt),
+ FileError::Changestore(c) => std::fmt::Debug::fmt(c, fmt),
+ FileError::Txn(c) => std::fmt::Debug::fmt(c, fmt),
+ FileError::Io(c) => std::fmt::Debug::fmt(c, fmt),
replacement in pijul-core/src/output/mod.rs at line 247
[100.23749]→[100.23749:23801](∅→∅) − let child = if let Some(child) = iter_adjacent(
+ let child = match iter_adjacent(
replacement in pijul-core/src/output/mod.rs at line 255
[100.23965]→[100.23965:23971](∅→∅) replacement in pijul-core/src/output/mod.rs at line 257
[100.23986]→[100.23986:23999](∅→∅) replacement in pijul-core/src/output/mod.rs at line 282
[165.5147]→[100.24566:24573](∅→∅),
[100.24566]→[100.24566:24573](∅→∅) replacement in pijul-core/src/output/mod.rs at line 306
[2.689916]→[25.87274:87390](∅→∅) − if let Some(n) =
− iter_adjacent(txn, channel, pos.inode_vertex(), f, f | EdgeFlags::BLOCK)?.next()
− {
+ match iter_adjacent(txn, channel, pos.inode_vertex(), f, f | EdgeFlags::BLOCK)?.next()
+ { Some(n) => {
replacement in pijul-core/src/output/mod.rs at line 322
[167.215]→[25.87419:87432](∅→∅),
[137.6332]→[25.87419:87432](∅→∅),
[25.87419]→[25.87419:87432](∅→∅) replacement in pijul-core/src/output/mod.rs at line 324
[137.6350]→[25.87450:87456](∅→∅),
[25.87450]→[25.87450:87456](∅→∅) replacement in pijul-core/src/missing_context.rs at line 169
[90.1716]→[90.1716:1804](∅→∅) − let dest_vertex = if let Ok(&dest_vertex) = txn.find_block_end(&channel, pos) {
+ let dest_vertex = match txn.find_block_end(&channel, pos) { Ok(&dest_vertex) => {
replacement in pijul-core/src/missing_context.rs at line 174
[90.1909]→[90.1909:1926](∅→∅) replacement in pijul-core/src/missing_context.rs at line 176
[90.1948]→[90.1948:1959](∅→∅) replacement in pijul-core/src/lib.rs at line 100
[72.3162]→[58.110:175](∅→∅),
[58.110]→[58.110:175](∅→∅) − let txn = if let Ok(txn) = std::sync::Arc::try_unwrap(txn) {
+ let txn = match std::sync::Arc::try_unwrap(txn) { Ok(txn) => {
replacement in pijul-core/src/lib.rs at line 102
[58.209]→[58.209:222](∅→∅) replacement in pijul-core/src/lib.rs at line 104
[58.245]→[58.245:252](∅→∅) replacement in pijul-core/src/lib.rs at line 385
[25.97658]→[45.127369:127399](∅→∅) replacement in pijul-core/src/lib.rs at line 388
[25.97793]→[25.97793:97803](∅→∅) replacement in pijul-core/src/lib.rs at line 396
[45.127755]→[25.97878:97895](∅→∅),
[25.97878]→[25.97878:97895](∅→∅) replacement in pijul-core/src/lib.rs at line 398
[25.97916]→[25.97916:97926](∅→∅) replacement in pijul-core/src/lib.rs at line 440
[2.732181]→[222.11320:11416](∅→∅) − if let Some((a, b)) = fs::find_path(changes, self, &channel.read(), false, position)? {
+ match fs::find_path(changes, self, &channel.read(), false, position)? { Some((a, b)) => {
replacement in pijul-core/src/lib.rs at line 442
[222.11455]→[222.11455:11472](∅→∅) replacement in pijul-core/src/lib.rs at line 444
[222.11493]→[222.11493:11503](∅→∅) replacement in pijul-core/src/lib.rs at line 457
[2.732653]→[222.11504:11599](∅→∅) − if let Some((a, b)) = fs::find_path(changes, self, &channel.read(), true, position)? {
+ match fs::find_path(changes, self, &channel.read(), true, position)? { Some((a, b)) => {
replacement in pijul-core/src/lib.rs at line 459
[222.11638]→[222.11638:11655](∅→∅) replacement in pijul-core/src/lib.rs at line 461
[222.11676]→[222.11676:11686](∅→∅) replacement in pijul-core/src/key.rs at line 336
[73.15100]→[73.15100:15162](∅→∅) − Encryption::Aes128(Kdf::Pbkdf2 { ref salt }) => {
+ Encryption::Aes128(Kdf::Pbkdf2 { salt }) => {
replacement in pijul-core/src/diff/bin.rs at line 87
[105.309]→[77.4768:4842](∅→∅),
[77.4768]→[77.4768:4842](∅→∅) − if let Some(Chunk::New { ref mut len, .. }) = bb.last_mut() {
+ if let Some(Chunk::New { len, .. }) = bb.last_mut() {
replacement in pijul-core/src/changestore/mod.rs at line 132
[2.820295]→[2.820295:820355](∅→∅) − if let crate::change::Atom::EdgeMap(ref n) = self {
+ if let crate::change::Atom::EdgeMap(n) = self {
replacement in pijul-core/src/changestore/filesystem.rs at line 153
[2.828061]→[2.828061:828149](∅→∅) − if let Ok(p) = crate::change::ChangeFile::open(hash, &path.to_str().unwrap()) {
+ match crate::change::ChangeFile::open(hash, &path.to_str().unwrap()) { Ok(p) => {
replacement in pijul-core/src/changestore/filesystem.rs at line 155
[2.828178]→[2.828178:828195](∅→∅) replacement in pijul-core/src/changestore/filesystem.rs at line 157
[2.828213]→[2.828213:828223](∅→∅) replacement in pijul-core/src/change.rs at line 303
[2.838610]→[163.142:213](∅→∅) − let from = if let Ok(from) = txn.find_block_end(channel, e_from) {
+ let from = match txn.find_block_end(channel, e_from) { Ok(from) => {
replacement in pijul-core/src/change.rs at line 305
[163.226]→[163.226:239](∅→∅) replacement in pijul-core/src/change.rs at line 307
[170.34896]→[163.290:297](∅→∅),
[163.290]→[163.290:297](∅→∅) replacement in pijul-core/src/change.rs at line 344
[2.839506]→[163.337:404](∅→∅) − let mut to = if let Ok(to) = txn.find_block(channel, to_pos) {
+ let mut to = match txn.find_block(channel, to_pos) { Ok(to) => {
replacement in pijul-core/src/change.rs at line 346
[163.415]→[163.415:428](∅→∅) replacement in pijul-core/src/change.rs at line 348
[170.34949]→[163.479:486](∅→∅),
[163.479]→[163.479:486](∅→∅) replacement in pijul-core/src/change.rs at line 522
[2.844883]→[2.844883:844975](∅→∅) − Atom::NewVertex(ref n) => n.inode,
− Atom::EdgeMap(ref n) => n.inode,
+ Atom::NewVertex(n) => n.inode,
+ Atom::EdgeMap(n) => n.inode,
replacement in pijul-core/src/change.rs at line 848
[2.853372]→[2.853372:853421](∅→∅) − if let Some(extra) = self.extra.take() {
+ match self.extra.take() { Some(extra) => {
replacement in pijul-core/src/change.rs at line 850
[2.853445]→[2.853445:853502](∅→∅) − } else if let Some(extra) = self.extra2.take() {
+ } _ => { match self.extra2.take() { Some(extra) => {
replacement in pijul-core/src/change.rs at line 852
[2.853526]→[2.853526:853578](∅→∅) − } else if let Some(rec) = self.rec.take() {
+ } _ => { match self.rec.take() { Some(rec) => {
replacement in pijul-core/src/change.rs at line 897
[2.855099]→[2.855099:855116](∅→∅) replacement in pijul-core/src/change.rs at line 899
[2.855133]→[2.855133:855143](∅→∅) replacement in pijul-core/src/change.rs at line 1002
[2.858201]→[2.858201:858253](∅→∅) − if let Some(ref c) = contents {
+ if let Some(c) = contents {
replacement in pijul-core/src/change.rs at line 1014
[2.858583]→[2.858583:858635](∅→∅) − if let Some(ref c) = contents {
+ if let Some(c) = contents {
replacement in pijul-core/src/change.rs at line 1027
[2.859005]→[2.859005:859057](∅→∅) − if let Some(ref c) = contents {
+ if let Some(c) = contents {
replacement in pijul-core/src/change.rs at line 1168
[97.1149]→[97.1149:1427](∅→∅) − Hunk::Edit { ref local, .. }
− | Hunk::Replacement { ref local, .. }
− | Hunk::SolveOrderConflict { ref local, .. }
− | Hunk::UnsolveOrderConflict { ref local, .. }
− | Hunk::ResurrectZombies { ref local, .. } => Some(local),
+ Hunk::Edit { local, .. }
+ | Hunk::Replacement { local, .. }
+ | Hunk::SolveOrderConflict { local, .. }
+ | Hunk::UnsolveOrderConflict { local, .. }
+ | Hunk::ResurrectZombies { local, .. } => Some(local),
replacement in pijul-core/src/change.rs at line 1179
[2.862747]→[32.6367:6947](∅→∅) − Hunk::FileMove { ref path, .. }
− | Hunk::FileDel { ref path, .. }
− | Hunk::FileUndel { ref path, .. }
− | Hunk::SolveNameConflict { ref path, .. }
− | Hunk::UnsolveNameConflict { ref path, .. }
− | Hunk::FileAdd { ref path, .. } => path,
− Hunk::Edit { ref local, .. }
− | Hunk::Replacement { ref local, .. }
− | Hunk::SolveOrderConflict { ref local, .. }
− | Hunk::UnsolveOrderConflict { ref local, .. }
− | Hunk::ResurrectZombies { ref local, .. } => &local.path,
+ Hunk::FileMove { path, .. }
+ | Hunk::FileDel { path, .. }
+ | Hunk::FileUndel { path, .. }
+ | Hunk::SolveNameConflict { path, .. }
+ | Hunk::UnsolveNameConflict { path, .. }
+ | Hunk::FileAdd { path, .. } => path,
+ Hunk::Edit { local, .. }
+ | Hunk::Replacement { local, .. }
+ | Hunk::SolveOrderConflict { local, .. }
+ | Hunk::UnsolveOrderConflict { local, .. }
+ | Hunk::ResurrectZombies { local, .. } => &local.path,
replacement in pijul-core/src/change/text_changes.rs at line 331
[101.13056]→[101.13056:13145](∅→∅) − Atom::NewVertex(ref new_vertex) => PrintableAtom::NewVertex(PrintableNewVertex {
+ Atom::NewVertex(new_vertex) => PrintableAtom::NewVertex(PrintableNewVertex {
replacement in pijul-core/src/change/text_changes.rs at line 345
[101.13581]→[101.13581:13642](∅→∅) − Atom::EdgeMap(ref edge_map) => PrintableAtom::Edges(
+ Atom::EdgeMap(edge_map) => PrintableAtom::Edges(
replacement in pijul-core/src/change/text_changes.rs at line 398
[32.8785]→[17.48927:48973](∅→∅),
[17.48927]→[17.48927:48973](∅→∅) − Atom::NewVertex(ref add) => {
+ Atom::NewVertex(add) => {
replacement in pijul-core/src/change/text_changes.rs at line 428
[27.269]→[101.15892:15977](∅→∅) − let (contents_data, content_edges) = if let Some(ref c) = contents {
+ let (contents_data, content_edges) = if let Some(c) = contents {
replacement in pijul-core/src/change/text_changes.rs at line 453
[27.308]→[101.16604:16689](∅→∅) − let (contents_data, content_edges) = if let Some(ref c) = contents {
+ let (contents_data, content_edges) = if let Some(c) = contents {
replacement in pijul-core/src/change/text_changes.rs at line 478
[17.51805]→[17.51805:51864](∅→∅) − if let Atom::NewVertex(ref n) = add_name {
+ if let Atom::NewVertex(n) = add_name {
replacement in pijul-core/src/change/text_changes.rs at line 491
[101.17336]→[101.17336:17420](∅→∅) − let contents = if let Some(Atom::NewVertex(ref n)) = contents {
+ let contents = if let Some(Atom::NewVertex(n)) = contents {
replacement in pijul-core/src/change/text_changes.rs at line 600
[102.1836]→[102.1836:1891](∅→∅) − if let Atom::NewVertex(ref n) = name {
+ if let Atom::NewVertex(n) = name {
replacement in pijul-core/src/change/text_changes.rs at line 729
[101.25736]→[101.25736:25823](∅→∅) − if let crate::InodeUpdate::Add { ref mut pos, .. } = e.get_mut() {
+ if let crate::InodeUpdate::Add { pos, .. } = e.get_mut() {
replacement in pijul-core/src/change/text_changes.rs at line 997
[102.4150]→[102.4150:4237](∅→∅) − if let crate::InodeUpdate::Add { ref mut pos, .. } = e.get_mut() {
+ if let crate::InodeUpdate::Add { pos, .. } = e.get_mut() {
replacement in pijul-core/src/change/text_changes.rs at line 1128
[17.85426]→[101.35153:35331](∅→∅),
[27.623]→[17.85693:85775](∅→∅),
[101.35331]→[17.85693:85775](∅→∅),
[17.85693]→[17.85693:85775](∅→∅) − Atom::NewVertex(ref n) => Ok(change_contents[n.start.us()..n.end.us()].to_vec()),
− Atom::EdgeMap(ref n) if n.edges.is_empty() => Err(TextSerError::InvalidChange),
− Atom::EdgeMap(ref n) if n.edges[0].flag.contains(EdgeFlags::DELETED) => {
+ Atom::NewVertex(n) => Ok(change_contents[n.start.us()..n.end.us()].to_vec()),
+ Atom::EdgeMap(n) if n.edges.is_empty() => Err(TextSerError::InvalidChange),
+ Atom::EdgeMap(n) if n.edges[0].flag.contains(EdgeFlags::DELETED) => {
replacement in pijul-core/src/change/text_changes.rs at line 1158
[129.32]→[17.86461:86501](∅→∅),
[101.35729]→[17.86461:86501](∅→∅),
[17.86461]→[17.86461:86501](∅→∅) − if let Atom::EdgeMap(ref e) = del {
+ if let Atom::EdgeMap(e) = del {
replacement in pijul-core/src/change/printable.rs at line 459
[101.48420]→[104.0:73](∅→∅) − let sign = if let PrintableAtom::Edges(ref e) = change {
+ let sign = if let PrintableAtom::Edges(e) = change {
replacement in pijul-core/src/apply.rs at line 792
[45.147009]→[45.147009:147080](∅→∅) − if let Ok(&dest) = txn.find_block_end(channel, p.dest()) {
+ match txn.find_block_end(channel, p.dest()) { Ok(&dest) => {
replacement in pijul-core/src/apply.rs at line 794
[2.971801]→[2.971801:971822](∅→∅) replacement in pijul-core/src/apply.rs at line 796
[2.971848]→[2.971848:971862](∅→∅),
[2.971862]→[45.147081:147151](∅→∅) − }
− } else if let Ok(&dest) = txn.find_block(channel, p.dest()) {
+ }}
+ } else { match txn.find_block(channel, p.dest()) { Ok(&dest) => {
replacement in pijul-core/src/apply.rs at line 799
[14.1688]→[2.971862:971879](∅→∅),
[2.971862]→[2.971862:971879](∅→∅) replacement in pijul-core/src/apply.rs at line 801
[14.1711]→[2.972040:972051](∅→∅),
[2.972040]→[2.972040:972051](∅→∅) replacement in pijul-core/src/apply.rs at line 939
[2.974716]→[24.21748:21811](∅→∅) − Atom::NewVertex(ref n) if !n.flag.is_folder() => {
+ Atom::NewVertex(n) if !n.flag.is_folder() => {
replacement in pijul-core/src/apply.rs at line 975
[24.22026]→[2.976959:976997](∅→∅),
[2.976959]→[2.976959:976997](∅→∅) − Atom::EdgeMap(ref n) => {
replacement in pijul-core/src/apply.rs at line 1097
[24.26780]→[25.133783:133840](∅→∅) − let al = if let Some(e) = iter_adjacent(
+ let al = match iter_adjacent(
replacement in pijul-core/src/apply.rs at line 1105
[24.27026]→[25.133861:133879](∅→∅) replacement in pijul-core/src/apply.rs at line 1108
[25.133928]→[25.133928:133953](∅→∅) replacement in pijul-core/src/apply.rs at line 1110
[25.133979]→[25.133979:133998](∅→∅) edit in pijul-core/src/alive/retrieve.rs at line 2
[2.984688]→[2.984688:984712](∅→∅) − use crate::pristine::*;
edit in pijul-core/src/alive/retrieve.rs at line 3
+ use crate::pristine::*;
replacement in pijul-core/src/alive/retrieve.rs at line 130
[116.44152]→[116.44152:44254](∅→∅) − debug!(target:"libpijul::forward", "deleting forward edge {:?} {:?} {:?}", ve.v, dest, ve.e);
+ debug!(target:"pijul_core::forward", "deleting forward edge {:?} {:?} {:?}", ve.v, dest, ve.e);
replacement in pijul-core/src/alive/dfs.rs at line 325
[2.1011776]→[2.1011776:1011891](∅→∅) − PathElement::Scc { ref scc } => *scc == side.end,
− PathElement::Conflict { ref sides } => {
+ PathElement::Scc { scc } => *scc == side.end,
+ PathElement::Conflict { sides } => {
replacement in pijul-core/Cargo.toml at line 2
[2.1020753]→[2.1020753:1020771](∅→∅) replacement in pijul-core/Cargo.toml at line 6
[199.908]→[2.1020973:1021016](∅→∅),
[2.1020973]→[2.1020973:1021016](∅→∅) − documentation = "https://docs.rs/libpijul"
+ documentation = "https://docs.rs/pijul-core"
replacement in pijul-config/src/local.rs at line 35
[231.3167]→[234.533:602](∅→∅) − let dot_directory = repository_path.join(libpijul::DOT_DIR);
+ let dot_directory = repository_path.join(pijul_core::DOT_DIR);
replacement in pijul-config/Cargo.toml at line 11
[175.404]→[231.16714:16740](∅→∅) − libpijul.workspace = true
+ pijul-core.workspace = true
replacement in pijul/tests/common/identity.rs at line 233
[142.24765]→[142.24765:24857](∅→∅) − let secret_key: libpijul::key::SecretKey = serde_json::from_str(&secret_key_text)?;
+ let secret_key: pijul_core::key::SecretKey = serde_json::from_str(&secret_key_text)?;
edit in pijul/src/commands/unrecord.rs at line 7
[189.31]→[11.19:59](∅→∅),
[205.126]→[11.19:59](∅→∅),
[99.148]→[11.19:59](∅→∅),
[4.1160]→[11.19:59](∅→∅),
[26.427]→[25.11703:11720](∅→∅),
[11.59]→[25.11703:11720](∅→∅) − use libpijul::changestore::ChangeStore;
− use libpijul::*;
edit in pijul/src/commands/unrecord.rs at line 8
+ use pijul_core::changestore::ChangeStore;
+ use pijul_core::*;
replacement in pijul/src/commands/unrecord.rs at line 134
[53.5580]→[53.5580:5640](∅→∅) − libpijul::output::output_repository_no_pending(
+ pijul_core::output::output_repository_no_pending(
replacement in pijul/src/commands/tag.rs at line 11
[201.98]→[62.219:255](∅→∅),
[218.113]→[62.219:255](∅→∅),
[189.130]→[62.219:255](∅→∅),
[99.193]→[62.219:255](∅→∅),
[195.1180]→[62.219:255](∅→∅),
[62.219]→[62.219:255](∅→∅),
[62.255]→[201.99:196](∅→∅) − use libpijul::change::ChangeHeader;
− use libpijul::{ArcTxn, Base32, ChannelMutTxnT, ChannelRef, ChannelTxnT, MutTxnT, TxnT, TxnTExt};
+ use pijul_core::change::ChangeHeader;
+ use pijul_core::{ArcTxn, Base32, ChannelMutTxnT, ChannelRef, ChannelTxnT, MutTxnT, TxnT, TxnTExt};
replacement in pijul/src/commands/tag.rs at line 121
[236.2008]→[201.1031:1102](∅→∅),
[228.2048]→[201.1031:1102](∅→∅),
[233.9756]→[201.1031:1102](∅→∅),
[141.142]→[201.1031:1102](∅→∅) − let h: libpijul::Merkle = libpijul::tag::from_channel(
+ let h: pijul_core::Merkle = pijul_core::tag::from_channel(
replacement in pijul/src/commands/tag.rs at line 127
[201.1263]→[120.212:301](∅→∅),
[120.212]→[120.212:301](∅→∅) − libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &h);
+ pijul_core::changestore::filesystem::push_tag_filename(&mut tag_path, &h);
replacement in pijul/src/commands/tag.rs at line 143
[119.211]→[120.380:562](∅→∅) − let h = if let Some(h) = libpijul::Merkle::from_base32(tag.as_bytes()) {
− libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &h);
+ let h = if let Some(h) = pijul_core::Merkle::from_base32(tag.as_bytes()) {
+ pijul_core::changestore::filesystem::push_tag_filename(&mut tag_path, &h);
replacement in pijul/src/commands/tag.rs at line 156
[62.4198]→[120.563:637](∅→∅),
[66.70]→[62.4457:4534](∅→∅),
[119.368]→[62.4457:4534](∅→∅),
[120.637]→[62.4457:4534](∅→∅),
[62.4457]→[62.4457:4534](∅→∅) − let f = libpijul::tag::OpenTagFile::open(&tag_path, &h)?;
− libpijul::tag::restore_channel(f, &mut txn, &channel_name)?;
+ let f = pijul_core::tag::OpenTagFile::open(&tag_path, &h)?;
+ pijul_core::tag::restore_channel(f, &mut txn, &channel_name)?;
replacement in pijul/src/commands/tag.rs at line 164
[119.430]→[120.638:820](∅→∅) − let h = if let Some(h) = libpijul::Merkle::from_base32(tag.as_bytes()) {
− libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &h);
+ let h = if let Some(h) = pijul_core::Merkle::from_base32(tag.as_bytes()) {
+ pijul_core::changestore::filesystem::push_tag_filename(&mut tag_path, &h);
replacement in pijul/src/commands/tag.rs at line 171
[116.6132]→[119.483:558](∅→∅),
[117.71]→[116.6211:6267](∅→∅),
[119.558]→[116.6211:6267](∅→∅),
[116.6211]→[116.6211:6267](∅→∅) − let tag = libpijul::tag::txn::TagTxn::new(&tag_path, &h)?;
− let txn = libpijul::tag::txn::WithTag {
+ let tag = pijul_core::tag::txn::TagTxn::new(&tag_path, &h)?;
+ let txn = pijul_core::tag::txn::WithTag {
replacement in pijul/src/commands/tag.rs at line 179
[116.6458]→[116.6458:6523](∅→∅) − libpijul::output::output_repository_no_pending_(
+ pijul_core::output::output_repository_no_pending_(
replacement in pijul/src/commands/tag.rs at line 198
[126.943]→[126.943:1125](∅→∅) − let h = if let Some(h) = libpijul::Merkle::from_base32(tag.as_bytes()) {
− libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &h);
+ let h = if let Some(h) = pijul_core::Merkle::from_base32(tag.as_bytes()) {
+ pijul_core::changestore::filesystem::push_tag_filename(&mut tag_path, &h);
replacement in pijul/src/commands/tag.rs at line 227
[125.26959]→[120.936:1029](∅→∅),
[120.936]→[120.936:1029](∅→∅) − libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &m);
+ pijul_core::changestore::filesystem::push_tag_filename(&mut tag_path, &m);
replacement in pijul/src/commands/tag.rs at line 229
[124.55]→[120.1029:1111](∅→∅),
[120.1029]→[120.1029:1111](∅→∅) − let mut f = libpijul::tag::OpenTagFile::open(&tag_path, &m)?;
+ let mut f = pijul_core::tag::OpenTagFile::open(&tag_path, &m)?;
replacement in pijul/src/commands/tag.rs at line 235
− libpijul::changestore::filesystem::pop_filename(&mut tag_path);
+ pijul_core::changestore::filesystem::pop_filename(&mut tag_path);
replacement in pijul/src/commands/tag.rs at line 251
[73.686]→[75.13529:13563](∅→∅) − use libpijul::change::Author;
+ use pijul_core::change::Author;
replacement in pijul/src/commands/tag.rs at line 290
[79.931]→[79.931:983](∅→∅) − let mut state = libpijul::RecordBuilder::new();
+ let mut state = pijul_core::RecordBuilder::new();
replacement in pijul/src/commands/tag.rs at line 293
[79.1014]→[79.1014:1054](∅→∅) − libpijul::Algorithm::default(),
+ pijul_core::Algorithm::default(),
replacement in pijul/src/commands/tag.rs at line 295
[111.15]→[99.246:284](∅→∅),
[79.1054]→[99.246:284](∅→∅) − &libpijul::DEFAULT_SEPARATOR,
+ &pijul_core::DEFAULT_SEPARATOR,
replacement in pijul/src/commands/status.rs at line 2
[217.18]→[198.0:20](∅→∅),
[197.221]→[198.0:20](∅→∅) replacement in pijul/src/commands/reset.rs at line 11
[206.79]→[226.1044:1070](∅→∅) − use libpijul::pristine::{
+ use pijul_core::pristine::{
replacement in pijul/src/commands/reset.rs at line 15
[226.1150]→[218.195:278](∅→∅),
[218.195]→[218.195:278](∅→∅) − use libpijul::{ArcTxn, ChannelRef, ChannelTxnT, DepsTxnT, MutTxnT, TxnT, TxnTExt};
+ use pijul_core::{ArcTxn, ChannelRef, ChannelTxnT, DepsTxnT, MutTxnT, TxnT, TxnTExt};
replacement in pijul/src/commands/reset.rs at line 88
[2.99409]→[53.6735:6778](∅→∅) − libpijul::output::output_file(
+ pijul_core::output::output_file(
replacement in pijul/src/commands/reset.rs at line 93
[2.99516]→[2.99516:99594](∅→∅) − &mut libpijul::vertex_buffer::Writer::new(std::io::stdout()),
+ &mut pijul_core::vertex_buffer::Writer::new(std::io::stdout()),
replacement in pijul/src/commands/reset.rs at line 101
[74.1051]→[174.379:429](∅→∅) − .unwrap_or(libpijul::DEFAULT_CHANNEL)
+ .unwrap_or(pijul_core::DEFAULT_CHANNEL)
replacement in pijul/src/commands/reset.rs at line 141
[184.472]→[53.8400:8464](∅→∅),
[83.4079]→[53.8400:8464](∅→∅),
[53.8400]→[53.8400:8464](∅→∅) − libpijul::output::output_repository_no_pending(
+ pijul_core::output::output_repository_no_pending(
replacement in pijul/src/commands/reset.rs at line 162
[53.9311]→[83.4292:4424](∅→∅),
[83.4424]→[56.0:52](∅→∅),
[53.9504]→[56.0:52](∅→∅) − let (a, b, s) =
− libpijul::pristine::last_common_state(&*txn_, &*cur.read(), &*channel.read())?;
− let s: libpijul::Merkle = s.into();
+ let (a, b, s) = pijul_core::pristine::last_common_state(
+ &*txn_,
+ &*cur.read(),
+ &*channel.read(),
+ )?;
+ let s: pijul_core::Merkle = s.into();
replacement in pijul/src/commands/reset.rs at line 169
[53.9557]→[56.53:117](∅→∅) − let (a, b) = if s == libpijul::Merkle::zero() {
+ let (a, b) = if s == pijul_core::Merkle::zero() {
replacement in pijul/src/commands/reset.rs at line 184
[53.10047]→[83.4604:4703](∅→∅) − libpijul::fs::find_path(&repo.changes, &*txn_, &*channel.read(), false, *pos)?
+ pijul_core::fs::find_path(&repo.changes, &*txn_, &*channel.read(), false, *pos)?
replacement in pijul/src/commands/reset.rs at line 205
− libpijul::output::output_repository_no_pending(
+ pijul_core::output::output_repository_no_pending(
replacement in pijul/src/commands/reset.rs at line 229
[91.1042]→[91.1042:1110](∅→∅) − libpijul::output::output_repository_no_pending(
+ pijul_core::output::output_repository_no_pending(
replacement in pijul/src/commands/reset.rs at line 247
[53.12467]→[23.6637:6691](∅→∅),
[2.101723]→[23.6637:6691](∅→∅) − let locks = libpijul::TIMERS.lock().unwrap();
+ let locks = pijul_core::TIMERS.lock().unwrap();
replacement in pijul/src/commands/reset.rs at line 271
[56.357]→[56.357:420](∅→∅) − for x in libpijul::pristine::changeid_log(txn, chan, f)? {
+ for x in pijul_core::pristine::changeid_log(txn, chan, f)? {
replacement in pijul/src/commands/reset.rs at line 298
[185.293]→[184.662:714](∅→∅),
[184.662]→[184.662:714](∅→∅) − let mut state = libpijul::RecordBuilder::new();
+ let mut state = pijul_core::RecordBuilder::new();
replacement in pijul/src/commands/reset.rs at line 301
[184.745]→[184.745:785](∅→∅) − libpijul::Algorithm::default(),
+ pijul_core::Algorithm::default(),
replacement in pijul/src/commands/reset.rs at line 303
[184.800]→[184.800:838](∅→∅) − &libpijul::DEFAULT_SEPARATOR,
+ &pijul_core::DEFAULT_SEPARATOR,
replacement in pijul/src/commands/record.rs at line 9
[195.1374]→[218.348:348](∅→∅),
[207.18]→[2.101821:101876](∅→∅),
[218.348]→[2.101821:101876](∅→∅),
[99.399]→[2.101821:101876](∅→∅),
[189.659]→[2.101821:101876](∅→∅),
[195.1374]→[2.101821:101876](∅→∅),
[4.1503]→[2.101821:101876](∅→∅),
[2.101821]→[2.101821:101876](∅→∅),
[2.101876]→[53.12515:12531](∅→∅) −
− use libpijul::change::*;
− use libpijul::changestore::*;
− use libpijul::{
+ use log::debug;
+ use pijul_core::change::*;
+ use pijul_core::changestore::*;
+ use pijul_core::{
replacement in pijul/src/commands/record.rs at line 15
[53.12623]→[53.12623:12657](∅→∅),
[53.12657]→[73.1051:1067](∅→∅) − use libpijul::{HashMap, HashSet};
− use log::debug;
+ use pijul_core::{HashMap, HashSet};
replacement in pijul/src/commands/record.rs at line 141
[43.506]→[83.5799:5883](∅→∅) − Some(libpijul::working_copy::filesystem::FileSystem::from_root(w)),
+ Some(pijul_core::working_copy::filesystem::FileSystem::from_root(
+ w,
+ )),
replacement in pijul/src/commands/record.rs at line 178
[83.6076]→[75.14018:14084](∅→∅),
[55.1421]→[75.14018:14084](∅→∅) − let mut path = repo.path.join(libpijul::DOT_DIR);
+ let mut path = repo.path.join(pijul_core::DOT_DIR);
replacement in pijul/src/commands/record.rs at line 282
[53.13817]→[83.6296:6355](∅→∅) − working_copy: &libpijul::working_copy::FileSystem,
+ working_copy: &pijul_core::working_copy::FileSystem,
replacement in pijul/src/commands/record.rs at line 286
[2.106714]→[38.722:761](∅→∅) − extra_deps: &[libpijul::Hash],
+ extra_deps: &[pijul_core::Hash],
replacement in pijul/src/commands/record.rs at line 292
[68.628]→[68.628:683](∅→∅) − HashMap<usize, libpijul::InodeUpdate>,
+ HashMap<usize, pijul_core::InodeUpdate>,
replacement in pijul/src/commands/record.rs at line 299
[2.106908]→[2.106908:106964](∅→∅) − let mut state = libpijul::RecordBuilder::new();
+ let mut state = pijul_core::RecordBuilder::new();
replacement in pijul/src/commands/record.rs at line 307
[220.277]→[220.277:319](∅→∅) − libpijul::Algorithm::Patience
+ pijul_core::Algorithm::Patience
replacement in pijul/src/commands/record.rs at line 309
[220.354]→[220.354:402](∅→∅) − libpijul::Algorithm::ImaraHistogram
+ pijul_core::Algorithm::ImaraHistogram
replacement in pijul/src/commands/record.rs at line 311
[220.419]→[220.419:462](∅→∅) − libpijul::Algorithm::default()
+ pijul_core::Algorithm::default()
replacement in pijul/src/commands/record.rs at line 324
[111.79]→[99.426:484](∅→∅),
[43.1329]→[99.426:484](∅→∅) − &libpijul::DEFAULT_SEPARATOR,
+ &pijul_core::DEFAULT_SEPARATOR,
replacement in pijul/src/commands/record.rs at line 338
[111.107]→[99.485:535](∅→∅),
[43.1694]→[99.485:535](∅→∅) − &libpijul::DEFAULT_SEPARATOR,
+ &pijul_core::DEFAULT_SEPARATOR,
edit in pijul/src/commands/pushpull.rs at line 14
[218.569]→[2.111667:111707](∅→∅),
[4.1742]→[2.111667:111707](∅→∅),
[2.111667]→[2.111667:111707](∅→∅),
[89.18516]→[200.0:34](∅→∅),
[200.34]→[226.1357:1414](∅→∅),
[200.75]→[25.12857:12874](∅→∅),
[218.613]→[25.12857:12874](∅→∅),
[26.623]→[25.12857:12874](∅→∅),
[226.1414]→[25.12857:12874](∅→∅),
[89.18516]→[25.12857:12874](∅→∅),
[2.111707]→[25.12857:12874](∅→∅) − use libpijul::changestore::ChangeStore;
− use libpijul::pristine::RemoteId;
− use libpijul::pristine::sanakirja::{MutTxn, RawMutTxnT};
− use libpijul::*;
edit in pijul/src/commands/pushpull.rs at line 15
+ use pijul_core::changestore::ChangeStore;
+ use pijul_core::pristine::RemoteId;
+ use pijul_core::pristine::sanakirja::{MutTxn, RawMutTxnT};
+ use pijul_core::*;
replacement in pijul/src/commands/pushpull.rs at line 723
[202.1354]→[202.1354:1405](∅→∅) − .unwrap_or(libpijul::DEFAULT_CHANNEL);
+ .unwrap_or(pijul_core::DEFAULT_CHANNEL);
replacement in pijul/src/commands/pushpull.rs at line 783
[5.808]→[2.120336:120394](∅→∅),
[89.22307]→[2.120336:120394](∅→∅),
[2.120336]→[2.120336:120394](∅→∅) − let mut ws = libpijul::ApplyWorkspace::new();
+ let mut ws = pijul_core::ApplyWorkspace::new();
replacement in pijul/src/commands/pushpull.rs at line 832
[125.29851]→[125.29851:29920](∅→∅) − let ext = libpijul::pristine::Position {
+ let ext = pijul_core::pristine::Position {
replacement in pijul/src/commands/pushpull.rs at line 854
[83.10730]→[83.10730:10897](∅→∅) − if let Some((path, _)) =
− libpijul::fs::find_path(&repo.changes, &*txn_, &*channel.read(), false, i)?
− {
+ if let Some((path, _)) = pijul_core::fs::find_path(
+ &repo.changes,
+ &*txn_,
+ &*channel.read(),
+ false,
+ i,
+ )? {
replacement in pijul/src/commands/pushpull.rs at line 890
[53.16573]→[53.16573:16641](∅→∅) − libpijul::output::output_repository_no_pending(
+ pijul_core::output::output_repository_no_pending(
edit in pijul/src/commands/protocol.rs at line 12
[4.1961]→[25.15132:15149](∅→∅) edit in pijul/src/commands/protocol.rs at line 13
replacement in pijul/src/commands/protocol.rs at line 50
[223.495]→[223.495:552](∅→∅) − type W = libpijul::working_copy::filesystem::FileSystem;
+ type W = pijul_core::working_copy::filesystem::FileSystem;
replacement in pijul/src/commands/protocol.rs at line 61
[51.511]→[2.124930:124984](∅→∅),
[191.3565]→[2.124930:124984](∅→∅),
[83.11418]→[2.124930:124984](∅→∅),
[2.124930]→[2.124930:124984](∅→∅) − let mut ws = libpijul::ApplyWorkspace::new();
+ let mut ws = pijul_core::ApplyWorkspace::new();
replacement in pijul/src/commands/protocol.rs at line 96
[15.1272]→[45.12182:12250](∅→∅) − let m: libpijul::Merkle = m.into();
+ let m: pijul_core::Merkle = m.into();
replacement in pijul/src/commands/protocol.rs at line 143
[191.4055]→[191.4055:4153](∅→∅) − let h: libpijul::Hash = txn.get_external(&p.change)?.unwrap().into();
+ let h: pijul_core::Hash = txn.get_external(&p.change)?.unwrap().into();
replacement in pijul/src/commands/protocol.rs at line 181
[125.34351]→[125.34351:34536](∅→∅) − libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &state);
− let mut tag = libpijul::tag::OpenTagFile::open(&tag_path, &state)?;
+ pijul_core::changestore::filesystem::push_tag_filename(&mut tag_path, &state);
+ let mut tag = pijul_core::tag::OpenTagFile::open(&tag_path, &state)?;
replacement in pijul/src/commands/protocol.rs at line 192
[208.502]→[121.209:305](∅→∅),
[121.209]→[121.209:305](∅→∅) − let m = libpijul::pristine::current_state(&*txn.read(), &*channel.read())?;
+ let m = pijul_core::pristine::current_state(&*txn.read(), &*channel.read())?;
replacement in pijul/src/commands/protocol.rs at line 195
[125.34988]→[125.34988:35085](∅→∅) − libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &m);
+ pijul_core::changestore::filesystem::push_tag_filename(&mut tag_path, &m);
replacement in pijul/src/commands/protocol.rs at line 215
[121.1332]→[125.35264:35365](∅→∅) − let header = libpijul::tag::read_short(std::io::Cursor::new(&buf[..]), &m)?;
+ let header =
+ pijul_core::tag::read_short(std::io::Cursor::new(&buf[..]), &m)?;
replacement in pijul/src/commands/protocol.rs at line 222
[125.35590]→[121.1398:1492](∅→∅),
[121.1398]→[121.1398:1492](∅→∅) − libpijul::tag::from_channel(&*txn.read(), &cap[2], &header, &mut w)?;
+ pijul_core::tag::from_channel(&*txn.read(), &cap[2], &header, &mut w)?;
replacement in pijul/src/commands/protocol.rs at line 239
[2.128478]→[2.128478:128571](∅→∅) − libpijul::changestore::filesystem::push_filename(&mut repo.changes_dir, &h);
+ pijul_core::changestore::filesystem::push_filename(&mut repo.changes_dir, &h);
replacement in pijul/src/commands/protocol.rs at line 246
[2.128902]→[2.128902:128974](∅→∅) − libpijul::change::Change::size_no_contents(&mut f)?
+ pijul_core::change::Change::size_no_contents(&mut f)?
replacement in pijul/src/commands/protocol.rs at line 262
[2.129500]→[2.129500:129588](∅→∅) − libpijul::changestore::filesystem::pop_filename(&mut repo.changes_dir);
+ pijul_core::changestore::filesystem::pop_filename(&mut repo.changes_dir);
replacement in pijul/src/commands/protocol.rs at line 271
[2.130015]→[2.130015:130096](∅→∅) − libpijul::changestore::filesystem::push_filename(&mut path, &h);
+ pijul_core::changestore::filesystem::push_filename(&mut path, &h);
replacement in pijul/src/commands/protocol.rs at line 277
[2.130282]→[2.130282:130373](∅→∅) − libpijul::change::Change::deserialize(&path.to_string_lossy(), Some(&h))?;
+ pijul_core::change::Change::deserialize(&path.to_string_lossy(), Some(&h))?;
replacement in pijul/src/commands/protocol.rs at line 287
[2.131024]→[2.131024:131090](∅→∅) − let mut tarball = libpijul::output::Tarball::new(
+ let mut tarball = pijul_core::output::Tarball::new(
replacement in pijul/src/commands/protocol.rs at line 296
[2.131473]→[7.3166:3356](∅→∅) − let state: libpijul::Merkle = hashes.next().unwrap().parse().unwrap();
− let extra: Vec<libpijul::Hash> = hashes.map(|x| x.parse().unwrap()).collect();
+ let state: pijul_core::Merkle = hashes.next().unwrap().parse().unwrap();
+ let extra: Vec<pijul_core::Hash> = hashes.map(|x| x.parse().unwrap()).collect();
replacement in pijul/src/commands/protocol.rs at line 366
[53.18176]→[53.18176:18236](∅→∅) − libpijul::output::output_repository_no_pending(
+ pijul_core::output::output_repository_no_pending(
replacement in pijul/src/commands/mod.rs at line 82
[11.1687]→[53.18607:18685](∅→∅),
[53.18685]→[83.12749:12779](∅→∅),
[83.12779]→[53.18732:18771](∅→∅),
[53.18732]→[53.18732:18771](∅→∅) − fn pending<T: libpijul::MutTxnTExt + libpijul::TxnT + Send + Sync + 'static>(
− txn: libpijul::ArcTxn<T>,
− channel: &libpijul::ChannelRef<T>,
+ fn pending<T: pijul_core::MutTxnTExt + pijul_core::TxnT + Send + Sync + 'static>(
+ txn: pijul_core::ArcTxn<T>,
+ channel: &pijul_core::ChannelRef<T>,
replacement in pijul/src/commands/mod.rs at line 86
[177.1722]→[11.1847:1944](∅→∅),
[11.1847]→[11.1847:1944](∅→∅) − ) -> Result<Option<libpijul::Hash>, anyhow::Error> {
− use libpijul::changestore::ChangeStore;
+ ) -> Result<Option<pijul_core::Hash>, anyhow::Error> {
+ use pijul_core::changestore::ChangeStore;
replacement in pijul/src/commands/mod.rs at line 89
[53.18773]→[53.18773:18829](∅→∅) − let mut builder = libpijul::record::Builder::new();
+ let mut builder = pijul_core::record::Builder::new();
replacement in pijul/src/commands/mod.rs at line 92
[53.18870]→[11.1979:2019](∅→∅),
[11.1979]→[11.1979:2019](∅→∅) − libpijul::Algorithm::default(),
+ pijul_core::Algorithm::default(),
replacement in pijul/src/commands/mod.rs at line 94
[111.123]→[99.777:815](∅→∅),
[11.2019]→[99.777:815](∅→∅) − &libpijul::DEFAULT_SEPARATOR,
+ &pijul_core::DEFAULT_SEPARATOR,
replacement in pijul/src/commands/mod.rs at line 116
[53.19245]→[11.2303:2371](∅→∅),
[11.2303]→[11.2303:2371](∅→∅) − let mut pending_change = libpijul::change::Change::make_change(
+ let mut pending_change = pijul_core::change::Change::make_change(
replacement in pijul/src/commands/mod.rs at line 121
[53.19280]→[11.2445:2496](∅→∅),
[11.2445]→[11.2445:2496](∅→∅) − libpijul::change::ChangeHeader::default(),
+ pijul_core::change::ChangeHeader::default(),
replacement in pijul/src/commands/mod.rs at line 125
[11.2561]→[83.12865:12962](∅→∅) − libpijul::change::dependencies(&*txn, &*channel.read(), pending_change.changes.iter())?;
+ pijul_core::change::dependencies(&*txn, &*channel.read(), pending_change.changes.iter())?;
replacement in pijul/src/commands/mod.rs at line 186
[22.3060]→[22.3060:3119](∅→∅) − fn make_changelist<S: libpijul::changestore::ChangeStore>(
+ fn make_changelist<S: pijul_core::changestore::ChangeStore>(
replacement in pijul/src/commands/mod.rs at line 191
[22.3223]→[22.3223:3249](∅→∅) + use pijul_core::Base32;
replacement in pijul/src/commands/mod.rs at line 262
[178.354]→[22.4995:5021](∅→∅),
[131.455]→[22.4995:5021](∅→∅),
[125.36562]→[22.4995:5021](∅→∅),
[22.4995]→[22.4995:5021](∅→∅) + use pijul_core::Base32;
replacement in pijul/src/commands/mod.rs at line 270
[125.36684]→[125.36684:36748](∅→∅) − libpijul::Merkle::from_base32(l.as_bytes())
+ pijul_core::Merkle::from_base32(l.as_bytes())
replacement in pijul/src/commands/mod.rs at line 272
[125.36767]→[178.355:453](∅→∅) − let h_ = libpijul::Hash::from_base32(l.as_bytes()).map(pijul_remote::CS::Change);
+ let h_ = pijul_core::Hash::from_base32(l.as_bytes()).map(pijul_remote::CS::Change);
replacement in pijul/src/commands/mod.rs at line 278
[125.37043]→[178.454:548](∅→∅) − libpijul::Merkle::from_base32(&l.as_bytes()[..]).map(pijul_remote::CS::State)
+ pijul_core::Merkle::from_base32(&l.as_bytes()[..]).map(pijul_remote::CS::State)
replacement in pijul/src/commands/mod.rs at line 286
[81.69]→[120.1179:1214](∅→∅) − fn find_hash<B: libpijul::Base32>(
+ fn find_hash<B: pijul_core::Base32>(
replacement in pijul/src/commands/mod.rs at line 324
[91.1593]→[216.29:73](∅→∅) − use libpijul::{ChannelRef, Conflict, TxnT};
+ use pijul_core::{ChannelRef, Conflict, TxnT};
replacement in pijul/src/commands/mod.rs at line 370
[216.241]→[216.241:298](∅→∅) − (ch.unwrap_or(libpijul::DEFAULT_CHANNEL), ch == cur)
+ (ch.unwrap_or(pijul_core::DEFAULT_CHANNEL), ch == cur)
replacement in pijul/src/commands/log.rs at line 17
[209.104]→[2.134430:134460](∅→∅),
[99.834]→[2.134430:134460](∅→∅),
[189.1113]→[2.134430:134460](∅→∅),
[218.1439]→[2.134430:134460](∅→∅),
[195.1720]→[2.134430:134460](∅→∅),
[4.2104]→[2.134430:134460](∅→∅),
[2.134430]→[2.134430:134460](∅→∅),
[2.134460]→[116.7018:7044](∅→∅) − use libpijul::changestore::*;
− use libpijul::pristine::{
+ use pijul_core::changestore::*;
+ use pijul_core::pristine::{
replacement in pijul/src/commands/log.rs at line 21
[116.7127]→[209.105:138](∅→∅) − use libpijul::{Base32, TxnTExt};
+ use pijul_core::{Base32, TxnTExt};
replacement in pijul/src/commands/log.rs at line 74
[96.1394]→[96.1394:1455](∅→∅) − let mut id_path = repo.path.join(libpijul::DOT_DIR);
+ let mut id_path = repo.path.join(pijul_core::DOT_DIR);
replacement in pijul/src/commands/log.rs at line 96
[96.1888]→[96.1888:1952](∅→∅) − Txn(#[from] libpijul::pristine::sanakirja::SanakirjaError),
+ Txn(#[from] pijul_core::pristine::sanakirja::SanakirjaError),
replacement in pijul/src/commands/log.rs at line 98
[96.1978]→[96.1978:2053](∅→∅) − TxnErr(#[from] TxnErr<libpijul::pristine::sanakirja::SanakirjaError>),
+ TxnErr(#[from] TxnErr<pijul_core::pristine::sanakirja::SanakirjaError>),
replacement in pijul/src/commands/log.rs at line 100
[96.2079]→[116.7128:7205](∅→∅) − TreeErr(#[from] TreeErr<libpijul::pristine::sanakirja::SanakirjaError>),
+ TreeErr(#[from] TreeErr<pijul_core::pristine::sanakirja::SanakirjaError>),
replacement in pijul/src/commands/log.rs at line 102
[116.7231]→[116.7231:7302](∅→∅) − Fs(#[from] libpijul::FsError<libpijul::pristine::sanakirja::Txn>),
+ Fs(#[from] pijul_core::FsError<pijul_core::pristine::sanakirja::Txn>),
replacement in pijul/src/commands/log.rs at line 119
[96.2682]→[96.2682:2748](∅→∅) − Filesystem(#[from] libpijul::changestore::filesystem::Error),
+ Filesystem(#[from] pijul_core::changestore::filesystem::Error),
replacement in pijul/src/commands/log.rs at line 131
[112.55]→[112.55:146](∅→∅) − libpijul::Inode,
− Option<libpijul::pristine::Position<libpijul::ChangeId>>,
+ pijul_core::Inode,
+ Option<pijul_core::pristine::Position<pijul_core::ChangeId>>,
replacement in pijul/src/commands/log.rs at line 160
[112.202]→[112.202:265](∅→∅) − let inode = libpijul::fs::find_inode(txn, s)?;
+ let inode = pijul_core::fs::find_inode(txn, s)?;
replacement in pijul/src/commands/log.rs at line 195
[95.636]→[95.636:662](∅→∅) + Hash(pijul_core::Hash),
replacement in pijul/src/commands/log.rs at line 386
[127.918]→[94.12405:12469](∅→∅),
[94.12405]→[94.12405:12469](∅→∅) − h: libpijul::Hash,
− m: Option<libpijul::Merkle>,
+ h: pijul_core::Hash,
+ m: Option<pijul_core::Merkle>,
replacement in pijul/src/commands/init.rs at line 4
[99.1006]→[7.3397:3420](∅→∅),
[189.1212]→[7.3397:3420](∅→∅),
[4.2201]→[7.3397:3420](∅→∅) + use pijul_core::MutTxnT;
replacement in pijul/src/commands/init.rs at line 33
[15.1700]→[174.788:859](∅→∅) − .unwrap_or_else(|| libpijul::DEFAULT_CHANNEL.to_string());
+ .unwrap_or_else(|| pijul_core::DEFAULT_CHANNEL.to_string());
replacement in pijul/src/commands/identity.rs at line 406
[140.53205]→[140.53205:53296](∅→∅) − libpijul::key::Encryption::Aes128(_) => "AES 128-bit",
+ pijul_core::key::Encryption::Aes128(_) => "AES 128-bit",
edit in pijul/src/commands/git.rs at line 3
[133.18]→[68.888:932](∅→∅),
[99.1066]→[68.888:932](∅→∅),
[189.1514]→[68.888:932](∅→∅),
[68.888]→[68.888:932](∅→∅) − use libpijul::pristine::*;
− use libpijul::*;
edit in pijul/src/commands/git.rs at line 4
+ use pijul_core::pristine::*;
+ use pijul_core::*;
replacement in pijul/src/commands/git.rs at line 81
[2.138447]→[2.138447:138509](∅→∅) − let mut path_git = repo.path.join(libpijul::DOT_DIR);
+ let mut path_git = repo.path.join(pijul_core::DOT_DIR);
replacement in pijul/src/commands/git.rs at line 105
[164.223]→[164.223:372](∅→∅) − libpijul::output::output_repository_no_pending(
− &libpijul::working_copy::FileSystem::from_root(&repo.repo.path),
+ pijul_core::output::output_repository_no_pending(
+ &pijul_core::working_copy::FileSystem::from_root(&repo.repo.path),
replacement in pijul/src/commands/git.rs at line 126
[2.139340]→[7.3455:3509](∅→∅) − root: Vec<(git2::Oid, Option<libpijul::Merkle>)>,
+ root: Vec<(git2::Oid, Option<pijul_core::Merkle>)>,
replacement in pijul/src/commands/git.rs at line 147
[2.140110]→[181.0:94](∅→∅) − let db: ::sanakirja::btree::UDb<Oid, libpijul::pristine::SerializedMerkle> = unsafe {
+ let db: ::sanakirja::btree::UDb<Oid, pijul_core::pristine::SerializedMerkle> = unsafe {
replacement in pijul/src/commands/git.rs at line 279
[2.143978]→[2.143978:144028](∅→∅) − let mut ws = libpijul::ApplyWorkspace::new();
+ let mut ws = pijul_core::ApplyWorkspace::new();
replacement in pijul/src/commands/git.rs at line 292
[29.256]→[46.1006:1065](∅→∅) − let merkle_: libpijul::Merkle = (&p.b).into();
+ let merkle_: pijul_core::Merkle = (&p.b).into();
replacement in pijul/src/commands/git.rs at line 375
[2.147667]→[7.3686:3715](∅→∅) − state: libpijul::Merkle,
+ state: pijul_core::Merkle,
replacement in pijul/src/commands/git.rs at line 379
[2.147840]→[181.165:259](∅→∅) − let mut db: ::sanakirja::btree::UDb<Oid, libpijul::pristine::SerializedMerkle> = unsafe {
+ let mut db: ::sanakirja::btree::UDb<Oid, pijul_core::pristine::SerializedMerkle> = unsafe {
replacement in pijul/src/commands/git.rs at line 398
[2.148275]→[30.0:65](∅→∅) − ) -> Result<(bool, Vec<(libpijul::Hash, u64)>), anyhow::Error> {
+ ) -> Result<(bool, Vec<(pijul_core::Hash, u64)>), anyhow::Error> {
replacement in pijul/src/commands/git.rs at line 419
[29.632]→[46.1492:1542](∅→∅) − let h: libpijul::Hash = h.into();
+ let h: pijul_core::Hash = h.into();
replacement in pijul/src/commands/git.rs at line 446
[2.149927]→[2.149927:149966](∅→∅) − ws: &mut libpijul::ApplyWorkspace,
+ ws: &mut pijul_core::ApplyWorkspace,
replacement in pijul/src/commands/git.rs at line 477
[2.151291]→[54.2579:2635](∅→∅),
[54.2635]→[138.107:152](∅→∅) − libpijul::output::output_repository_no_pending(
− &libpijul::working_copy::sink(),
+ pijul_core::output::output_repository_no_pending(
+ &pijul_core::working_copy::sink(),
replacement in pijul/src/commands/git.rs at line 561
[46.1756]→[68.1095:1196](∅→∅) − if let Some(old_path) = libpijul::fs::inode_filename(&*txn, *inode)?
+ if let Some(old_path) =
+ pijul_core::fs::inode_filename(&*txn, *inode)?
replacement in pijul/src/commands/git.rs at line 642
[138.778]→[138.778:844](∅→∅) − impl<'a> libpijul::working_copy::WorkingCopyRead for Commit<'a> {
+ impl<'a> pijul_core::working_copy::WorkingCopyRead for Commit<'a> {
replacement in pijul/src/commands/git.rs at line 691
[2.157761]→[7.3911:3958](∅→∅) − ) -> Result<libpijul::Merkle, anyhow::Error> {
+ ) -> Result<pijul_core::Merkle, anyhow::Error> {
replacement in pijul/src/commands/git.rs at line 705
[138.2355]→[138.2355:2428](∅→∅) − let (tracked, pos) = libpijul::fs::get_vertex(&*txn_, &p_)?;
+ let (tracked, pos) = pijul_core::fs::get_vertex(&*txn_, &p_)?;
replacement in pijul/src/commands/git.rs at line 764
[138.3147]→[2.158632:158673](∅→∅),
[2.158632]→[2.158632:158673](∅→∅) − libpijul::change::ChangeHeader {
+ pijul_core::change::ChangeHeader {
replacement in pijul/src/commands/git.rs at line 766
[60.398]→[76.285:346](∅→∅) − authors: vec![libpijul::change::Author(author)],
+ authors: vec![pijul_core::change::Author(author)],
replacement in pijul/src/commands/git.rs at line 784
[2.159258]→[17.266:343](∅→∅) − Err(libpijul::LocalApplyError::ChangeAlreadyOnChannel { hash }) => {
+ Err(pijul_core::LocalApplyError::ChangeAlreadyOnChannel { hash }) => {
replacement in pijul/src/commands/git.rs at line 807
[138.3184]→[138.3184:3291](∅→∅) − C: libpijul::changestore::ChangeStore + Clone,
− W: libpijul::working_copy::WorkingCopyRead + Clone,
+ C: pijul_core::changestore::ChangeStore + Clone,
+ W: pijul_core::working_copy::WorkingCopyRead + Clone,
replacement in pijul/src/commands/git.rs at line 815
[138.3355]→[2.160635:160679](∅→∅),
[2.160635]→[2.160635:160679](∅→∅) − header: libpijul::change::ChangeHeader,
+ header: pijul_core::change::ChangeHeader,
replacement in pijul/src/commands/git.rs at line 817
[132.39]→[138.3356:3449](∅→∅) − ) -> Result<(usize, Option<libpijul::Hash>, libpijul::Merkle), libpijul::LocalApplyError<T>>
+ ) -> Result<(usize, Option<pijul_core::Hash>, pijul_core::Merkle), pijul_core::LocalApplyError<T>>
replacement in pijul/src/commands/git.rs at line 823
[132.89]→[2.160829:160881](∅→∅),
[109.128]→[2.160829:160881](∅→∅),
[21.396]→[2.160829:160881](∅→∅),
[17.646]→[2.160829:160881](∅→∅),
[29.1006]→[2.160829:160881](∅→∅),
[7.4047]→[2.160829:160881](∅→∅),
[2.160829]→[2.160829:160881](∅→∅) − let mut state = libpijul::RecordBuilder::new();
+ let mut state = pijul_core::RecordBuilder::new();
replacement in pijul/src/commands/git.rs at line 834
[138.3720]→[138.3720:3768](∅→∅) − libpijul::Algorithm::default(),
+ pijul_core::Algorithm::default(),
replacement in pijul/src/commands/git.rs at line 836
[138.3791]→[138.3791:3837](∅→∅) − &libpijul::DEFAULT_SEPARATOR,
+ &pijul_core::DEFAULT_SEPARATOR,
replacement in pijul/src/commands/git.rs at line 849
[138.4102]→[138.4102:4150](∅→∅) − libpijul::Algorithm::default(),
+ pijul_core::Algorithm::default(),
replacement in pijul/src/commands/git.rs at line 851
[138.4173]→[138.4173:4219](∅→∅) − &libpijul::DEFAULT_SEPARATOR,
+ &pijul_core::DEFAULT_SEPARATOR,
replacement in pijul/src/commands/git.rs at line 871
[30.1614]→[83.15495:15576](∅→∅),
[30.1695]→[2.161362:161427](∅→∅),
[54.5254]→[2.161362:161427](∅→∅),
[83.15576]→[2.161362:161427](∅→∅),
[2.161362]→[2.161362:161427](∅→∅) − libpijul::change::dependencies(&*txn, &channel.read(), actions.iter())?;
− let mut change = libpijul::change::LocalChange::make_change(
+ pijul_core::change::dependencies(&*txn, &channel.read(), actions.iter())?;
+ let mut change = pijul_core::change::LocalChange::make_change(
replacement in pijul/src/commands/git.rs at line 909
[2.162231]→[7.4048:4082](∅→∅) − hash: Option<libpijul::Hash>,
+ hash: Option<pijul_core::Hash>,
replacement in pijul/src/commands/git.rs at line 969
[2.163932]→[2.163932:163977](∅→∅) − let timers = libpijul::get_timers();
+ let timers = pijul_core::get_timers();
replacement in pijul/src/commands/git.rs at line 1003
[2.165113]→[2.165113:165147](∅→∅) − libpijul::reset_timers();
+ pijul_core::reset_timers();
replacement in pijul/src/commands/fork.rs at line 4
[210.18]→[186.0:73](∅→∅),
[190.64]→[186.0:73](∅→∅),
[99.1111]→[186.0:73](∅→∅) − use libpijul::{Base32, ChannelTxnT, MutTxnT, MutTxnTExt, TxnT, TxnTExt};
+ use pijul_core::{Base32, ChannelTxnT, MutTxnT, MutTxnTExt, TxnT, TxnTExt};
replacement in pijul/src/commands/fork.rs at line 45
[186.1184]→[186.1184:1271](∅→∅) − if let Some(state) = libpijul::Merkle::from_base32(state.as_bytes()) {
+ if let Some(state) = pijul_core::Merkle::from_base32(state.as_bytes()) {
replacement in pijul/src/commands/file_operations.rs at line 9
[203.44]→[218.1440:1486](∅→∅) − use libpijul::{MutTxnT, MutTxnTExt, TxnTExt};
+ use pijul_core::{MutTxnT, MutTxnTExt, TxnTExt};
replacement in pijul/src/commands/file_operations.rs at line 158
− && !libpijul::working_copy::filesystem::filter_ignore(
+ && !pijul_core::working_copy::filesystem::filter_ignore(
replacement in pijul/src/commands/file_operations.rs at line 167
[16.281]→[16.281:340](∅→∅) − use libpijul::working_copy::filesystem::*;
+ use pijul_core::working_copy::filesystem::*;
replacement in pijul/src/commands/diff.rs at line 7
[204.18]→[4.2570:2595](∅→∅),
[99.1294]→[4.2570:2595](∅→∅),
[189.1891]→[4.2570:2595](∅→∅),
[4.2570]→[4.2570:2595](∅→∅),
[4.2595]→[204.19:53](∅→∅) − use libpijul::change::*;
− use libpijul::{MutTxnT, TxnTExt};
+ use pijul_core::change::*;
+ use pijul_core::{MutTxnT, TxnTExt};
replacement in pijul/src/commands/diff.rs at line 63
[2.174399]→[2.174399:174455](∅→∅) − let mut state = libpijul::RecordBuilder::new();
+ let mut state = pijul_core::RecordBuilder::new();
replacement in pijul/src/commands/diff.rs at line 68
[220.851]→[220.851:893](∅→∅) − libpijul::Algorithm::Patience
+ pijul_core::Algorithm::Patience
replacement in pijul/src/commands/diff.rs at line 70
[220.928]→[220.928:976](∅→∅) − libpijul::Algorithm::ImaraHistogram
+ pijul_core::Algorithm::ImaraHistogram
replacement in pijul/src/commands/diff.rs at line 72
[220.993]→[220.993:1036](∅→∅) − libpijul::Algorithm::default()
+ pijul_core::Algorithm::default()
replacement in pijul/src/commands/diff.rs at line 79
[118.28]→[99.1321:1367](∅→∅),
[111.146]→[99.1321:1367](∅→∅),
[2.174593]→[99.1321:1367](∅→∅) − &libpijul::DEFAULT_SEPARATOR,
+ &pijul_core::DEFAULT_SEPARATOR,
replacement in pijul/src/commands/diff.rs at line 255
[53.20834]→[53.20834:20893](∅→∅) − Err(libpijul::change::TextSerError::Io(e))
+ Err(pijul_core::change::TextSerError::Io(e))
replacement in pijul/src/commands/diff.rs at line 261
[128.494]→[128.494:536](∅→∅) − use libpijul::ChannelMutTxnT;
+ use pijul_core::ChannelMutTxnT;
replacement in pijul/src/commands/diff.rs at line 305
[42.795]→[42.795:877](∅→∅) − impl<W: termcolor::WriteColor> libpijul::change::WriteChangeLine for Colored<W> {
+ impl<W: termcolor::WriteColor> pijul_core::change::WriteChangeLine for Colored<W> {
replacement in pijul/src/commands/diff.rs at line 368
[219.801]→[219.801:831](∅→∅) − txn: libpijul::ArcTxn<T>,
+ txn: pijul_core::ArcTxn<T>,
replacement in pijul/src/commands/diff.rs at line 379
[85.2241]→[187.1313:1343](∅→∅) − txn: libpijul::ArcTxn<T>,
+ txn: pijul_core::ArcTxn<T>,
replacement in pijul/src/commands/dependents.rs at line 2
[211.18]→[156.306:323](∅→∅),
[189.1990]→[156.306:323](∅→∅),
[156.306]→[156.306:323](∅→∅) edit in pijul/src/commands/debug.rs at line 4
[212.103]→[212.103:126](∅→∅) edit in pijul/src/commands/debug.rs at line 5
+ use pijul_core::TxnTExt;
replacement in pijul/src/commands/debug.rs at line 28
[53.21126]→[53.21126:21178](∅→∅),
[53.21178]→[107.0:101](∅→∅),
[107.101]→[53.21178:21348](∅→∅),
[53.21178]→[53.21178:21348](∅→∅),
[53.21348]→[75.24193:24246](∅→∅) − libpijul::pristine::debug_inodes(&txn);
− libpijul::pristine::debug_dep(&txn);
− libpijul::pristine::debug_revdep(&txn);
− libpijul::pristine::debug_revinodes(&txn);
− libpijul::pristine::debug_tree_print(&txn);
− libpijul::pristine::debug_revtree_print(&txn);
− libpijul::pristine::debug_remotes(&txn);
+ pijul_core::pristine::debug_inodes(&txn);
+ pijul_core::pristine::debug_dep(&txn);
+ pijul_core::pristine::debug_revdep(&txn);
+ pijul_core::pristine::debug_revinodes(&txn);
+ pijul_core::pristine::debug_tree_print(&txn);
+ pijul_core::pristine::debug_revtree_print(&txn);
+ pijul_core::pristine::debug_remotes(&txn);
replacement in pijul/src/commands/debug.rs at line 39
[165.126]→[165.126:198](∅→∅) − let inode = libpijul::fs::find_inode(&txn, &root)?;
+ let inode = pijul_core::fs::find_inode(&txn, &root)?;
replacement in pijul/src/commands/debug.rs at line 41
[165.247]→[165.247:291](∅→∅) − use libpijul::TreeTxnT;
+ use pijul_core::TreeTxnT;
replacement in pijul/src/commands/debug.rs at line 51
[152.74]→[53.21530:21578](∅→∅),
[182.547]→[53.21530:21578](∅→∅),
[165.670]→[53.21530:21578](∅→∅),
[171.1882]→[53.21530:21578](∅→∅),
[53.21530]→[53.21530:21578](∅→∅) − libpijul::pristine::debug_root(
+ pijul_core::pristine::debug_root(
replacement in pijul/src/commands/debug.rs at line 60
[83.16568]→[106.374:453](∅→∅) − libpijul::pristine::debug(&txn, &channel, std::io::stdout())?;
+ pijul_core::pristine::debug(&txn, &channel, std::io::stdout())?;
replacement in pijul/src/commands/debug.rs at line 62
[53.21940]→[83.16569:16663](∅→∅) − libpijul::pristine::check_alive_debug(&repo.changes, &txn, &*channel.read(), 0)?;
+ pijul_core::pristine::check_alive_debug(&repo.changes, &txn, &*channel.read(), 0)?;
replacement in pijul/src/commands/debug.rs at line 75
[165.680]→[165.680:774](∅→∅) − fn parse_pos(s: &str) -> Option<libpijul::pristine::Position<libpijul::pristine::ChangeId>> {
+ fn parse_pos(s: &str) -> Option<pijul_core::pristine::Position<pijul_core::pristine::ChangeId>> {
replacement in pijul/src/commands/debug.rs at line 78
[170.1752]→[170.1752:1830](∅→∅) − use libpijul::pristine::{Base32, ChangeId, ChangePosition, Position};
+ use pijul_core::pristine::{Base32, ChangeId, ChangePosition, Position};
edit in pijul/src/commands/credit.rs at line 6
[189.2209]→[146.0:40](∅→∅),
[99.1431]→[146.0:40](∅→∅),
[146.40]→[194.5942:6003](∅→∅),
[146.101]→[25.18103:18120](∅→∅),
[194.6003]→[25.18103:18120](∅→∅),
[2.178851]→[25.18103:18120](∅→∅) − use libpijul::changestore::ChangeStore;
− use libpijul::vertex_buffer::{VertexBuffer, change_message};
− use libpijul::*;
edit in pijul/src/commands/credit.rs at line 7
+ use pijul_core::changestore::ChangeStore;
+ use pijul_core::vertex_buffer::{VertexBuffer, change_message};
+ use pijul_core::*;
replacement in pijul/src/commands/credit.rs at line 51
[136.360]→[64.0:45](∅→∅),
[134.1111]→[64.0:45](∅→∅),
[83.16741]→[64.0:45](∅→∅),
[53.22212]→[64.0:45](∅→∅) − match libpijul::output::output_file(
+ match pijul_core::output::output_file(
replacement in pijul/src/commands/credit.rs at line 59
[68.1774]→[65.0:58](∅→∅),
[64.83]→[65.0:58](∅→∅) − Err(libpijul::output::FileError::Io(io)) => {
+ Err(pijul_core::output::FileError::Io(io)) => {
edit in pijul/src/commands/clone.rs at line 5
[189.2355]→[110.0:41](∅→∅),
[99.1476]→[110.0:41](∅→∅) − use libpijul::{ChannelMutTxnT, MutTxnT};
edit in pijul/src/commands/clone.rs at line 6
+ use pijul_core::{ChannelMutTxnT, MutTxnT};
replacement in pijul/src/commands/clone.rs at line 12
[8.4661]→[174.1198:1271](∅→∅) − #[clap(long = "channel", default_value = libpijul::DEFAULT_CHANNEL)]
+ #[clap(long = "channel", default_value = pijul_core::DEFAULT_CHANNEL)]
replacement in pijul/src/commands/clone.rs at line 115
[155.3802]→[155.3802:3862](∅→∅) − libpijul::output::output_repository_no_pending(
+ pijul_core::output::output_repository_no_pending(
replacement in pijul/src/commands/clone.rs at line 128
[155.4202]→[155.4202:4266](∅→∅) − libpijul::output::output_repository_no_pending(
+ pijul_core::output::output_repository_no_pending(
replacement in pijul/src/commands/clone.rs at line 168
[41.138]→[41.138:221](∅→∅) − remove_dot: std::fs::metadata(&path.join(libpijul::DOT_DIR)).is_err(),
+ remove_dot: std::fs::metadata(&path.join(pijul_core::DOT_DIR)).is_err(),
replacement in pijul/src/commands/clone.rs at line 176
[41.373]→[41.373:460](∅→∅) − std::fs::remove_dir_all(&self.path.join(libpijul::DOT_DIR)).unwrap_or(());
+ std::fs::remove_dir_all(&self.path.join(pijul_core::DOT_DIR)).unwrap_or(());
edit in pijul/src/commands/channel.rs at line 9
[213.120]→[26.943:987](∅→∅),
[99.1521]→[26.943:987](∅→∅),
[189.2527]→[26.943:987](∅→∅),
[13.163]→[26.943:987](∅→∅) − use libpijul::{ChannelTxnT, MutTxnT, TxnT};
edit in pijul/src/commands/channel.rs at line 10
+ use pijul_core::{ChannelTxnT, MutTxnT, TxnT};
replacement in pijul/src/commands/channel.rs at line 131
[151.907]→[151.907:966](∅→∅) − use libpijul::{GraphTxnT, MutTxnTExt};
+ use pijul_core::{GraphTxnT, MutTxnTExt};
replacement in pijul/src/commands/channel.rs at line 133
[151.1020]→[151.1020:1109](∅→∅) − libpijul::pristine::changeid_log(&txn, &ch, 0u64.into())?.next()
+ pijul_core::pristine::changeid_log(&txn, &ch, 0u64.into())?.next()
replacement in pijul/src/commands/change.rs at line 5
[99.1592]→[2.189362:189402](∅→∅),
[189.2626]→[2.189362:189402](∅→∅),
[2.189362]→[2.189362:189402](∅→∅),
[2.189429]→[2.189429:189446](∅→∅) − use libpijul::changestore::ChangeStore;
− use libpijul::*;
+ use pijul_core::changestore::ChangeStore;
+ use pijul_core::*;
edit in pijul/src/commands/archive.rs at line 3
[189.2746]→[214.0:30](∅→∅) − use libpijul::{Hash, Merkle};
edit in pijul/src/commands/archive.rs at line 4
+ use pijul_core::{Hash, Merkle};
replacement in pijul/src/commands/archive.rs at line 85
[2.192302]→[214.245:319](∅→∅) − self.base.channel().unwrap_or(libpijul::DEFAULT_CHANNEL),
+ self.base.channel().unwrap_or(pijul_core::DEFAULT_CHANNEL),
replacement in pijul/src/commands/archive.rs at line 112
[2.193296]→[52.761:851](∅→∅) − let mut tarball = libpijul::output::Tarball::new(&mut f, self.prefix, umask);
+ let mut tarball = pijul_core::output::Tarball::new(&mut f, self.prefix, umask);
replacement in pijul/src/commands/archive.rs at line 129
[2.193815]→[223.725:798](∅→∅) − type W = libpijul::working_copy::filesystem::FileSystem;
+ type W = pijul_core::working_copy::filesystem::FileSystem;
replacement in pijul/src/commands/apply.rs at line 9
[215.18]→[2.194343:194383](∅→∅),
[218.1628]→[2.194343:194383](∅→∅),
[99.1682]→[2.194343:194383](∅→∅),
[189.2905]→[2.194343:194383](∅→∅),
[4.3378]→[2.194343:194383](∅→∅),
[2.194343]→[2.194343:194383](∅→∅),
[2.194383]→[83.17448:17503](∅→∅),
[83.17503]→[53.23441:23475](∅→∅),
[34.617]→[53.23441:23475](∅→∅) − use libpijul::changestore::ChangeStore;
− use libpijul::{DepsTxnT, GraphTxnT, MutTxnTExt, TxnT};
− use libpijul::{HashMap, HashSet};
+ use pijul_core::changestore::ChangeStore;
+ use pijul_core::{DepsTxnT, GraphTxnT, MutTxnTExt, TxnT};
+ use pijul_core::{HashMap, HashSet};
replacement in pijul/src/commands/apply.rs at line 41
[161.146]→[161.146:246](∅→∅) − let mut change = libpijul::change::Change::read(&mut change, &mut HashMap::default())?;
+ let mut change =
+ pijul_core::change::Change::read(&mut change, &mut HashMap::default())?;
replacement in pijul/src/commands/apply.rs at line 49
[161.408]→[154.0:31](∅→∅),
[2.195413]→[154.0:31](∅→∅) + use pijul_core::MutTxnT;
replacement in pijul/src/commands/apply.rs at line 68
[2.195560]→[61.0:79](∅→∅) − let change = libpijul::change::Change::deserialize(&ch, None);
+ let change = pijul_core::change::Change::deserialize(&ch, None);
replacement in pijul/src/commands/apply.rs at line 73
[98.678]→[61.165:232](∅→∅),
[81.1148]→[61.165:232](∅→∅),
[61.165]→[61.165:232](∅→∅) − Err(libpijul::change::ChangeError::Io(e)) => {
+ Err(pijul_core::change::ChangeError::Io(e)) => {
replacement in pijul/src/commands/apply.rs at line 124
[47.3098]→[160.0:95](∅→∅) − libpijul::fs::find_path(&repo.changes, &*txn_, &*forked.read(), false, i)?
+ pijul_core::fs::find_path(&repo.changes, &*txn_, &*forked.read(), false, i)?
replacement in pijul/src/commands/apply.rs at line 139
[149.190]→[149.190:254](∅→∅) − let mut state = libpijul::RecordBuilder::new();
+ let mut state = pijul_core::RecordBuilder::new();
replacement in pijul/src/commands/apply.rs at line 143
[149.371]→[149.371:427](∅→∅) − libpijul::Algorithm::default(),
+ pijul_core::Algorithm::default(),
replacement in pijul/src/commands/apply.rs at line 145
[149.458]→[149.458:512](∅→∅) − &libpijul::DEFAULT_SEPARATOR,
+ &pijul_core::DEFAULT_SEPARATOR,
replacement in pijul/src/commands/apply.rs at line 157
[149.968]→[154.404:460](∅→∅) − libpijul::Algorithm::default(),
+ pijul_core::Algorithm::default(),
replacement in pijul/src/commands/apply.rs at line 178
[91.3206]→[91.3206:3274](∅→∅) − libpijul::output::output_repository_no_pending(
+ pijul_core::output::output_repository_no_pending(
replacement in pijul/src/commands/apply.rs at line 194
[91.3691]→[91.3691:3759](∅→∅) − libpijul::output::output_repository_no_pending(
+ pijul_core::output::output_repository_no_pending(
replacement in pijul/Cargo.toml at line 18
[2.197381]→[193.2005:2061](∅→∅) − libpijul = { workspace = true, features = ["tarball"] }
+ pijul-core = { workspace = true, features = ["tarball"] }
replacement in flake.nix at line 39
[230.1046]→[230.1046:1078](∅→∅) replacement in Cargo.toml at line 3
[179.1112]→[179.1112:1128](∅→∅) replacement in Cargo.toml at line 23
[193.5441]→[193.5441:5501](∅→∅) − libpijul = { path = "libpijul", version = "1.0.0-beta.10" }
+ pijul-core = { path = "pijul-core", version = "1.0.0-beta.10" }
replacement in Cargo.nix at line 40
[224.1414]→[224.1414:1467](∅→∅) − "libpijul" = rec {
− packageId = "libpijul";
+ "pijul-core" = rec {
+ packageId = "pijul-core";
replacement in Cargo.nix at line 43
[224.1519]→[224.1519:1551](∅→∅) − packageId = "libpijul";
+ packageId = "pijul-core";
replacement in Cargo.nix at line 5018
[224.158067]→[224.158067:158124](∅→∅) − "libpijul" = rec {
− crateName = "libpijul";
+ "pijul-core" = rec {
+ crateName = "pijul-core";
replacement in Cargo.nix at line 5022
[224.158185]→[224.158185:158266](∅→∅) − src = lib.cleanSourceWith { filter = sourceFilter; src = ./libpijul; };
+ src = lib.cleanSourceWith { filter = sourceFilter; src = ./pijul-core; };
replacement in Cargo.nix at line 6939
[224.214360]→[237.2761:2828](∅→∅) − name = "libpijul";
− packageId = "libpijul";
+ name = "pijul-core";
+ packageId = "pijul-core";
replacement in Cargo.nix at line 7009
[224.216111]→[224.216111:216178](∅→∅) − name = "libpijul";
− packageId = "libpijul";
+ name = "pijul-core";
+ packageId = "pijul-core";
replacement in Cargo.nix at line 7143
[237.2865]→[237.2865:2932](∅→∅) − name = "libpijul";
− packageId = "libpijul";
+ name = "pijul-core";
+ packageId = "pijul-core";
replacement in Cargo.nix at line 7220
[224.221444]→[224.221444:221511](∅→∅) − name = "libpijul";
− packageId = "libpijul";
+ name = "pijul-core";
+ packageId = "pijul-core";
replacement in Cargo.nix at line 7383
[224.225700]→[224.225700:225767](∅→∅) − name = "libpijul";
− packageId = "libpijul";
+ name = "pijul-core";
+ packageId = "pijul-core";
replacement in Cargo.nix at line 7477
[224.228152]→[224.228152:228219](∅→∅) − name = "libpijul";
− packageId = "libpijul";
+ name = "pijul-core";
+ packageId = "pijul-core";
edit in Cargo.lock at line 1642
[221.39742]→[221.39742:39760](∅→∅),
[221.39760]→[227.1355:1381](∅→∅),
[227.1381]→[221.39786:39953](∅→∅),
[221.39786]→[221.39786:39953](∅→∅),
[221.39953]→[227.1382:1409](∅→∅),
[227.1409]→[221.39974:40269](∅→∅),
[221.39974]→[221.39974:40269](∅→∅),
[221.40269]→[227.1410:1447](∅→∅),
[227.1447]→[221.40306:40492](∅→∅),
[221.40306]→[221.40306:40492](∅→∅) − name = "libpijul"
− version = "1.0.0-beta.11"
− dependencies = [
− "adler32",
− "aes",
− "anyhow",
− "bincode",
− "bitflags 2.10.0",
− "blake3",
− "bs58",
− "byteorder",
− "canonical-path",
− "chardetng",
− "crossbeam-deque",
− "curve25519-dalek 4.1.3",
− "data-encoding",
− "diffs",
− "ed25519-dalek",
− "encoding_rs",
− "env_logger 0.11.8",
− "flate2",
− "generic-array",
− "getrandom 0.2.16",
− "hmac",
− "ignore",
− "imara-diff",
− "jiff",
− "log",
− "lru-cache",
− "nom",
− "parking_lot 0.12.5",
− "path-slash",
− "pbkdf2 0.9.0",
− "pijul-macros",
− "quickcheck",
− "rand 0.9.2",
− "rand_chacha 0.9.0",
− "regex",
− "sanakirja",
− "serde",
− "serde_derive",
− "serde_json",
− "sha2 0.9.9",
− "tar",
− "tempfile",
− "thiserror 2.0.17",
− "toml 0.8.23",
− "twox-hash",
− "zstd-seekable",
− ]
−
− [[package]]
edit in Cargo.lock at line 2206
[221.57819]→[221.57819:57832](∅→∅) edit in Cargo.lock at line 2211
edit in Cargo.lock at line 2241
[236.4096]→[236.4096:4109](∅→∅) edit in Cargo.lock at line 2242
edit in Cargo.lock at line 2247
+ ]
+
+ [[package]]
+ name = "pijul-core"
+ version = "1.0.0-beta.11"
+ dependencies = [
+ "adler32",
+ "aes",
+ "anyhow",
+ "bincode",
+ "bitflags 2.10.0",
+ "blake3",
+ "bs58",
+ "byteorder",
+ "canonical-path",
+ "chardetng",
+ "crossbeam-deque",
+ "curve25519-dalek 4.1.3",
+ "data-encoding",
+ "diffs",
+ "ed25519-dalek",
+ "encoding_rs",
+ "env_logger 0.11.8",
+ "flate2",
+ "generic-array",
+ "getrandom 0.2.16",
+ "hmac",
+ "ignore",
+ "imara-diff",
+ "jiff",
+ "log",
+ "lru-cache",
+ "nom",
+ "parking_lot 0.12.5",
+ "path-slash",
+ "pbkdf2 0.9.0",
+ "pijul-macros",
+ "quickcheck",
+ "rand 0.9.2",
+ "rand_chacha 0.9.0",
+ "regex",
+ "sanakirja",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sha2 0.9.9",
+ "tar",
+ "tempfile",
+ "thiserror 2.0.17",
+ "toml 0.8.23",
+ "twox-hash",
+ "zstd-seekable",
edit in Cargo.lock at line 2309
[221.58477]→[221.58477:58490](∅→∅) edit in Cargo.lock at line 2311
edit in Cargo.lock at line 2355
[221.59115]→[221.59115:59128](∅→∅) edit in Cargo.lock at line 2357
edit in Cargo.lock at line 2379
[221.59454]→[221.59454:59467](∅→∅) edit in Cargo.lock at line 2381