[PATCH 2 of 9] bookmarks: convert opts to bytes dict early
Yuya Nishihara
yuya at tcha.org
Fri Sep 21 09:24:04 EDT 2018
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1536979875 -32400
# Sat Sep 15 11:51:15 2018 +0900
# Node ID c8d2fd3848a58477e0ce9eb15b62c0e7cc30303e
# Parent 9e58d4b235e42fbf982dd733252e5d442f211422
bookmarks: convert opts to bytes dict early
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -958,12 +958,13 @@ def bookmark(ui, repo, *names, **opts):
hg book -f @
'''
- force = opts.get(r'force')
- rev = opts.get(r'rev')
- delete = opts.get(r'delete')
- rename = opts.get(r'rename')
- inactive = opts.get(r'inactive')
- active = opts.get(r'active')
+ opts = pycompat.byteskwargs(opts)
+ force = opts.get('force')
+ rev = opts.get('rev')
+ delete = opts.get('delete')
+ rename = opts.get('rename')
+ inactive = opts.get('inactive')
+ active = opts.get('active')
if delete and rename:
raise error.Abort(_("--delete and --rename are incompatible"))
@@ -1011,7 +1012,6 @@ def bookmark(ui, repo, *names, **opts):
return 1
ui.write("%s\n" % book, label=bookmarks.activebookmarklabel)
else: # show bookmarks
- opts = pycompat.byteskwargs(opts)
with ui.formatter('bookmarks', opts) as fm:
bookmarks.printbookmarks(ui, repo, fm)
More information about the Mercurial-devel
mailing list