pijul/pijul - Change SFJ3XRTFUNG6KNYDLIYKHCENZ6Y3PG33GNGDW6444LAVBMCSH2FAC

Proper escaping of UTF-8 filenames in the patch text format

Created by pmeunier on September 7, 2021

SFJ3XRTFUNG6KNYDLIYKHCENZ6Y3PG33GNGDW6444LAVBMCSH2FAC

Dependencies

In channels

main

In discussions

#528 [BUG] File names with weird characters break stuff

Change contents

Deletion in ""pijul/src/commands/record.rs"" at line 363 [4.101759]

B:BD[4.107873] → [4.107873:107972]

        let file_name = |local: &Local, _| -> String { format!("{}:{}", local.path, local.line) };

Replacement in ""pijul/src/commands/record.rs"" at line 371 [4.101759]
∅:D[5.462] → [4.108241:108308]
B:BD[4.108241] → [4.108241:108308]
```
            change.write(changes, None, file_name, true, &mut o)?;
```
[5.462]
[5.463]
```
            change.write(changes, None, true, &mut o)?;
```

Deletion in ""pijul/src/commands/diff.rs"" at line 231 [4.173551]

B:BD[4.177116] → [4.177116:177261]

                |local: &libpijul::change::Local, _| -> String {
                    format!("{}:{}", local.path, local.line)
                },

Deletion in ""pijul/src/commands/change.rs"" at line 4 [4.189306]
∅:D[6.3123] → [4.189333:189362]
B:BD[4.189333] → [4.189333:189362]
```
use libpijul::change::Local;
```
Deletion in ""pijul/src/commands/change.rs"" at line 42 [4.189306]
B:BD[4.190342] → [7.346:419]
```
        let file_name = |l: &Local, _| format!("{}:{}", l.path, l.line);
```
Deletion in ""pijul/src/commands/change.rs"" at line 46 [4.189306]
B:BD[8.2218] → [8.2218:2241]
```
            file_name,
```
Deletion in ""libpijul/src/change/text_changes.rs"" at line 91 [10.37976]
B:BD[9.1465] → [9.1465:1525]
```
        F: FnMut(&Local, Position<Option<Hash>>) -> String,
```
Deletion in ""libpijul/src/change/text_changes.rs"" at line 95 [10.37976]
B:BD[10.40762] → [10.40762:40788]
```
        mut file_name: F,
```

Replacement in ""libpijul/src/change/text_changes.rs"" at line 153 [10.37976]

B:BD[10.42756] → [10.42756:42841]

                rec.write(changes, &mut file_name, &hashes, &self.contents, &mut w)?

[10.42756]

[10.42841]

                rec.write(changes, &hashes, &self.contents, &mut w)?

Insertion in ""libpijul/src/change/text_changes.rs"" at line 309 [10.37976]

[11.3177]

[10.48443]


struct Escaped<'a>(&'a str);
impl<'a> std::fmt::Display for Escaped<'a> {
    fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
        write!(fmt, "\"")?;
        for c in self.0.chars() {
            if c == '"' {
                write!(fmt, "\\{}", c)?
            } else if c == '\\' {
                write!(fmt, "\\\\")?
            } else {
                write!(fmt, "{}", c)?
            }
        }
        write!(fmt, "\"")?;
        Ok(())
    }
}
fn unescape(s: &str) -> std::borrow::Cow<str> {
    let mut b = 0;
    let mut result = String::new();
    let mut ch = s.chars();
    while let Some(c) = ch.next() {
        if c == '\\' {
            if result.is_empty() {
                result = s.split_at(b).0.to_string();
            }
            if let Some(c) = ch.next() {
                result.push(c)
            }
        } else if !result.is_empty() {
            result.push(c)
        }
        b += c.len_utf8()
    }
    if result.is_empty() {
        s.into()
    } else {
        result.into()
    }
}

Deletion in ""libpijul/src/change/text_changes.rs"" at line 357 [10.37976]
B:BD[10.48544] → [10.48544:48604]
```
        F: FnMut(&Local, Position<Option<Hash>>) -> String,
```
Deletion in ""libpijul/src/change/text_changes.rs"" at line 360 [10.37976]
B:BD[10.48647] → [10.48647:48673]
```
        mut file_name: F,
```

Insertion in ""libpijul/src/change/text_changes.rs"" at line 364 [10.37976]

[10.48808]


        // let file_name = |local: &Local, _| -> String { format!("{}:{}", local.path, local.line) };

Replacement in ""libpijul/src/change/text_changes.rs"" at line 378 [10.37976]

B:BD[12.1537] → [12.1537:1644]

                        "Moved: {:?} {:?} {}",
                        path,
                        name,

[12.1537]

[12.1644]

                        "Moved: {} {} {}",
                        Escaped(&path),
                        Escaped(&name),

Replacement in ""libpijul/src/change/text_changes.rs"" at line 420 [10.37976]

B:BD[13.269] → [3.105657:105716]

                write!(w, "File deletion: {:?} ", path,)?;

[13.269]

[10.50578]

                write!(w, "File deletion: {} ", Escaped(path))?;

Replacement in ""libpijul/src/change/text_changes.rs"" at line 440 [10.37976]

B:BD[13.308] → [3.105717:105779]

                write!(w, "File un-deletion: {:?} ", path,)?;

[13.308]

[10.51227]

                write!(w, "File un-deletion: {} ", Escaped(path))?;

Replacement in ""libpijul/src/change/text_changes.rs"" at line 476 [10.37976]

B:BD[10.52618] → [14.97:165]

∅:D[14.165] → [12.2008:2070]

B:BD[12.2008] → [12.2008:2070]

                        "File addition: {:?} in {:?}{} {:?}\n  up",
                        name,
                        parent,

[10.52618]

[12.2070]

                        "File addition: {} in {}{} \"{}\"\n  up",
                        Escaped(name),
                        Escaped(parent),

Replacement in ""libpijul/src/change/text_changes.rs"" at line 509 [10.37976]

∅:D[13.341] → [10.53458:53536]

B:BD[10.53458] → [10.53458:53536]

                write!(w, "Edit in {} ", file_name(&local, change.inode()))?;

[13.341]

[10.53536]

                write!(w, "Edit in \"{}\":{} ", Escaped(&local.path), local.line)?;

Replacement in ""libpijul/src/change/text_changes.rs"" at line 523 [10.37976]

∅:D[13.381] → [10.53905:53990]

B:BD[10.53905] → [10.53905:53990]

                write!(w, "Replacement in {} ", file_name(&local, change.inode()))?;

[13.381]

[10.53990]

                write!(w, "Replacement in \"{}\":{} ", Escaped(&local.path), local.line)?;

Replacement in ""libpijul/src/change/text_changes.rs"" at line 533 [10.37976]

∅:D[15.9011] → [10.54434:54504]

B:BD[10.54434] → [10.54434:54504]

                write!(w, "Solving a name conflict in {:?} ", path)?;

[15.9011]

[10.54504]

                write!(w, "Solving a name conflict in {} ", Escaped(path))?;

Replacement in ""libpijul/src/change/text_changes.rs"" at line 541 [10.37976]

∅:D[15.9070] → [10.54813:54886]

B:BD[10.54813] → [10.54813:54886]

                write!(w, "Un-solving a name conflict in {:?} ", path)?;

[15.9070]

[10.54886]

                write!(w, "Un-solving a name conflict in {} ", Escaped(path))?;

Replacement in ""libpijul/src/change/text_changes.rs"" at line 552 [10.37976]

B:BD[10.55244] → [10.55244:55354]

                    "Solving an order conflict in {} ",
                    file_name(&local, change.inode())

[10.55244]

[10.55354]

                    "Solving an order conflict in \"{}\":{} ",
                    Escaped(&local.path),
                    local.line,

Replacement in ""libpijul/src/change/text_changes.rs"" at line 565 [10.37976]

B:BD[10.55725] → [10.55725:55838]

                    "Un-solving an order conflict in {} ",
                    file_name(&local, change.inode())

[10.55725]

[10.55838]

                    "Un-solving an order conflict in \"{}\":{} ",
                    Escaped(&local.path),
                    local.line,

Replacement in ""libpijul/src/change/text_changes.rs"" at line 582 [10.37976]

B:BD[10.56205] → [10.56205:56309]

                    "Resurrecting zombie lines in {:?}:{} ",
                    local.path, local.line

[10.56205]

[10.56309]

                    "Resurrecting zombie lines in {}:{} ",
                    Escaped(&local.path), local.line

Replacement in ""libpijul/src/change/text_changes.rs"" at line 586 [10.37976]

B:BD[10.56389] → [16.3532:3595]

                write!(w, " {:?}", encoding_label(encoding))?;

[10.56389]

                write!(w, " \"{}\"", encoding_label(encoding))?;

Replacement in ""libpijul/src/change/text_changes.rs"" at line 651 [10.37976]

B:BD[10.59079] → [10.59079:59139]

            let name = &cap.name("name").unwrap().as_str();

[10.59079]

[10.59139]

            let name = unescape(&cap.name("name").unwrap().as_str());

Replacement in ""libpijul/src/change/text_changes.rs"" at line 657 [10.37976]

B:BD[10.59326] → [2.0:45]

∅:D[2.45] → [10.59365:59391]

B:BD[10.59365] → [10.59365:59391]

                    parent.to_string() + "/"
                }) + name

[10.59326]

[10.59391]

                    unescape(&parent).to_string() + "/"
                }) + &name

Replacement in ""libpijul/src/change/text_changes.rs"" at line 676 [10.37976]
B:BD[17.3129] → [17.3129:3161]
```
                basename: name,
```
[17.3129]
[18.5888]
```
                basename: &name,
```

Replacement in ""libpijul/src/change/text_changes.rs"" at line 806 [10.37976]

B:BD[10.64287] → [10.64287:64345]

            let name = cap.name("new").unwrap().as_str();

[10.64287]

[12.2937]

            let name = unescape(cap.name("new").unwrap().as_str());

Replacement in ""libpijul/src/change/text_changes.rs"" at line 821 [10.37976]
B:BD[17.3302] → [17.3302:3334]
```
                basename: name,
```
[17.3302]
[18.6078]
```
                basename: &name,
```