# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1623360986 25200
# Node ID 5c49e0aa7fadf68aebeb29fac73b26642029ed7f
# Parent  54849b65dc5fa80c007a2e7ba8518aea4c0a0075
dog-raft: keep opts dict str-keyed a bit longer

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

diff -r 54849b65dc5f -r 5c49e0aa7fad mercurial/commands.py
--- a/mercurial/commands.py	Thu Jun 10 14:25:16 2021 -0700
+++ b/mercurial/commands.py	Thu Jun 10 14:36:26 2021 -0700
@@ -3088,8 +3088,7 @@
 
 
 def _dograft(ui, repo, *revs, **opts):
-    opts = pycompat.byteskwargs(opts)
-    if revs and opts.get(b'rev'):
+    if revs and opts.get('rev'):
         ui.warn(
             _(
                 b'warning: inconsistent use of --rev might give unexpected '
@@ -3098,12 +3097,13 @@
         )
 
     revs = list(revs)
-    revs.extend(opts.get(b'rev'))
+    revs.extend(opts.get('rev'))
     # a dict of data to be stored in state file
     statedata = {}
     # list of new nodes created by ongoing graft
     statedata[b'newnodes'] = []
 
+    opts = pycompat.byteskwargs(opts)
     cmdutil.resolvecommitoptions(ui, opts)
 
     editor = cmdutil.getcommiteditor(