jcdickinson/pijul - Change XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC

file encoding in updates

Created by rohan on March 6, 2021

XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/working_copy/mod.rs at line 3 [7.198172]

B:BD[4.64] → [5.0:63]

use crate::{pristine::InodeMetadata, text_encoding::Encoding};

[4.64]

[7.198264]

use crate::pristine::InodeMetadata;
use crate::text_encoding::Encoding;

Replacement in libpijul/src/record.rs at line 451 [7.488880]
B:BD[7.502569] → [8.12094:12123]
```
                working_copy
```
[7.502569]
[4.1102]
```
                let encoding = working_copy
```
Insertion in libpijul/src/record.rs at line 465 [7.488880]
[7.503008]
[7.503008]
```
                    &encoding,
```
Insertion in libpijul/src/diff/replace.rs at line 7 [7.779907]
[7.780225]
[7.780225]
```
use crate::text_encoding::Encoding;
```
Insertion in libpijul/src/diff/replace.rs at line 37 [7.779907]
[7.781057]
[9.251]
```
        encoding: &Option<Encoding>,
```

Replacement in libpijul/src/diff/replace.rs at line 79 [7.779907]

B:BD[7.782229] → [10.2024:2083]

                Some(Hunk::Edit { change: c, local }) => {

[7.782229]

[11.0]

                Some(Hunk::Edit {
                    change: c, local, ..
                }) => {

Insertion in libpijul/src/diff/replace.rs at line 87 [7.779907]

[12.112]

[7.782529]

                            encoding: encoding.clone(),

Replacement in libpijul/src/diff/replace.rs at line 91 [7.779907]

B:BD[7.782625] → [10.2151:2230]

                        self.rec.actions.push(Hunk::Edit { change: c, local })

[7.782625]

[7.782706]

                        self.rec.actions.push(Hunk::Edit {
                            change: c,
                            local,
                            encoding: encoding.clone(),
                        })

Insertion in libpijul/src/diff/replace.rs at line 108 [7.779907]
[12.1209]
[7.783027]
```
            encoding: encoding.clone(),
```
Insertion in libpijul/src/diff/mod.rs at line 5 [7.793247]
[7.793368]
[7.793368]
```
use crate::text_encoding::Encoding;
```
Insertion in libpijul/src/diff/mod.rs at line 62 [7.793247]
[7.794388]
[13.115897]
```
        encoding: &Option<Encoding>,
```

Replacement in libpijul/src/diff/mod.rs at line 67 [7.793247]

B:BD[7.794648] → [6.997:1063]

∅:D[6.1063] → [14.4948:5212]

B:BD[7.794648] → [14.4948:5212]

        // TODO pass through the encodings and use that to decide
        let mime_a = tree_magic_mini::from_u8(&d.contents_a);
        let mime_b = tree_magic_mini::from_u8(&b);
        debug!("mimes = {:?}, {:?}", mime_a, mime_b);
        if (!mime_a.starts_with("text/") || !mime_b.starts_with("text/")) && d.contents_a != b {

[7.794648]

[6.1064]

        // TODO pass through both encodings and use that to decide
        if encoding.is_none() {

Insertion in libpijul/src/diff/mod.rs at line 131 [7.793247]
[7.797108]
[13.116075]
```
                    encoding,
```

Replacement in libpijul/src/diff/mod.rs at line 135 [7.793247]

B:BD[7.797176] → [9.313:399]

                self.replace(&d, &mut conflict_contexts, &lines_a, &lines_b, &dd, r);

[7.797176]

[7.797262]

                self.replace(
                    &d,
                    &mut conflict_contexts,
                    &lines_a,
                    &lines_b,
                    &dd,
                    r,
                    encoding,
                );

Insertion in libpijul/src/diff/mod.rs at line 218 [7.793247]
[7.800168]
[7.800168]
```
                encoding: None,
```
Insertion in libpijul/src/diff/mod.rs at line 232 [7.793247]
[7.800730]
[13.116350]
```
            encoding: None,
```
Insertion in libpijul/src/diff/delete.rs at line 9 [7.805350]
[7.805702]
[7.805702]
```
use crate::text_encoding::Encoding;
```
Insertion in libpijul/src/diff/delete.rs at line 22 [7.805350]
[7.805988]
[13.116448]
```
        encoding: &Option<Encoding>,
```

Replacement in libpijul/src/diff/delete.rs at line 25 [7.805350]

B:BD[7.806059] → [13.116494:116557]

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

[7.806059]

[7.806121]

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

Insertion in libpijul/src/diff/delete.rs at line 57 [7.805350]
[7.806904]
[13.116639]
```
        encoding: &Option<Encoding>,
```
Insertion in libpijul/src/diff/delete.rs at line 70 [7.805350]
[7.807392]
[7.807392]
```
                encoding: encoding.clone(),
```
Insertion in libpijul/src/diff/delete.rs at line 83 [7.805350]
[7.808286]
[7.808286]
```
                encoding: encoding.clone(),
```

Replacement in libpijul/src/change.rs at line 5 [7.831311]

B:BD[15.2977] → [5.84:135]

use crate::{pristine::*, text_encoding::Encoding};

[15.2977]

[7.831519]

use crate::pristine::*;
use crate::text_encoding::Encoding;

Replacement in libpijul/src/change.rs at line 613 [7.831311]

B:BD[7.849257] → [10.3344:3401]

            Hunk::Edit { change, local } => Hunk::Edit {

[7.849257]

[7.849318]

            Hunk::Edit {
                change,
                local,
                encoding,
            } => Hunk::Edit {

Insertion in libpijul/src/change.rs at line 620 [7.831311]
[7.849402]
[7.849402]
```
                encoding: encoding.clone(),
```
Insertion in libpijul/src/change.rs at line 626 [7.831311]
[7.849527]
[10.3435]
```
                encoding,
```
Insertion in libpijul/src/change.rs at line 631 [7.831311]
[7.849706]
[7.849706]
```
                encoding: encoding.clone(),
```

Replacement in libpijul/src/change.rs at line 641 [7.831311]

B:BD[7.850101] → [10.3649:3718]

            Hunk::ResurrectZombies { change, local } => Hunk::Edit {

[7.850101]

[7.850174]

            Hunk::ResurrectZombies {
                change,
                local,
                encoding,
            } => Hunk::Edit {

Insertion in libpijul/src/change.rs at line 648 [7.831311]
[7.850258]
[7.850258]
```
                encoding: encoding.clone(),
```
Insertion in libpijul/src/change.rs at line 716 [7.831311]
[7.851895]
[7.851895]
```
        encoding: Option<Encoding>,
```
Insertion in libpijul/src/change.rs at line 722 [7.831311]
[7.852003]
[7.852003]
```
        encoding: Option<Encoding>,
```
Insertion in libpijul/src/change.rs at line 735 [7.831311]
[7.852249]
[7.852249]
```
        encoding: Option<Encoding>,
```

Replacement in libpijul/src/change.rs at line 1142 [7.831311]

B:BD[7.865627] → [10.8006:8063]

            Hunk::Edit { change, local } => Hunk::Edit {

[7.865627]

[13.122190]

            Hunk::Edit {
                change,
                local,
                encoding,
            } => Hunk::Edit {

Insertion in libpijul/src/change.rs at line 1149 [7.831311]
[7.865758]
[7.865758]
```
                encoding,
```
Insertion in libpijul/src/change.rs at line 1155 [7.831311]
[7.865883]
[10.8097]
```
                encoding,
```
Insertion in libpijul/src/change.rs at line 1160 [7.831311]
[7.866049]
[7.866049]
```
                encoding,
```

Replacement in libpijul/src/change.rs at line 1170 [7.831311]

B:BD[7.866416] → [10.8311:8392]

            Hunk::ResurrectZombies { change, local } => Hunk::ResurrectZombies {

[7.866416]

[13.122444]

            Hunk::ResurrectZombies {
                change,
                local,
                encoding,
            } => Hunk::ResurrectZombies {

Insertion in libpijul/src/change.rs at line 1177 [7.831311]
[7.866571]
[7.866571]
```
                encoding,
```
Insertion in libpijul/src/change/text_changes.rs at line 4 [8.37976]
[8.38111]
[8.38111]
```
use regex::Captures;
```

Replacement in libpijul/src/change/text_changes.rs at line 386 [8.37976]

B:BD[8.50865] → [16.2714:2797]

                    print_change_contents(w, changes, contents, change_contents)?;

[8.50865]

[8.50953]

                    print_change_contents(w, changes, contents, change_contents, &None)?;

Replacement in libpijul/src/change/text_changes.rs at line 403 [8.37976]

B:BD[8.51484] → [16.2798:2881]

                    print_change_contents(w, changes, contents, change_contents)?;

[8.51484]

[8.51572]

                    print_change_contents(w, changes, contents, change_contents, &None)?;

Deletion in libpijul/src/change/text_changes.rs at line 429 [8.37976]

B:BD[8.52540] → [15.3205:3389]

                    };
                    let encoding_label = match encoding {
                        Some(encoding) => encoding.label(),
                        _ => BINARY_LABEL,

Replacement in libpijul/src/change/text_changes.rs at line 442 [8.37976]

B:BD[3.193] → [3.193:232]

                        encoding_label

[3.193]

[8.52730]

                        encoding_label(encoding)

Replacement in libpijul/src/change/text_changes.rs at line 459 [8.37976]

B:BD[8.53410] → [10.8875:8921]

            Hunk::Edit { change, local } => {

[8.53410]

[17.309]

            Hunk::Edit {
                change,
                local,
                encoding,
            } => {

Insertion in libpijul/src/change/text_changes.rs at line 467 [8.37976]
[8.53596]
[8.53596]
```
                write!(w, " {:?}", encoding_label(encoding))?;
```

Replacement in libpijul/src/change/text_changes.rs at line 470 [8.37976]

B:BD[8.53680] → [16.2931:3008]

                print_change_contents(w, changes, change, change_contents)?;

[8.53680]

[8.53762]

                print_change_contents(w, changes, change, change_contents, encoding)?;

Insertion in libpijul/src/change/text_changes.rs at line 476 [8.37976]
[8.53886]
[8.53886]
```
                encoding,
```
Insertion in libpijul/src/change/text_changes.rs at line 481 [8.37976]
[8.54050]
[8.54050]
```
                write!(w, " {:?}", encoding_label(encoding))?;
```

Replacement in libpijul/src/change/text_changes.rs at line 485 [8.37976]

B:BD[8.54193] → [16.3009:3168]

                print_change_contents(w, changes, change, change_contents)?;
                print_change_contents(w, changes, replacement, change_contents)?;

[8.54193]

[8.54362]

                print_change_contents(w, changes, change, change_contents, encoding)?;
                print_change_contents(w, changes, replacement, change_contents, encoding)?;

Replacement in libpijul/src/change/text_changes.rs at line 514 [8.37976]

B:BD[8.55518] → [16.3169:3246]

                print_change_contents(w, changes, change, change_contents)?;

[8.55518]

[8.55600]

                print_change_contents(w, changes, change, change_contents, &None)?;

Replacement in libpijul/src/change/text_changes.rs at line 526 [8.37976]

B:BD[8.56002] → [16.3247:3324]

                print_change_contents(w, changes, change, change_contents)?;

[8.56002]

[8.56084]

                print_change_contents(w, changes, change, change_contents, &None)?;

Replacement in libpijul/src/change/text_changes.rs at line 528 [8.37976]

B:BD[8.56098] → [10.9195:9253]

            Hunk::ResurrectZombies { change, local } => {

[8.56098]

[17.482]

            Hunk::ResurrectZombies {
                change,
                local,
                encoding,
            } => {

Insertion in libpijul/src/change/text_changes.rs at line 540 [8.37976]
[8.56389]
[8.56389]
```
                write!(w, " {:?}", encoding_label(encoding))?;
```

Replacement in libpijul/src/change/text_changes.rs at line 543 [8.37976]

B:BD[8.56473] → [16.3325:3402]

                print_change_contents(w, changes, change, change_contents)?;

[8.56473]

[8.56555]

                print_change_contents(w, changes, change, change_contents, &None)?;

Insertion in libpijul/src/change/text_changes.rs at line 547 [8.37976]

[8.56594]

    }
}
fn encoding_label(encoding: &Option<Encoding>) -> &str {
    match encoding {
        Some(encoding) => encoding.label(),
        _ => BINARY_LABEL,

Replacement in libpijul/src/change/text_changes.rs at line 570 [8.37976]

B:BD[8.57069] → [3.233:384]

                Regex::new(r#"^(?P<n>\d+)\. File addition: "(?P<name>[^"]*)" in "(?P<parent>[^"]*)"(?P<perm> [^ ]+)? "(?P<encoding>[^"]*)"#).unwrap();

[8.57069]

[8.57195]

                Regex::new(r#"^(?P<n>\d+)\. File addition: "(?P<name>[^"]*)" in "(?P<parent>[^"]*)"(?P<perm> [^ ]+)? "(?P<encoding>[^"]*)""#).unwrap();

Replacement in libpijul/src/change/text_changes.rs at line 572 [8.37976]

B:BD[8.57232] → [18.128:216]

                Regex::new(r#"^([0-9]+)\. Edit in ([^:]+):(\d+) (\d+\.\d+)"#).unwrap();

[8.57232]

[8.57316]

                Regex::new(r#"^([0-9]+)\. Edit in ([^:]+):(\d+) (\d+\.\d+) "(?P<encoding>[^"]*)""#).unwrap();

Replacement in libpijul/src/change/text_changes.rs at line 574 [8.37976]

B:BD[8.57360] → [18.217:312]

                Regex::new(r#"^([0-9]+)\. Replacement in ([^:]+):(\d+) (\d+\.\d+)"#).unwrap();

[8.57360]

[8.57451]

                Regex::new(r#"^([0-9]+)\. Replacement in ([^:]+):(\d+) (\d+\.\d+) "(?P<encoding>[^"]*)""#).unwrap();

Replacement in libpijul/src/change/text_changes.rs at line 591 [8.37976]

B:BD[8.58396] → [18.926:1052]

                Regex::new(r#"^([0-9]+)\. Resurrecting zombie lines in (?P<path>"[^"]+"):(?P<line>\d+) (?P<inode>\d+\.\d+)"#)

[8.58396]

[8.58518]

                Regex::new(r#"^([0-9]+)\. Resurrecting zombie lines in (?P<path>"[^"]+"):(?P<line>\d+) (?P<inode>\d+\.\d+) "(?P<encoding>[^"]*)""#)

Deletion in libpijul/src/change/text_changes.rs at line 647 [8.37976]

B:BD[8.60586] → [15.3674:3925]

            let encoding_label = cap.name("encoding").unwrap().as_str();
            let encoding = if encoding_label != BINARY_LABEL {
                Some(Encoding::for_label(encoding_label))
            } else {
                None
            };

Replacement in libpijul/src/change/text_changes.rs at line 654 [8.37976]

B:BD[8.60862] → [15.3926:3956]

                    encoding,

[8.60862]

                    encoding: encoding_from_label(cap),

Insertion in libpijul/src/change/text_changes.rs at line 673 [8.37976]
[8.61443]
[8.61443]
```
                    encoding: encoding_from_label(cap),
```
Insertion in libpijul/src/change/text_changes.rs at line 692 [8.37976]
[8.62098]
[8.62098]
```
                    encoding: encoding_from_label(cap),
```
Insertion in libpijul/src/change/text_changes.rs at line 838 [8.37976]
[8.67530]
[8.67530]
```
                    encoding: encoding_from_label(cap),
```

Insertion in libpijul/src/change/text_changes.rs at line 1102 [8.37976]

[8.79941]

    }
}
fn encoding_from_label(cap: Captures) -> Option<Encoding> {
    let encoding_label = cap.name("encoding").unwrap().as_str();
    if encoding_label != BINARY_LABEL {
        Some(Encoding::for_label(encoding_label))
    } else {
        None

Insertion in libpijul/src/change/text_changes.rs at line 1296 [8.37976]
[8.85365]
[8.85365]
```
    encoding: &Option<Encoding>,
```
Replacement in libpijul/src/change/text_changes.rs at line 1301 [8.37976]
∅:D[2.1] → [19.592:639]
B:BD[8.85538] → [19.592:639]
```
            print_contents(w, "+", c, &None)?;
```
[20.143228]
[8.85578]
```
            print_contents(w, "+", c, encoding)?;
```

Replacement in libpijul/src/change/text_changes.rs at line 1319 [8.37976]

B:BD[8.86133] → [3.385:443]

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

[8.86133]

[21.0]

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

file encoding in updates

Dependencies

In channels

Change contents

Replacement in libpijul/src/working_copy/mod.rs at line 3 [7.198172]

Replacement in libpijul/src/record.rs at line 451 [7.488880]

Insertion in libpijul/src/record.rs at line 465 [7.488880]

Insertion in libpijul/src/diff/replace.rs at line 7 [7.779907]

Insertion in libpijul/src/diff/replace.rs at line 37 [7.779907]

Replacement in libpijul/src/diff/replace.rs at line 79 [7.779907]

Insertion in libpijul/src/diff/replace.rs at line 87 [7.779907]

Replacement in libpijul/src/diff/replace.rs at line 91 [7.779907]

Insertion in libpijul/src/diff/replace.rs at line 108 [7.779907]

Insertion in libpijul/src/diff/mod.rs at line 5 [7.793247]

Insertion in libpijul/src/diff/mod.rs at line 62 [7.793247]

Replacement in libpijul/src/diff/mod.rs at line 67 [7.793247]

Insertion in libpijul/src/diff/mod.rs at line 131 [7.793247]

Replacement in libpijul/src/diff/mod.rs at line 135 [7.793247]

Insertion in libpijul/src/diff/mod.rs at line 218 [7.793247]

Insertion in libpijul/src/diff/mod.rs at line 232 [7.793247]

Insertion in libpijul/src/diff/delete.rs at line 9 [7.805350]

Insertion in libpijul/src/diff/delete.rs at line 22 [7.805350]

Replacement in libpijul/src/diff/delete.rs at line 25 [7.805350]

Insertion in libpijul/src/diff/delete.rs at line 57 [7.805350]

Insertion in libpijul/src/diff/delete.rs at line 70 [7.805350]

Insertion in libpijul/src/diff/delete.rs at line 83 [7.805350]

Replacement in libpijul/src/change.rs at line 5 [7.831311]

Replacement in libpijul/src/change.rs at line 613 [7.831311]

Insertion in libpijul/src/change.rs at line 620 [7.831311]

Insertion in libpijul/src/change.rs at line 626 [7.831311]

Insertion in libpijul/src/change.rs at line 631 [7.831311]

Replacement in libpijul/src/change.rs at line 641 [7.831311]

Insertion in libpijul/src/change.rs at line 648 [7.831311]

Insertion in libpijul/src/change.rs at line 716 [7.831311]

Insertion in libpijul/src/change.rs at line 722 [7.831311]

Insertion in libpijul/src/change.rs at line 735 [7.831311]

Replacement in libpijul/src/change.rs at line 1142 [7.831311]

Insertion in libpijul/src/change.rs at line 1149 [7.831311]

Insertion in libpijul/src/change.rs at line 1155 [7.831311]

Insertion in libpijul/src/change.rs at line 1160 [7.831311]

Replacement in libpijul/src/change.rs at line 1170 [7.831311]

Insertion in libpijul/src/change.rs at line 1177 [7.831311]

Insertion in libpijul/src/change/text_changes.rs at line 4 [8.37976]

Replacement in libpijul/src/change/text_changes.rs at line 386 [8.37976]

Replacement in libpijul/src/change/text_changes.rs at line 403 [8.37976]

Deletion in libpijul/src/change/text_changes.rs at line 429 [8.37976]

Replacement in libpijul/src/change/text_changes.rs at line 442 [8.37976]

Replacement in libpijul/src/change/text_changes.rs at line 459 [8.37976]

Insertion in libpijul/src/change/text_changes.rs at line 467 [8.37976]

Replacement in libpijul/src/change/text_changes.rs at line 470 [8.37976]

Insertion in libpijul/src/change/text_changes.rs at line 476 [8.37976]

Insertion in libpijul/src/change/text_changes.rs at line 481 [8.37976]