5af8f70 cli: Fix `rev` argument parsing — heartwood

Radicle Heartwood Protocol & Stack

cli: Fix `rev` argument parsing

cloudhead committed 2 years ago

commit 5af8f706655c4e8c18fcf80e3c0818b6c9305247
parent 8196027f3528e344df19253c3fb643b02d51440e

3 files changed +11 -11

modified radicle-cli/src/commands/issue.rs

@@ -269,7 +269,7 @@ impl Args for Options {

                 }
                 Long("reply-to") if op == Some(OperationName::Comment) => {
                     let val = parser.value()?;
                     let rev = term::args::oid(&val)?;
                     let rev = term::args::rev(&val)?;
                     reply_to = Some(rev);
                 }

@@ -321,7 +321,7 @@ impl Args for Options {

                     unknown => anyhow::bail!("unknown operation '{}'", unknown),
                 },
                 Value(val) if op.is_some() => {
                     let val = term::args::oid(&val)?;
                     let val = term::args::rev(&val)?;
                     id = Some(val);
                 }
                 _ => {

modified radicle-cli/src/commands/patch.rs

@@ -323,7 +323,7 @@ impl Args for Options {

                 // Update options.
                 Long("revision") if op == Some(OperationName::Update) => {
                     let val = parser.value()?;
                     let rev = term::args::oid(&val)?;
                     let rev = term::args::rev(&val)?;
                     revision_id = Some(rev);
                 }

@@ -331,7 +331,7 @@ impl Args for Options {

                 // Comment options.
                 Long("reply-to") if op == Some(OperationName::Comment) => {
                     let val = parser.value()?;
                     let rev = term::args::oid(&val)?;
                     let rev = term::args::rev(&val)?;
                     reply_to = Some(rev);
                 }

@@ -339,7 +339,7 @@ impl Args for Options {

                 // Review options.
                 Long("revision") if op == Some(OperationName::Review) => {
                     let val = parser.value()?;
                     let rev = term::args::oid(&val)?;
                     let rev = term::args::rev(&val)?;
                     revision_id = Some(rev);
                 }

@@ -398,7 +398,7 @@ impl Args for Options {

                 // Checkout options
                 Long("revision") if op == Some(OperationName::Checkout) => {
                     let val = parser.value()?;
                     let rev = term::args::oid(&val)?;
                     let rev = term::args::rev(&val)?;
                     revision_id = Some(rev);
                 }

@@ -495,7 +495,7 @@ impl Args for Options {

                     unknown => anyhow::bail!("unknown operation '{}'", unknown),
                 },
                 Value(val) if op == Some(OperationName::Redact) => {
                     let rev = term::args::oid(&val)?;
                     let rev = term::args::rev(&val)?;
                     revision_id = Some(rev);
                 }
                 Value(val)

modified radicle-cli/src/terminal/args.rs

@@ -6,7 +6,7 @@ use anyhow::anyhow;

 use radicle::cob::{self, issue, patch};
 use radicle::crypto;
 use radicle::git::RefString;
 use radicle::git::{Oid, RefString};
 use radicle::node::{Address, Alias};
 use radicle::prelude::{Did, Id, NodeId};

@@ -154,11 +154,11 @@ pub fn rev(val: &OsString) -> anyhow::Result<Rev> {

     Ok(Rev::from(s.to_owned()))
 }
 pub fn oid(val: &OsString) -> anyhow::Result<Rev> {
 pub fn oid(val: &OsString) -> anyhow::Result<Oid> {
     let s = string(val);
     let _ = radicle::git::Oid::from_str(&s).map_err(|_| anyhow!("invalid git oid '{s}'"))?;
     let o = radicle::git::Oid::from_str(&s).map_err(|_| anyhow!("invalid git oid '{s}'"))?;
     Ok(Rev::from(s))
     Ok(o)
 }
 pub fn alias(val: &OsString) -> anyhow::Result<Alias> {