pijul/pijul - Change J33DKFPM7LLK5V47GXZYJ6LO24VYA77DYHKT4QNPESABETUOVYMQC

Do not traverse unindexed directories in `pijul diff -su`

This patch adds a filter to check whether we should traverse directories, which allows us to traverse them when adding files, but not when doing a simple pijul diff -su, improving the time for that command and uncluttering the output.

Created by pmeunier on February 8, 2024

J33DKFPM7LLK5V47GXZYJ6LO24VYA77DYHKT4QNPESABETUOVYMQC

Dependencies

In channels

main

In discussions

#862 Request: Don't traverse unindexed directories in pijul diff -su

Change contents

Deletion in pijul/src/commands/diff.rs at line 47 [7.173551]
B:BD[6.42] → [6.42:76]
```
            let txn = txn.read();
```

Replacement in pijul/src/commands/diff.rs at line 49 [7.173551]

B:BD[6.158] → [6.158:221]

                &untracked(&repo, &*txn)?.collect::<Vec<_>>(),

[6.158]

[6.221]

                &untracked(&repo, txn.clone())?.collect::<Result<Vec<_>, _>>()?,

Deletion in pijul/src/commands/diff.rs at line 105 [7.173551]
B:BD[7.175108] → [8.0:34]
```
            let txn = txn.read();
```

Replacement in pijul/src/commands/diff.rs at line 106 [7.173551]

∅:D[9.46] → [8.62:188]

B:BD[8.62] → [8.62:188]

                for path in untracked(&repo, &*txn)? {
                    writeln!(stdout, "U {}", path.to_str().unwrap())?;

[9.46]

[8.188]

                for path in untracked(&repo, txn.clone())? {
                    writeln!(stdout, "U {}", path?.to_str().unwrap())?;

Replacement in pijul/src/commands/diff.rs at line 110 [7.173551]

B:BD[8.245] → [8.245:369]

                for path in untracked(&repo, &*txn)? {
                    writeln!(stdout, "{}", path.to_str().unwrap())?;

[8.245]

[8.369]

                for path in untracked(&repo, txn.clone())? {
                    writeln!(stdout, "{}", path?.to_str().unwrap())?;

Replacement in pijul/src/commands/diff.rs at line 116 [7.173551]

B:BD[7.175145] → [3.0:70]

∅:D[3.70] → [7.175171:175217]

B:BD[7.175171] → [7.175171:175217]

B:BD[7.175217] → [3.71:126]

∅:D[3.126] → [7.175261:175285]

∅:D[10.17573] → [7.175261:175285]

∅:D[11.20408] → [7.175261:175285]

B:BD[7.175261] → [7.175261:175285]

        let mut txn_ = txn.write();
        let actions: Vec<_> = rec
            .actions
            .into_iter()
            .map(|rec| rec.globalize(&*txn_).unwrap())
            .collect();

[7.175145]

[3.127]

        let actions: Vec<_> = {
            let txn_ = txn.read();
            rec.actions
                .into_iter()
                .map(|rec| rec.globalize(&*txn_).unwrap())
                .collect()
        };

Replacement in pijul/src/commands/diff.rs at line 130 [7.173551]
B:BD[7.175336] → [3.179:199]
```
            &*txn_,
```
[7.175336]
[7.175354]
```
            &*txn.read(),
```

Replacement in pijul/src/commands/diff.rs at line 138 [7.173551]

B:BD[7.175496] → [7.175496:175552]

B:BD[7.175552] → [3.200:249]

∅:D[3.249] → [7.175598:175615]

∅:D[10.17634] → [7.175598:175615]

∅:D[11.20679] → [7.175598:175615]

B:BD[7.175598] → [7.175598:175615]

B:BD[7.175615] → [3.250:325]

        let (dependencies, extra_known) = if self.tag {
            full_dependencies(&*txn_, &channel)?
        } else {
            dependencies(&*txn_, &*channel.read(), change.changes.iter())?

[7.175496]

[7.175679]

        let (dependencies, extra_known) = {
            let txn_ = txn.read();
            if self.tag {
                full_dependencies(&*txn_, &channel)?
            } else {
                dependencies(&*txn_, &*channel.read(), change.changes.iter())?
            }

Replacement in pijul/src/commands/diff.rs at line 242 [7.173551]

B:BD[9.79] → [3.326:382]

∅:D[3.382] → [9.134:205]

B:BD[9.134] → [9.134:205]

                for path in untracked(&repo, &*txn_)? {
                    writeln!(stdout, "U {}", path.to_str().unwrap())?;

[9.79]

[9.205]

                for path in untracked(&repo, txn.clone())? {
                    writeln!(stdout, "U {}", path?.to_str().unwrap())?;

Replacement in pijul/src/commands/diff.rs at line 247 [7.173551]

B:BD[12.2054] → [3.383:435]

∅:D[3.435] → [12.2105:2170]

B:BD[12.2105] → [12.2105:2170]

            for path in untracked(&repo, &*txn_)? {
                writeln!(stdout, "{}", path.to_str().unwrap())?;

[12.2054]

[12.2170]

            for path in untracked(&repo, txn.clone())? {
                writeln!(stdout, "{}", path?.to_str().unwrap())?;

Replacement in pijul/src/commands/diff.rs at line 268 [7.173551]

B:BD[3.536] → [3.536:631]

            txn_.touch_channel(&mut *channel.write(), None);
            std::mem::drop(txn_);

[3.536]

[3.631]

            {
                let mut txn_ = txn.write();
                txn_.touch_channel(&mut *channel.write(), None);
            }

Replacement in pijul/src/commands/diff.rs at line 375 [7.173551]
B:BD[12.2188] → [12.2188:2218]
```
fn untracked<'a, T: TxnTExt>(
```
[12.2188]
[12.2218]
```
fn untracked<T: TxnTExt + Send + Sync + 'static>(
```

Replacement in pijul/src/commands/diff.rs at line 377 [7.173551]

B:BD[12.2241] → [12.2241:2322]

    txn: &'a T,
) -> Result<impl Iterator<Item = PathBuf> + 'a, anyhow::Error> {

[12.2241]

[12.2322]

    txn: libpijul::ArcTxn<T>,
) -> Result<impl Iterator<Item = Result<PathBuf, std::io::Error>>, anyhow::Error> {

Insertion in pijul/src/commands/diff.rs at line 381 [7.173551]
[5.1767]
[12.2422]
```
    let txn_ = txn.clone();
```

Replacement in pijul/src/commands/diff.rs at line 384 [7.173551]

B:BD[12.2456] → [13.121:204]

∅:D[13.204] → [12.2532:2603]

B:BD[12.2532] → [12.2532:2603]

B:BD[12.2783] → [12.2783:2820]

B:BD[12.2820] → [2.0:50]

∅:D[2.50] → [12.2871:2993]

B:BD[12.2871] → [12.2871:2993]

        .iterate_prefix_rec(repo_path.clone(), repo_path.clone(), false, threads)?
        .filter_map(move |x| {
            let (path, _) = x.unwrap();
            use path_slash::PathExt;
            let path_str = path.to_slash_lossy();
            if !txn.is_tracked(&path_str).unwrap() {
                Some(path)
            } else {
                None

[12.2456]

[12.2993]

        .iterate_prefix_rec(
            repo_path.clone(),
            repo_path.clone(),
            false,
            threads,
            move |path, _| {
                use path_slash::PathExt;
                let path_str = path.to_slash_lossy();
                log::debug!("untracked {:?}", path_str);
                path_str.is_empty() || txn.read().is_tracked(&path_str).unwrap()
            },
        )?
        .filter_map(move |path| match path {
            Err(e) => Some(Err(e)),
            Ok((path, _)) => {
                use path_slash::PathExt;
                let path_str = path.to_slash_lossy();
                log::debug!("untracked {:?}", path_str);
                if !txn_.read().is_tracked(&path_str).unwrap() {
                    Some(Ok(path))
                } else {
                    None
                }

Replacement in libpijul/src/working_copy/filesystem.rs at line 141 [7.208900]

B:BD[12.3436] → [12.3436:3567]

        } else if let Some(j) = self.join.take() {
            if let Ok(Err(e)) = j.join() {
                return Some(Err(e));

[12.3436]

[12.3567]

        } else {
            if let Some(j) = self.join.take() {
                if let Ok(Err(e)) = j.join() {
                    return Some(Err(e));
                }

Replacement in libpijul/src/working_copy/filesystem.rs at line 220 [7.208900]

B:BD[12.3672] → [13.368:461]

        for p in self.iterate_prefix_rec(repo_path.clone(), full.clone(), force, threads)? {

[12.3672]

[12.3758]

        for p in
            self.iterate_prefix_rec(repo_path.clone(), full.clone(), force, threads, |_, _| true)?
        {

Replacement in libpijul/src/working_copy/filesystem.rs at line 239 [7.208900]
B:BD[12.4162] → [12.4162:4193]
```
    pub fn iterate_prefix_rec(
```
[12.4162]
[12.4193]
```
    pub fn iterate_prefix_rec<F: Fn(&Path, bool) -> bool + Send + Sync + 'static>(
```
Insertion in libpijul/src/working_copy/filesystem.rs at line 245 [7.208900]
[12.4301]
[12.4301]
```
        follow: F,
```
Insertion in libpijul/src/working_copy/filesystem.rs at line 266 [7.208900]
[14.185]
[12.4452]
```
        let follow = std::sync::Arc::new(follow);
```
Insertion in libpijul/src/working_copy/filesystem.rs at line 268 [7.208900]
[12.4527]
[14.186]
```
            let follow = follow.clone();
```

Replacement in libpijul/src/working_copy/filesystem.rs at line 279 [7.208900]

∅:D[15.1894] → [14.576:662]

B:BD[14.576] → [14.576:662]

                walk.build_parallel().run(|| {
                    Box::new(|entry| {

[15.1894]

[14.662]

                walk.build_parallel().run(move || {
                    let repo_path = repo_path.clone();
                    let sender = sender.clone();
                    let follow = follow.clone();
                    Box::new(move |entry| {

Insertion in libpijul/src/working_copy/filesystem.rs at line 303 [7.208900]

[16.2707]

[4.309]

                            if !follow(path, is_dir) {
                                return ignore::WalkState::Skip;
                            }

Do not traverse unindexed directories in `pijul diff -su`

Dependencies

In channels

In discussions

Change contents

Deletion in pijul/src/commands/diff.rs at line 47 [7.173551]

Replacement in pijul/src/commands/diff.rs at line 49 [7.173551]

Deletion in pijul/src/commands/diff.rs at line 105 [7.173551]

Replacement in pijul/src/commands/diff.rs at line 106 [7.173551]

Replacement in pijul/src/commands/diff.rs at line 110 [7.173551]

Replacement in pijul/src/commands/diff.rs at line 116 [7.173551]

Replacement in pijul/src/commands/diff.rs at line 130 [7.173551]

Replacement in pijul/src/commands/diff.rs at line 138 [7.173551]

Replacement in pijul/src/commands/diff.rs at line 242 [7.173551]

Replacement in pijul/src/commands/diff.rs at line 247 [7.173551]

Replacement in pijul/src/commands/diff.rs at line 268 [7.173551]

Replacement in pijul/src/commands/diff.rs at line 375 [7.173551]

Replacement in pijul/src/commands/diff.rs at line 377 [7.173551]

Insertion in pijul/src/commands/diff.rs at line 381 [7.173551]

Replacement in pijul/src/commands/diff.rs at line 384 [7.173551]

Replacement in libpijul/src/working_copy/filesystem.rs at line 141 [7.208900]

Replacement in libpijul/src/working_copy/filesystem.rs at line 220 [7.208900]

Replacement in libpijul/src/working_copy/filesystem.rs at line 239 [7.208900]

Insertion in libpijul/src/working_copy/filesystem.rs at line 245 [7.208900]

Insertion in libpijul/src/working_copy/filesystem.rs at line 266 [7.208900]

Insertion in libpijul/src/working_copy/filesystem.rs at line 268 [7.208900]

Replacement in libpijul/src/working_copy/filesystem.rs at line 279 [7.208900]

Insertion in libpijul/src/working_copy/filesystem.rs at line 303 [7.208900]