Patchwork D3616: py3: fix kwargs handling in hgext/rebase.py

login
register
mail settings
Submitter phabricator
Date May 19, 2018, 7:38 p.m.
Message ID <662f03bf16022e66ce7abf5de2e8ea88@localhost.localdomain>
Download mbox | patch
Permalink /patch/31710/
State Not Applicable
Headers show

Comments

phabricator - May 19, 2018, 7:38 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG46e8abc4eb04: py3: fix kwargs handling in hgext/rebase.py (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3616?vs=8788&id=8793

REVISION DETAIL
  https://phab.mercurial-scm.org/D3616

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -798,21 +798,21 @@ 
 
     """
     inmemory = ui.configbool('rebase', 'experimental.inmemory')
-    if (opts.get('continue') or opts.get('abort') or
+    if (opts.get(r'continue') or opts.get(r'abort') or
         repo.currenttransaction() is not None):
         # in-memory rebase is not compatible with resuming rebases.
         # (Or if it is run within a transaction, since the restart logic can
         # fail the entire transaction.)
         inmemory = False
 
-    if opts.get('auto_orphans'):
+    if opts.get(r'auto_orphans'):
         for key in opts:
-            if key != 'auto_orphans' and opts.get(key):
+            if key != r'auto_orphans' and opts.get(key):
                 raise error.Abort(_('--auto-orphans is incompatible with %s') %
                                   ('--' + key))
-        userrevs = list(repo.revs(opts.get('auto_orphans')))
-        opts['rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
-        opts['dest'] = '_destautoorphanrebase(SRC)'
+        userrevs = list(repo.revs(opts.get(r'auto_orphans')))
+        opts[r'rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
+        opts[r'dest'] = '_destautoorphanrebase(SRC)'
 
     if inmemory:
         try:
@@ -824,7 +824,7 @@ 
         except error.InMemoryMergeConflictsError:
             ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
                       ' merge\n'))
-            _origrebase(ui, repo, **{'abort': True})
+            _origrebase(ui, repo, **{r'abort': True})
             return _origrebase(ui, repo, inmemory=False, **opts)
     else:
         return _origrebase(ui, repo, **opts)