finchie/editor - Change KGM44JFVCAMKTJM6I7VX6PNNKHVWY3MMXW46IWB2NGECZFST7SHQC

Implement annotations for FileState

Created by finchie on June 26, 2023

KGM44JFVCAMKTJM6I7VX6PNNKHVWY3MMXW46IWB2NGECZFST7SHQC

Dependencies

In channels

main

Change contents

Insertion in src/lib.rs at line 4 [4.585]
[3.50]
[3.50]
```
use std::collections::HashSet;
```

Replacement in src/lib.rs at line 8 [4.585]

B:BD[5.85] → [6.0:47]

use libpijul::change::{Change, PrintableHunk};

[5.85]

[7.2]

use libpijul::change::{BaseHunk, Change, PrintableHunk};

Deletion in src/lib.rs at line 21 [4.585]
B:BD[3.265] → [3.265:307]
```
pub enum ResourceState {
    Modified,
}
```
Replacement in src/lib.rs at line 101 [4.585]
B:BD[3.2792] → [5.418:450]
```
#[derive(Debug, Eq, PartialEq)]
```
[3.2792]
[3.2817]
```
#[derive(Debug, Eq, PartialEq, Hash, Clone)]
```
Replacement in src/lib.rs at line 106 [4.585]
B:BD[3.2867] → [5.451:483]
```
#[derive(Debug, Eq, PartialEq)]
```
[3.2867]
[5.483]
```
#[derive(Debug, Eq, PartialEq, Hash, Clone)]
```
Deletion in src/lib.rs at line 323 [4.585]
B:BD[3.5895] → [3.5895:5918]
```
// TODO: fn tracked()
```
Insertion in src/lib.rs at line 401 [4.585]
[6.144]
[6.144]
```
    path: PathBuf,
```

Replacement in src/lib.rs at line 408 [4.585]

B:BD[6.256] → [6.256:429]

∅:D[6.429] → [7.1616:1700]

B:BD[7.1616] → [7.1616:1700]

B:BD[7.1700] → [6.430:503]

∅:D[8.439] → [7.1782:2057]

∅:D[6.503] → [7.1782:2057]

B:BD[7.1782] → [7.1782:2057]

    fn is_current_state(&self, hash: &Hash) -> bool {
        self.current_state
            .hash()
            .map(|h| &h == hash)
            .unwrap_or(false)
    }
}
// TODO: Refactor repository setup into separate module to prevent code duplication
pub fn file_credits(path: PathBuf) -> Result<FileState, anyhow::Error> {
    let repo = Repository::find_root(Some(path.to_owned())).expect("Could not find root");
    let txn = repo.pristine.arc_txn_begin()?;
    let channel_name = txn
        .read()
        .current_channel()
        .unwrap_or(libpijul::DEFAULT_CHANNEL)
        .to_string();

[6.256]

[7.2057]

    pub fn new(path: PathBuf) -> Result<Self, anyhow::Error> {
        let repo = Repository::find_root(Some(path.to_owned())).expect("Could not find root");
        let txn = repo.pristine.arc_txn_begin()?;
        let channel_name = txn
            .read()
            .current_channel()
            .unwrap_or(libpijul::DEFAULT_CHANNEL)
            .to_string();

Replacement in src/lib.rs at line 417 [4.585]

B:BD[7.2058] → [7.2058:2207]

B:BD[7.2207] → [8.440:1353]

    let channel = txn.write().open_or_create_channel(&channel_name)?;
    let prefix = path.strip_prefix(&repo.path)?.to_string_lossy().to_string();
    let mut record_builder = RecordBuilder::new();
    record_builder.record(
        txn.clone(),
        libpijul::Algorithm::default(),
        false,
        &libpijul::DEFAULT_SEPARATOR,
        channel.clone(),
        &repo.working_copy,
        &repo.changes,
        &prefix,
        std::thread::available_parallelism()?.into(),
    )?;
    let recorded = record_builder.finish();
    let mut write_txn = txn.write();
    let actions: Vec<_> = recorded
        .actions
        .into_iter()
        .map(|rec| rec.globalize(&*write_txn).unwrap())
        .collect();
    let contents = if let Ok(cont) = std::sync::Arc::try_unwrap(recorded.contents) {
        cont.into_inner()
    } else {
        unreachable!()
    };
    let mut change = LocalChange::make_change(
        &*write_txn,
        &channel,
        actions,
        contents,
        ChangeHeader::default(),
        Vec::new(),
    )?;

[7.2058]

[7.2240]

        let channel = txn.write().open_or_create_channel(&channel_name)?;
        let prefix = path.strip_prefix(&repo.path)?.to_string_lossy().to_string();
        let mut record_builder = RecordBuilder::new();
        record_builder.record(
            txn.clone(),
            libpijul::Algorithm::default(),
            false,
            &libpijul::DEFAULT_SEPARATOR,
            channel.clone(),
            &repo.working_copy,
            &repo.changes,
            &prefix,
            std::thread::available_parallelism()?.into(),
        )?;
        let recorded = record_builder.finish();
        let mut write_txn = txn.write();
        let actions: Vec<_> = recorded
            .actions
            .into_iter()
            .map(|rec| rec.globalize(&*write_txn).unwrap())
            .collect();
        let contents = if let Ok(cont) = std::sync::Arc::try_unwrap(recorded.contents) {
            cont.into_inner()
        } else {
            unreachable!()
        };
        let mut change = LocalChange::make_change(
            &*write_txn,
            &channel,
            actions,
            contents,
            ChangeHeader::default(),
            Vec::new(),
        )?;

Replacement in src/lib.rs at line 452 [4.585]

B:BD[7.2241] → [7.2241:2360]

    let (oldest_change, _ambiguous) =
        write_txn.follow_oldest_path(&repo.changes, &channel, prefix.as_str())?;

[7.2241]

[8.1354]

        let (oldest_change, _ambiguous) =
            write_txn.follow_oldest_path(&repo.changes, &channel, prefix.as_str())?;

Replacement in src/lib.rs at line 455 [4.585]

B:BD[8.1355] → [8.1355:1526]

    repo.changes
        .save_change(&mut change, |_, _| Ok::<_, anyhow::Error>(()))?;
    write_txn.apply_change(&repo.changes, &mut channel.write(), &change.hash()?)?;

[8.1355]

[7.2360]

        repo.changes
            .save_change(&mut change, |_, _| Ok::<_, anyhow::Error>(()))?;
        write_txn.apply_change(&repo.changes, &mut channel.write(), &change.hash()?)?;

Replacement in src/lib.rs at line 459 [4.585]

B:BD[7.2361] → [7.2361:2475]

    // Drop writeable access to prevent ownership deadlock from calling txn.read()
    std::mem::drop(write_txn);

[7.2361]

[7.2475]

        // Drop writeable access to prevent ownership deadlock from calling txn.read()
        std::mem::drop(write_txn);

Replacement in src/lib.rs at line 462 [4.585]

B:BD[7.2476] → [7.2476:2681]

    let mut credit_buffer = InlineCreditBuffer::new()?;
    libpijul::output::output_file(
        &repo.changes,
        &txn,
        &channel,
        oldest_change,
        &mut credit_buffer,
    )?;

[7.2476]

[7.2681]

        let mut credit_buffer = InlineCreditBuffer::new()?;
        libpijul::output::output_file(
            &repo.changes,
            &txn,
            &channel,
            oldest_change,
            &mut credit_buffer,
        )?;

Replacement in src/lib.rs at line 471 [4.585]

B:BD[7.2682] → [7.2682:2715]

B:BD[7.2715] → [8.1527:1868]

    let mut hashes = Vec::new();
    let mut changes: Vec<Change> = Vec::new();
    for (change_id, lines) in credit_buffer.hashes {
        let hash = Hash::from(txn.read().get_external(&change_id)?.unwrap().to_owned());
        let change = repo.changes.get_change(&hash)?;
        if !changes.iter().any(|c| c.hash().unwrap() == hash) {
            changes.push(change);

[7.2682]

[8.1868]

        let mut hashes = Vec::new();
        let mut changes: Vec<Change> = Vec::new();
        for (change_id, lines) in credit_buffer.hashes {
            let hash = Hash::from(txn.read().get_external(&change_id)?.unwrap().to_owned());
            let change = repo.changes.get_change(&hash)?;
            if !changes.iter().any(|c| c.hash().unwrap() == hash) {
                changes.push(change);
            }
            hashes.push((hash, lines));

Replacement in src/lib.rs at line 481 [4.585]

B:BD[8.1878] → [8.1878:1914]

        hashes.push((hash, lines));

[8.1878]

[7.2894]


        // Make sure to not pollute .pijul/changes
        repo.changes.del_change(&change.hash()?)?;
        Ok(Self {
            path,
            current_state: change,
            recorded_changes: changes,
            hashes,
        })

Replacement in src/lib.rs at line 493 [4.585]

B:BD[7.2901] → [8.1915:2009]

    // Make sure to not pollute .pijul/changes
    repo.changes.del_change(&change.hash()?)?;

[7.2901]

[8.2009]

    // TODO: State::Ignored
    fn annotate(&self) -> State {
        let mut annotations = Vec::new();
        for change in &self.current_state.changes {
            match change {
                BaseHunk::Edit { .. } | BaseHunk::Replacement { .. } => {
                    annotations.push(Annotation::Modified);
                }
                BaseHunk::FileAdd { .. } => {
                    return State::Added;
                }
                _ => todo!(),
            }
        }

Replacement in src/lib.rs at line 508 [4.585]

B:BD[8.2010] → [6.504:612]

    Ok(FileState {
        current_state: change,
        recorded_changes: changes,
        hashes,
    })

[8.2010]

[3.6749]

        State::Tracked(annotations)
    }
    fn is_current_state(&self, hash: &Hash) -> bool {
        self.current_state
            .hash()
            .map(|h| &h == hash)
            .unwrap_or(false)
    }

Replacement in src/lib.rs at line 528 [4.585]

B:BD[3.6752] → [6.680:730]

    let file_state = file_credits(path).unwrap();

[3.6752]

[8.2510]

    let file_state = FileState::new(path).unwrap();

Deletion in src/extension.ts at line 104 [4.2222]
B:BD[2.12875] → [2.12875:12924]
```
		console.log(`Decorating file: ${uri.fsPath}`);
```
Insertion in src/extension.ts at line 107 [4.2222]
[2.12994]
[2.12994]
```
			console.log(`Decorating file: ${uri.fsPath}`);
```
Replacement in src/extension.ts at line 218 [4.2222]
B:BD[2.15909] → [2.15909:15913]
```
			
```
[2.15909]
[2.15913]

Implement annotations for FileState

Dependencies

In channels

Change contents

Insertion in src/lib.rs at line 4 [4.585]

Replacement in src/lib.rs at line 8 [4.585]

Deletion in src/lib.rs at line 21 [4.585]

Replacement in src/lib.rs at line 101 [4.585]

Replacement in src/lib.rs at line 106 [4.585]

Deletion in src/lib.rs at line 323 [4.585]

Insertion in src/lib.rs at line 401 [4.585]