Rename --notation to --signature-notation.

- This aligns with `sq encrypt --signature-notation` and makes it
    clearer that notations are being put on signatures.

  - Fixes #454.

NEWS

@@ -111,6 +111,8 @@
    - `sq pki vouch certify` is now called `sq pki vouch add`.
    - We now certify newly generated keys with a per-host shadow CA.
    - The argument `sq encrypt --signature-notation` has been added.
+   - All arguments to add signature notations have been renamed from
+     `--notation` to `--signature-notation`.
 
 * Changes in 0.39.0
 ** Notable changes

src/cli/key/revoke.rs

@@ -110,7 +110,7 @@ future.`",
     pub message: String,
 
     #[clap(
-        long,
+        long = "signature-notation",
         value_names = &["NAME", "VALUE"],
         number_of_values = 2,
         help = "Add a notation to the revocation",

src/cli/key/subkey/revoke.rs

@@ -135,7 +135,7 @@ created a new subkey, please refresh the certificate.\"",
     pub message: String,
 
     #[clap(
-        long,
+        long = "signature-notation",
         value_names = &["NAME", "VALUE"],
         number_of_values = 2,
         help = "Add a notation to the revocation.",

src/cli/key/userid.rs

@@ -254,7 +254,7 @@ has left the organization, it might say who to contact instead.",
     pub message: String,
 
     #[clap(
-        long,
+        long = "signature-notation",
         value_names = &["NAME", "VALUE"],
         number_of_values = 2,
         help = "Add a notation to the certification.",

src/cli/pki/link.rs

@@ -216,7 +216,7 @@ to force the signature to be re-created anyway.",
     pub recreate: bool,
 
     #[clap(
-        long,
+        long = "signature-notation",
         value_names = &["NAME", "VALUE"],
         number_of_values = 2,
         help = "Add a notation to the certification.",
@@ -427,7 +427,7 @@ to force the signature to be recreated anyway.",
     pub recreate: bool,
 
     #[clap(
-        long,
+        long = "signature-notation",
         value_names = &["NAME", "VALUE"],
         number_of_values = 2,
         help = "Add a notation to the certification.",
@@ -501,7 +501,7 @@ particular time instead of the current time.
 )]
 pub struct RetractCommand {
     #[clap(
-        long,
+        long = "signature-notation",
         value_names = &["NAME", "VALUE"],
         number_of_values = 2,
         help = "Add a notation to the certification.",

src/cli/pki/vouch/add.rs

@@ -136,7 +136,7 @@ pub struct Command {
     pub non_revocable: bool,
 
     #[clap(
-        long,
+        long = "signature-notation",
         value_names = &["NAME", "VALUE"],
         number_of_values = 2,
         help = "Add a notation to the certification.",

src/cli/pki/vouch/authorize.rs

@@ -202,7 +202,7 @@ of power, you have to opt in to this behavior explicitly.",
     pub expiration: ExpirationArg,
 
     #[clap(
-        long,
+        long = "signature-notation",
         value_names = &["NAME", "VALUE"],
         number_of_values = 2,
         help = "Add a notation to the certification.",

src/cli/sign.rs

@@ -168,7 +168,7 @@ may change line endings.  In doubt, create binary signatures.",
                                  SignerDoc>,
 
     #[clap(
-        long,
+        long = "signature-notation",
         value_names = &["NAME", "VALUE"],
         number_of_values = 2,
         help = "Add a notation to the signature.",

tests/integration/common.rs

@@ -881,7 +881,7 @@ impl Sq {
         }
 
         for (k, v) in notations {
-            cmd.args(["--notation", k, v]);
+            cmd.args(["--signature-notation", k, v]);
         }
 
         if let Some(time) = revocation_time {
@@ -1218,7 +1218,7 @@ impl Sq {
         }
 
         for (k, v) in notations {
-            cmd.args(["--notation", k, v]);
+            cmd.args(["--signature-notation", k, v]);
         }
 
         if let Some(time) = revocation_time {

tests/integration/sq_key_subkey.rs

@@ -268,7 +268,7 @@ fn sq_key_subkey_revoke() -> Result<()> {
             }
 
             for (k, v) in notations {
-                cmd.args(["--notation", k, v]);
+                cmd.args(["--signature-notation", k, v]);
             }
             if let Some(time) = revocation_time {
                 cmd.args([
@@ -523,7 +523,7 @@ fn sq_key_subkey_revoke_thirdparty() -> Result<()> {
             }
 
             for (k, v) in notations {
-                cmd.args(["--notation", k, v]);
+                cmd.args(["--signature-notation", k, v]);
             }
             if let Some(time) = revocation_time {
                 cmd.args([

tests/integration/sq_key_userid.rs

@@ -111,7 +111,7 @@ fn sq_key_userid_revoke() -> Result<()> {
             }
 
             for (k, v) in notations {
-                cmd.args(["--notation", k, v]);
+                cmd.args(["--signature-notation", k, v]);
             }
             if let Some(time) = revocation_time {
                 cmd.args([
@@ -282,7 +282,7 @@ fn sq_key_userid_revoke_thirdparty() -> Result<()> {
             }
 
             for (k, v) in notations {
-                cmd.args(["--notation", k, v]);
+                cmd.args(["--signature-notation", k, v]);
             }
             if let Some(time) = revocation_time {
                 cmd.args([

tests/integration/sq_pki_link.rs

@@ -545,13 +545,13 @@ fn sq_pki_link_update_detection() -> Result<()> {
 
     // Use a notation.
     let output = sq_link(&sq, &alice_fpr, &[], &[],
-                         &["--notation", "foo", "10", "--all"], true);
+                         &["--signature-notation", "foo", "10", "--all"], true);
     assert!(output.2.contains("was previously"),
             "stdout:\n{}\nstderr:\n{}", output.1, output.2);
     let bytes = compare(bytes, &alice_cert_pgp, false);
 
     let output = sq_link(&sq, &alice_fpr, &[], &[],
-                         &["--notation", "foo", "10", "--all"], true);
+                         &["--signature-notation", "foo", "10", "--all"], true);
     assert!(output.2.contains("Certification parameters are unchanged"),
             "stdout:\n{}\nstderr:\n{}", output.1, output.2);
     let bytes = compare(bytes, &alice_cert_pgp, true);

tests/integration/sq_pki_vouch_add.rs

@@ -168,9 +168,9 @@ fn sq_pki_vouch_add() -> Result<()> {
         let bob_pgp_new = sq.scratch_file(None);
         let cert = sq.pki_vouch_add(
             &[
-                "--notation", "foo", "bar",
-                "--notation", "!foo", "xyzzy",
-                "--notation", "hello@example.org", "1234567890",
+                "--signature-notation", "foo", "bar",
+                "--signature-notation", "!foo", "xyzzy",
+                "--signature-notation", "hello@example.org", "1234567890",
             ],
             &alice_handle, bob_pgp.last().unwrap(), &["<bob@example.org>"],
             Some(&*bob_pgp_new));

tests/integration/sq_sign.rs

@@ -69,9 +69,9 @@ fn sq_sign_with_notations() {
     let sig = tmp_dir.path().join("sig0");
 
     // Sign message.
-    sq.sign_args(&["--notation", "foo", "bar",
-                   "--notation", "!foo", "xyzzy",
-                   "--notation", "hello@example.org", "1234567890"],
+    sq.sign_args(&["--signature-notation", "foo", "bar",
+                   "--signature-notation", "!foo", "xyzzy",
+                   "--signature-notation", "hello@example.org", "1234567890"],
                  artifact("keys/dennis-simon-anton-private.pgp"), None,
                  &artifact("messages/a-cypherpunks-manifesto.txt"), sig.as_path());