jcdickinson/pijul - Change LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC

Fixing output (including its uses in reset and pull)

Created by pmeunier on January 20, 2021

LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/remote/ssh.rs at line 1 [5.25380]
B:BD[5.25380] → [6.0:42]
```
use std::collections::{HashMap, HashSet};
```
[5.25380]
[5.25647]
```
use std::collections::HashSet;
```
Deletion in pijul/src/remote/ssh.rs at line 912 [5.25380]
B:BD[6.169] → [6.169:202]
```
            &mut HashMap::new(),
```
Replacement in pijul/src/remote/local.rs at line 1 [5.79745]
B:BD[5.79745] → [6.249:291]
```
use std::collections::{HashMap, HashSet};
```
[5.79745]
[7.11563]
```
use std::collections::HashSet;
```

Replacement in pijul/src/remote/local.rs at line 128 [5.79745]

B:BD[8.66] → [6.292:470]

B:BD[6.470] → [9.19:37]

∅:D[9.37] → [6.470:482]

B:BD[6.470] → [6.470:482]

        txn.output_repository_no_pending(
            &mut repo,
            &store,
            &mut channel,
            &mut HashMap::new(),
            "",
            true,
            None,
        )?;

[8.66]

[5.83408]

        txn.output_repository_no_pending(&mut repo, &store, &mut channel, "", true, None)?;

Replacement in pijul/src/remote/local.rs at line 155 [5.79745]
B:BD[7.12700] → [7.12700:12742]
```
            send.send(*c).await.unwrap();
```
[7.12700]
[10.3741]
```
            send.send(*c).await?;
```
Deletion in pijul/src/commands/unrecord.rs at line 1 [5.95630]
B:BD[5.95630] → [6.483:514]
```
use std::collections::HashMap;
```
Deletion in pijul/src/commands/unrecord.rs at line 122 [5.95630]
B:BD[11.1308] → [6.515:556]
```
                    &mut HashMap::new(),
```
Replacement in pijul/src/commands/reset.rs at line 1 [5.97650]
B:BD[5.97650] → [12.0:42]
```
use std::collections::{HashMap, HashSet};
```
[5.97650]
[13.1289]
```
use std::collections::HashSet;
```
Deletion in pijul/src/commands/reset.rs at line 102 [5.97650]
B:BD[14.494] → [14.494:539]
```
                        &mut HashMap::new(),
```
Deletion in pijul/src/commands/reset.rs at line 142 [5.97650]
B:BD[12.1927] → [12.1927:1972]
```
                        &mut HashMap::new(),
```
Deletion in pijul/src/commands/reset.rs at line 148 [5.97650]
B:BD[5.101200] → [6.631:678]
```
                let mut done = HashMap::new();
```
Deletion in pijul/src/commands/reset.rs at line 155 [5.97650]
B:BD[5.101570] → [6.679:714]
```
                        &mut done,
```
Replacement in pijul/src/commands/pushpull.rs at line 1 [5.111631]
B:BD[5.111631] → [6.715:757]
```
use std::collections::{HashMap, HashSet};
```
[5.111631]
[13.1651]
```
use std::collections::HashSet;
```

Replacement in pijul/src/commands/pushpull.rs at line 458 [5.111631]

B:BD[6.1544] → [6.1544:1730]

        let mut done = HashMap::new();
        for i in touched {
            let (path, _) =
                libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, i)?;

[6.1544]

[6.1730]

        let mut touched_paths: Vec<_> = Vec::new();
        for &i in touched.iter() {
            touched_paths
                .push(libpijul::fs::find_path(&repo.changes, &txn, &channel.borrow(), false, i)?.0)
        }
        touched_paths.sort();
        let mut last = "";
        for path in touched_paths.iter() {
            if !last.is_empty() && path.starts_with(last) {
                continue;
            }

Replacement in pijul/src/commands/pushpull.rs at line 474 [5.111631]
B:BD[15.10377] → [6.1772:1822]
```
                &mut done,
                &path,
```
[15.10377]
[15.10397]
```
                path,
```
Insertion in pijul/src/commands/pushpull.rs at line 478 [5.111631]
[15.10435]
[15.11126]
```
            last = path
```
Deletion in pijul/src/commands/protocol.rs at line 242 [5.123281]
B:BD[5.133451] → [6.1823:1860]
```
                &mut HashMap::new(),
```
Replacement in pijul/src/commands/git.rs at line 2 [5.137210]
B:BD[5.137305] → [3.0:53]
```
use std::collections::{BTreeMap, BTreeSet, HashMap};
```
[5.137305]
[5.137367]
```
use std::collections::{BTreeMap, BTreeSet};
```
Deletion in pijul/src/commands/git.rs at line 426 [5.137210]
B:BD[5.151427] → [3.54:87]
```
            &mut HashMap::new(),
```
Deletion in pijul/src/commands/clone.rs at line 1 [5.182891]
B:BD[5.182891] → [6.1861:1892]
```
use std::collections::HashMap;
```
Deletion in pijul/src/commands/clone.rs at line 100 [5.182891]
B:BD[5.185732] → [6.1893:1926]
```
            &mut HashMap::new(),
```
Deletion in pijul/src/commands/apply.rs at line 76 [5.194289]
B:BD[9.1107] → [9.1107:1146]
```
        let mut done = HashMap::new();
```
Deletion in pijul/src/commands/apply.rs at line 83 [5.194289]
B:BD[9.1440] → [9.1440:1467]
```
                &mut done,
```

Replacement in libpijul/src/record.rs at line 398 [5.488880]

B:BD[5.500855] → [4.0:86]

            debug!("former basename of {:?}: {:?} {:?}", vertex, basename, metadata);

[5.500855]

[16.395]

            debug!(
                "former basename of {:?}: {:?} {:?}",
                vertex, basename, metadata
            );

Deletion in libpijul/src/output/output.rs at line 35 [5.671807]
B:BD[5.673174] → [6.1961:2023]
```
    done: &mut HashMap<Position<ChangeId>, Vertex<ChangeId>>,
```
Deletion in libpijul/src/output/output.rs at line 45 [5.671807]
B:BD[5.673397] → [6.2024:2038]
```
        done,
```
Deletion in libpijul/src/output/output.rs at line 63 [5.671807]
B:BD[5.673775] → [6.2039:2101]
```
    done: &mut HashMap<Position<ChangeId>, Vertex<ChangeId>>,
```

Insertion in libpijul/src/output/output.rs at line 71 [5.671807]

[5.674094]

    let mut is_first_none = true;
    if next_prefix_basename.is_none() {
        let dead = collect_dead_files(txn, txn.graph(channel), pending_change_id, Inode::ROOT)?;
        debug!("dead (line {}) = {:?}", line!(), dead);
        kill_dead_files::<T, R, P>(txn, repo, &dead)?;
        is_first_none = false;
    }

Deletion in libpijul/src/output/output.rs at line 88 [5.671807]
B:BD[5.674278] → [5.674278:674352]
B:BD[5.674352] → [17.4365:4462]
∅:D[17.4462] → [5.674437:674493]
∅:D[18.57866] → [5.674437:674493]
∅:D[19.82270] → [5.674437:674493]
B:BD[5.674437] → [5.674437:674493]
B:BD[5.674493] → [20.20227:20282]
∅:D[20.20282] → [5.674537:674574]
B:BD[5.674537] → [5.674537:674574]
```
    let mut is_first_none = true;
    if next_prefix_basename.is_none() {
        let dead = collect_dead_files(txn, txn.graph(channel), pending_change_id, Inode::ROOT)?;
        debug!("dead (line {}) = {:?}", line!(), dead);
        kill_dead_files::<T, R, P>(txn, repo, &dead)?;
        is_first_none = false;
    }
```
Insertion in libpijul/src/output/output.rs at line 90 [5.671807]
[5.674695]
[5.674695]
```
    let mut done_vertices = HashMap::new();
```

Replacement in libpijul/src/output/output.rs at line 111 [5.671807]

B:BD[5.675559] → [5.675559:675611]

                match done.entry(output_item.pos) {

[5.675559]

[5.675611]

                match done_vertices.entry(output_item.pos) {

Deletion in libpijul/src/lib.rs at line 275 [5.717381]

B:BD[5.725674] → [6.2102:2178]

        done: &mut HashMap<pristine::Position<ChangeId>, Vertex<ChangeId>>,

Deletion in libpijul/src/lib.rs at line 285 [5.717381]
B:BD[5.725913] → [6.2179:2197]
```
            done,
```

Insertion in libpijul/src/apply.rs at line 643 [5.944089]

[5.964790]

[2.476]

            debug_assert!(ws.children.is_empty());
            debug_assert!(ws.parents.is_empty());

Fixing output (including its uses in reset and pull)

Dependencies

In channels

Change contents

Replacement in pijul/src/remote/ssh.rs at line 1 [5.25380]

Deletion in pijul/src/remote/ssh.rs at line 912 [5.25380]

Replacement in pijul/src/remote/local.rs at line 1 [5.79745]

Replacement in pijul/src/remote/local.rs at line 128 [5.79745]

Replacement in pijul/src/remote/local.rs at line 155 [5.79745]

Deletion in pijul/src/commands/unrecord.rs at line 1 [5.95630]

Deletion in pijul/src/commands/unrecord.rs at line 122 [5.95630]

Replacement in pijul/src/commands/reset.rs at line 1 [5.97650]

Deletion in pijul/src/commands/reset.rs at line 102 [5.97650]

Deletion in pijul/src/commands/reset.rs at line 142 [5.97650]

Deletion in pijul/src/commands/reset.rs at line 148 [5.97650]

Deletion in pijul/src/commands/reset.rs at line 155 [5.97650]

Replacement in pijul/src/commands/pushpull.rs at line 1 [5.111631]

Replacement in pijul/src/commands/pushpull.rs at line 458 [5.111631]

Replacement in pijul/src/commands/pushpull.rs at line 474 [5.111631]

Insertion in pijul/src/commands/pushpull.rs at line 478 [5.111631]

Deletion in pijul/src/commands/protocol.rs at line 242 [5.123281]

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

Deletion in pijul/src/commands/git.rs at line 426 [5.137210]

Deletion in pijul/src/commands/clone.rs at line 1 [5.182891]

Deletion in pijul/src/commands/clone.rs at line 100 [5.182891]

Deletion in pijul/src/commands/apply.rs at line 76 [5.194289]

Deletion in pijul/src/commands/apply.rs at line 83 [5.194289]

Replacement in libpijul/src/record.rs at line 398 [5.488880]

Deletion in libpijul/src/output/output.rs at line 35 [5.671807]

Deletion in libpijul/src/output/output.rs at line 45 [5.671807]

Deletion in libpijul/src/output/output.rs at line 63 [5.671807]

Insertion in libpijul/src/output/output.rs at line 71 [5.671807]

Deletion in libpijul/src/output/output.rs at line 88 [5.671807]

Insertion in libpijul/src/output/output.rs at line 90 [5.671807]

Replacement in libpijul/src/output/output.rs at line 111 [5.671807]

Deletion in libpijul/src/lib.rs at line 275 [5.717381]

Deletion in libpijul/src/lib.rs at line 285 [5.717381]

Insertion in libpijul/src/apply.rs at line 643 [5.944089]