dblsaiko/pijul - Change FF4TXHN5T4QFIUI4MNCWZYNV6D5F5K5JKPBESN3EPP5YHLHSYI5AC

In `pijul git`, avoid diffing files not modified by a commit

Created by pmeunier on October 18, 2022

FF4TXHN5T4QFIUI4MNCWZYNV6D5F5K5JKPBESN3EPP5YHLHSYI5AC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/git.rs at line 6 [5.137210]
B:BD[5.137305] → [6.728:772]
```
use std::collections::{BTreeMap, BTreeSet};
```
[7.970]
[5.137367]
```
use std::collections::{BTreeMap, BTreeSet, HashSet};
```

Insertion in pijul/src/commands/git.rs at line 14 [5.137210]

[5.137477]

[8.1590]

    /// Process this path instead of the current directory, creating a Pijul repository if necessary.
    pub git_path: Option<PathBuf>,

Replacement in pijul/src/commands/git.rs at line 17 [5.137210]
B:BD[8.1692] → [8.1692:1728]
```
    pub repo_path: Option<PathBuf>,
```
[8.1692]
[8.1728]
```
    pub pijul_path: Option<PathBuf>,
```

Replacement in pijul/src/commands/git.rs at line 43 [5.137210]

∅:D[9.52] → [10.0:85]

B:BD[11.14293] → [10.0:85]

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

[9.52]

[5.138182]

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

Insertion in pijul/src/commands/git.rs at line 45 [5.137210]

[5.138199]

        } else {
            Repository::init(self.pijul_path.clone(), None, None)?
        };
        let git_path = if let Some(git_path) = self.git_path.clone() {
            git_path

Replacement in pijul/src/commands/git.rs at line 51 [5.137210]

B:BD[5.138216] → [3.764:830]

            Repository::init(self.repo_path.clone(), None, None)?

[5.138216]

[5.138270]

            repo.path.clone()

Replacement in pijul/src/commands/git.rs at line 53 [5.137210]

B:BD[5.138281] → [5.138281:138336]

        let git = git2::Repository::open(&repo.path)?;

[5.138281]

[2.0]

        let git = git2::Repository::open(&git_path)?;

Replacement in pijul/src/commands/git.rs at line 489 [5.137210]

B:BD[5.152146] → [4.153:227]

) -> Result<(git2::Object<'a>, BTreeMap<PathBuf, bool>), anyhow::Error> {

[5.152146]

[5.152214]

) -> Result<(git2::Object<'a>, BTreeMap<PathBuf, bool>, HashSet<String>), anyhow::Error> {

Insertion in pijul/src/commands/git.rs at line 499 [5.137210]
[4.268]
[5.153473]
```
    let mut pref = HashSet::new();
```

Replacement in pijul/src/commands/git.rs at line 558 [5.137210]

B:BD[5.156099] → [5.156099:156162]

B:BD[5.156162] → [4.348:407]

                        let new_path = new_path.to_path_buf();
                        prefixes.insert(new_path, is_dir);

[5.156099]

[5.156213]

                        let new_path_ = new_path.to_path_buf();
                        pref.insert(new_path.to_str().unwrap().to_string());
                        prefixes.insert(new_path_, is_dir);

Replacement in pijul/src/commands/git.rs at line 569 [5.137210]

B:BD[5.156608] → [5.156608:156742]

B:BD[5.156742] → [4.468:594]

                            let old_path = old_path.to_path_buf();
                            let new_path = new_path.to_path_buf();
                            prefixes.insert(old_path, is_dir);
                            prefixes.insert(new_path, is_dir);

[5.156608]

[5.156852]

                            let old_path_ = old_path.to_path_buf();
                            let new_path_ = new_path.to_path_buf();
                            prefixes.insert(old_path_, is_dir);
                            prefixes.insert(new_path_, is_dir);
                            pref.insert(old_path.to_str().unwrap().to_string());
                            pref.insert(new_path.to_str().unwrap().to_string());

Replacement in pijul/src/commands/git.rs at line 603 [5.137210]
B:BD[5.157439] → [5.157439:157466]
```
    Ok((object, prefixes))
```
[5.157439]
[4.682]
```
    Ok((object, prefixes, pref))
```
Insertion in pijul/src/commands/git.rs at line 610 [5.137210]
[4.776]
[5.157466]
```
    pref: HashSet<String>,
```

Replacement in pijul/src/commands/git.rs at line 644 [5.137210]

B:BD[4.1889] → [4.1889:2015]

    fn modified_time(&self, _: &str) -> Result<std::time::SystemTime, Self::Error> {
        Ok(std::time::SystemTime::now())

[4.1889]

[4.2015]

    fn modified_time(&self, x: &str) -> Result<std::time::SystemTime, Self::Error> {
        if self.pref.contains(x) {
            Ok(std::time::SystemTime::now())
        } else {
            Ok(std::time::SystemTime::UNIX_EPOCH)
        }

Replacement in pijul/src/commands/git.rs at line 663 [5.137210]

B:BD[12.3958] → [13.14694:14776]

    let (object, prefixes) = git_reset(git, repo, &txn, &channel, child, stats)?;

[12.3958]

[14.319]

    let (object, prefixes, prefstr) = git_reset(git, repo, &txn, &channel, child, stats)?;

Insertion in pijul/src/commands/git.rs at line 731 [5.137210]
[4.3115]
[4.3115]
```
            pref: prefstr,
```