jcdickinson/pijul - Change RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC

Formatting

Created by pmeunier on June 2, 2021

RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/remote/ssh.rs at line 62 [16.25380]

B:BD[10.163] → [10.163:336]

        let p =  cap.name("path0").unwrap_or_else(
              || cap.name("path1").unwrap_or_else(
              || cap.name("path2").unwrap()
              )).as_str();

[10.163]

[10.336]

        let p = cap
            .name("path0")
            .unwrap_or_else(|| {
                cap.name("path1")
                    .unwrap_or_else(|| cap.name("path2").unwrap())
            })
            .as_str();

Replacement in pijul/src/remote/ssh.rs at line 71 [16.25380]
B:BD[10.397] → [10.397:422]
```
        }
        else {
```
[10.397]
[10.422]
```
        } else {
```

Replacement in pijul/src/remote/ssh.rs at line 247 [16.25380]

B:BD[16.31447] → [16.31447:31595]

pub fn load_secret_key(key_path: &Path, k: &str) -> Option<thrussh_keys::key::KeyPair> {
    match thrussh_keys::load_secret_key(&key_path, None) {

[16.31447]

[16.31595]

pub fn load_secret_key<P: AsRef<Path>>(key_path: P, k: &str) -> Option<thrussh_keys::key::KeyPair> {
    match thrussh_keys::load_secret_key(key_path.as_ref(), None) {

Insertion in pijul/src/remote/local.rs at line 5 [16.79745]
[17.535]
[18.9780]
```
use anyhow::bail;
```
Insertion in pijul/src/commands/record.rs at line 377 [16.101759]
[16.108241]
[16.108241]
```
            debug!("write change");
```
Insertion in pijul/src/commands/record.rs at line 379 [16.101759]
[16.108308]
[16.108308]
```
            debug!("write change done");
```

Replacement in libpijul/src/working_copy/memory.rs at line 300 [16.199222]

B:BD[4.468] → [4.468:530]

            if let Inode::File { ref mut contents, .. } = f {

[4.468]

[19.26973]

            if let Inode::File {
                ref mut contents, ..
            } = f
            {

Replacement in libpijul/src/working_copy/memory.rs at line 307 [16.199222]
B:BD[19.27092] → [19.27092:27111]
```
                })
```
[19.27092]
[4.567]
```
                });
```
Replacement in libpijul/src/unrecord/working_copy.rs at line 68 [16.225940]
B:BD[20.238] → [20.238:259]
```
            continue
```
[20.238]
[16.227911]
```
            continue;
```

Replacement in libpijul/src/unrecord/working_copy.rs at line 111 [16.225940]

B:BD[16.229205] → [21.521:579]

    let FileMetadata { basename, metadata, .. } = changes

[16.229205]

[22.48]

    let FileMetadata {
        basename, metadata, ..
    } = changes

Replacement in libpijul/src/unrecord/mod.rs at line 197 [16.231493]

B:BD[23.372] → [12.2607:2711]

                    working_copy::undo_file_deletion(txn, changes, channel, change_id, newedges, salt)?

[23.372]

[23.628]

                    working_copy::undo_file_deletion(
                        txn, changes, channel, change_id, newedges, salt,
                    )?

Replacement in libpijul/src/unrecord/mod.rs at line 375 [16.231493]

B:BD[9.140] → [9.140:416]

        let mut source = crate::apply::edge::find_source_vertex(txn, channel, &n.from, change_id, newedges.inode, n.flag, &mut ws.apply)?;
        let mut target = crate::apply::edge::find_target_vertex(txn, channel, &n.to, change_id, newedges.inode, n.flag, &mut ws.apply)?;

[9.140]

[9.416]

        let mut source = crate::apply::edge::find_source_vertex(
            txn,
            channel,
            &n.from,
            change_id,
            newedges.inode,
            n.flag,
            &mut ws.apply,
        )?;
        let mut target = crate::apply::edge::find_target_vertex(
            txn,
            channel,
            &n.to,
            change_id,
            newedges.inode,
            n.flag,
            &mut ws.apply,
        )?;

Replacement in libpijul/src/unrecord/mod.rs at line 396 [16.231493]

B:BD[9.569] → [9.569:672]

            if must_reintroduce(txn, channel, changes, source, target, intro_ext, intro, change_id)? {

[9.569]

[9.672]

            if must_reintroduce(
                txn, channel, changes, source, target, intro_ext, intro, change_id,
            )? {

Resurrecting zombie bytes in "libpijul/src/tests/mod.rs" at line 99 [16.289338]
∅:∅[15.886] → [24.452:467]
B:B[24.452] → [24.452:467]
BD:B[24.452] → [24.452:467]
```
    store: &P,
```
Resurrecting zombie bytes in "libpijul/src/tests/mod.rs" at line 102 [16.289338]
∅:∅[15.940] → [24.517:574]
B:B[24.517] → [24.517:574]
BD:B[24.517] → [24.517:574]
```
    prefix: &str,
) -> Result<Hash, anyhow::Error>
where
```
Resurrecting zombie bytes in "libpijul/src/tests/mod.rs" at line 108 [16.289338]
∅:∅[15.1077] → [24.574:613]
B:B[24.574] → [24.574:613]
BD:B[24.574] → [24.574:613]
```
    R::Error: Send + Sync + 'static,
{
```

Insertion in libpijul/src/record.rs at line 9 [16.488880]

[16.489199]

[19.40828]

use crate::{alive::retrieve, text_encoding::Encoding};
use crate::{change::*, changestore::FileMetadata};

Deletion in libpijul/src/record.rs at line 14 [16.488880]
B:BD[19.40928] → [21.731:731]
∅:D[21.731] → [26.1496:1551]
B:BD[16.489199] → [26.1496:1551]
∅:D[26.1551] → [22.73:124]
B:BD[16.489199] → [22.73:124]
```
use crate::{alive::retrieve, text_encoding::Encoding};
use crate::{change::*, changestore::FileMetadata};
```

Replacement in libpijul/src/record.rs at line 58 [16.488880]

B:BD[7.437] → [7.437:518]

            crate::output::            FileError::Txn(t) => RecordError::Txn(t),

[7.437]

[7.518]

            crate::output::FileError::Txn(t) => RecordError::Txn(t),

Replacement in libpijul/src/record.rs at line 613 [16.488880]

B:BD[19.55791] → [21.788:898]

                rec.record_deleted_file(txn, txn.graph(channel), working_copy, &full_path, *vertex, changes)?

[19.55791]

[19.55892]

                rec.record_deleted_file(
                    txn,
                    txn.graph(channel),
                    working_copy,
                    &full_path,
                    *vertex,
                    changes,
                )?

Replacement in libpijul/src/record.rs at line 982 [16.488880]

B:BD[16.509929] → [7.710:807]

                    path: crate::fs::find_path(changes, txn, channel, true, vertex)?.unwrap().0,

[16.509929]

[16.509979]

                    path: crate::fs::find_path(changes, txn, channel, true, vertex)?
                        .unwrap()
                        .0,

Replacement in libpijul/src/pristine/sanakirja.rs at line 1868 [16.531056]

B:BD[27.441] → [27.441:574]

                    if self.channel_has_state(&chan.states, &p.b).map_err(|e| e.0)?.is_some() {
                        break 'outer

[27.441]

[27.574]

                    if self
                        .channel_has_state(&chan.states, &p.b)
                        .map_err(|e| e.0)?
                        .is_some()
                    {
                        break 'outer;

Replacement in libpijul/src/pristine/sanakirja.rs at line 1875 [16.531056]

B:BD[27.596] → [27.596:729]

                    if self.get_changeset(&chan.changes, &p.a).map_err(|e| e.0)?.is_some() {
                        continue 'outer

[27.596]

[27.729]

                    if self
                        .get_changeset(&chan.changes, &p.a)
                        .map_err(|e| e.0)?
                        .is_some()
                    {
                        continue 'outer;

Replacement in libpijul/src/pristine/sanakirja.rs at line 1890 [16.531056]
B:BD[3.259] → [3.259:289]
```
                        break
```
[3.259]
[3.289]
```
                        break;
```

Replacement in libpijul/src/pristine/mod.rs at line 375 [16.586748]

B:BD[8.3189] → [8.3189:3315]

    ) -> Result<
        Cursor<Self, &Self, Self::TagsCursor, L64, SerializedHash>,
        TxnErr<Self::GraphError>,
    >;

[8.3189]

[8.3315]

    ) -> Result<Cursor<Self, &Self, Self::TagsCursor, L64, SerializedHash>, TxnErr<Self::GraphError>>;

Replacement in libpijul/src/pristine/inode.rs at line 6 [16.643628]
B:BD[12.3436] → [12.3436:3475]
```
use byteorder::{ByteOrder, BigEndian};
```
[12.3436]
[16.643917]
```
use byteorder::{BigEndian, ByteOrder};
```

Replacement in libpijul/src/output/output.rs at line 360 [16.671807]

B:BD[28.1319] → [2.0:50]

            return last.duration_since(m).is_ok()

[28.1319]

[28.1474]

            return last.duration_since(m).is_ok();

Replacement in libpijul/src/output/output.rs at line 402 [16.671807]

B:BD[12.3718] → [12.3718:3856]

                    unsafe {
                        *(c.as_mut_ptr() as *mut Position<ChangeId>) = output_item.pos
                    }

[12.3718]

[12.3856]

                    unsafe { *(c.as_mut_ptr() as *mut Position<ChangeId>) = output_item.pos }

Replacement in libpijul/src/lib.rs at line 43 [16.717381]
B:BD[14.217] → [14.217:253]
```
pub struct ParseError { s: String }
```
[14.217]
[14.253]
```
pub struct ParseError {
    s: String,
}
```
Deletion in libpijul/src/lib.rs at line 63 [16.717381]
B:BD[29.27689] → [13.0:40]
```
pub use crate::unrecord::UnrecordError;
```
Insertion in libpijul/src/lib.rs at line 71 [16.717381]
[16.720352]
[19.83620]
```
pub use crate::unrecord::UnrecordError;
```
Replacement in libpijul/src/lib.rs at line 75 [16.717381]
∅:D[12.4100] → [19.83668:83693]
B:BD[19.83668] → [19.83668:83693]
B:BD[19.83693] → [12.4101:4146]
∅:D[12.4146] → [19.83782:83804]
B:BD[19.83782] → [19.83782:83804]
B:BD[19.83804] → [12.4147:4189]
```
pub type HashMap<K, V> =
    std::collections::HashMap<K, V, Hasher>;
pub type HashSet<K> =
    std::collections::HashSet<K, Hasher>;
```
[12.4100]
[19.83890]
```
pub type HashMap<K, V> = std::collections::HashMap<K, V, Hasher>;
pub type HashSet<K> = std::collections::HashSet<K, Hasher>;
```

Replacement in libpijul/src/lib.rs at line 84 [16.717381]

B:BD[16.720537] → [5.0:110]

pub fn commit<T: pristine::MutTxnT>(txn: std::sync::Arc<std::sync::RwLock<T>>) -> Result<(), T::GraphError> {

[16.720537]

[5.110]

pub fn commit<T: pristine::MutTxnT>(
    txn: std::sync::Arc<std::sync::RwLock<T>>,
) -> Result<(), T::GraphError> {

Replacement in libpijul/src/lib.rs at line 301 [16.717381]

B:BD[16.726871] → [12.4574:4680]

    fn add(&mut self, path: &str, is_dir: bool, salt: u64) -> Result<(), fs::FsError<Self::GraphError>> {

[16.726871]

[12.4680]

    fn add(
        &mut self,
        path: &str,
        is_dir: bool,
        salt: u64,
    ) -> Result<(), fs::FsError<Self::GraphError>> {

Replacement in libpijul/src/lib.rs at line 310 [16.717381]

B:BD[16.727005] → [12.4735:4839]

    fn move_file(&mut self, a: &str, b: &str, salt: u64) -> Result<(), fs::FsError<Self::GraphError>> {

[16.727005]

[12.4839]

    fn move_file(
        &mut self,
        a: &str,
        b: &str,
        salt: u64,
    ) -> Result<(), fs::FsError<Self::GraphError>> {

Replacement in libpijul/src/fs.rs at line 61 [16.737429]

B:BD[29.30675] → [12.5000:5132]

pub(crate) fn create_new_inode<T: TreeMutTxnT>(txn: &mut T, parent_id: &PathId, salt: u64) -> Result<Inode, TxnErr<T::TreeError>> {

[29.30675]

[12.5132]

pub(crate) fn create_new_inode<T: TreeMutTxnT>(
    txn: &mut T,
    parent_id: &PathId,
    salt: u64,
) -> Result<Inode, TxnErr<T::TreeError>> {

Replacement in libpijul/src/find_alive.rs at line 9 [16.763306]

B:BD[18.114985] → [6.0:91]

    let mut stack = vec![(SerializedEdge::empty(vertex0.start_pos(), ChangeId::ROOT), 0)];

[18.114985]

[19.85243]

    let mut stack = vec![(
        SerializedEdge::empty(vertex0.start_pos(), ChangeId::ROOT),
        0,
    )];

Replacement in libpijul/src/find_alive.rs at line 35 [16.763306]

B:BD[6.235] → [6.235:276]

                        return Ok(alive)

[6.235]

[6.276]

                        return Ok(alive);

Deletion in libpijul/src/diff/replace.rs at line 7 [16.779907]
B:BD[19.85631] → [19.85631:85662]
```
use crate::{HashMap, HashSet};
```
Insertion in libpijul/src/diff/replace.rs at line 8 [16.779907]
[30.186]
[31.0]
```
use crate::{HashMap, HashSet};
```
Deletion in libpijul/src/diff/delete.rs at line 24 [16.805350]
B:BD[16.806059] → [30.1240:1313]
BD:BD[16.806059] → [30.1240:1313]
```
        self.delete_lines(txn, channel, diff, d, lines_a, r, encoding)?;
```
Resurrecting zombie bytes in "libpijul/src/diff/delete.rs" at line 24 [16.805350]
B:B[18.116493] → [11.0:46]
BD:B[18.116493] → [11.0:46]
```
        debug!("delete {:?}: {:?}", r, d[r]);
```

Insertion in libpijul/src/diff/delete.rs at line 25 [16.805350]

[11.46]

[16.806121]

        self.delete_lines(txn, channel, diff, d, lines_a, r, encoding)?;

Replacement in libpijul/src/diff/delete.rs at line 107 [16.805350]

B:BD[11.112] → [11.112:209]

    debug!("first_vertex = {:?}, vertex = {:?}", first_vertex, diff.pos_a[first_vertex].vertex);

[11.112]

[16.808927]

    debug!(
        "first_vertex = {:?}, vertex = {:?}",
        first_vertex, diff.pos_a[first_vertex].vertex
    );

Insertion in libpijul/src/changestore/mod.rs at line 100 [16.817216]
[22.2460]
[22.2460]
```
        debug!("filemetadata read: {:?}", buf);
```
Replacement in libpijul/src/changestore/mod.rs at line 104 [16.817216]
B:BD[22.2510] → [22.2510:2553]
```
    pub fn write(&self, w: &mut Vec<u8>) {
```
[22.2510]
[22.2553]
```
    pub fn write(&self, mut w: &mut Vec<u8>) {
```

Replacement in libpijul/src/changestore/mod.rs at line 106 [16.817216]

B:BD[22.2609] → [22.2609:2659]

        bincode::serialize_into(w, self).unwrap()

[22.2609]

[16.820132]

        let l = w.len();
        bincode::serialize_into(&mut w, self).unwrap();
        debug!("filemetadata write: {:?}", &w[l..]);

Deletion in libpijul/src/change.rs at line 4 [16.831311]
B:BD[32.2947] → [32.2947:2976]
```
use chrono::{DateTime, Utc};
```
Insertion in libpijul/src/change.rs at line 6 [16.831311]
[30.1502]
[16.831519]
```
use chrono::{DateTime, Utc};
```
Insertion in libpijul/src/change/text_changes.rs at line 426 [29.37976]
[29.51864]
[22.2861]
```
                    debug!("add_name {:?}", n);
```
Replacement in libpijul/src/apply.rs at line 117 [16.944089]
B:BD[29.94973] → [29.94973:94986]
B:BD[29.94986] → [33.6197:6214]
∅:D[33.6214] → [29.95008:95077]
B:BD[29.95008] → [29.95008:95077]
```
        txn,
        channel,
        internal,
        &hash,
        &change,
        workspace,
```
[29.94973]
[29.95077]
```
        txn, channel, internal, &hash, &change, workspace,
```
Deletion in libpijul/src/apply.rs at line 348 [16.944089]
B:BD[34.3408] → [12.5888:5889]

Formatting

Dependencies

In channels

Change contents

Replacement in pijul/src/remote/ssh.rs at line 62 [16.25380]

Replacement in pijul/src/remote/ssh.rs at line 71 [16.25380]

Replacement in pijul/src/remote/ssh.rs at line 247 [16.25380]

Insertion in pijul/src/remote/local.rs at line 5 [16.79745]

Insertion in pijul/src/commands/record.rs at line 377 [16.101759]

Insertion in pijul/src/commands/record.rs at line 379 [16.101759]

Replacement in libpijul/src/working_copy/memory.rs at line 300 [16.199222]

Replacement in libpijul/src/working_copy/memory.rs at line 307 [16.199222]

Replacement in libpijul/src/unrecord/working_copy.rs at line 68 [16.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 111 [16.225940]

Replacement in libpijul/src/unrecord/mod.rs at line 197 [16.231493]

Replacement in libpijul/src/unrecord/mod.rs at line 375 [16.231493]

Replacement in libpijul/src/unrecord/mod.rs at line 396 [16.231493]

Resurrecting zombie bytes in "libpijul/src/tests/mod.rs" at line 99 [16.289338]

Resurrecting zombie bytes in "libpijul/src/tests/mod.rs" at line 102 [16.289338]

Resurrecting zombie bytes in "libpijul/src/tests/mod.rs" at line 108 [16.289338]

Insertion in libpijul/src/record.rs at line 9 [16.488880]

Deletion in libpijul/src/record.rs at line 14 [16.488880]

Replacement in libpijul/src/record.rs at line 58 [16.488880]

Replacement in libpijul/src/record.rs at line 613 [16.488880]

Replacement in libpijul/src/record.rs at line 982 [16.488880]

Replacement in libpijul/src/pristine/sanakirja.rs at line 1868 [16.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 1875 [16.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 1890 [16.531056]

Replacement in libpijul/src/pristine/mod.rs at line 375 [16.586748]

Replacement in libpijul/src/pristine/inode.rs at line 6 [16.643628]

Replacement in libpijul/src/output/output.rs at line 360 [16.671807]

Replacement in libpijul/src/output/output.rs at line 402 [16.671807]

Replacement in libpijul/src/lib.rs at line 43 [16.717381]

Deletion in libpijul/src/lib.rs at line 63 [16.717381]

Insertion in libpijul/src/lib.rs at line 71 [16.717381]

Replacement in libpijul/src/lib.rs at line 75 [16.717381]

Replacement in libpijul/src/lib.rs at line 84 [16.717381]

Replacement in libpijul/src/lib.rs at line 301 [16.717381]

Replacement in libpijul/src/lib.rs at line 310 [16.717381]

Replacement in libpijul/src/fs.rs at line 61 [16.737429]

Replacement in libpijul/src/find_alive.rs at line 9 [16.763306]

Replacement in libpijul/src/find_alive.rs at line 35 [16.763306]

Deletion in libpijul/src/diff/replace.rs at line 7 [16.779907]

Insertion in libpijul/src/diff/replace.rs at line 8 [16.779907]

Deletion in libpijul/src/diff/delete.rs at line 24 [16.805350]

Resurrecting zombie bytes in "libpijul/src/diff/delete.rs" at line 24 [16.805350]

Insertion in libpijul/src/diff/delete.rs at line 25 [16.805350]

Replacement in libpijul/src/diff/delete.rs at line 107 [16.805350]

Insertion in libpijul/src/changestore/mod.rs at line 100 [16.817216]

Replacement in libpijul/src/changestore/mod.rs at line 104 [16.817216]

Replacement in libpijul/src/changestore/mod.rs at line 106 [16.817216]

Deletion in libpijul/src/change.rs at line 4 [16.831311]

Insertion in libpijul/src/change.rs at line 6 [16.831311]

Insertion in libpijul/src/change/text_changes.rs at line 426 [29.37976]

Replacement in libpijul/src/apply.rs at line 117 [16.944089]

Deletion in libpijul/src/apply.rs at line 348 [16.944089]