pijul/pijul - Change KJDQ2WOMIUTVDEEQ7NMJYBZAVUZ3NIVOVJ6MUCZPRAWIEWOV6TWQC

Fixing the parsing of section headers in the text change format

Created by pmeunier on December 7, 2020

KJDQ2WOMIUTVDEEQ7NMJYBZAVUZ3NIVOVJ6MUCZPRAWIEWOV6TWQC

Dependencies

[2] VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC

In channels

main

In discussions

#193 Panic in `pijul record` – perhaps because it contains something that looks like a patch?

#214 Minor cleanup

#219 Minor cleanup, redux

#243 Better Remotes

Change contents

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

B:BD[2.57069] → [2.57069:57195]

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

[2.57069]

[2.57195]

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

Replacement in libpijul/src/change/text_changes.rs at line 511 [2.37976]

B:BD[2.57232] → [2.57232:57316]

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

[2.57232]

[2.57316]

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

Replacement in libpijul/src/change/text_changes.rs at line 513 [2.37976]

B:BD[2.57360] → [2.57360:57451]

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

[2.57360]

[2.57451]

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

Replacement in libpijul/src/change/text_changes.rs at line 515 [2.37976]

B:BD[2.57497] → [2.57497:57584]

                Regex::new(r#"(\d+)\. File deletion: "([^"]*)" (\d+\.\d+)"#).unwrap();

[2.57497]

[2.57584]

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

Replacement in libpijul/src/change/text_changes.rs at line 517 [2.37976]

B:BD[2.57632] → [2.57632:57722]

                Regex::new(r#"(\d+)\. File un-deletion: "([^"]*)" (\d+\.\d+)"#).unwrap();

[2.57632]

[2.57722]

                Regex::new(r#"^([0-9]+)\. File un-deletion: "([^"]*)" (\d+\.\d+)"#).unwrap();

Replacement in libpijul/src/change/text_changes.rs at line 519 [2.37976]

B:BD[2.57759] → [2.57759:57977]

                Regex::new(r#"(\d+)\. Moved: "(?P<former>[^"]*)" "(?P<new>[^"]*)" (?P<perm>\d+) (?P<inode>.*)"#).unwrap();
            static ref MOVE_: Regex = Regex::new(r#"(\d+)\. Moved: "([^"]*)" (.*)"#).unwrap();

[2.57759]

[2.57977]

                Regex::new(r#"^([0-9]+)\. Moved: "(?P<former>[^"]*)" "(?P<new>[^"]*)" (?P<perm>\d+) (?P<inode>.*)"#).unwrap();
            static ref MOVE_: Regex = Regex::new(r#"^([0-9]+)\. Moved: "([^"]*)" (.*)"#).unwrap();

Replacement in libpijul/src/change/text_changes.rs at line 522 [2.37976]

B:BD[2.58035] → [2.58035:58127]

                r#"(\d+)\. ((Solving)|(Un-solving)) a name conflict in "([^"]*)" (.*): .*"#

[2.58035]

[2.58127]

                r#"^([0-9]+)\. ((Solving)|(Un-solving)) a name conflict in "([^"]*)" (.*): .*"#

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

B:BD[2.58223] → [2.58223:58320]

                r#"(\d+)\. ((Solving)|(Un-solving)) an order conflict in (.*):(\d+) (\d+\.\d+)"#

[2.58223]

[2.58320]

                r#"^([0-9]+)\. ((Solving)|(Un-solving)) an order conflict in (.*):(\d+) (\d+\.\d+)"#

Replacement in libpijul/src/change/text_changes.rs at line 530 [2.37976]

B:BD[2.58396] → [2.58396:58518]

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

[2.58396]

[2.58518]

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