pijul/pijul - Change PEUL7HHDK65WQ2JHVUC5EMBHMQL6ITX6KWBW3KQIEJTHBRFJGH7QC

store new non-UTF-8 files raw and decode to deplay the contents

Because https://www.mercurial-scm.org/wiki/EncodingStrategy#The_encoding_tracking_problem says that roundtripping through UTF-8 is lossy

Created by rohan on February 25, 2021

PEUL7HHDK65WQ2JHVUC5EMBHMQL6ITX6KWBW3KQIEJTHBRFJGH7QC

Dependencies

In discussions

#179 supporting non-UTF8 text file encodings

Change contents

Replacement in libpijul/src/working_copy/mod.rs at line 36 [5.198172]

B:BD[4.66] → [2.67:139]

    /// Read the file into the buffer, decoding to UTF-8 for text files

[4.66]

[2.139]

    /// Read the file into the buffer

Replacement in libpijul/src/working_copy/mod.rs at line 38 [5.198172]

B:BD[2.147] → [2.147:213]

    /// Returns the encoding used or None if it was a binary file

[2.147]

[2.213]

    /// Returns the file's text encoding or None if it was a binary file

Replacement in libpijul/src/working_copy/mod.rs at line 48 [5.198172]

B:BD[2.444] → [2.444:513]

        let (mut decoded, encoding) = if mime.starts_with("text/") {

[2.444]

[4.342]

        let encoding = if mime.starts_with("text/") {

Replacement in libpijul/src/working_copy/mod.rs at line 53 [5.198172]

B:BD[4.560] → [4.560:636]

            let (decoded, encoding, malformed) = encoding.decode(&uncoded);

[4.560]

[4.636]

            let (_decoded, encoding, malformed) = encoding.decode(&uncoded);

Replacement in libpijul/src/working_copy/mod.rs at line 56 [5.198172]

B:BD[4.726] → [2.514:586]

                (decoded.as_bytes().to_vec(), Some(Encoding(encoding)))

[4.726]

[4.788]

                Some(Encoding(encoding))

Replacement in libpijul/src/working_copy/mod.rs at line 59 [5.198172]
B:BD[4.859] → [4.859:891]
```
                (uncoded, None)
```
[4.859]
[4.891]
```
                None
```
Replacement in libpijul/src/working_copy/mod.rs at line 62 [5.198172]
B:BD[4.922] → [4.922:950]
```
            (uncoded, None)
```
[4.922]
[4.950]
```
            None
```
Replacement in libpijul/src/working_copy/mod.rs at line 64 [5.198172]
B:BD[4.961] → [4.961:998]
```
        buffer.append(&mut decoded);
```
[4.961]
[2.587]
```
        buffer.append(&mut uncoded);
```

Replacement in libpijul/src/change/text_changes.rs at line 423 [6.37976]

B:BD[6.53215] → [6.53215:53268]

                    print_contents(&mut w, "+", c)?;

[6.53215]

[6.53268]

                    print_contents(&mut w, "+", c, encoding)?;

Insertion in libpijul/src/change/text_changes.rs at line 1173 [6.37976]
[6.84694]
[6.84694]
```
    encoding: &Option<Encoding>,
```

Replacement in libpijul/src/change/text_changes.rs at line 1175 [6.37976]

B:BD[6.84728] → [7.5247:5313]

B:BD[7.5313] → [8.1745:1861]

    if tree_magic_mini::from_u8(&contents).starts_with("text/") {
        for a in std::str::from_utf8(&contents)
            .unwrap()
            .split_terminator('\n')
        {

[6.84728]

[7.5804]

    if let Some(encoding) = encoding {
        for a in encoding.decode(&contents).split_terminator('\n') {

Replacement in libpijul/src/change/text_changes.rs at line 1194 [6.37976]
B:BD[6.85538] → [6.85538:85578]
```
            print_contents(w, "+", c)?;
```
[6.85538]
[6.85578]
```
            print_contents(w, "+", c, &None)?;
```

Replacement in libpijul/src/change/text_changes.rs at line 1211 [6.37976]

B:BD[6.86133] → [6.86133:86184]

                print_contents(w, "-", &buf[..])?;

[6.86133]

[6.86184]

                print_contents(w, "-", &buf[..], &None)?;