diff hgext/gpg.py @ 43117:8ff1ecfadcd1

cleanup: join string literals that are already on one line

Thanks to Kyle for noticing this and for providing the regular
expression to run on the codebase.

This patch has been reviewed by the test suite and they approved of
it.

# skip-blame: fallout from mass reformatting

Differential Revision: https://phab.mercurial-scm.org/D7028

--- a/hgext/gpg.py	Tue Oct 08 15:15:37 2019 -0700
+++ b/hgext/gpg.py	Tue Oct 08 15:06:18 2019 -0700
@@ -76,7 +76,7 @@
             fp = os.fdopen(fd, r'wb')
             fp.write(data)
             fp.close()
-            gpgcmd = b"%s --logger-fd 1 --status-fd 1 --verify " b"\"%s\" \"%s\"" % (
+            gpgcmd = b"%s --logger-fd 1 --status-fd 1 --verify \"%s\" \"%s\"" % (
                 self.path,
                 sigfile,
                 datafile,
@@ -179,12 +179,12 @@
             continue
         if key[0] == b"EXPSIG":
             ui.write(
-                _(b"%s Note: Signature has expired" b" (signed by: \"%s\")\n")
+                _(b"%s Note: Signature has expired (signed by: \"%s\")\n")
                 % (prefix, key[2])
             )
         elif key[0] == b"EXPKEYSIG":
             ui.write(
-                _(b"%s Note: This key has expired" b" (signed by: \"%s\")\n")
+                _(b"%s Note: This key has expired (signed by: \"%s\")\n")
                 % (prefix, key[2])
             )
         validkeys.append((key[1], key[2], key[3]))
@@ -304,7 +304,7 @@
         ]
         if len(nodes) > 1:
             raise error.Abort(
-                _(b'uncommitted merge - please provide a ' b'specific revision')
+                _(b'uncommitted merge - please provide a specific revision')
             )
         if not nodes:
             nodes = [repo.changelog.tip()]