diff --git a/Cargo.lock b/Cargo.lock index 0663a5b..089b314 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,12 +52,12 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.52" +version = "0.3.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f813291114c186a042350e787af10c26534601062603d888be110f59f85ef8fa" +checksum = "707b586e0e2f247cbde68cdd2c3ce69ea7b7be43e1c5b426e37c9319c4b9838e" dependencies = [ "addr2line", - "cfg-if", + "cfg-if 1.0.0", "libc", "miniz_oxide", "object", @@ -97,6 +97,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "chrono" version = "0.4.19" @@ -125,15 +131,6 @@ dependencies = [ "vec_map", ] -[[package]] -name = "cmake" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e56268c17a6248366d66d4a47a3381369d068cce8409bb1716ed77ea32163bb" -dependencies = [ - "cc", -] - [[package]] name = "console" version = "0.11.3" @@ -180,7 +177,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -189,7 +186,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -225,7 +222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", "lazy_static", "maybe-uninit", @@ -239,7 +236,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", "maybe-uninit", ] @@ -251,7 +248,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] @@ -340,10 +337,9 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da80be589a72651dcda34d8b35bcdc9b7254ad06325611074d9cc0fbb19f60ee" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crc32fast", "libc", - "libz-sys", "miniz_oxide", ] @@ -369,7 +365,7 @@ version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] @@ -400,7 +396,7 @@ dependencies = [ [[package]] name = "hg-git-fast-import" -version = "1.3.6" +version = "1.3.7" dependencies = [ "dialoguer", "exitfailure", @@ -421,9 +417,9 @@ dependencies = [ [[package]] name = "hg-parser" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50a078ffa5ba541857886cd58b7dd47d3ed468189493a261f77a3393267a88d7" +checksum = "7ef762f4df8e61b82f9577c5dcd52f289074ca025cab09216ade032acfa22d25" dependencies = [ "bitflags", "byteorder", @@ -483,19 +479,6 @@ version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743" -[[package]] -name = "libz-sys" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655" -dependencies = [ - "cc", - "cmake", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "linked-hash-map" version = "0.5.3" @@ -508,7 +491,7 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -598,9 +581,9 @@ checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" [[package]] name = "object" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" +checksum = "37fd5004feb2ce328a52b0b3d01dbf4ffff72583493900ed15f22d4111c51693" [[package]] name = "opaque-debug" @@ -628,12 +611,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "pkg-config" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" - [[package]] name = "ppv-lite86" version = "0.2.9" @@ -832,7 +809,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770" dependencies = [ "block-buffer", - "cfg-if", + "cfg-if 0.1.10", "cpuid-bool", "digest", "opaque-debug", @@ -887,9 +864,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.42" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c51d92969d209b54a98397e1b91c8ae82d8c87a7bb87df0b29aa2ad81454228" +checksum = "e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd" dependencies = [ "proc-macro2", "quote", @@ -914,7 +891,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "rand", "redox_syscall", @@ -981,9 +958,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645" dependencies = [ "serde", ] @@ -1012,12 +989,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" -[[package]] -name = "vcpkg" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" - [[package]] name = "vec_map" version = "0.8.2" diff --git a/Cargo.toml b/Cargo.toml index b259c25..cda18f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hg-git-fast-import" -version = "1.3.6" +version = "1.3.7" authors = ["Alexander Korolev "] license = "Unlicense OR MIT" description = """ @@ -23,7 +23,7 @@ regex = "1" lazy_static = "1" toml = "0.5" structopt = "0.3" -hg-parser = "0.4" +hg-parser = "0.5" ordered-parallel-iterator = "0.1" indicatif = "0.15" dialoguer = "0.6" diff --git a/README.md b/README.md index 1476c55..2427700 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ With Snap (*): ```bash $ hg-git-fast-import --help -hg-git-fast-import 1.3.6 +hg-git-fast-import 1.3.7 Alexander Korolev A utility to import single and multiple Mercurial repositories to Git. @@ -71,7 +71,7 @@ Import of single repository: ```bash $ hg-git-fast-import single --help -hg-git-fast-import-single 1.3.6 +hg-git-fast-import-single 1.3.7 Alexander Korolev Exports single Mercurial repository to Git fast-import compatible format @@ -108,7 +108,7 @@ Import of multiple repositories: ```bash $ hg-git-fast-import multi --help -hg-git-fast-import-multi 1.3.6 +hg-git-fast-import-multi 1.3.7 Alexander Korolev Exports multiple Mercurial repositories to single Git repo in fast-import compatible format @@ -139,7 +139,7 @@ Rebuild saved state of repo: ```bash $ hg-git-fast-import build-marks --help -hg-git-fast-import-build-marks 1.3.6 +hg-git-fast-import-build-marks 1.3.7 Alexander Korolev Rebuilds saved state of repo diff --git a/snapcraft.yaml b/snapcraft.yaml index 1fc4063..cf5d424 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,5 +1,5 @@ name: hg-git-fast-import -version: '1.3.6' +version: '1.3.7' summary: A utility to import single and multiple Mercurial repositories to Git description: | Features: diff --git a/src/lib.rs b/src/lib.rs index e45930a..173e3ff 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -35,7 +35,7 @@ cargo install --path . ```bash $ hg-git-fast-import --help -hg-git-fast-import 1.3.6 +hg-git-fast-import 1.3.7 Alexander Korolev A utility to import single and multiple Mercurial repositories to Git. @@ -57,7 +57,7 @@ Import of single repository: ```bash $ hg-git-fast-import single --help -hg-git-fast-import-single 1.3.6 +hg-git-fast-import-single 1.3.7 Alexander Korolev Exports single Mercurial repository to Git fast-import compatible format @@ -94,7 +94,7 @@ Import of multiple repositories: ```bash $ hg-git-fast-import multi --help -hg-git-fast-import-multi 1.3.6 +hg-git-fast-import-multi 1.3.7 Alexander Korolev Exports multiple Mercurial repositories to single Git repo in fast-import compatible format @@ -125,7 +125,7 @@ Rebuild saved state of repo: ```bash $ hg-git-fast-import build-marks --help -hg-git-fast-import-build-marks 1.3.6 +hg-git-fast-import-build-marks 1.3.7 Alexander Korolev Rebuilds saved state of repo