Cleanup and formatting

pmeunier

Sep 9, 2021, 12:32 PM

KJOOI346EYXQIRDEGWHYILGX44AZNPHBFUDW5HYEEG5IC2ZXV6GAC

Dependencies

[2] C4MJ7D7Q Verbose printing of conflicts to stderr
[3] 44HXAOMJ When applying non-block edgemaps pointing to split vertices, do not propagate to the rest of the split
[4] FJTRJD6B Supporting patches recorded with older versions of Pijul
[5] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
[6] 6YMDOZIB Refactoring apply
[7] XA23FMQM Reset only files that have been modified
[8] LGEJSLTY Fixing output (including its uses in reset and pull)
[9] VO5OQW4W Removing anyhow in libpijul
[10] 7A2TSC4P Conflict solving code (FOLDER edges)
[11] I24UEJQL Various post-fire fixes
[12] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
[13] 3KRGVQFU Do not update the mtime of unmodified files
[14] 2RXOCWUW Making libpijul deterministic (and getting rid of `rand`)
[15] KDF6FJRV bigger clippy refactors
[16] MDADYULS Fix a panic when switching between channels that have different files
[17] YGPEHOTE libpijul::fs::add_{file,dir} now return the created Inode
[18] G6S6PWZE Do not touch the channel if this is a partial record

Change contents

replacement in ""libpijul/src/pristine/vertex.rs"" at line 49

[5.114]→[5.526416:526481](∅→∅),[5.526416]→[5.526416:526481](∅→∅)

pub(crate) fn to_option(&self) -> Vertex<Option<ChangeId>> {

[5.114]

[5.526481]

pub fn to_option(&self) -> Vertex<Option<ChangeId>> {
replacement in ""libpijul/src/pristine/vertex.rs"" at line 196

[5.530456]→[5.530456:530523](∅→∅)

pub(crate) fn to_option(&self) -> Position<Option<ChangeId>> {

[5.530456]

[5.530523]

pub fn to_option(&self) -> Position<Option<ChangeId>> {
replacement in ""libpijul/src/output/output.rs"" at line 231

[5.675655]→[5.675655:675741](∅→∅)

debug!("pos already visited: {:?} {:?}", a, output_item.pos);

[5.675655]

[2.4714]

debug!(
"pos already visited: {:?} {:?} {:?} {:?}",
a,
output_item.pos,
e.get(),
name_key
);
replacement in ""libpijul/src/output/output.rs"" at line 246

[5.676028]→[2.4824:4867](∅→∅)

Entry::Vacant(e) => e,

[5.676028]

[2.4867]

Entry::Vacant(e) => {
debug!("first visit {:?} {:?}", a, output_item.pos);
e
}
edit in ""libpijul/src/lib.rs"" at line 164

[5.722974]→[5.722974:722981](∅→∅),[5.722981]→[5.84190:84197](∅→∅),[5.84197]→[5.722981:723283](∅→∅),[5.722981]→[5.722981:723283](∅→∅),[5.723283]→[5.93730:93967](∅→∅),[5.93967]→[5.84198:84240](∅→∅),[5.84240]→[5.94006:94083](∅→∅),[5.94006]→[5.94006:94083](∅→∅),[5.94083]→[5.723405:723558](∅→∅),[5.723405]→[5.723405:723558](∅→∅),[5.723558]→[5.84241:84287](∅→∅),[5.84287]→[5.723608:723681](∅→∅),[5.723608]→[5.723608:723681](∅→∅),[5.723681]→[5.94084:94265](∅→∅),[5.28500]→[5.723732:723789](∅→∅),[5.94265]→[5.723732:723789](∅→∅),[5.723732]→[5.723732:723789](∅→∅),[5.723789]→[5.94266:94336](∅→∅),[5.94336]→[5.84288:84330](∅→∅),[5.84330]→[5.94375:94454](∅→∅),[5.94375]→[5.94375:94454](∅→∅),[5.94454]→[5.723876:723905](∅→∅),[5.723876]→[5.723876:723905](∅→∅)

}

/*
fn record<W: crate::working_copy::WorkingCopy, C: crate::changestore::ChangeStore>(
&mut self,
builder: &mut RecordBuilder,
diff_algorithm: Algorithm,
channel: &mut pristine::ChannelRef<Self>,
working_copy: &mut W,
changes: &C,
prefix: &str,
) -> Result<(), crate::record::RecordError<C::Error, W::Error, Self::GraphError>>
where
<W as crate::working_copy::WorkingCopy>::Error: 'static,
{
builder.record(
self,
diff_algorithm,
&mut channel.lock().unwrap(),
working_copy,
changes,
prefix,
)
}

fn record_all<W: crate::working_copy::WorkingCopy, C: crate::changestore::ChangeStore>(
&mut self,
diff_algorithm: Algorithm,
channel: &pristine::ChannelRef<Self>,
working_copy: &mut W,
changes: &C,
prefix: &str,
) -> Result<record::Recorded, crate::record::RecordError<C::Error, W::Error, Self::GraphError>>
where
<W as crate::working_copy::WorkingCopy>::Error: 'static,
{
let mut builder = crate::record::Builder::new();
builder.record(
self,
diff_algorithm,
&mut channel.lock().unwrap(),
working_copy,
changes,
prefix,
)?;
Ok(builder.finish())
edit in ""libpijul/src/lib.rs"" at line 165

[5.723911]→[5.84331:84338](∅→∅)

*/
edit in ""libpijul/src/lib.rs"" at line 214

[5.725466]→[5.84606:84613](∅→∅),[5.84613]→[5.725466:725674](∅→∅),[5.725466]→[5.725466:725674](∅→∅),[5.2178]→[5.725674:725733](∅→∅),[5.725674]→[5.725674:725733](∅→∅),[5.725733]→[5.1500:1558](∅→∅),[5.1558]→[5.94684:94788](∅→∅),[5.2654]→[5.94684:94788](∅→∅),[5.725733]→[5.94684:94788](∅→∅),[5.28874]→[5.725789:725913](∅→∅),[5.94788]→[5.725789:725913](∅→∅),[5.725789]→[5.725789:725913](∅→∅),[5.2197]→[5.725913:725968](∅→∅),[5.725913]→[5.725913:725968](∅→∅),[5.725968]→[5.2655:2686](∅→∅),[5.2686]→[5.725968:725978](∅→∅),[5.725968]→[5.725968:725978](∅→∅),[5.725978]→[5.725978:725984](∅→∅),[5.725984]→[5.84614:84621](∅→∅),[5.84621]→[5.725984:725985](∅→∅),[5.725984]→[5.725984:725985](∅→∅)

/*
fn output_repository_no_pending<R: working_copy::WorkingCopy, C: changestore::ChangeStore>(
&mut self,
repo: &mut R,
changes: &C,
channel: &mut pristine::ChannelRef<Self>,
prefix: &str,
output_name_conflicts: bool,
if_modified_since: Option<std::time::SystemTime>,
) -> Result<Vec<output::Conflict>, output::OutputError<C::Error, Self::GraphError, R::Error>>
{
output::output_repository_no_pending(
repo,
changes,
self,
channel,
prefix,
output_name_conflicts,
if_modified_since,
)
}
*/
replacement in ""libpijul/src/fs.rs"" at line 877

[4.47]→[4.47:190](∅→∅)

info!("find_path: {:?} != {:?}, this may be due to a corrupt change", inode_vertex, v.inode_vertex());
return Ok(None)

[4.47]

[4.190]

info!(
"find_path: {:?} != {:?}, this may be due to a corrupt change",
inode_vertex,
v.inode_vertex()
);
return Ok(None);
replacement in ""libpijul/src/apply/edge.rs"" at line 88

[3.49]→[3.49:67](∅→∅)

break

[3.49]

[3.67]

break;