jcdickinson/pijul - Change GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC

Cleanup and formatting

Created by pmeunier on May 27, 2021

GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/unrecord.rs at line 132 [10.95630]

B:BD[8.998] → [9.117:196]

            txn.write().unwrap().unrecord(&repo.changes, &channel, &hash, 0)?;

[8.998]

[11.5477]

            txn.write()
                .unwrap()
                .unrecord(&repo.changes, &channel, &hash, 0)?;

Replacement in pijul/src/commands/unrecord.rs at line 151 [10.95630]

B:BD[11.5939] → [9.217:293]

            txn.write().unwrap().unrecord(&repo.changes, &channel, &h, 0)?;

[11.5939]

[11.6012]

            txn.write()
                .unwrap()
                .unrecord(&repo.changes, &channel, &h, 0)?;

Replacement in pijul/src/commands/tag.rs at line 120 [12.74]

B:BD[5.268] → [5.268:440]

                let channel_name = repo
                    .config
                    .get_current_channel(None)
                    .0
                    .to_string();

[5.268]

[5.440]

                let channel_name = repo.config.get_current_channel(None).0.to_string();

Replacement in pijul/src/commands/record.rs at line 60 [10.101759]
B:BD[3.230] → [3.230:256]
```
            return Ok(())
```
[3.230]
[3.256]
```
            return Ok(());
```

Replacement in pijul/src/commands/record.rs at line 117 [10.101759]

B:BD[13.282] → [9.390:486]

            txn.unrecord(&repo.changes, &mut channel, &h, self.timestamp.unwrap_or(0) as u64)?;

[13.282]

[10.103981]

            txn.unrecord(
                &repo.changes,
                &mut channel,
                &h,
                self.timestamp.unwrap_or(0) as u64,
            )?;

Replacement in pijul/src/commands/record.rs at line 149 [10.101759]
B:BD[10.104255] → [2.0:24]
```
        match result  {
```
[10.104255]
[2.24]
```
        match result {
```

Replacement in pijul/src/commands/record.rs at line 287 [10.101759]

B:BD[10.106731] → [2.2754:2771]

        Either<(

[10.106731]

[11.13881]

        Either<
            (
                Arc<RwLock<T>>,
                Change,
                HashMap<usize, libpijul::InodeUpdate>,
                Option<libpijul::Hash>,
                std::time::SystemTime,
            ),

Replacement in pijul/src/commands/record.rs at line 296 [10.101759]
∅:D[14.132] → [10.106748:106819]
∅:D[11.13909] → [10.106748:106819]
B:BD[10.106748] → [10.106748:106819]
B:BD[10.106819] → [15.2267:2303]
B:BD[15.2303] → [16.714:749]
B:BD[16.749] → [2.2772:2800]
```
            Change,
            HashMap<usize, libpijul::InodeUpdate>,
            Option<libpijul::Hash>,
            std::time::SystemTime,
        ), Arc<RwLock<T>>>,
```
[11.13909]
[10.106877]
```
        >,
```
Replacement in pijul/src/commands/record.rs at line 435 [10.101759]
B:BD[2.2895] → [2.2895:2904]
```
    B(B)
```
[2.2895]
[2.2904]
```
    B(B),
```

Insertion in pijul/src/commands/git.rs at line 1 [10.137210]

[10.137210]

[10.137281]

use anyhow::bail;
use canonical_path::CanonicalPathBuf;
use clap::{ArgSettings, Clap};
use libpijul::pristine::*;
use libpijul::*;
use log::{debug, error, info, trace};

Deletion in pijul/src/commands/git.rs at line 13 [10.137210]
∅:D[17.843] → [18.0:18]
B:BD[19.2237] → [18.0:18]
∅:D[18.18] → [20.160:198]
B:BD[19.2237] → [20.160:198]
∅:D[20.198] → [21.0:31]
B:BD[19.2237] → [21.0:31]
∅:D[21.31] → [22.0:27]
B:BD[23.16] → [22.0:27]
∅:D[22.27] → [19.2264:2281]
B:BD[19.2264] → [19.2264:2281]
B:BD[19.2281] → [23.17:55]
```
use anyhow::bail;
use canonical_path::CanonicalPathBuf;
use clap::{ArgSettings, Clap};
use libpijul::pristine::*;
use libpijul::*;
use log::{debug, error, info, trace};
```

Replacement in pijul/src/commands/git.rs at line 329 [10.137210]

B:BD[10.146777] → [17.1369:1472]

                let state = import_commit(git, repo, txn.clone(), channel.clone(), &oid, &mut stats)?;

[10.146777]

[10.146874]

                let state =
                    import_commit(git, repo, txn.clone(), channel.clone(), &oid, &mut stats)?;

Replacement in pijul/src/commands/git.rs at line 571 [10.137210]

B:BD[24.1756] → [17.3118:3221]

                                if let Some(old_path) = libpijul::fs::inode_filename(&*txn, *inode)? {

[24.1756]

[10.154875]

                                if let Some(old_path) = libpijul::fs::inode_filename(&*txn, *inode)?
                                {

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

B:BD[10.158287] → [17.3627:3705]

    debug!("recording on channel {:?}", txn_.name(&channel.read().unwrap()));

[10.158287]

[10.158352]

    debug!(
        "recording on channel {:?}",
        txn_.name(&channel.read().unwrap())
    );

Replacement in pijul/src/commands/git.rs at line 703 [10.137210]

B:BD[10.158961] → [4.399:487]

            description: if description.is_empty() { None } else { Some(description) },

[10.158961]

[10.158992]

            description: if description.is_empty() {
                None
            } else {
                Some(description)
            },

Replacement in pijul/src/commands/git.rs at line 747 [10.137210]

B:BD[10.160373] → [17.4245:4382]

fn record_apply<T: TxnT + TxnTExt + MutTxnTExt + Send + Sync + 'static, C: libpijul::changestore::ChangeStore + Clone + Send + 'static>(

[10.160373]

[17.4382]

fn record_apply<
    T: TxnT + TxnTExt + MutTxnTExt + Send + Sync + 'static,
    C: libpijul::changestore::ChangeStore + Clone + Send + 'static,
>(

Replacement in pijul/src/commands/git.rs at line 789 [10.137210]

B:BD[25.1447] → [17.5038:5112]

            txn.current_state(&channel.read().unwrap()).map_err(TxnErr)?,

[25.1447]

[25.1514]

            txn.current_state(&channel.read().unwrap())
                .map_err(TxnErr)?,

Replacement in pijul/src/commands/file_operations.rs at line 6 [10.169058]
B:BD[20.647] → [7.0:31]
```
use clap::{Clap, ArgSettings};
```
[20.647]
[15.4127]
```
use clap::{ArgSettings, Clap};
```
Replacement in pijul/src/commands/credit.rs at line 61 [10.178684]
B:BD[26.58] → [26.58:83]
```
            Ok(_) => {},
```
[26.58]
[6.0]
```
            Ok(_) => {}
```

Replacement in pijul/src/commands/credit.rs at line 65 [10.178684]

B:BD[6.151] → [6.151:193]

                    return Err(io.into())

[6.151]

[6.193]

                    return Err(io.into());

Replacement in pijul/src/commands/credit.rs at line 67 [10.178684]
B:BD[6.211] → [6.211:226]
```
            },
```
[6.211]
[26.143]
```
            }
```

Insertion in pijul/src/commands/credit.rs at line 140 [10.178684]

[10.182206]

            let st: u64 = v.start.into();
            write!(self.w, "{}.{} > ", v.change.to_base32(), st)?;

Deletion in libpijul/src/pristine/sanakirja.rs at line 1409 [10.531056]

B:BD[27.50063] → [9.2889:2997]

∅:D[9.2997] → [11.63728:64393]

B:BD[11.63728] → [11.63728:64393]

        // self.counter += 1;
        // debug!("put_graph {:?} {:?}, counter = {:?}", k, e, self.counter);
        /*
        if self.counter >= 12965 {
            let mut x = None;
            let mut cursor = btree::cursor::Cursor::new(&self.txn, graph)?;
            let mut panic = None;
            while let Some((k, v)) = cursor.next(&self.txn)? {
                if let Some((ref k_, ref v_)) = x {
                    if k_ > k || (k_== k && v_ > v) {
                        panic = Some((*k, *v));
                        break
                    }
                }
                x = Some((*k, *v))
            }
            self.debug(graph, ".put");
            if panic.is_some() {
                panic!("{:?}", x);
            }
        }
         */

Replacement in libpijul/src/pristine/sanakirja.rs at line 1418 [10.531056]

B:BD[27.50114] → [9.2998:3106]

∅:D[9.3106] → [11.64496:66261]

B:BD[11.64496] → [11.64496:66261]

        // self.counter += 1;
        // debug!("del_graph {:?} {:?}, counter = {:?}", k, e, self.counter);
        /*
        if self.counter >= 12965 {
            let mut x = None;
            let mut cursor = btree::cursor::Cursor::new(&self.txn, graph)?;
            let mut panic = None;
            while let Some((k, v)) = cursor.next(&self.txn)? {
                if let Some((ref k_, ref v_)) = x {
                    if k_ > k || (k_== k && v_ > v) {
                        panic = Some((*k, *v));
                        break
                    }
                }
                x = Some((*k, *v))
            }
            self.debug(graph, ".del");
            if panic.is_some() {
                panic!("{:?}", x);
            }
        }
        let change = ChangeId::from_base32(b"MM6XEY5S32WRA").unwrap();
        let mm6v = Vertex {
            change,
            start: ChangePosition(L64(1478218)),
            end: ChangePosition(L64(1478229)),
        };
        let mm6e = (Edge {
            flag: EdgeFlags::BLOCK | EdgeFlags::FOLDER | EdgeFlags::PARENT,
            dest: Position {
                change,
                pos: ChangePosition(L64(1466149)),
            },
            introduced_by: change,
        }).into();
        let has_mm6 = if let Some((v, e)) = btree::get(&self.txn, graph, &mm6v, Some(&mm6e)).unwrap() {
            v == &mm6v && e == &mm6e
        } else {
            false
        };
        */
        let result = Ok(btree::del(&mut self.txn, graph, k, e)?);
        /*
        if has_mm6 && (k != &mm6v || e != Some(&mm6e)) {
            if let Some((v, e)) = btree::get(&self.txn, graph, &mm6v, Some(&mm6e)).unwrap() {
                assert_eq!(v, &mm6v);
                assert_eq!(e, &mm6e)
            } else {
                panic!("Not found")
            }
        }
        */
        result

[27.50114]

[11.66261]

        Ok(btree::del(&mut self.txn, graph, k, e)?)