Patchwork [2,of,2] py3: convert `'{}'.format(foo)` to `'%s' % foo` in the bookflow extension

login
register
mail settings
Submitter Matt Harbison
Date Dec. 21, 2018, 5:13 a.m.
Message ID <aec88a38ec9d29d7b414.1545369196@Envy>
Download mbox | patch
Permalink /patch/37290/
State Accepted
Headers show

Comments

Matt Harbison - Dec. 21, 2018, 5:13 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1545365818 18000
#      Thu Dec 20 23:16:58 2018 -0500
# Node ID aec88a38ec9d29d7b4145bda26e4a6b2bed93244
# Parent  5323f3f275a8522e445e8029acc5cac6b636f1c8
py3: convert `'{}'.format(foo)` to `'%s' % foo` in the bookflow extension

Byte strings don't have the former.  Converting these to byte strings is waiting
on the mass rewrite.

Patch

diff --git a/hgext/bookflow.py b/hgext/bookflow.py
--- a/hgext/bookflow.py
+++ b/hgext/bookflow.py
@@ -41,11 +41,11 @@  def commit_hook(ui, repo, **kwargs):
     if active:
         if active in ui.configlist(MY_NAME, 'protect'):
             raise error.Abort(
-                _('cannot commit, bookmark {} is protected').format(active))
+                _('cannot commit, bookmark %s is protected') % active)
         if not cwd_at_bookmark(repo, active):
             raise error.Abort(
        _('cannot commit, working directory out of sync with active bookmark'),
-                hint=_("run 'hg up {}'").format(active))
+                hint=_("run 'hg up %s'") % active)
     elif ui.configbool(MY_NAME, 'require-bookmark', True):
         raise error.Abort(_('cannot commit without an active bookmark'))
     return 0
@@ -64,9 +64,9 @@  def bookmarks_addbookmarks(
         marks = repo._bookmarks
         for name in names:
             if name in marks:
-                raise error.Abort(
-                    _("bookmark {} already exists, to move use the --rev option"
-                    ).format(name))
+                raise error.Abort(_(
+                    "bookmark %s already exists, to move use the --rev option"
+                    ) % name)
     return orig(repo, tr, names, rev, force, inactive)
 
 def commands_commit(orig, ui, repo, *args, **opts):
@@ -78,8 +78,9 @@  def commands_pull(orig, ui, repo, *args,
     active = repo._bookmarks.active
     if active and not cwd_at_bookmark(repo, active):
         ui.warn(_(
-            "working directory out of sync with active bookmark, run 'hg up {}'"
-        ).format(active))
+            "working directory out of sync with active bookmark, run "
+            "'hg up %s'"
+        ) % active)
     return rc
 
 def commands_branch(orig, ui, repo, label=None, **opts):