laumann/pijul - Change C5MZXLVCVS6JVFYUASM4YH7KCC75D2BH3ARTJ5WCRAVEDQIQSSEQC

Fix in output

If many components are changed simultaneously (in the same patch) along a file path, moving them is confusing, especially since swaps (a → b and b → a in the same patch) must be handled properly.

This fix takes care of this by introducing a map to remember which files were moved to a temporary location, and using that map instead of fs::inode_filename to get the temporary path instead of the actual one.

Created by pmeunier on June 19, 2023

C5MZXLVCVS6JVFYUASM4YH7KCC75D2BH3ARTJ5WCRAVEDQIQSSEQC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/output/output.rs at line 7 [4.671807]
B:BD[4.672103] → [4.672103:672154]
```
use crate::fs::{create_new_inode, inode_filename};
```
[4.672103]
[4.672154]
```
use crate::fs::create_new_inode;
```
Replacement in libpijul/src/output/output.rs at line 258 [4.671807]
B:BD[5.13191] → [2.3405:3406]
[5.13191]
[6.263]
```
        move_map: HashMap::new(),
```

Replacement in libpijul/src/output/output.rs at line 321 [4.671807]

∅:D[6.471] → [5.14112:14158]

B:BD[5.14112] → [5.14112:14158]

    for (a, b) in state.actual_moves.iter() {

[6.471]

[5.14158]

    // Since we did a depth-first search of the output paths, we need
    // to move in reverse order of the search.
    for (a, b) in state.actual_moves.iter().rev() {
        debug!("actual move: {:?} {:?}", a, b);

Insertion in libpijul/src/output/output.rs at line 366 [4.671807]
[5.14836]
[5.14836]
```
    move_map: HashMap<Inode, String>,
```

Replacement in libpijul/src/output/output.rs at line 398 [4.671807]

B:BD[5.15961] → [7.25563:25662]

                collect_dead_files::<_, R, P>(&*txn_, graph, self.pending_change_id, Inode::ROOT)?

[5.15961]

[5.16049]

                collect_dead_files::<_, R, P>(
                    &*txn_,
                    graph,
                    &self.move_map,
                    self.pending_change_id,
                    Inode::ROOT,
                )?

Insertion in libpijul/src/output/output.rs at line 529 [4.671807]
[5.20289]
[5.20289]
```
                &mut self.move_map,
```
Insertion in libpijul/src/output/output.rs at line 555 [4.671807]
[5.20967]
[5.20967]
```
                debug!("next_files {:?}", next_files);
```
Insertion in libpijul/src/output/output.rs at line 617 [4.671807]
[8.1501]
[8.1501]
```
use std::borrow::Cow;
```
Insertion in libpijul/src/output/output.rs at line 629 [4.671807]
[4.679880]
[9.3632]
```
    move_map: &mut HashMap<Inode, String>,
```

Replacement in libpijul/src/output/output.rs at line 643 [4.671807]

∅:D[10.103023] → [11.79838:79911]

B:BD[11.79838] → [11.79838:79911]

∅:D[11.79911] → [4.680438:680552]

∅:D[12.83144] → [4.680438:680552]

B:BD[4.680438] → [4.680438:680552]

        if let Some(ref current_name) = inode_filename(&*txn_, inode)? {
            debug!("current_name = {:?}, path = {:?}", current_name, path);
            if current_name != path {

[10.103023]

[11.79912]

        if let Some(ref current_name) = inode_filename(&*txn_, inode, move_map)? {
            let actual_path = if let Some(tmp) = tmp.take() {
                Cow::Owned(tmp)
            } else {
                Cow::Borrowed(path)
            };
            debug!(
                "current_name = {:?}, path = {:?}, actual_path = {:?}",
                current_name, path, actual_path
            );
            if current_name.as_str() != &actual_path {

Deletion in libpijul/src/output/output.rs at line 660 [4.671807]

B:BD[4.680853] → [4.680853:680955]

B:BD[4.680955] → [9.3648:3649]

                let mut tmp_path = path.to_string();
                crate::path::pop(&mut tmp_path);

Deletion in libpijul/src/output/output.rs at line 665 [4.671807]

∅:D[9.3959] → [4.681168:681222]

B:BD[4.681168] → [4.681168:681222]

B:BD[4.681223] → [13.21340:21451]

                crate::path::push(&mut tmp_path, &s);
                repo.rename(&current_name, &tmp_path)
                    .map_err(OutputError::WorkingCopy)?;

Insertion in libpijul/src/output/output.rs at line 667 [4.671807]

[14.1234]

                    // The parent was already moved
                    debug!("tmp {:?}", tmp);
                    crate::path::pop(tmp);

Deletion in libpijul/src/output/output.rs at line 671 [4.671807]

B:BD[14.1282] → [14.1282:1358]

                } else {
                    *tmp = Some(tmp_path.clone());

Replacement in libpijul/src/output/output.rs at line 672 [4.671807]

∅:D[14.1376] → [4.681279:681344]

∅:D[13.21451] → [4.681279:681344]

B:BD[4.681279] → [4.681279:681344]

                actual_moves.push((tmp_path, path.to_string()));

[14.1376]

[4.681344]


                let mut tmp_ = actual_path.to_string();
                crate::path::pop(&mut tmp_);
                crate::path::push(&mut tmp_, &s);
                debug!("rename {:?} {:?}", current_name, tmp_);
                repo.rename(&current_name, &tmp_)
                    .map_err(OutputError::WorkingCopy)?;
                move_map.insert(inode, tmp_.to_string());
                actual_moves.push((tmp_.to_string(), actual_path.to_string()));
                *tmp = Some(tmp_);

Insertion in libpijul/src/output/output.rs at line 836 [4.671807]
[12.84535]
[4.683937]
```
    move_map: &HashMap<Inode, String>,
```

Replacement in libpijul/src/output/output.rs at line 867 [4.671807]

B:BD[4.685037] → [15.121566:121656]

                    dead.insert(id.to_owned(), (*inode_, inode_filename(txn, *inode_)?));

[4.685037]

[4.685124]

                    dead.insert(
                        id.to_owned(),
                        (*inode_, inode_filename(txn, *inode_, move_map)?),
                    );

Replacement in libpijul/src/output/output.rs at line 893 [4.671807]
B:BD[3.191] → [3.191:228]
```
        let cmp = b.1.1.cmp(&a.1.1);
```
[3.191]
[3.228]
```
        let cmp = b.1 .1.cmp(&a.1 .1);
```

Insertion in libpijul/src/output/output.rs at line 927 [4.671807]

[4.686178]

}
fn inode_filename<T: TreeTxnT>(
    txn: &T,
    inode: Inode,
    tmp: &HashMap<Inode, String>,
) -> Result<Option<String>, TreeErr<T::TreeError>> {
    debug!("inode_filename {:?}", inode);
    let mut components = Vec::new();
    let mut current = inode;
    loop {
        if let Some(tmp) = tmp.get(&current) {
            components.push(SmallString::from_str(tmp));
            break;
        }
        match txn.get_revtree(&current, None)? {
            Some(v) => {
                components.push(v.basename.to_owned());
                current = v.parent_inode;
                if current == Inode::ROOT {
                    break;
                }
            }
            None => {
                debug!("filename_of_inode: not in tree");
                return Ok(None);
            }
        }
    }
    let mut path = String::new();
    for c in components.iter().rev() {
        if !path.is_empty() {
            path.push('/')
        }
        path.push_str(c.as_str());
    }
    debug!("inode_filename = {:?}", path);
    Ok(Some(path))

Fix in output

Dependencies

In channels

Change contents

Replacement in libpijul/src/output/output.rs at line 7 [4.671807]

Replacement in libpijul/src/output/output.rs at line 258 [4.671807]

Replacement in libpijul/src/output/output.rs at line 321 [4.671807]

Insertion in libpijul/src/output/output.rs at line 366 [4.671807]

Replacement in libpijul/src/output/output.rs at line 398 [4.671807]

Insertion in libpijul/src/output/output.rs at line 529 [4.671807]

Insertion in libpijul/src/output/output.rs at line 555 [4.671807]

Insertion in libpijul/src/output/output.rs at line 617 [4.671807]

Insertion in libpijul/src/output/output.rs at line 629 [4.671807]