tzemanovic/inflorescence - Change SWDPAGF6BGUA2L6KFP6LAVCA3SX4QA5FOZRLLOAWLNZ6RNCIV4RQC

test channel name

Created by Tomáš Zemanovič on June 3, 2025

SWDPAGF6BGUA2L6KFP6LAVCA3SX4QA5FOZRLLOAWLNZ6RNCIV4RQC

Dependencies

In channels

main

Change contents

Insertion in libflorescence/src/testing.rs at line 1 [7.5]
[7.5]
[7.6]
```
use crate::prelude::pijul;
use crate::repo;
```
Insertion in libflorescence/src/testing.rs at line 12 [7.5]
[12.38]
[7.177]
```
use std::sync::Arc;
```

Replacement in libflorescence/src/testing.rs at line 14 [7.5]

B:BD[7.178] → [12.39:136]

/// Get the path to the repo
pub fn repo_path(repo: &PijulRepo) -> PathBuf {
    let PijulRepo {

[7.178]

[12.136]

/// Get the path to the test repo
pub fn repo_path(repo: &TestRepo) -> PathBuf {
    let TestRepo {

Replacement in libflorescence/src/testing.rs at line 27 [7.5]

∅:D[12.310] → [7.178:327]

B:BD[7.178] → [7.178:327]

/// Setup a Pijul ID in a temp dir. Sets `PIJUL_CONFIG_DIR` env var, which is
/// used by pijul when loading ID
pub fn setup_pijul_id() -> PijulId {

[12.310]

[7.327]

/// Setup a Pijul user ID in a temp dir. Sets `PIJUL_CONFIG_DIR` env var, which
/// is used by pijul when loading ID
pub fn setup_test_user_id() -> TestUserId {

Replacement in libflorescence/src/testing.rs at line 57 [7.5]
B:BD[7.1289] → [7.1289:1315]
```
    PijulId { dir, skey }
```
[7.1289]
[7.1315]
```
    TestUserId { dir, skey }
```

Replacement in libflorescence/src/testing.rs at line 61 [7.5]

B:BD[7.1362] → [7.1362:1403]

B:BD[7.1403] → [12.311:346]

pub fn setup_pijul_repo() -> PijulRepo {
    setup_pijul_repo_in_subdir("")

[7.1362]

[12.346]

pub fn setup_test_repo() -> TestRepo {
    setup_test_repo_in_subdir("")

Replacement in libflorescence/src/testing.rs at line 66 [7.5]

B:BD[12.415] → [12.415:491]

pub fn setup_pijul_repo_in_subdir<P: AsRef<Path>>(subdir: P) -> PijulRepo {

[12.415]

[12.491]

pub fn setup_test_repo_in_subdir<P: AsRef<Path>>(subdir: P) -> TestRepo {

Insertion in libflorescence/src/testing.rs at line 68 [7.5]

[12.529]

    let repo_dir = rootdir.path().join(&subdir);
    let mut repo = empty_pijul_repo(repo_dir.clone());

Replacement in libflorescence/src/testing.rs at line 71 [7.5]

B:BD[12.530] → [12.530:629]

∅:D[12.629] → [7.1532:1856]

B:BD[7.1532] → [7.1532:1856]

    let repo = Repository::init(Some(rootdir.path().join(&subdir)), None, None)
        .unwrap();
    let mut txn = repo.pristine.mut_txn_begin().unwrap();
    let channel_name = libpijul::DEFAULT_CHANNEL.to_string();
    libpijul::MutTxnT::open_or_create_channel(&mut txn, &channel_name).unwrap();
    libpijul::MutTxnT::set_current_channel(&mut txn, &channel_name).unwrap();
    libpijul::MutTxnT::commit(txn).unwrap();

[12.530]

[7.1856]

    // Select and record the default ".ignore" file
    let file_to_record = ".ignore";
    repo::add(&mut repo, file_to_record);
    let (internal, _state) = repo::load(repo_dir).unwrap();
    let skey = Arc::new(SKey::generate(None));
    repo::record(&internal, "Initialized".to_string(), skey);

Replacement in libflorescence/src/testing.rs at line 79 [7.5]
B:BD[7.1857] → [12.630:646]
```
    PijulRepo {
```
[7.1857]
[12.646]
```
    TestRepo {
```

Insertion in libflorescence/src/testing.rs at line 87 [7.5]

[12.822]

[7.1879]

}
pub fn empty_pijul_repo(dir: PathBuf) -> pijul::Repository {
    let repo = Repository::init(Some(dir), None, None).unwrap();
    let mut txn = repo.pristine.mut_txn_begin().unwrap();
    let channel_name = libpijul::DEFAULT_CHANNEL.to_string();
    libpijul::MutTxnT::open_or_create_channel(&mut txn, &channel_name).unwrap();
    libpijul::MutTxnT::set_current_channel(&mut txn, &channel_name).unwrap();
    libpijul::MutTxnT::commit(txn).unwrap();
    repo

Replacement in libflorescence/src/testing.rs at line 102 [7.5]
B:BD[7.1925] → [7.1925:1946]
```
pub struct PijulId {
```
[7.1925]
[7.1946]
```
pub struct TestUserId {
```
Replacement in libflorescence/src/testing.rs at line 109 [7.5]
B:BD[7.2044] → [7.2044:2067]
```
pub struct PijulRepo {
```
[7.2044]
[12.823]
```
pub struct TestRepo {
```

Replacement in libflorescence/src/repo.rs at line 276 [2.7]

B:BD[2.663] → [12.1552:1622]

fn load(path: PathBuf) -> Result<(InternalState, State), LoadError> {

[2.663]

[12.1622]

pub(crate) fn load(path: PathBuf) -> Result<(InternalState, State), LoadError> {

Replacement in libflorescence/src/repo.rs at line 322 [2.7]

B:BD[2.1299] → [6.803:870]

fn record(state: &InternalState, message: String, sk: Arc<SKey>) {

[2.1299]

[4.361]

#[derive(Debug)]
pub enum NewChannelError {
    AlreadyExists(String),
}
#[allow(dead_code)] // TODO rm once used
fn new_channel(
    repo: &mut pijul::Repository,
    name: String,
) -> Result<(), NewChannelError> {
    use libpijul::{GraphTxnT, MutTxnTExt};
    // pijul's command `Channel::New`
    let mut txn = repo.pristine.mut_txn_begin().unwrap();
    if txn.load_channel(&name).unwrap().is_some() {
        return Err(NewChannelError::AlreadyExists(name));
    }
    let new = txn.open_or_create_channel(&name).unwrap();
    // Safeguard: apply the root patch if we're creating a new channel.
    let current = txn.current_channel().unwrap();
    let channel = txn.load_channel(current).unwrap().unwrap();
    let ch = channel.read();
    let h = if let Some(Ok((k, v))) =
        libpijul::pristine::changeid_log(&txn, &ch, 0u64.into())
            .unwrap()
            .next()
    {
        Some(txn.get_external(&v.a).unwrap().unwrap().into())
    } else {
        None
    };
    if let Some(h) = h {
        let mut new = new.write();
        txn.apply_change(&repo.changes, &mut new, &h).unwrap();
    }
    // txn.commit().unwrap();
    // Parts of pijul's command `Channel::Switch`
    txn.set_current_channel(&name).unwrap();
    txn.commit().unwrap();
    Ok(())
}
pub(crate) fn record(state: &InternalState, message: String, sk: Arc<SKey>) {

Replacement in libflorescence/src/repo.rs at line 550 [2.7]

B:BD[5.3438] → [5.3438:3498]

fn add(repo: &mut pijul::Repository, file_path_str: &str) {

[5.3438]

[3.635]

pub fn add(repo: &mut pijul::Repository, file_path_str: &str) {

Replacement in libflorescence/src/repo/test.rs at line 1 [12.1959]

B:BD[12.1959] → [12.1960:2056]

use crate::repo;
use crate::testing::{repo_path, setup_pijul_repo, setup_pijul_repo_in_subdir};

[12.1959]

[12.2056]

use crate::repo::{self, pijul};
use crate::testing::{repo_path, setup_test_repo, setup_test_repo_in_subdir};

Replacement in libflorescence/src/repo/test.rs at line 32 [12.1959]

B:BD[12.2798] → [12.2798:2853]

        let repo = setup_pijul_repo_in_subdir(subdir);

[12.2798]

[12.2853]

        let repo = setup_test_repo_in_subdir(subdir);

Replacement in libflorescence/src/repo/test.rs at line 46 [12.1959]
∅:D[13.558] → [12.3365:3400]
B:BD[12.3365] → [12.3365:3400]
```
    let repo = setup_pijul_repo();
```
[13.558]
[12.3400]
```
    let repo = setup_test_repo();
```

Replacement in libflorescence/src/repo/test.rs at line 66 [12.1959]

B:BD[12.3878] → [12.3878:3970]

    assert_eq!(untracked_files.len(), 1);
    assert!(untracked_files.contains(".ignore"));

[12.3878]

[12.3970]

    assert!(untracked_files.is_empty());

Replacement in libflorescence/src/repo/test.rs at line 68 [12.1959]
B:BD[12.4009] → [12.4009:4038]
```
    assert!(log.is_empty());
```
[12.4009]
[12.4038]
```
    assert_eq!(log.len(), 2);
```

Insertion in libflorescence/src/repo/test.rs at line 70 [12.1959]

[12.4040]


#[test]
fn test_current_channel() {
    let repo = setup_test_repo();
    let repo_path = repo_path(&repo);
    let mut repo = pijul::Repository::find_root(Some(repo_path)).unwrap();
    assert_eq!(repo::current_channel(&repo), libpijul::DEFAULT_CHANNEL);
    let new_channel_name = "NEW CHANNEL!".to_string();
    repo::new_channel(&mut repo, new_channel_name.clone()).unwrap();
    assert_eq!(repo::current_channel(&repo), new_channel_name);
}

Replacement in inflorescence/src/test.rs at line 10 [7.2521]

B:BD[8.1520] → [12.4153:4222]

    repo_path, setup_pijul_id, setup_pijul_repo, PijulId, PijulRepo,

[8.1520]

[8.1578]

    repo_path, setup_test_repo, setup_test_user_id, TestRepo, TestUserId,

Replacement in inflorescence/src/test.rs at line 25 [7.2521]

B:BD[7.2682] → [7.2682:2749]

    let _id = setup_pijul_id();
    let repo = setup_pijul_repo();

[7.2682]

[12.4223]

    let _id = setup_test_user_id();
    let repo = setup_test_repo();

Replacement in inflorescence/src/test.rs at line 719 [7.2521]

B:BD[8.4785] → [8.4785:4851]

    let id = setup_pijul_id();
    let repo = setup_pijul_repo();

[8.4785]

[12.4340]

    let id = setup_test_user_id();
    let repo = setup_test_repo();

Deletion in inflorescence/src/test.rs at line 740 [7.2521]

B:BD[8.5488] → [8.5488:5576]

B:BD[8.5576] → [9.1361:1698]

∅:D[9.1698] → [8.5710:6088]

B:BD[8.5710] → [8.5710:6088]

B:BD[8.6088] → [9.1699:1753]

∅:D[9.1753] → [8.6130:6235]

B:BD[8.6130] → [8.6130:6235]

B:BD[8.6235] → [9.1754:1779]

∅:D[9.1779] → [8.6256:6276]

B:BD[8.6256] → [8.6256:6276]

B:BD[8.6276] → [9.1780:1921]

∅:D[9.1921] → [8.6381:6713]

B:BD[8.6381] → [8.6381:6713]

B:BD[8.6713] → [9.1922:1991]

∅:D[9.1991] → [8.6754:6919]

B:BD[8.6754] → [8.6754:6919]

    // Select and record the default ".ignore" file
    let file_to_record = ".ignore";
    update(
        &mut state,
        Msg::View(app::Msg::Cursor(cursor::Msg::Select(
            cursor::Select::UntrackedFile {
                ix: 0,
                path: file_to_record.to_string(),
            },
        ))),
    );
    // Selection triggers `LoadedSrcFile`
    let _msg = task::await_next_msg(&mut tasks).await;
    // Add it to tracked files
    let _task = update(&mut state, Msg::AddUntrackedFile);
    // Wait for it to be added
    let msg = task::await_next_msg(&mut tasks).await;
    assert_matches!(
        &msg,
        Msg::FromRepo(repo::MsgOut::AddedUntrackedFile { path }) if path == file_to_record
    );
    // Make the initial record to add project root: Start a record
    let _task = update(&mut state, Msg::StartRecord);
    assert!(state.record_msg.is_some());
    // Edit the record msg
    let record_msg = "Initialized";
    let _task = update(
        &mut state,
        Msg::View(app::Msg::EditRecordMsg(text_editor::Action::Edit(
            text_editor::Edit::Paste(Arc::new(record_msg.to_string())),
        ))),
    );
    assert!(state.record_msg.is_some());
    assert_matches!(
        state.record_msg.as_ref().unwrap(),
        app::RecordMsg::Typing(_)
    );
    if let app::RecordMsg::Typing(content) = state.record_msg.as_ref().unwrap()
    {
        assert_eq!(&content.text(), record_msg);
    }
    // Save the record
    let _task = update(&mut state, Msg::View(app::Msg::SaveRecord));
    let msg = task::await_next_msg(&mut tasks).await;
    assert_matches!(&msg, Msg::FromRepo(repo::MsgOut::Recorded(_)));
    let _task = update(&mut state, msg);

Replacement in inflorescence/src/test.rs at line 745 [7.2521]
∅:D[10.2742] → [8.7129:7182]
B:BD[8.7129] → [8.7129:7182]
```
    assert_eq!(log[0].file_paths, [file_to_record]);
```
[10.2742]
[8.7182]
```
    assert_eq!(log[0].file_paths, [".ignore"]);
```
Replacement in inflorescence/src/test.rs at line 765 [7.2521]
B:BD[8.7604] → [8.7604:7650]
```
    pub id: PijulId,
    pub repo: PijulRepo,
```
[8.7573]
[11.2214]
```
    pub id: TestUserId,
    pub repo: TestRepo,
```

test channel name

Dependencies

In channels

Change contents

Insertion in libflorescence/src/testing.rs at line 1 [7.5]

Insertion in libflorescence/src/testing.rs at line 12 [7.5]

Replacement in libflorescence/src/testing.rs at line 14 [7.5]

Replacement in libflorescence/src/testing.rs at line 27 [7.5]

Replacement in libflorescence/src/testing.rs at line 57 [7.5]

Replacement in libflorescence/src/testing.rs at line 61 [7.5]

Replacement in libflorescence/src/testing.rs at line 66 [7.5]

Insertion in libflorescence/src/testing.rs at line 68 [7.5]

Replacement in libflorescence/src/testing.rs at line 71 [7.5]

Replacement in libflorescence/src/testing.rs at line 79 [7.5]

Insertion in libflorescence/src/testing.rs at line 87 [7.5]

Replacement in libflorescence/src/testing.rs at line 102 [7.5]

Replacement in libflorescence/src/testing.rs at line 109 [7.5]