Patchwork [1,of,5] py3: byteify bookflow extension

login
register
mail settings
Submitter Matt Harbison
Date Dec. 19, 2018, 10:39 p.m.
Message ID <155fcb60c7ec28729e50.1545259156@Envy>
Download mbox | patch
Permalink /patch/37249/
State Accepted
Headers show

Comments

Matt Harbison - Dec. 19, 2018, 10:39 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1545163992 18000
#      Tue Dec 18 15:13:12 2018 -0500
# Node ID 155fcb60c7ec28729e50790c398a256498731d0e
# Parent  b6c610bf567e2fa2a8576f04bbd269004a5e135d
py3: byteify bookflow extension

`'{}'.format()` had to also be replaced with `'%s' % bytes`.

# skip-blame for b'' prefixing
Yuya Nishihara - Dec. 20, 2018, 11:44 a.m.
On Wed, 19 Dec 2018 17:39:16 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1545163992 18000
> #      Tue Dec 18 15:13:12 2018 -0500
> # Node ID 155fcb60c7ec28729e50790c398a256498731d0e
> # Parent  b6c610bf567e2fa2a8576f04bbd269004a5e135d
> py3: byteify bookflow extension

Queued 2-5, thanks.

> `'{}'.format()` had to also be replaced with `'%s' % bytes`.
> 
> # skip-blame for b'' prefixing

This shouldn't be skip-blame because of .format() change. Since we'll have
to do bulk b'' rewrites anyway, let's just fix the use of .format() in this
patch.

Patch

diff --git a/hgext/bookflow.py b/hgext/bookflow.py
--- a/hgext/bookflow.py
+++ b/hgext/bookflow.py
@@ -24,14 +24,14 @@  from mercurial import (
     registrar,
 )
 
-MY_NAME = 'bookflow'
+MY_NAME = b'bookflow'
 
 configtable = {}
 configitem = registrar.configitem(configtable)
 
-configitem(MY_NAME, 'protect', ['@'])
-configitem(MY_NAME, 'require-bookmark', True)
-configitem(MY_NAME, 'enable-branches', False)
+configitem(MY_NAME, b'protect', [b'@'])
+configitem(MY_NAME, b'require-bookmark', True)
+configitem(MY_NAME, b'enable-branches', False)
 
 cmdtable = {}
 command = registrar.command(cmdtable)
@@ -39,15 +39,15 @@  command = registrar.command(cmdtable)
 def commit_hook(ui, repo, **kwargs):
     active = repo._bookmarks.active
     if active:
-        if active in ui.configlist(MY_NAME, 'protect'):
+        if active in ui.configlist(MY_NAME, b'protect'):
             raise error.Abort(
-                _('cannot commit, bookmark {} is protected').format(active))
+                _(b'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))
-    elif ui.configbool(MY_NAME, 'require-bookmark', True):
-        raise error.Abort(_('cannot commit without an active bookmark'))
+       _(b'cannot commit, working directory out of sync with active bookmark'),
+                hint=_(b"run 'hg up %s'") % active)
+    elif ui.configbool(MY_NAME, b'require-bookmark', True):
+        raise error.Abort(_(b'cannot commit without an active bookmark'))
     return 0
 
 def bookmarks_update(orig, repo, parents, node):
@@ -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(_(
+                    b"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,26 +78,27 @@  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))
+            b"working directory out of sync with active bookmark, run "
+            b"'hg up %s'"
+        ) % active)
     return rc
 
 def commands_branch(orig, ui, repo, label=None, **opts):
     if label and not opts.get(r'clean') and not opts.get(r'rev'):
         raise error.Abort(
-         _("creating named branches is disabled and you should use bookmarks"),
-            hint="see 'hg help bookflow'")
+         _(b"creating named branches is disabled and you should use bookmarks"),
+            hint=b"see 'hg help bookflow'")
     return orig(ui, repo, label, **opts)
 
 def cwd_at_bookmark(repo, mark):
     mark_id = repo._bookmarks[mark]
-    cur_id = repo.lookup('.')
+    cur_id = repo.lookup(b'.')
     return cur_id == mark_id
 
 def uisetup(ui):
-    extensions.wrapfunction(bookmarks, 'update', bookmarks_update)
-    extensions.wrapfunction(bookmarks, 'addbookmarks', bookmarks_addbookmarks)
-    extensions.wrapcommand(commands.table, 'commit', commands_commit)
-    extensions.wrapcommand(commands.table, 'pull', commands_pull)
-    if not ui.configbool(MY_NAME, 'enable-branches'):
-        extensions.wrapcommand(commands.table, 'branch', commands_branch)
+    extensions.wrapfunction(bookmarks, b'update', bookmarks_update)
+    extensions.wrapfunction(bookmarks, b'addbookmarks', bookmarks_addbookmarks)
+    extensions.wrapcommand(commands.table, b'commit', commands_commit)
+    extensions.wrapcommand(commands.table, b'pull', commands_pull)
+    if not ui.configbool(MY_NAME, b'enable-branches'):
+        extensions.wrapcommand(commands.table, b'branch', commands_branch)