ilyagr/pijul - Change NEJOYVJB4VXJJPFBWD2YK7PK6KKHQGRHIJHLEJ53HLQ3ZQRE5EPQC

Fixing the Git feature

Created by pmeunier on June 29, 2021

NEJOYVJB4VXJJPFBWD2YK7PK6KKHQGRHIJHLEJ53HLQ3ZQRE5EPQC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/git.rs at line 45 [4.137210]

B:BD[3.14293] → [3.14293:14384]

        let repo = if let Ok(repo) = Repository::find_root(self.repo_path.clone()).await {

[3.14293]

[4.138182]

        let repo = if let Ok(repo) = Repository::find_root(self.repo_path.clone()) {

Deletion in pijul/src/commands/git.rs at line 457 [4.137210]
B:BD[4.151008] → [4.151008:151103]
B:BD[4.151103] → [5.2513:2551]
∅:D[6.110] → [4.151135:151142]
∅:D[7.526] → [4.151135:151142]
∅:D[5.2551] → [4.151135:151142]
B:BD[4.151135] → [4.151135:151142]
```
    debug!(
        "last_recorded {:?}, name {:?}",
        repo.repo.config.current_channel,
        txn_.name(&*channel.read()?),
    );
```

Insertion in pijul/src/commands/git.rs at line 684 [4.137210]

[8.376]

[4.158463]

    let mut author = BTreeMap::new();
    author.insert("name".to_string(), signature.name().unwrap().to_string());
    author.insert("email".to_string(), signature.email().unwrap().to_string());

Replacement in pijul/src/commands/git.rs at line 696 [4.137210]

∅:D[8.398] → [4.158733:158961]

B:BD[4.158733] → [4.158733:158961]

            authors: vec![libpijul::change::Author {
                name: signature.name().unwrap().to_string(),
                email: signature.email().map(|e| e.to_string()),
                full_name: None,
            }],

[8.398]

[2.1332]

            authors: vec![libpijul::change::Author(author)],

Insertion in pijul/src/commands/git.rs at line 708 [4.137210]

[4.159191]

[5.3820]

    {
        let mut txn = txn.write().unwrap();
        let name = txn.name(&channel.read().unwrap()).to_string();
        txn.set_current_channel(&name)?;
    }

Deletion in pijul/src/commands/git.rs at line 730 [4.137210]
B:BD[4.159846] → [4.159846:159934]
B:BD[4.159934] → [5.4017:4075]
∅:D[6.315] → [4.159981:159994]
∅:D[7.1242] → [4.159981:159994]
∅:D[5.4075] → [4.159981:159994]
B:BD[4.159981] → [4.159981:159994]
B:BD[4.159994] → [5.4076:4172]
∅:D[6.405] → [4.160079:160115]
∅:D[7.1331] → [4.160079:160115]
∅:D[5.4172] → [4.160079:160115]
B:BD[4.160079] → [4.160079:160115]
```
    if let Some(ref mut cur) = repo.repo.config.current_channel {
        cur.clear();
        cur.push_str(txn.name(&channel.read().unwrap()));
    } else {
        repo.repo.config.current_channel = Some(txn.name(&channel.read().unwrap()).to_string())
    }
    repo.repo.save_config()?;
```