mx00s/pijul - Change 5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC

Fixing the Git feature

Created by pmeunier on April 24, 2021

5SLOJYHGPMZVCOE3IS7ICNMJJYX3RBT6CDG5MAV6T4CJIOW7YZ6QC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/remote/mod.rs at line 451 [8.52474]

∅:D[6.3600] → [7.7658:7732]

B:BD[9.1048] → [7.7658:7732]

                txn.apply_change_ws(&repo.changes, channel, h, &mut ws)?;

[6.3600]

[6.3601]

                let mut channel = channel.write().unwrap();
                txn.apply_change_ws(&repo.changes, &mut channel, h, &mut ws)?;

Replacement in pijul/src/remote/mod.rs at line 521 [8.52474]

B:BD[8.72806] → [10.1763:1872]

        for hash in hashes.iter() {
            txn.apply_change_ws(&repo.changes, channel, hash, &mut ws)?;

[8.72806]

[8.72925]

        {
            let mut channel_ = channel.write().unwrap();
            for hash in hashes.iter() {
                txn.apply_change_ws(&repo.changes, &mut channel_, hash, &mut ws)?;
            }

Replacement in pijul/src/remote/local.rs at line 176 [8.79745]
B:BD[11.3935] → [11.3935:3988]
```
    channel: &mut libpijul::pristine::ChannelRef<T>,
```
[11.3935]
[11.3988]
```
    channel: &libpijul::pristine::ChannelRef<T>,
```
Insertion in pijul/src/remote/local.rs at line 180 [8.79745]
[11.4093]
[11.4093]
```
    let mut channel = channel.write().unwrap();
```

Replacement in pijul/src/remote/local.rs at line 182 [8.79745]

B:BD[11.4116] → [7.8910:8968]

        txn.apply_change_ws(store, channel, c, &mut ws)?;

[11.4116]

[11.4175]

        txn.apply_change_ws(store, &mut *channel, c, &mut ws)?;

Insertion in pijul/src/commands/pushpull.rs at line 423 [8.111631]
[3.267]
[12.155]
```
            let mut channel = channel.write().unwrap();
```

Replacement in pijul/src/commands/protocol.rs at line 184 [8.123281]

B:BD[8.130373] → [8.130373:130437]

B:BD[8.130437] → [7.12632:12712]

                let mut channel = load_channel(&txn, &cap[1])?;
                txn.apply_change_ws(&repo.changes, &mut channel, &h, &mut ws)?;

[8.130373]

[13.67]

                let channel = load_channel(&txn, &cap[1])?;
                {
                    let mut channel_ = channel.write().unwrap();
                    txn.apply_change_ws(&repo.changes, &mut channel_, &h, &mut ws)?;
                }

Replacement in pijul/src/commands/git.rs at line 6 [8.137210]
B:BD[8.137436] → [14.2236:2237]
[8.137436]
[15.0]
```
use std::sync::{Arc, RwLock};
```
Replacement in pijul/src/commands/git.rs at line 165 [8.137210]
B:BD[8.141594] → [8.141594:141615]
```
        txn: &mut T,
```
[8.141594]
[8.141615]
```
        txn: Arc<RwLock<T>>,
```
Insertion in pijul/src/commands/git.rs at line 175 [8.137210]
[8.142007]
[8.142007]
```
                    let mut txn = txn.write().unwrap();
```

Replacement in pijul/src/commands/git.rs at line 263 [8.137210]

∅:D[16.1005] → [15.163:227]

B:BD[8.144337] → [15.163:227]

                .changeid_reverse_log(&channel.borrow(), None)?

[16.1005]

[8.144396]

                .changeid_reverse_log(&*channel.read()?, None)?

Deletion in pijul/src/commands/git.rs at line 292 [8.137210]
B:BD[8.145374] → [4.52:115]
```
            let mut txn = repo.repo.pristine.mut_txn_begin()?;
```

Insertion in pijul/src/commands/git.rs at line 293 [8.137210]

[8.145484]

            let txn = repo.repo.pristine.mut_txn_begin()?;
            let txn = Arc::new(RwLock::new(txn));

Replacement in pijul/src/commands/git.rs at line 296 [8.137210]

B:BD[8.145536] → [8.145536:145617]

                let mut channel = if let Some(parents) = dag.parents.get(&oid) {

[8.145536]

[8.145617]

                let channel = if let Some(parents) = dag.parents.get(&oid) {

Insertion in pijul/src/commands/git.rs at line 304 [8.137210]
[8.145980]
[15.389]
```
                    let mut txn = txn.write().unwrap();
```
Insertion in pijul/src/commands/git.rs at line 314 [8.137210]
[8.146349]
[8.146349]
```
                    let mut txn = txn.write().unwrap();
```

Replacement in pijul/src/commands/git.rs at line 323 [8.137210]

B:BD[8.146606] → [8.146606:146670]

                    &mut txn,
                    &mut channel,

[8.146606]

[8.146670]

                    txn.clone(),
                    channel.clone(),

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

B:BD[8.146777] → [8.146777:146874]

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

[8.146777]

[8.146874]

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

Replacement in pijul/src/commands/git.rs at line 331 [8.137210]

B:BD[8.146925] → [8.146925:146995]

                dag.collect_dead_parents(&oid, &mut todo, &mut txn)?;

[8.146925]

[8.146995]

                dag.collect_dead_parents(&oid, &mut todo, txn.clone())?;

Insertion in pijul/src/commands/git.rs at line 344 [8.137210]

[8.147512]

            let txn = if let Ok(txn) = Arc::try_unwrap(txn) {
                txn.into_inner().unwrap()
            } else {
                unreachable!()
            };

Replacement in pijul/src/commands/git.rs at line 377 [8.137210]
B:BD[8.148197] → [8.148197:148239]
```
    txn: &T,
    channel: &ChannelRef<T>,
```
[8.148197]
[8.148239]
```
    txn: Arc<RwLock<T>>,
    channel: ChannelRef<T>,
```
Insertion in pijul/src/commands/git.rs at line 386 [8.137210]
[8.148491]
[8.148491]
```
        let txn = txn.read().unwrap();
```
Replacement in pijul/src/commands/git.rs at line 400 [8.137210]
∅:D[17.131] → [15.538:594]
B:BD[8.149112] → [15.538:594]
```
            for x in txn.log(&p_channel.borrow(), 0)? {
```
[17.131]
[15.594]
```
            for x in txn.log(&*p_channel.read()?, 0)? {
```

Replacement in pijul/src/commands/git.rs at line 423 [8.137210]

B:BD[8.149765] → [15.693:756]

fn import_commit_parents<T: TxnTExt + MutTxnTExt + GraphIter>(

[8.149765]

[8.149816]

fn import_commit_parents<T: TxnTExt + MutTxnTExt + GraphIter + Send + Sync + 'static>(

Replacement in pijul/src/commands/git.rs at line 426 [8.137210]
B:BD[8.149856] → [8.149856:149906]
```
    txn: &mut T,
    channel: &mut ChannelRef<T>,
```
[8.149856]
[8.149906]
```
    txn: Arc<RwLock<T>>,
    channel: ChannelRef<T>,
```

Replacement in pijul/src/commands/git.rs at line 433 [8.137210]

B:BD[8.150070] → [17.166:249]

    let (needs_output, to_apply) = make_apply_plan(repo, txn, channel, dag, oid)?;

[8.150070]

[8.150152]

    let (needs_output, to_apply) = make_apply_plan(repo, txn.clone(), channel.clone(), dag, oid)?;

Insertion in pijul/src/commands/git.rs at line 438 [8.137210]
[8.150285]
[8.150285]
```
    let mut txn_ = txn.write().unwrap();
```

Replacement in pijul/src/commands/git.rs at line 440 [8.137210]

B:BD[8.150321] → [2.0:72]

        info!("applying {:?} to {:?}", h, txn.name(&channel.borrow()));

[8.150321]

[15.886]

        let mut channel_ = channel.write().unwrap();
        info!("applying {:?} to {:?}", h, txn_.name(&channel_));

Replacement in pijul/src/commands/git.rs at line 443 [8.137210]

B:BD[15.887] → [16.1604:1670]

        txn.apply_change_ws(&repo.repo.changes, channel, h, ws)?;

[15.887]

[8.150456]

        txn_.apply_change_ws(&repo.repo.changes, &mut channel_, h, ws)?;

Replacement in pijul/src/commands/git.rs at line 445 [8.137210]

B:BD[8.150512] → [17.322:407]

            check_alive_debug(&repo.repo.changes, txn, &channel.borrow(), line!())?;

[8.150512]

[8.150581]

            check_alive_debug(&repo.repo.changes, &*txn_, &channel_, line!())?;

Replacement in pijul/src/commands/git.rs at line 449 [8.137210]

B:BD[8.150649] → [17.408:489]

        check_alive_debug(&repo.repo.changes, txn, &channel.borrow(), line!())?;

[8.150649]

[8.150714]

        check_alive_debug(&repo.repo.changes, &*txn_, &*channel.read()?, line!())?;

Replacement in pijul/src/commands/git.rs at line 459 [8.137210]
B:BD[8.151103] → [2.73:110]
```
        txn.name(&channel.borrow()),
```
[8.151103]
[8.151135]
```
        txn_.name(&*channel.read()?),
```
Insertion in pijul/src/commands/git.rs at line 461 [8.137210]
[8.151142]
[8.151142]
```
    std::mem::drop(txn_);
```

Replacement in pijul/src/commands/git.rs at line 465 [8.137210]

B:BD[8.151291] → [8.151291:151374]

        txn.output_repository_no_pending(
            &mut repo.repo.working_copy,

[8.151291]

[8.151374]

        libpijul::output::output_repository_no_pending(
            repo.repo.working_copy.clone(),

Replacement in pijul/src/commands/git.rs at line 468 [8.137210]
B:BD[8.151406] → [8.151406:151427]
```
            channel,
```
[8.151406]
[8.151427]
```
            txn.clone(),
            channel.clone(),
```
Insertion in pijul/src/commands/git.rs at line 473 [8.137210]
[2.129]
[8.151462]
```
            num_cpus::get(),
```

Replacement in pijul/src/commands/git.rs at line 477 [8.137210]

B:BD[8.151569] → [17.527:612]

            check_alive_debug(&repo.repo.changes, txn, &channel.borrow(), line!())?;

[8.151569]

[8.151638]

            let txn = txn.read().unwrap();
            check_alive_debug(&repo.repo.changes, &*txn, &channel.read().unwrap(), line!())?;

Replacement in pijul/src/commands/git.rs at line 485 [8.137210]

B:BD[8.151772] → [2.130:192]

        check_tree_inodes(txn, txn.graph(&channel.borrow()));

[8.151772]

[8.151823]

        let txn = txn.read().unwrap();
        check_tree_inodes(&*txn, txn.graph(&*channel.read().unwrap()));

Replacement in pijul/src/commands/git.rs at line 497 [8.137210]
B:BD[8.152048] → [8.152048:152098]
```
    txn: &mut T,
    channel: &mut ChannelRef<T>,
```
[8.152048]
[8.152098]
```
    txn: Arc<RwLock<T>>,
    channel: ChannelRef<T>,
```
Insertion in pijul/src/commands/git.rs at line 550 [8.137210]
[8.153980]
[8.153980]
```
            let mut txn = txn.write().unwrap();
```

Replacement in pijul/src/commands/git.rs at line 567 [8.137210]

B:BD[16.1756] → [16.1756:1857]

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

[16.1756]

[8.154875]

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

Replacement in pijul/src/commands/git.rs at line 632 [8.137210]

B:BD[8.157569] → [17.921:976]

fn import_commit<T: TxnTExt + MutTxnTExt + GraphIter>(

[8.157569]

[8.157612]

fn import_commit<T: TxnTExt + MutTxnTExt + GraphIter + Send + Sync + 'static>(

Replacement in pijul/src/commands/git.rs at line 635 [8.137210]
B:BD[8.157665] → [8.157665:157715]
```
    txn: &mut T,
    channel: &mut ChannelRef<T>,
```
[8.157665]
[8.157715]
```
    txn: Arc<RwLock<T>>,
    channel: ChannelRef<T>,
```

Replacement in pijul/src/commands/git.rs at line 640 [8.137210]

∅:D[18.3958] → [8.157818:157898]

B:BD[8.157818] → [8.157818:157898]

    let (object, prefixes) = git_reset(git, repo, txn, channel, child, stats)?;

[18.3958]

[8.157898]

    let (object, prefixes) = git_reset(git, repo, txn.clone(), channel.clone(), child, stats)?;
    let mut txn_ = txn.write().unwrap();

Replacement in pijul/src/commands/git.rs at line 645 [8.137210]

B:BD[8.158004] → [8.158004:158068]

                txn.add_dir(p.to_str().unwrap()).unwrap_or(());

[8.158004]

[8.158068]

                txn_.add_dir(p.to_str().unwrap()).unwrap_or(());

Replacement in pijul/src/commands/git.rs at line 647 [8.137210]

B:BD[8.158089] → [8.158089:158154]

                txn.add_file(p.to_str().unwrap()).unwrap_or(());

[8.158089]

[8.158154]

                txn_.add_file(p.to_str().unwrap()).unwrap_or(());

Replacement in pijul/src/commands/git.rs at line 654 [8.137210]

B:BD[8.158287] → [2.193:263]

    debug!("recording on channel {:?}", txn.name(&channel.borrow()));

[8.158287]

[8.158352]

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

Insertion in pijul/src/commands/git.rs at line 663 [8.137210]
[19.332]
[8.158463]
```
    std::mem::drop(txn_);
```

Replacement in pijul/src/commands/git.rs at line 665 [8.137210]

B:BD[8.158491] → [8.158491:158558]

        txn,
        channel,
        &mut repo.repo.working_copy,

[8.158491]

[8.158558]

        txn.clone(),
        channel.clone(),
        repo.repo.working_copy.clone(),

Insertion in pijul/src/commands/git.rs at line 685 [8.137210]
[8.159191]
[8.159191]
```
    let txn = txn.read().unwrap();
```

Replacement in pijul/src/commands/git.rs at line 690 [8.137210]

B:BD[20.404] → [17.1047:1109]

            return Ok(txn.current_state(&channel.borrow())?);

[20.404]

[20.474]

            return Ok(txn.current_state(&channel.read().unwrap())?);

Replacement in pijul/src/commands/git.rs at line 697 [8.137210]

B:BD[8.159718] → [17.1110:1191]

        check_alive_debug(&repo.repo.changes, txn, &channel.borrow(), line!())?;

[8.159718]

[8.159783]

        check_alive_debug(&repo.repo.changes, &*txn, &channel.read().unwrap(), line!())?;

Replacement in pijul/src/commands/git.rs at line 705 [8.137210]

B:BD[8.159934] → [2.264:315]

        cur.push_str(txn.name(&channel.borrow()));

[8.159934]

[8.159981]

        cur.push_str(txn.name(&channel.read().unwrap()));

Replacement in pijul/src/commands/git.rs at line 707 [8.137210]

B:BD[8.159994] → [2.316:405]

        repo.repo.config.current_channel = Some(txn.name(&channel.borrow()).to_string())

[8.159994]

[8.160079]

        repo.repo.config.current_channel = Some(txn.name(&channel.read().unwrap()).to_string())

Replacement in pijul/src/commands/git.rs at line 712 [8.137210]

B:BD[8.160168] → [2.406:468]

        check_tree_inodes(txn, txn.graph(&channel.borrow()));

[8.160168]

[8.160219]

        check_tree_inodes(&*txn, txn.graph(&channel.read().unwrap()));

Replacement in pijul/src/commands/git.rs at line 718 [8.137210]

B:BD[8.160373] → [8.160373:160570]

fn record_apply<T: TxnT + TxnTExt + MutTxnTExt, C: libpijul::changestore::ChangeStore>(
    txn: &mut T,
    channel: &mut ChannelRef<T>,
    working_copy: &mut libpijul::working_copy::FileSystem,

[8.160373]

[8.160570]

fn record_apply<T: TxnT + TxnTExt + MutTxnTExt + Send + Sync + 'static, C: libpijul::changestore::ChangeStore + Clone + Send + 'static>(
    txn: Arc<RwLock<T>>,
    channel: ChannelRef<T>,
    working_copy: Arc<libpijul::working_copy::FileSystem>,

Replacement in pijul/src/commands/git.rs at line 732 [8.137210]

∅:D[21.70] → [22.188:219]

B:BD[8.160881] → [22.188:219]

B:BD[22.219] → [23.397:608]

∅:D[21.191] → [20.647:969]

∅:D[23.608] → [20.647:969]

B:BD[22.317] → [20.647:969]

∅:D[20.969] → [22.535:549]

B:BD[22.535] → [22.535:549]

    for p in prefixes.iter() {
        let result = working_copy.record_prefix(
            txn,
            channel,
            changes,
            &mut state,
            repo_path.clone(),
            p,
            num_cpus,
        );
        use libpijul::working_copy::filesystem::*;
        match result {
            Ok(_) => {}
            Err(Error::Add(AddError::Fs(FsError::NotFound(_)))) => {}
            Err(Error::Add(AddError::Fs(FsError::AlreadyInRepo(_)))) => {}
            Err(e) => {
                error!("While adding {:?}: {}", p, e);
            }

[21.70]

[22.549]

    let result = working_copy.record_prefixes(
        txn.clone(),
        channel.clone(),
        changes,
        &mut state,
        repo_path.clone(),
        prefixes,
        num_cpus,
    );
    use libpijul::working_copy::filesystem::*;
    match result {
        Ok(_) => {}
        Err(Error::Add(AddError::Fs(FsError::NotFound(_)))) => {}
        Err(Error::Add(AddError::Fs(FsError::AlreadyInRepo(_)))) => {}
        Err(e) => {
            error!("While adding {:?}: {}", prefixes, e);

Insertion in pijul/src/commands/git.rs at line 751 [8.137210]
[8.161002]
[8.161002]
```
    let mut txn = txn.write().unwrap();
```

Replacement in pijul/src/commands/git.rs at line 756 [8.137210]

B:BD[17.1447] → [17.1447:1514]

            txn.current_state(&channel.borrow()).map_err(TxnErr)?,

[17.1447]

[17.1514]

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

Replacement in pijul/src/commands/git.rs at line 762 [8.137210]
B:BD[8.161176] → [17.1527:1575]
```
        .map(|rec| rec.globalize(txn).unwrap())
```
[8.161176]
[8.161215]
```
        .map(|rec| rec.globalize(&*txn).unwrap())
```

Replacement in pijul/src/commands/git.rs at line 766 [8.137210]

B:BD[17.1614] → [17.1614:1695]

        libpijul::change::dependencies(txn, &channel.borrow(), actions.iter())?;

[17.1614]

[8.161362]

        libpijul::change::dependencies(&*txn, &channel.read().unwrap(), actions.iter())?;

Replacement in pijul/src/commands/git.rs at line 768 [8.137210]
B:BD[8.161427] → [8.161427:161457]
```
        txn,
        channel,
```
[8.161427]
[8.161457]
```
        &*txn,
        &channel,
```
Replacement in pijul/src/commands/git.rs at line 771 [8.137210]
B:BD[8.161474] → [8.161474:161496]
```
        rec.contents,
```
[8.161474]
[8.161496]
```
        std::mem::replace(&mut *rec.contents.lock().unwrap(), Vec::new()),
```

Replacement in pijul/src/commands/git.rs at line 780 [8.137210]

B:BD[8.161721] → [16.1858:1942]

    let (_, m) = txn.apply_local_change(channel, &change, &hash, &rec.updatables)?;

[8.161721]

[24.169]

    let (_, m) = txn.apply_local_change(&channel, &change, &hash, &rec.updatables)?;

Replacement in pijul/src/commands/fork.rs at line 31 [8.167873]

B:BD[8.168609] → [8.168609:168678]

            let mut channel = txn.open_or_create_channel(&self.to)?;

[8.168609]

[7.13204]

            let channel = txn.open_or_create_channel(&self.to)?;
            let mut channel = channel.write().unwrap();

Replacement in pijul/src/commands/apply.rs at line 35 [8.194289]
∅:D[25.1239] → [26.19373:19457]
∅:D[27.2922] → [26.19373:19457]
B:BD[8.195050] → [26.19373:19457]
```
        let mut channel = if let Some(channel) = txn.load_channel(&channel_name)? {
```
[27.2922]
[8.195133]
```
        let channel = if let Some(channel) = txn.load_channel(&channel_name)? {
```
Insertion in pijul/src/commands/apply.rs at line 58 [8.194289]
[22.1173]
[7.14215]
```
            let mut channel = channel.write().unwrap();
```
Insertion in pijul/src/commands/apply.rs at line 61 [8.194289]
[8.196057]
[7.14302]
```
            let mut channel = channel.write().unwrap();
```
Replacement in libpijul/src/lib.rs at line 122 [8.717381]
B:BD[8.720672] → [8.720672:720722]
```
        channel: &mut pristine::ChannelRef<Self>,
```
[8.720672]
[7.125930]
```
        channel: &mut Self::Channel,
```
Replacement in libpijul/src/lib.rs at line 132 [8.717381]
B:BD[8.721040] → [8.721040:721090]
```
        channel: &mut pristine::ChannelRef<Self>,
```
[8.721040]
[7.125969]
```
        channel: &mut Self::Channel,
```
Replacement in libpijul/src/lib.rs at line 142 [8.717381]
B:BD[8.721391] → [8.721391:721441]
```
        channel: &mut pristine::ChannelRef<Self>,
```
[8.721391]
[7.126008]
```
        channel: &mut Self::Channel,
```
Replacement in libpijul/src/lib.rs at line 151 [8.717381]
B:BD[8.721695] → [8.721695:721745]
```
        channel: &mut pristine::ChannelRef<Self>,
```
[8.721695]
[7.126040]
```
        channel: &mut Self::Channel,
```
Replacement in libpijul/src/lib.rs at line 160 [8.717381]
B:BD[8.721987] → [8.721987:722037]
```
        channel: &mut pristine::ChannelRef<Self>,
```
[8.721987]
[7.126072]
```
        channel: &mut Self::Channel,
```

Replacement in libpijul/src/lib.rs at line 390 [8.717381]

B:BD[8.729347] → [8.729347:729385]

B:BD[8.729385] → [7.126592:126654]

            for app in extra.iter() {
                self.apply_change_rec(changes, channel, app)?

[8.729347]

[8.729448]

            {
                let mut channel_ = channel.write().unwrap();
                for app in extra.iter() {
                    self.apply_change_rec(changes, &mut channel_, app)?
                }

Replacement in libpijul/src/apply.rs at line 88 [8.944089]
B:BD[8.944800] → [8.944800:944833]
```
    channel: &mut ChannelRef<T>,
```
[8.944800]
[7.143229]
```
    channel: &mut T::Channel,
```
Deletion in libpijul/src/apply.rs at line 94 [8.944089]
B:BD[8.944998] → [5.89993:90041]
```
    let mut channel = channel.write().unwrap();
```
Replacement in libpijul/src/apply.rs at line 118 [8.944089]
B:BD[20.94986] → [20.94986:95008]
```
        &mut channel,
```
[20.94986]
[20.95008]
```
        channel,
```
Replacement in libpijul/src/apply.rs at line 129 [8.944089]
B:BD[8.946010] → [8.946010:946043]
```
    channel: &mut ChannelRef<T>,
```
[8.946010]
[7.143567]
```
    channel: &mut T::Channel,
```
Deletion in libpijul/src/apply.rs at line 136 [8.944089]
B:BD[8.946218] → [5.90042:90090]
∅:D[5.90090] → [8.946264:946265]
B:BD[8.946264] → [8.946264:946265]
```
    let mut channel = channel.write().unwrap();
```

Replacement in libpijul/src/apply.rs at line 177 [8.944089]

B:BD[8.947384] → [28.85:183]

                apply_change_to_channel(txn, &mut channel, internal, &hash, &change, workspace)?;

[8.947384]

[8.947698]

                apply_change_to_channel(txn, channel, internal, &hash, &change, workspace)?;

Replacement in libpijul/src/apply.rs at line 188 [8.944089]
B:BD[8.947889] → [8.947889:947922]
```
    channel: &mut ChannelRef<T>,
```
[8.947889]
[7.143985]
```
    channel: &mut T::Channel,
```
Replacement in libpijul/src/apply.rs at line 198 [8.944089]
B:BD[8.948208] → [8.948208:948241]
```
    channel: &mut ChannelRef<T>,
```
[8.948208]
[7.144003]
```
    channel: &mut T::Channel,
```

Fixing the Git feature

Dependencies

In channels

Change contents

Replacement in pijul/src/remote/mod.rs at line 451 [8.52474]

Replacement in pijul/src/remote/mod.rs at line 521 [8.52474]

Replacement in pijul/src/remote/local.rs at line 176 [8.79745]

Insertion in pijul/src/remote/local.rs at line 180 [8.79745]

Replacement in pijul/src/remote/local.rs at line 182 [8.79745]

Insertion in pijul/src/commands/pushpull.rs at line 423 [8.111631]

Replacement in pijul/src/commands/protocol.rs at line 184 [8.123281]

Replacement in pijul/src/commands/git.rs at line 6 [8.137210]

Replacement in pijul/src/commands/git.rs at line 165 [8.137210]

Insertion in pijul/src/commands/git.rs at line 175 [8.137210]

Replacement in pijul/src/commands/git.rs at line 263 [8.137210]

Deletion in pijul/src/commands/git.rs at line 292 [8.137210]

Insertion in pijul/src/commands/git.rs at line 293 [8.137210]

Replacement in pijul/src/commands/git.rs at line 296 [8.137210]

Insertion in pijul/src/commands/git.rs at line 304 [8.137210]

Insertion in pijul/src/commands/git.rs at line 314 [8.137210]

Replacement in pijul/src/commands/git.rs at line 323 [8.137210]

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

Replacement in pijul/src/commands/git.rs at line 331 [8.137210]

Insertion in pijul/src/commands/git.rs at line 344 [8.137210]

Replacement in pijul/src/commands/git.rs at line 377 [8.137210]

Insertion in pijul/src/commands/git.rs at line 386 [8.137210]

Replacement in pijul/src/commands/git.rs at line 400 [8.137210]

Replacement in pijul/src/commands/git.rs at line 423 [8.137210]

Replacement in pijul/src/commands/git.rs at line 426 [8.137210]

Replacement in pijul/src/commands/git.rs at line 433 [8.137210]

Insertion in pijul/src/commands/git.rs at line 438 [8.137210]

Replacement in pijul/src/commands/git.rs at line 440 [8.137210]

Replacement in pijul/src/commands/git.rs at line 443 [8.137210]

Replacement in pijul/src/commands/git.rs at line 445 [8.137210]

Replacement in pijul/src/commands/git.rs at line 449 [8.137210]

Replacement in pijul/src/commands/git.rs at line 459 [8.137210]

Insertion in pijul/src/commands/git.rs at line 461 [8.137210]

Replacement in pijul/src/commands/git.rs at line 465 [8.137210]

Replacement in pijul/src/commands/git.rs at line 468 [8.137210]

Insertion in pijul/src/commands/git.rs at line 473 [8.137210]

Replacement in pijul/src/commands/git.rs at line 477 [8.137210]

Replacement in pijul/src/commands/git.rs at line 485 [8.137210]

Replacement in pijul/src/commands/git.rs at line 497 [8.137210]

Insertion in pijul/src/commands/git.rs at line 550 [8.137210]

Replacement in pijul/src/commands/git.rs at line 567 [8.137210]

Replacement in pijul/src/commands/git.rs at line 632 [8.137210]

Replacement in pijul/src/commands/git.rs at line 635 [8.137210]

Replacement in pijul/src/commands/git.rs at line 640 [8.137210]

Replacement in pijul/src/commands/git.rs at line 645 [8.137210]

Replacement in pijul/src/commands/git.rs at line 647 [8.137210]

Replacement in pijul/src/commands/git.rs at line 654 [8.137210]

Insertion in pijul/src/commands/git.rs at line 663 [8.137210]

Replacement in pijul/src/commands/git.rs at line 665 [8.137210]

Insertion in pijul/src/commands/git.rs at line 685 [8.137210]

Replacement in pijul/src/commands/git.rs at line 690 [8.137210]

Replacement in pijul/src/commands/git.rs at line 697 [8.137210]

Replacement in pijul/src/commands/git.rs at line 705 [8.137210]

Replacement in pijul/src/commands/git.rs at line 707 [8.137210]

Replacement in pijul/src/commands/git.rs at line 712 [8.137210]

Replacement in pijul/src/commands/git.rs at line 718 [8.137210]

Replacement in pijul/src/commands/git.rs at line 732 [8.137210]

Insertion in pijul/src/commands/git.rs at line 751 [8.137210]

Replacement in pijul/src/commands/git.rs at line 756 [8.137210]

Replacement in pijul/src/commands/git.rs at line 762 [8.137210]

Replacement in pijul/src/commands/git.rs at line 766 [8.137210]

Replacement in pijul/src/commands/git.rs at line 768 [8.137210]

Replacement in pijul/src/commands/git.rs at line 771 [8.137210]

Replacement in pijul/src/commands/git.rs at line 780 [8.137210]

Replacement in pijul/src/commands/fork.rs at line 31 [8.167873]

Replacement in pijul/src/commands/apply.rs at line 35 [8.194289]

Insertion in pijul/src/commands/apply.rs at line 58 [8.194289]

Insertion in pijul/src/commands/apply.rs at line 61 [8.194289]

Replacement in libpijul/src/lib.rs at line 122 [8.717381]

Replacement in libpijul/src/lib.rs at line 132 [8.717381]

Replacement in libpijul/src/lib.rs at line 142 [8.717381]

Replacement in libpijul/src/lib.rs at line 151 [8.717381]

Replacement in libpijul/src/lib.rs at line 160 [8.717381]

Replacement in libpijul/src/lib.rs at line 390 [8.717381]

Replacement in libpijul/src/apply.rs at line 88 [8.944089]

Deletion in libpijul/src/apply.rs at line 94 [8.944089]