pijul/pijul - Change 3S6LU2U5TIU43WRE5RQS3IOLVJLVNCDL4W44FVK2HR3NAXZ7IDUAC

abstract out FileMetadata (de)serialistion

Created by rohan on April 11, 2021

3S6LU2U5TIU43WRE5RQS3IOLVJLVNCDL4W44FVK2HR3NAXZ7IDUAC

Dependencies

In channels

main

In discussions

#179 supporting non-UTF8 text file encodings

Change contents

Replacement in libpijul/src/unrecord/working_copy.rs at line 104 [6.225940]
B:BD[6.229205] → [7.7078:7110]
B:BD[7.7110] → [2.2151:2175]
```
    let (_, basename) = changes
        .get_file_name(
```
[6.229205]
[2.2175]
```
    let FileMetadata { basename, .. } = changes
        .get_file_meta(
```
Deletion in libpijul/src/record.rs at line 3 [6.488880]
B:BD[6.488965] → [6.488965:488987]
```
use crate::change::*;
```
Insertion in libpijul/src/record.rs at line 10 [6.488880]
[6.489199]
[5.692]
```
use crate::{change::*, changestore::FileMetadata};
```

Replacement in libpijul/src/record.rs at line 266 [6.488880]

∅:D[8.49256] → [6.496047:496160]

B:BD[6.496047] → [6.496047:496160]

        meta.write(&mut self.rec.contents).unwrap();
        self.rec.contents.extend(item.basename.as_bytes());

[8.49256]

[8.49257]

        let file_meta = FileMetadata {
            metadata: meta,
            basename: item.basename.as_str(),
        };
        file_meta.write(&mut self.rec.contents);

Replacement in libpijul/src/record.rs at line 392 [6.488880]

B:BD[6.500570] → [7.11872:11892]

B:BD[7.11892] → [2.6543:6574]

            changes
                .get_contents(

[6.500570]

[2.6574]

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

Deletion in libpijul/src/record.rs at line 399 [6.488880]

∅:D[7.12022] → [6.500652:500855]

B:BD[6.500652] → [6.500652:500855]

            let (metadata, basename) = name.split_at(2);
            let metadata = InodeMetadata::from_basename(metadata);
            let basename = std::str::from_utf8(basename).unwrap().to_string();

Replacement in libpijul/src/record.rs at line 408 [6.488880]

B:BD[9.204] → [9.204:238]

                        basename,

[9.204]

[9.238]

                        basename: basename.to_string(),

Replacement in libpijul/src/record.rs at line 680 [6.488880]

∅:D[3.48] → [8.51052:51125]

B:BD[6.508005] → [8.51052:51125]

∅:D[8.51125] → [7.12529:12591]

B:BD[6.508141] → [7.12529:12591]

∅:D[7.12591] → [6.508195:508255]

B:BD[6.508195] → [6.508195:508255]

B:BD[6.508255] → [8.51126:51197]

        let name_start = ChangePosition(self.rec.contents.len().into());
        item.metadata.write(&mut self.rec.contents).unwrap();
        self.rec.contents.extend(item.basename.as_bytes());
        let name_end = ChangePosition(self.rec.contents.len().into());

[3.48]

[6.508326]

        let basename = item.basename.as_str();
        let meta_start = ChangePosition(self.rec.contents.len().into());
        FileMetadata {
            metadata: item.metadata,
            basename,
        }
        .write(&mut self.rec.contents);
        let meta_end = ChangePosition(self.rec.contents.len().into());

Deletion in libpijul/src/record.rs at line 689 [6.488880]

B:BD[6.508361] → [8.51198:51285]

        let name = &self.rec.contents[name_start.0.as_usize()..name_end.0.as_usize()];

Replacement in libpijul/src/record.rs at line 696 [6.488880]
B:BD[6.508702] → [6.508702:508720]
```
            name,
```
[6.508680]
[6.508720]
```
            basename,
```

Replacement in libpijul/src/record.rs at line 724 [6.488880]

B:BD[6.509711] → [6.509711:509793]

                        start: name_start,
                        end: name_end,

[6.509711]

[6.509793]

                        start: meta_start,
                        end: meta_end,

Replacement in libpijul/src/record.rs at line 739 [6.488880]

B:BD[6.510318] → [8.51286:51354]

                self.rec.contents.truncate(name_start.0.as_usize())

[6.510318]

[6.510384]

                self.rec.contents.truncate(meta_start.0.as_usize())

Replacement in libpijul/src/record.rs at line 742 [6.488880]

B:BD[6.510415] → [8.51355:51419]

            self.rec.contents.truncate(name_start.0.as_usize())

[6.510415]

[6.510477]

            self.rec.contents.truncate(meta_start.0.as_usize())

Replacement in libpijul/src/record.rs at line 763 [6.488880]
B:BD[6.511007] → [6.511007:511024]
```
    name: &[u8],
```
[6.510978]
[10.36183]
```
    name: &str,
```

Replacement in libpijul/src/record.rs at line 817 [6.488880]

∅:D[11.29505] → [10.36549:36592]

∅:D[8.52079] → [10.36549:36592]

B:BD[10.36549] → [10.36549:36592]

        changes
            .get_contents(

[8.52079]

[8.52080]

        let FileMetadata {
            metadata: parent_meta,
            basename: parent_name,
        } = changes
            .get_file_meta(

Replacement in libpijul/src/record.rs at line 829 [6.488880]
∅:D[3.91] → [6.513013:513038]
B:BD[6.513013] → [6.513013:513038]
B:BD[6.513038] → [3.92:125]
∅:D[3.125] → [6.513038:513091]
B:BD[6.513038] → [6.513038:513091]
```
            parent_dest,
            &previous_name[..2],
            std::str::from_utf8(&previous_name[2..])
```
[3.91]
[6.513091]
```
            parent_dest, parent_meta, parent_name
```

Deletion in libpijul/src/record.rs at line 831 [6.488880]

B:BD[6.513102] → [3.126:263]

        let (parent_meta, parent_name) = previous_name.split_at(2);
        let parent_meta = InodeMetadata::from_basename(parent_meta);

Replacement in libpijul/src/record.rs at line 832 [6.488880]

∅:D[3.341] → [6.513174:513201]

B:BD[6.513174] → [6.513174:513201]

B:BD[6.513201] → [3.342:434]

        let name_changed =
            (parent_name != &name[2..]) || (new_meta != parent_meta && cfg!(not(windows)));

[3.341]

[12.34801]

        let name_changed = (parent_name != name) || (new_meta != parent_meta && cfg!(not(windows)));

Replacement in libpijul/src/pristine/inode_metadata.rs at line 3 [6.641569]

B:BD[6.641730] → [6.641730:641798]

#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd)]

[6.641730]

[6.641798]

#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Serialize, Deserialize)]

Deletion in libpijul/src/pristine/inode_metadata.rs at line 8 [6.641569]
B:BD[6.641877] → [6.641877:641931]
```
use byteorder::{BigEndian, ByteOrder, WriteBytesExt};
```

Deletion in libpijul/src/pristine/inode_metadata.rs at line 9 [6.641569]

B:BD[6.641952] → [6.641952:642172]

    /// Read the file metadata from the file name encoded in the
    /// repository.
    pub fn from_basename(p: &[u8]) -> Self {
        debug_assert!(p.len() == 2);
        InodeMetadata(BigEndian::read_u16(p))
    }

Deletion in libpijul/src/pristine/inode_metadata.rs at line 51 [6.641569]

B:BD[6.643488] → [6.643488:643614]


    pub fn write<W: std::io::Write>(&self, mut w: W) -> std::io::Result<()> {
        w.write_u16::<BigEndian>(self.0)
    }

Replacement in libpijul/src/output/mod.rs at line 1 [6.686190]
B:BD[6.686190] → [6.686191:686228]
```
use crate::changestore::ChangeStore;
```
[6.686190]
[6.686228]
```
use crate::changestore::{ChangeStore, FileMetadata};
```

Replacement in libpijul/src/output/mod.rs at line 123 [6.686190]

B:BD[6.687519] → [7.24840:24856]

B:BD[7.24856] → [2.17556:17583]

        changes
            .get_contents(

[6.687519]

[2.17583]

        let FileMetadata {
            basename,
            metadata: perms,
        } = changes
            .get_file_meta(

Deletion in libpijul/src/output/mod.rs at line 133 [6.686190]

∅:D[7.24999] → [6.687603:687814]

∅:D[10.86600] → [6.687603:687814]

B:BD[6.687603] → [6.687603:687814]

        let (perms, basename) = name_buf.as_slice().split_at(2);
        let (perms, basename) = (
            InodeMetadata::from_basename(perms),
            std::str::from_utf8(basename).unwrap(),
        );

Replacement in libpijul/src/fs.rs at line 568 [6.737429]

B:BD[10.109758] → [10.109758:109779]

B:BD[10.109779] → [2.18451:18478]

        self.changes
            .get_contents(

[10.109758]

[2.18478]

        let FileMetadata {
            basename,
            metadata: perms,
        } = self
            .changes
            .get_file_meta(

Deletion in libpijul/src/fs.rs at line 580 [6.737429]

B:BD[10.109907] → [10.109907:110081]

        let (perms, basename) = self.buf.split_at(2);
        let perms = InodeMetadata::from_basename(perms);
        let basename = std::str::from_utf8(basename).unwrap();

Replacement in libpijul/src/fs.rs at line 659 [6.737429]

B:BD[6.755303] → [6.755303:755328]

B:BD[6.755328] → [2.18755:18786]

            self.changes
                .get_contents(

[6.755303]

[2.18786]

            let FileMetadata {
                basename,
                metadata: perms,
            } = self
                .changes
                .get_file_meta(

Deletion in libpijul/src/fs.rs at line 671 [6.737429]

B:BD[6.755459] → [6.755459:755657]

            let (perms, basename) = self.buf.split_at(2);
            let perms = InodeMetadata::from_basename(perms);
            let basename = std::str::from_utf8(basename).unwrap().to_string();

Replacement in libpijul/src/fs.rs at line 680 [6.737429]

B:BD[2.18987] → [2.18987:19066]

                        return Some(Ok((grandparent.dest(), perms, basename)))

[2.18987]

[2.19066]

                        return Some(Ok((grandparent.dest(), perms, basename.to_owned())))

Replacement in libpijul/src/changestore/mod.rs at line 78 [6.817216]
∅:D[7.34277] → [6.819697:819756]
B:BD[6.819697] → [6.819697:819756]
```
    fn get_file_name<'a, F: Fn(ChangeId) -> Option<Hash>>(
```
[7.34277]
[6.819756]
```
    fn get_file_meta<'a, F: Fn(ChangeId) -> Option<Hash>>(
```
Replacement in libpijul/src/changestore/mod.rs at line 83 [6.817216]
B:BD[6.819852] → [7.34278:34335]
```
    ) -> Result<(InodeMetadata, &'a str), Self::Error> {
```
[6.819852]
[6.819911]
```
    ) -> Result<FileMetadata<'a>, Self::Error> {
```

Replacement in libpijul/src/changestore/mod.rs at line 86 [6.817216]

B:BD[6.819979] → [6.819979:820132]

        assert!(buf.len() >= 2);
        let (a, b) = buf.as_slice().split_at(2);
        Ok((InodeMetadata::from_basename(a), std::str::from_utf8(b)?))

[6.819979]

[6.820132]

        Ok(FileMetadata::read(buf))
    }
}
#[derive(Serialize, Deserialize)]
pub struct FileMetadata<'a> {
    pub metadata: InodeMetadata,
    pub basename: &'a str,
    // pub encoding: Encoding,
}
impl<'a> FileMetadata<'a> {
    pub fn read(buf: &'a [u8]) -> FileMetadata<'a> {
        // FIXME use ? by adding the From trait somehow
        bincode::deserialize(buf).unwrap()
    }
    pub fn write(&self, w: &mut Vec<u8>) {
        // FIXME use ? by adding the From trait somehow
        bincode::serialize_into(w, self).unwrap()

File move: text_changes.rs (----------) → text_changes.rs (---x------)
BF:BFD[6.931000] → [4.1464:1481]
[6.931000]
[7.37976]

Replacement in libpijul/src/change/text_changes.rs at line 329 [7.37976]

B:BD[7.48973] → [2.20938:21104]

∅:D[2.21104] → [7.49166:49245]

B:BD[7.49166] → [7.49166:49245]

B:BD[7.49245] → [8.140561:140639]

∅:D[8.140639] → [7.49335:49359]

B:BD[7.49335] → [7.49335:49359]

                    let name =
                        std::str::from_utf8(&change_contents[add.start.us() + 2..add.end.us()])
                            .unwrap();
                    let perms = crate::pristine::InodeMetadata::from_basename(
                        &change_contents[add.start.us()..add.start.us() + 2],
                    );

[7.48973]

[4.1482]

                    let FileMetadata {
                        basename: name,
                        metadata: perms,
                    } = FileMetadata::read(&change_contents);

Replacement in libpijul/src/change/text_changes.rs at line 425 [7.37976]

B:BD[7.51864] → [2.21105:21239]

∅:D[2.21239] → [7.52053:52132]

B:BD[7.52053] → [7.52053:52132]

B:BD[7.52132] → [8.140713:140787]

∅:D[8.140787] → [7.52218:52241]

B:BD[7.52218] → [7.52218:52241]

                    let name = std::str::from_utf8(&change_contents[n.start.us() + 2..n.end.us()])
                        .unwrap();
                    let perms = crate::pristine::InodeMetadata::from_basename(
                        &change_contents[n.start.us()..n.start.us() + 2],
                    );

[7.51864]

[7.52241]

                    let FileMetadata {
                        basename: name,
                        metadata: perms,
                    } = FileMetadata::read(&change_contents);

Replacement in libpijul/src/change/text_changes.rs at line 633 [7.37976]

∅:D[4.2936] → [7.59607:59747]

B:BD[7.59607] → [7.59607:59747]

            let meta = InodeMetadata(meta);
            meta.write(&mut contents_).unwrap();
            contents_.extend(name.as_bytes());

[4.2936]

[8.140931]

            let meta = FileMetadata {
                metadata: InodeMetadata(meta),
                basename: name,
            };
            meta.write(&mut contents_);

Replacement in libpijul/src/change/text_changes.rs at line 776 [7.37976]

∅:D[4.3265] → [7.64546:64686]

B:BD[7.64546] → [7.64546:64686]

            let meta = InodeMetadata(meta);
            meta.write(&mut contents_).unwrap();
            contents_.extend(name.as_bytes());

[4.3265]

[8.141265]

            let meta = FileMetadata {
                metadata: InodeMetadata(meta),
                basename: name,
            };
            meta.write(&mut contents_);

Replacement in libpijul/src/change/text_changes.rs at line 1377 [7.37976]

B:BD[7.86774] → [7.86774:86850]

                let name = std::str::from_utf8(buf.split_at(2).1).unwrap();

[7.86774]

[7.86850]

                let FileMetadata { basename: name, .. } = FileMetadata::read(&buf);