jcdickinson/pijul - Change B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC

Fixing the Git features with the latest Pijul (+ conflicts in Cargo.toml)

Created by pmeunier on January 5, 2021

B3QWIGDERNMB3M6P5WTWP5CN2DB3KCS7MVTEPC2XVJ237ZXVQGMAC

Dependencies

In channels

main

Change contents

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

B:BD[8.146114] → [9.0:79]

B:BD[9.79] → [6.473:537]

∅:D[6.537] → [9.135:187]

B:BD[9.135] → [9.135:187]

                    debug!(
                        "fork channel: {:?} {:?}",
                        MutTxn::name(&parent_channel.borrow()),
                        name
                    );

Replacement in pijul/src/commands/git.rs at line 342 [8.137210]
B:BD[8.148275] → [10.3868:3910]
```
) -> (bool, Vec<(libpijul::Hash, u64)>) {
```
[8.148275]
[8.148327]
```
) -> Result<(bool, Vec<(libpijul::Hash, u64)>), anyhow::Error> {
```

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

B:BD[8.149048] → [8.149048:149112]

            let p_channel = txn.load_channel(&p_name).unwrap();

[8.149048]

[6.538]

            let p_channel = txn.load_channel(&p_name)?.unwrap();

Replacement in pijul/src/commands/git.rs at line 378 [8.137210]
B:BD[8.149661] → [8.149661:149690]
```
    (needs_output, to_apply)
```
[8.149661]
[8.149690]
```
    Ok((needs_output, to_apply))
```

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

B:BD[8.150070] → [8.150070:150152]

    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, channel, dag, oid)?;

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

B:BD[8.150321] → [6.757:886]

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

[8.150321]

[6.886]

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

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

B:BD[8.150512] → [11.92:167]

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

[8.150512]

[8.150581]

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

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

B:BD[8.150649] → [11.168:239]

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

[8.150649]

[8.150714]

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

Replacement in pijul/src/commands/git.rs at line 416 [8.137210]
B:BD[8.151103] → [8.151103:151135]
```
        channel.borrow().name()
```
[8.151103]
[8.151135]
```
        T::name(&channel.borrow()),
```

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

B:BD[8.151569] → [11.240:315]

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

[8.151569]

[8.151638]

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

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

B:BD[8.151772] → [8.151772:151823]

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

[8.151772]

[8.151823]

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

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

B:BD[8.154693] → [8.154693:154875]

                            if let Some(inode) = txn.get_revinodes(vertex, None) {
                                if let Some(old_path) = libpijul::fs::inode_filename(txn, inode) {

[8.154693]

[8.154875]

                            if let Some(inode) = txn.get_revinodes(vertex, None)? {
                                if let Some(old_path) = libpijul::fs::inode_filename(txn, inode)? {

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

[8.155504]

                                        .map(|x| x as char)

Replacement in pijul/src/commands/git.rs at line 582 [8.137210]
B:BD[8.157569] → [8.157569:157612]
```
fn import_commit<T: TxnTExt + MutTxnTExt>(
```
[8.157569]
[8.157612]
```
fn import_commit<T: TxnTExt + MutTxnTExt + GraphIter>(
```

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

B:BD[8.158287] → [12.88:154]

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

[8.158287]

[8.158352]

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

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

B:BD[13.404] → [14.92:153]

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

[13.404]

[13.474]

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

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

B:BD[8.159718] → [11.316:387]

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

[8.159718]

[8.159783]

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

Replacement in pijul/src/commands/git.rs at line 652 [8.137210]
B:BD[8.159934] → [8.159934:159981]
```
        cur.push_str(channel.borrow().name());
```
[8.159934]
[8.159981]
```
        cur.push_str(T::name(&channel.borrow()));
```

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

B:BD[8.159994] → [8.159994:160079]

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

[8.159994]

[8.160079]

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

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

B:BD[8.160168] → [8.160168:160219]

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

[8.160168]

[8.160219]

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

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

B:BD[8.161034] → [8.161034:161102]

        return Ok((0, None, txn.current_state(&channel.borrow())));

[8.161034]

[8.161102]

        return Ok((
            0,
            None,
            txn.current_state(&channel.borrow()).map_err(TxnErr)?,
        ));

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

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

B:BD[8.161262] → [8.161262:161362]

    let (dependencies, extra_known) = libpijul::change::dependencies(txn, channel, actions.iter());

[8.161262]

[8.161362]

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

Replacement in pijul/src/commands/git.rs at line 722 [8.137210]
B:BD[8.161532] → [8.161532:161539]
```
    );
```
[8.161532]
[8.161539]
```
    )?;
```
Insertion in pijul/src/commands/clone.rs at line 62 [8.182891]
[5.131]
[5.131]
```
            std::process::exit(130)
```

Replacement in pijul/src/commands/clone.rs at line 110 [8.182891]

B:BD[8.185859] → [2.0:56]

        repo.config.default_remote = Some(self.remote);

[8.185859]

        if let crate::remote::RemoteRepo::Local(ref l) = remote {
            repo.config.default_remote = std::fs::canonicalize(&l.root)?
                .to_str()
                .map(|x| x.to_string());
        } else {
            repo.config.default_remote = Some(self.remote);
        }

Replacement in pijul/Cargo.toml at line 50 [8.196374]

B:BD[8.197438] → [15.19486:19554]

B:BD[8.197456] → [7.4:93]

BD:BD[8.197456] → [7.4:93]

libpijul = { version = "1.0.0-alpha.23", features = [ "tarball" ] }
libpijul = { path = "../libpijul", version = "1.0.0-alpha.6", features = [ "tarball" ] }

[8.197438]

[8.197523]

libpijul = { path = "../libpijul", version = "1.0.0-alpha.26", features = [ "tarball" ] }

Replacement in libpijul/Cargo.toml at line 106 [8.1020742]
B:BD[8.1023195] → [15.138461:138484]
B:BD[8.1023195] → [7.96:159]
```
pijul-macros = "0.3.0"
pijul-macros = { path = "../pijul-macros", version = "0.1.0" }
```
[8.1023195]
[8.1023218]
```
pijul-macros = { path = "../pijul-macros", version = "0.3.0" }
```
Deletion in libpijul/Cargo.toml at line 124 [8.1020742]
B:BD[8.1023723] → [16.8134:8167]
```
env_logger = "0.8"
anyhow = "1.0"
```
Insertion in libpijul/Cargo.toml at line 125 [8.1020742]
[7.179]
```
anyhow = "1.0"
```

Insertion in Cargo.nix at line 907 [17.12]

[17.33099]

      };
      "ctrlc" = rec {
        crateName = "ctrlc";
        version = "3.1.7";
        edition = "2015";
        sha256 = "027bzbddk0wg7s2wnbgcwx2iv6bjzvxfpp0s2xdg444yfklr4ymm";
        authors = [
          "Antti Keränen <detegr@gmail.com>"
        ];
        dependencies = [
          {
            name = "nix";
            packageId = "nix";
            target = { target, features }: target."unix";
          }
          {
            name = "winapi";
            packageId = "winapi 0.3.9";
            target = { target, features }: target."windows";
            features = [ "consoleapi" "handleapi" "synchapi" "winbase" ];
          }
        ];
        devDependencies = [
          {
            name = "winapi";
            packageId = "winapi 0.3.9";
            target = {target, features}: target."windows";
            features = [ "fileapi" "processenv" "winnt" ];
          }
        ];
        features = {
        };

Replacement in Cargo.nix at line 2685 [17.12]

B:BD[17.82372] → [17.82372:82435]

        resolvedDefaultFeatures = [ "align" "default" "std" ];

[17.82372]

[17.82435]

        resolvedDefaultFeatures = [ "align" "default" "extra_traits" "std" ];

Replacement in Cargo.nix at line 2741 [17.12]
B:BD[17.84748] → [4.1300:1336]
```
        version = "1.0.0-alpha.25";
```
[17.84748]
[17.84783]
```
        version = "1.0.0-alpha.26";
```

Insertion in Cargo.nix at line 3453 [17.12]

[17.103471]

      };
      "nix" = rec {
        crateName = "nix";
        version = "0.18.0";
        edition = "2018";
        sha256 = "0m8h9bskjjqx9sk687z8bxqg2kpwhdh78jq6zfaxsb8llvk0yic3";
        authors = [
          "The nix-rust Project Developers"
        ];
        dependencies = [
          {
            name = "bitflags";
            packageId = "bitflags";
          }
          {
            name = "cfg-if";
            packageId = "cfg-if 0.1.10";
          }
          {
            name = "libc";
            packageId = "libc";
            features = [ "extra_traits" ];
          }
        ];
        buildDependencies = [
          {
            name = "cc";
            packageId = "cc";
            target = {target, features}: (target."os" == "dragonfly");
          }
        ];

Insertion in Cargo.nix at line 3911 [17.12]

[17.115481]

            name = "ctrlc";
            packageId = "ctrlc";
          }
          {

Deletion in Cargo.nix at line 4011 [17.12]

B:BD[17.117409] → [17.117409:117476]

B:BD[17.117569] → [17.117569:117593]

            name = "tempfile";
            packageId = "tempfile";
          }
          {

Replacement in Cargo.nix at line 4997 [17.12]
B:BD[17.144463] → [4.4558:4586]
```
        version = "0.15.3";
```
[17.144463]
[17.144491]
```
        version = "0.15.4";
```

Replacement in Cargo.nix at line 4999 [17.12]

B:BD[17.144517] → [4.4587:4660]

        sha256 = "0rcpwm99rx7rbgp5590m8j619wm483hqm0zw6x7j304wwy9ac9kq";

[17.144517]

[17.144590]

        sha256 = "036mf8yrjb6lrissihvzib0syf020hfflral5z8srxli3hzi9qp2";

Insertion in Cargo.nix at line 5036 [17.12]

[17.145279]

          {
            name = "thiserror";
            packageId = "thiserror";
          }

Replacement in Cargo.lock at line 997 [8.1030385]
B:BD[8.1055747] → [18.432:447]
```
 "rand 0.8.0",
```
[8.1055747]
[8.1055756]
```
 "rand 0.8.1",
```
Replacement in Cargo.lock at line 1404 [8.1030385]
B:BD[19.1067] → [3.67750:67765]
```
 "rand 0.8.0",
```
[19.1067]
[8.1064359]
```
 "rand 0.8.1",
```
Replacement in Cargo.lock at line 1570 [8.1030385]
B:BD[18.603] → [18.603:621]
```
version = "0.8.0"
```
[18.603]
[18.621]
```
version = "0.8.1"
```

Replacement in Cargo.lock at line 1572 [8.1030385]

B:BD[18.686] → [18.686:764]

checksum = "a76330fb486679b4ace3670f117bbc9e16204005c4bde9c4bd372f45bed34f12"

[18.686]

[18.764]

checksum = "c24fcd450d3fa2b592732565aa4f17a27a61c65ece4726353e000939b0edee34"

Replacement in Cargo.lock at line 1576 [8.1030385]
B:BD[18.812] → [18.812:832]
```
 "rand_core 0.6.0",
```
[18.812]
[18.832]
```
 "rand_core 0.6.1",
```
Replacement in Cargo.lock at line 1597 [8.1030385]
B:BD[18.1100] → [18.1100:1120]
```
 "rand_core 0.6.0",
```
[18.1100]
[8.1068575]
```
 "rand_core 0.6.1",
```
Replacement in Cargo.lock at line 1611 [8.1030385]
B:BD[18.1162] → [18.1162:1180]
```
version = "0.6.0"
```
[18.1162]
[18.1180]
```
version = "0.6.1"
```

Replacement in Cargo.lock at line 1613 [8.1030385]

B:BD[18.1245] → [18.1245:1323]

checksum = "a8b34ba8cfb21243bd8df91854c830ff0d785fff2e82ebd4434c2644cb9ada18"

[18.1245]

[18.1323]

checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5"

Replacement in Cargo.lock at line 1633 [8.1030385]
B:BD[18.1606] → [18.1606:1626]
```
 "rand_core 0.6.0",
```
[18.1606]
[8.1069025]
```
 "rand_core 0.6.1",
```
Replacement in Cargo.lock at line 1770 [8.1030385]
B:BD[8.1072363] → [18.1748:1763]
```
 "rand 0.8.0",
```
[8.1072363]
[6.1128]
```
 "rand 0.8.1",
```

Fixing the Git features with the latest Pijul (+ conflicts in Cargo.toml)

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Insertion in pijul/src/commands/clone.rs at line 62 [8.182891]

Replacement in pijul/src/commands/clone.rs at line 110 [8.182891]

Replacement in pijul/Cargo.toml at line 50 [8.196374]

Replacement in libpijul/Cargo.toml at line 106 [8.1020742]

Deletion in libpijul/Cargo.toml at line 124 [8.1020742]

Insertion in libpijul/Cargo.toml at line 125 [8.1020742]

Insertion in Cargo.nix at line 907 [17.12]

Replacement in Cargo.nix at line 2685 [17.12]

Replacement in Cargo.nix at line 2741 [17.12]

Insertion in Cargo.nix at line 3453 [17.12]

Insertion in Cargo.nix at line 3911 [17.12]

Deletion in Cargo.nix at line 4011 [17.12]

Replacement in Cargo.nix at line 4997 [17.12]

Replacement in Cargo.nix at line 4999 [17.12]

Insertion in Cargo.nix at line 5036 [17.12]

Replacement in Cargo.lock at line 997 [8.1030385]

Replacement in Cargo.lock at line 1404 [8.1030385]

Replacement in Cargo.lock at line 1570 [8.1030385]

Replacement in Cargo.lock at line 1572 [8.1030385]

Replacement in Cargo.lock at line 1576 [8.1030385]

Replacement in Cargo.lock at line 1597 [8.1030385]

Replacement in Cargo.lock at line 1611 [8.1030385]

Replacement in Cargo.lock at line 1613 [8.1030385]

Replacement in Cargo.lock at line 1633 [8.1030385]

Replacement in Cargo.lock at line 1770 [8.1030385]