Merge branch 'develop'

Release v0.7.11
release-script: Fix missing newline
2022-12-12 13:53:02 +01:00 · 2022-12-12 13:53:02 +01:00 · 2022-12-12 13:43:34 +01:00 · 2022-10-10 18:50:40 +02:00 · 2022-10-10 18:50:40 +02:00 · 2022-10-10 18:06:27 +02:00
11 changed files with 112 additions and 133 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3

 [[package]]
 name = "aho-corasick"
-version = "0.7.18"
+version = "0.7.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
 dependencies = [
 "memchr",
 ]
@@ -80,26 +80,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "clap"
-version = "3.2.18"
+version = "4.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15f2ea93df33549dbe2e8eecd1ca55269d63ae0b3ba1f55db030817d1c2867f"
+checksum = "4ed45cc2c62a3eff523e718d8576ba762c83a3146151093283ac62ae11933a73"
 dependencies = [
 "atty",
 "bitflags",
 "clap_derive",
 "clap_lex",
- "indexmap",
 "once_cell",
 "strsim",
 "termcolor",
- "textwrap",
 ]

 [[package]]
 name = "clap_derive"
-version = "3.2.18"
+version = "4.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+checksum = "db342ce9fda24fb191e2ed4e102055a4d381c1086a06630174cd8da8d5d917ce"
 dependencies = [
 "heck",
 "proc-macro-error",
@@ -110,9 +108,9 @@ dependencies = [

 [[package]]
 name = "clap_lex"
-version = "0.2.4"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
 dependencies = [
 "os_str_bytes",
 ]
@@ -140,13 +138,13 @@ dependencies = [

 [[package]]
 name = "console"
-version = "0.15.1"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847"
+checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c"
 dependencies = [
 "encode_unicode",
+ "lazy_static",
 "libc",
- "once_cell",
 "terminal_size",
 "unicode-width",
 "winapi",
@@ -154,12 +152,11 @@ dependencies = [

 [[package]]
 name = "crossbeam-utils"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
+checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
 dependencies = [
 "cfg-if",
- "once_cell",
 ]

 [[package]]
@@ -276,11 +273,10 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

 [[package]]
 name = "form_urlencoded"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
 dependencies = [
- "matches",
 "percent-encoding",
 ]

@@ -330,7 +326,7 @@ dependencies = [

 [[package]]
 name = "git-repo-manager"
-version = "0.7.7"
+version = "0.7.11"
 dependencies = [
 "clap",
 "comfy-table",
@@ -397,11 +393,10 @@ dependencies = [

 [[package]]
 name = "idna"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
 dependencies = [
- "matches",
 "unicode-bidi",
 "unicode-normalization",
 ]
@@ -456,15 +451,15 @@ dependencies = [

 [[package]]
 name = "itoa"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"

 [[package]]
 name = "jobserver"
-version = "0.1.24"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
+checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
 dependencies = [
 "libc",
 ]
@@ -477,9 +472,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.132"
+version = "0.2.135"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"

 [[package]]
 name = "libgit2-sys"
@@ -533,9 +528,9 @@ dependencies = [

 [[package]]
 name = "lock_api"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 dependencies = [
 "autocfg",
 "scopeguard",
@@ -550,12 +545,6 @@ dependencies = [
 "cfg-if",
 ]

-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
 [[package]]
 name = "memchr"
 version = "2.5.0"
@@ -582,9 +571,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.13.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"

 [[package]]
 name = "openssl-probe"
@@ -603,9 +592,9 @@ dependencies = [

 [[package]]
 name = "openssl-sys"
-version = "0.9.75"
+version = "0.9.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f"
+checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce"
 dependencies = [
 "autocfg",
 "cc",
@@ -663,9 +652,9 @@ dependencies = [

 [[package]]
 name = "percent-encoding"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"

 [[package]]
 name = "pin-project"
@@ -739,9 +728,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.43"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
 dependencies = [
 "unicode-ident",
 ]
@@ -868,18 +857,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

 [[package]]
 name = "serde"
-version = "1.0.144"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
+checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.144"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
+checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -888,9 +877,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
+checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074"
 dependencies = [
 "itoa",
 "ryu",
@@ -899,9 +888,9 @@ dependencies = [

 [[package]]
 name = "serde_yaml"
-version = "0.9.10"
+version = "0.9.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a09f551ccc8210268ef848f0bab37b306e87b85b2e017b899e7fb815f5aed62"
+checksum = "8613d593412a0deb7bbd8de9d908efff5a0cb9ccd8f62c641e7b2ed2f57291d1"
 dependencies = [
 "indexmap",
 "itoa",
@@ -971,15 +960,15 @@ dependencies = [

 [[package]]
 name = "smallvec"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"

 [[package]]
 name = "socket2"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10c98bba371b9b22a71a9414e420f92ddeb2369239af08200816169d5e2dd7aa"
+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
 dependencies = [
 "libc",
 "winapi",
@@ -1012,9 +1001,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.99"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1050,26 +1039,20 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "textwrap"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
-
 [[package]]
 name = "thiserror"
-version = "1.0.32"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994"
+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.32"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21"
+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1102,9 +1085,9 @@ dependencies = [

 [[package]]
 name = "tracing"
-version = "0.1.36"
+version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
 "cfg-if",
 "log",
@@ -1115,9 +1098,9 @@ dependencies = [

 [[package]]
 name = "tracing-attributes"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
+checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1126,9 +1109,9 @@ dependencies = [

 [[package]]
 name = "tracing-core"
-version = "0.1.29"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
 dependencies = [
 "once_cell",
 ]
@@ -1151,40 +1134,39 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"

 [[package]]
 name = "unicode-ident"
-version = "1.0.3"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"

 [[package]]
 name = "unicode-normalization"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 dependencies = [
 "tinyvec",
 ]

 [[package]]
 name = "unicode-width"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"

 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.2"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "931179334a56395bcf64ba5e0ff56781381c1a5832178280c7d7f91d1679aeb0"
+checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68"

 [[package]]
 name = "url"
-version = "2.2.2"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
 dependencies = [
 "form_urlencoded",
 "idna",
- "matches",
 "percent-encoding",
 ]

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "git-repo-manager"
-version = "0.7.7"
+version = "0.7.11"
 edition = "2021"

 authors = [
@@ -44,7 +44,7 @@ path = "src/grm/main.rs"
 version = "=0.5.9"

 [dependencies.serde]
-version = "=1.0.144"
+version = "=1.0.145"
 features = ["derive"]

 [dependencies.git2]
@@ -54,11 +54,11 @@ version = "=0.15.0"
 version = "=2.1.2"

 [dependencies.clap]
-version = "=3.2.18"
+version = "=4.0.11"
 features = ["derive", "cargo"]

 [dependencies.console]
-version = "=0.15.1"
+version = "=0.15.2"

 [dependencies.regex]
 version = "=1.6.0"
@@ -67,10 +67,10 @@ version = "=1.6.0"
 version = "=6.1.0"

 [dependencies.serde_yaml]
-version = "=0.9.10"
+version = "=0.9.13"

 [dependencies.serde_json]
-version = "=1.0.85"
+version = "=1.0.86"

 [dependencies.isahc]
 version = "=1.7.2"
--- a/2
+++ b/2
@@ -1,5 +1,7 @@
 set positional-arguments

+set shell := ["/bin/bash", "-c"]
+
 static_target := "x86_64-unknown-linux-musl"

 check: fmt-check lint test
--- a/e2e_tests/helpers.py
+++ b/e2e_tests/helpers.py
@@ -28,7 +28,7 @@ def get_temporary_directory(dir=None):
 def grm(args, cwd=None, is_invalid=False):
    cmd = subprocess.run([binary] + args, cwd=cwd, capture_output=True, text=True)
    if not is_invalid:
-        assert "USAGE" not in cmd.stderr
+        assert "usage" not in cmd.stderr.lower()
    print(f"grmcmd: {args}")
    print(f"stdout:\n{cmd.stdout}")
    print(f"stderr:\n{cmd.stderr}")
--- a/e2e_tests/test_basic.py
+++ b/e2e_tests/test_basic.py
@@ -5,9 +5,9 @@ from helpers import *

 def test_invalid_command():
    cmd = grm(["whatever"], is_invalid=True)
-    assert "USAGE" in cmd.stderr
+    assert "usage" in cmd.stderr.lower()


 def test_help():
    cmd = grm(["--help"])
-    assert "USAGE" in cmd.stdout
+    assert "usage" in cmd.stdout.lower()
--- a/release.sh
+++ b/release.sh
@@ -67,7 +67,7 @@ fi

 for remote in $(git remote); do
    if git ls-remote --tags "${remote}" | grep -q "refs/tags/v${new_version}$"; then
-        printf 'Tag %s already exists on %s' "v${new_version}" "${remote}" >&2
+        printf 'Tag %s already exists on %s\n' "v${new_version}" "${remote}" >&2
        exit 1
    fi
 done
--- a/src/config.rs
+++ b/src/config.rs
@@ -52,7 +52,6 @@ pub struct ConfigProvider {
    pub api_url: Option<String>,

    pub worktree: Option<bool>,
-    pub init_worktree: Option<bool>,

    pub remote_name: Option<String>,
 }
--- a/src/grm/cmd.rs
+++ b/src/grm/cmd.rs
@@ -1,4 +1,4 @@
-use clap::{AppSettings, Parser};
+use clap::Parser;

 #[derive(Parser)]
 #[clap(
@@ -7,7 +7,6 @@ use clap::{AppSettings, Parser};
    author = clap::crate_authors!("\n"),
    about = clap::crate_description!(),
    long_version = clap::crate_version!(),
-    global_setting(AppSettings::DeriveDisplayOrder),
    propagate_version = true,
 )]
 pub struct Opts {
@@ -65,7 +64,7 @@ pub struct FindLocalArgs {
    pub path: String,

    #[clap(
-        arg_enum,
+        value_enum,
        short,
        long,
        help = "Format to produce",
@@ -85,7 +84,7 @@ pub struct FindConfigArgs {
    pub config: String,

    #[clap(
-        arg_enum,
+        value_enum,
        short,
        long,
        help = "Format to produce",
@@ -100,14 +99,14 @@ pub struct FindRemoteArgs {
    #[clap(short, long, help = "Path to the configuration file")]
    pub config: Option<String>,

-    #[clap(arg_enum, short, long, help = "Remote provider to use")]
+    #[clap(value_enum, short, long, help = "Remote provider to use")]
    pub provider: RemoteProvider,

    #[clap(short, long, help = "Name of the remote to use")]
    pub remote_name: Option<String>,

    #[clap(
-        multiple_occurrences = true,
+        action = clap::ArgAction::Append,
        name = "user",
        long,
        help = "Users to get repositories from"
@@ -115,7 +114,7 @@ pub struct FindRemoteArgs {
    pub users: Vec<String>,

    #[clap(
-        multiple_occurrences = true,
+        action = clap::ArgAction::Append,
        name = "group",
        long,
        help = "Groups to get repositories from"
@@ -138,7 +137,7 @@ pub struct FindRemoteArgs {
    pub root: String,

    #[clap(
-        arg_enum,
+        value_enum,
        short,
        long,
        help = "Format to produce",
@@ -149,11 +148,10 @@ pub struct FindRemoteArgs {
    #[clap(
        long,
        help = "Use worktree setup for repositories",
-        possible_values = &["true", "false"],
+        value_parser = ["true", "false"],
        default_value = "false",
        default_missing_value = "true",
-        min_values = 0,
-        max_values = 1,
+        num_args = 0..=1,
    )]
    pub worktree: String,

@@ -174,12 +172,11 @@ pub struct Config {

    #[clap(
        long,
+        value_parser = ["true", "false"],
        help = "Check out the default worktree after clone",
-        possible_values = &["true", "false"],
        default_value = "true",
        default_missing_value = "true",
-        min_values = 0,
-        max_values = 1,
+        num_args = 0..=1,
    )]
    pub init_worktree: String,
 }
@@ -189,14 +186,14 @@ pub type RemoteProvider = super::provider::RemoteProvider;
 #[derive(Parser)]
 #[clap()]
 pub struct SyncRemoteArgs {
-    #[clap(arg_enum, short, long, help = "Remote provider to use")]
+    #[clap(value_enum, short, long, help = "Remote provider to use")]
    pub provider: RemoteProvider,

    #[clap(short, long, help = "Name of the remote to use")]
    pub remote_name: Option<String>,

    #[clap(
-        multiple_occurrences = true,
+        action = clap::ArgAction::Append,
        name = "user",
        long,
        help = "Users to get repositories from"
@@ -204,7 +201,7 @@ pub struct SyncRemoteArgs {
    pub users: Vec<String>,

    #[clap(
-        multiple_occurrences = true,
+        action = clap::ArgAction::Append,
        name = "group",
        long,
        help = "Groups to get repositories from"
@@ -229,11 +226,10 @@ pub struct SyncRemoteArgs {
    #[clap(
        long,
        help = "Use worktree setup for repositories",
-        possible_values = &["true", "false"],
+        value_parser = ["true", "false"],
        default_value = "false",
        default_missing_value = "true",
-        min_values = 0,
-        max_values = 1,
+        num_args = 0..=1,
    )]
    pub worktree: String,

@@ -243,11 +239,10 @@ pub struct SyncRemoteArgs {
    #[clap(
        long,
        help = "Check out the default worktree after clone",
-        possible_values = &["true", "false"],
+        value_parser = ["true", "false"],
        default_value = "true",
        default_missing_value = "true",
-        min_values = 0,
-        max_values = 1,
+        num_args = 0..=1,
    )]
    pub init_worktree: String,
 }
@@ -259,7 +254,7 @@ pub struct OptionalConfig {
    pub config: Option<String>,
 }

-#[derive(clap::ArgEnum, Clone)]
+#[derive(clap::ValueEnum, Clone)]
 pub enum ConfigFormat {
    Yaml,
    Toml,
@@ -299,7 +294,7 @@ pub struct WorktreeAddArgs {
    #[clap(short = 't', long = "track", help = "Remote branch to track")]
    pub track: Option<String>,

-    #[clap(long = "--no-track", help = "Disable tracking")]
+    #[clap(long = "no-track", help = "Disable tracking")]
    pub no_track: bool,
 }
 #[derive(Parser)]
@@ -328,22 +323,19 @@ pub struct WorktreeFetchArgs {}

 #[derive(Parser)]
 pub struct WorktreePullArgs {
-    #[clap(long = "--rebase", help = "Perform a rebase instead of a fast-forward")]
+    #[clap(long = "rebase", help = "Perform a rebase instead of a fast-forward")]
    pub rebase: bool,
-    #[clap(long = "--stash", help = "Stash & unstash changes before & after pull")]
+    #[clap(long = "stash", help = "Stash & unstash changes before & after pull")]
    pub stash: bool,
 }

 #[derive(Parser)]
 pub struct WorktreeRebaseArgs {
-    #[clap(long = "--pull", help = "Perform a pull before rebasing")]
+    #[clap(long = "pull", help = "Perform a pull before rebasing")]
    pub pull: bool,
-    #[clap(long = "--rebase", help = "Perform a rebase when doing a pull")]
+    #[clap(long = "rebase", help = "Perform a rebase when doing a pull")]
    pub rebase: bool,
-    #[clap(
-        long = "--stash",
-        help = "Stash & unstash changes before & after rebase"
-    )]
+    #[clap(long = "stash", help = "Stash & unstash changes before & after rebase")]
    pub stash: bool,
 }

--- a/src/provider/mod.rs
+++ b/src/provider/mod.rs
@@ -16,7 +16,7 @@ use std::collections::HashMap;

 const DEFAULT_REMOTE_NAME: &str = "origin";

-#[derive(Debug, Deserialize, Serialize, clap::ArgEnum, Clone)]
+#[derive(Debug, Deserialize, Serialize, clap::ValueEnum, Clone)]
 pub enum RemoteProvider {
    #[serde(alias = "github", alias = "GitHub")]
    Github,
--- a/src/table.rs
+++ b/src/table.rs
@@ -185,7 +185,11 @@ pub fn get_status_table(config: config::Config) -> Result<(Vec<Table>, Vec<Strin
                }
            };

-            add_repo_status(&mut table, &repo.name, &repo_handle, repo.worktree_setup)?;
+            if let Err(err) =
+                add_repo_status(&mut table, &repo.name, &repo_handle, repo.worktree_setup)
+            {
+                errors.push(format!("{}: Couldn't add repo status: {}", &repo.name, err));
+            }
        }

        tables.push(table);
--- a/src/worktree.rs
+++ b/src/worktree.rs
@@ -372,7 +372,7 @@ impl<'a> Worktree<'a, WithRemoteTrackingBranch<'a>> {
                // TECHDEBT
                // We must not call this with `Some()` without a valid target.
                // I'm sure this can be improved, just not sure how.
-                &*self.extra.target_commit.unwrap(),
+                &self.extra.target_commit.unwrap(),
            )?
        };
Author	SHA1	Message	Date
Hannes Körber	6da27c6444	Merge branch 'develop'	2022-12-12 13:53:02 +01:00
Hannes Körber	3026b3e6de	Release v0.7.11	2022-12-12 13:53:02 +01:00
Hannes Körber	725414cc71	release-script: Fix missing newline	2022-12-12 13:43:34 +01:00
Hannes Körber	defb8fafca	Merge branch 'develop'	2022-10-10 18:50:40 +02:00
Hannes Körber	f747c085c9	Release v0.7.10	2022-10-10 18:50:40 +02:00
Hannes Körber	85dd794b53	Cargo.lock: Updating tracing v0.1.36 -> v0.1.37	2022-10-10 18:06:27 +02:00
Hannes Körber	be8d85cb66	dependencies: Update serde_json to 1.0.86	2022-10-10 18:06:25 +02:00
Hannes Körber	0b7527fc7d	dependencies: Update clap to 4.0.11	2022-10-10 18:06:25 +02:00
Hannes Körber	3a568a774a	Remove init_worktree from sync config It was currently unused and only confuses. The initialization of worktrees can currently only be controlled via the `--init-worktree` command line switch. This is unfortunate, but it's the only was to handle it right now. Changing it would mean a restructure of the code, mainly the `tree::sync_trees` function.	2022-10-06 12:59:56 +02:00
Hannes Körber	a6ecb66547	Merge branch 'develop'	2022-10-06 12:38:32 +02:00
Hannes Körber	8a04db8130	Release v0.7.9	2022-10-06 12:38:32 +02:00
Hannes Körber	d5bbbe6171	just: Use bash explicitly	2022-10-06 12:28:20 +02:00
Hannes Körber	c6a27525fd	Remove unnecessary deref	2022-10-06 12:20:30 +02:00
Hannes Körber	5880066531	cli: Update code for clap v4	2022-10-06 12:17:26 +02:00
Hannes Körber	918b63047b	Cargo.lock: Updating thiserror v1.0.35 -> v1.0.37	2022-10-06 11:36:53 +02:00
Hannes Körber	0fa2a65c81	Cargo.lock: Updating openssl-sys v0.9.75 -> v0.9.76	2022-10-06 11:36:52 +02:00
Hannes Körber	87d5b7ad85	Cargo.lock: Updating crossbeam-utils v0.8.11 -> v0.8.12	2022-10-06 11:36:50 +02:00
Hannes Körber	7db3596302	Cargo.lock: Updating smallvec v1.9.0 -> v1.10.0	2022-10-06 11:36:49 +02:00
Hannes Körber	e65c744f9c	Cargo.lock: Updating jobserver v0.1.24 -> v0.1.25	2022-10-06 11:36:48 +02:00
Hannes Körber	bd79602d3a	dependencies: Update console to 0.15.2	2022-10-06 11:36:47 +02:00
Hannes Körber	6e876aaefc	dependencies: Update clap to 4.0.10	2022-10-06 11:36:47 +02:00
Hannes Körber	04753e8d9c	Merge branch 'develop'	2022-09-23 07:19:03 +02:00
Hannes Körber	5811476e27	Release v0.7.8	2022-09-23 07:19:03 +02:00
Hannes Körber	5ac814b857	Cargo.lock: Updating idna v0.2.3 -> v0.3.0	2022-09-23 07:05:43 +02:00
Hannes Körber	3a87772606	Cargo.lock: Updating form_urlencoded v1.0.1 -> v1.1.0	2022-09-23 07:05:40 +02:00
Hannes Körber	001911bed9	Cargo.lock: Updating thiserror v1.0.32 -> v1.0.35	2022-09-23 07:05:37 +02:00
Hannes Körber	d1d729c33d	Cargo.lock: Updating socket2 v0.4.6 -> v0.4.7	2022-09-23 07:05:35 +02:00
Hannes Körber	b4cabae4ec	Cargo.lock: Updating lock_api v0.4.8 -> v0.4.9	2022-09-23 07:05:33 +02:00
Hannes Körber	196bbeb2c2	Cargo.lock: Updating aho-corasick v0.7.18 -> v0.7.19	2022-09-23 07:05:30 +02:00
Hannes Körber	4d60012f44	dependencies: Update serde_yaml to 0.9.13	2022-09-23 07:05:30 +02:00
Hannes Körber	b2f413b033	dependencies: Update clap to 3.2.22	2022-09-23 07:05:30 +02:00
Hannes Körber	c25bb8bf55	dependencies: Update serde to 1.0.145	2022-09-23 07:05:30 +02:00
Hannes Körber	3b923e3e13	Merge pull request #44 from vrischmann/name-in-error catch the error returned by add_repo_status	2022-09-23 07:03:40 +02:00
Vincent Rischmann	061265bbd0	catch the error returned by add_repo_status If add_repo_status returns an error it will eventually be printed to the user but there won't be any repository information: [✘] Error getting status: No branch checked out Catch the error earlier so we can print the repository name: [✘] Error: freebsd-src: Couldn't add repo status: No branch checked out	2022-09-22 21:10:16 +02:00