pijul/pijul - Change HRB4ZDWXHB2ZNBCV7LOE6O6KT4PECDMHR5QIB5SR4D6AOVD2OR3AC

Make Author optional in config::Global

Created by ryanbooker on January 9, 2024

HRB4ZDWXHB2ZNBCV7LOE6O6KT4PECDMHR5QIB5SR4D6AOVD2OR3AC

Dependencies

In discussions

#864 If there is no [author] block global config doesn't appear to be loaded, so root level settings are ignored

Change contents

Deletion in pijul/src/identity/repair.rs at line 182 [3.56]
B:BD[3.10149] → [3.10149:10150]

Replacement in pijul/src/identity/repair.rs at line 267 [3.56]

B:BD[3.13841] → [4.1325:1387]

        let config: super::Config = if config_path.exists() {

[3.13841]

[3.13904]

        let author: super::Author = if config_path.exists() {

Replacement in pijul/src/identity/repair.rs at line 278 [3.56]

B:BD[4.1389] → [4.1389:1538]

            super::Config {
                key_path: config_data.author.key_path.clone(),
                author: config_data.author,
            }

[4.1389]

[3.14367]

            config_data.author.unwrap_or(default_author(identity))

Replacement in pijul/src/identity/repair.rs at line 280 [3.56]

B:BD[3.14384] → [4.1539:1595]

B:BD[4.1595] → [2.3345:3384]

∅:D[4.1635] → [3.14417:14443]

∅:D[2.3384] → [3.14417:14443]

B:BD[3.14417] → [3.14417:14443]

B:BD[3.14443] → [2.3385:3466]

            let mut author = config::Author::default();
            author.username = identity
                .as_ref()
                .map_or_else(String::new, |x| x.config.author.username.clone());

[3.14384]

[3.14646]

            default_author(identity)
        };

Replacement in pijul/src/identity/repair.rs at line 283 [3.56]

B:BD[3.14647] → [4.1719:1817]

            super::Config {
                key_path: None,
                author,
            }

[3.14647]

[3.14762]

        let config = super::Config {
            key_path: author.key_path.clone(),
            author: author,

Insertion in pijul/src/identity/repair.rs at line 301 [3.56]

[3.15593]

}
fn default_author(identity: Option<Complete>) -> super::Author {
    let mut author = config::Author::default();
    author.username = identity
        .as_ref()
        .map_or_else(String::new, |x| x.config.author.username.clone());
    author

Replacement in pijul/src/identity/mod.rs at line 213 [3.15627]

B:BD[3.18887] → [3.18887:18920]

            global_config.author

[3.18887]

[3.18920]

            global_config.author.unwrap_or(Author::default())

Replacement in pijul/src/config.rs at line 12 [5.89866]
B:BD[5.89960] → [6.89:113]
```
    pub author: Author,
```
[5.89960]
[7.781]
```
    pub author: Option<Author>,
```