pijul/pijul - Change NGRJOJE7CA7655Z7VVH74W2OUVAKBC7ZGZSI5AYZS2WZP4LN3IVQC

Complete the dependencies of explicit patches when pulling

When an explicit patch is given in pijul pull, we need to complete its dependencies in addition to doing a recursive apply (which also does apply transitive dependencies), in order to get the "touched files" right: some touched files might come from transitive dependencies.

Created by pmeunier on December 16, 2023

NGRJOJE7CA7655Z7VVH74W2OUVAKBC7ZGZSI5AYZS2WZP4LN3IVQC

Dependencies

In channels

main

In discussions

#842 [CRASH, REGRESSION, BETA8] pull-record1.sh

Change contents

Replacement in pijul/src/commands/pushpull.rs at line 299 [6.111631]

∅:D[2.168] → [5.16:90]

B:BD[7.158] → [5.16:90]

                let comp = complete_deps(&repo.changes, &to_upload, &d)?;

[2.168]

[7.232]

                let comp = complete_deps(&repo.changes, Some(&to_upload), &d)?;

Replacement in pijul/src/commands/pushpull.rs at line 440 [6.111631]

B:BD[8.10157] → [3.0:50]

∅:D[3.50] → [9.146:225]

B:BD[6.120145] → [9.146:225]

B:BD[9.225] → [10.38:71]

B:BD[10.71] → [2.169:253]

∅:D[2.253] → [5.91:167]

B:BD[7.566] → [5.91:167]

∅:D[5.167] → [7.642:685]

∅:D[11.187] → [7.642:685]

∅:D[12.1075] → [7.642:685]

∅:D[13.10185] → [7.642:685]

B:BD[7.642] → [7.642:685]

B:BD[7.685] → [14.2578:2610]

∅:D[14.2610] → [7.716:734]

B:BD[7.716] → [7.716:734]

B:BD[7.734] → [9.226:293]

∅:D[9.293] → [7.793:808]

B:BD[7.793] → [7.793:808]

        if !self.all && self.changes.is_empty() {
            let mut o = make_changelist(&repo.changes, &to_download, "pull")?;
            to_download = loop {
                let d = parse_changelist(&edit::edit_bytes(&o[..])?, &to_download);
                let comp = complete_deps(&repo.changes, &to_download, &d)?;
                if comp.len() == d.len() {
                    break comp;
                }
                o = make_changelist(&repo.changes, &comp, "pull")?
            };

[8.10157]

[15.22214]

        if self.changes.is_empty() {
            if !self.all {
                let mut o = make_changelist(&repo.changes, &to_download, "pull")?;
                to_download = loop {
                    let d = parse_changelist(&edit::edit_bytes(&o[..])?, &to_download);
                    let comp = complete_deps(&repo.changes, Some(&to_download), &d)?;
                    if comp.len() == d.len() {
                        break comp;
                    }
                    o = make_changelist(&repo.changes, &comp, "pull")?
                };
            }
        } else {
            to_download = complete_deps(&repo.changes, None, &to_download)?;

Insertion in pijul/src/commands/pushpull.rs at line 501 [6.111631]
[16.839]
[17.29394]
```
            debug!("to_download {:?}", d);
```
Replacement in pijul/src/commands/pushpull.rs at line 602 [6.111631]
B:BD[7.854] → [17.30515:30536]
```
    original: &[CS],
```
[7.854]
[17.30536]
```
    original: Option<&[CS]>,
```

Replacement in pijul/src/commands/pushpull.rs at line 605 [6.111631]

∅:D[17.30590] → [5.237:295]

B:BD[14.2937] → [5.237:295]

    let original: HashSet<_> = original.iter().collect();

[17.30590]

[4.381]

    debug!("complete deps {:?} {:?}", original, now);
    let original_: Option<HashSet<_>> = original.map(|original| original.iter().collect());

Replacement in pijul/src/commands/pushpull.rs at line 608 [6.111631]

∅:D[4.439] → [5.354:411]

B:BD[5.354] → [5.354:411]

B:BD[5.411] → [4.440:503]

    let mut result = Vec::with_capacity(original.len());
    let mut result_h = HashSet::with_capacity(original.len());

[4.439]

[5.411]

    let mut result = Vec::with_capacity(original.unwrap_or(now).len());
    let mut result_h = HashSet::with_capacity(original.unwrap_or(now).len());

Replacement in pijul/src/commands/pushpull.rs at line 625 [6.111631]

B:BD[4.628] → [4.628:698]

            if original.get(&CS::Change(d)).is_some() && is_missing {

[4.628]

[5.638]

            debug!("complete_deps {:?} {:?}", d, is_missing);
            let is_missing = if let Some(ref original) = original_ {
                // If this is a list we submitted to the user for editing
                original.get(&CS::Change(d)).is_some() && is_missing
            } else {
                // Else, we were given an explicit list of patches to pull/push
                is_missing
            };
            if is_missing {

Insertion in pijul/src/commands/pushpull.rs at line 647 [6.111631]
[7.1469]
[7.1469]
```
    debug!("result {:?}", result);
```