Patchwork D2038: py3: add r'' to convert keys to keyword arguments to str

login
register
mail settings
Submitter phabricator
Date Feb. 5, 2018, 2:26 p.m.
Message ID <04b4caf770cdf9ee51836129012f9e49@localhost.localdomain>
Download mbox | patch
Permalink /patch/27314/
State Not Applicable
Headers show

Comments

phabricator - Feb. 5, 2018, 2:26 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG78b985c75731: py3: add r&#039;&#039; to convert keys to keyword arguments to str (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2038?vs=5196&id=5209

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

AFFECTED FILES
  hgext/shelve.py

CHANGE DETAILS




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

Patch

diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -619,7 +619,7 @@ 
             repo.vfs.rename('unshelverebasestate', 'rebasestate')
             try:
                 rebase.rebase(ui, repo, **{
-                    'abort' : True
+                    r'abort' : True
                 })
             except Exception:
                 repo.vfs.rename('rebasestate', 'unshelverebasestate')
@@ -648,7 +648,7 @@ 
         ui.pushbuffer(True)
         cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(),
                        *pathtofiles(repo, files),
-                       **{'no_backup': True})
+                       **{r'no_backup': True})
         ui.popbuffer()
 
 def restorebranch(ui, repo, branchtorestore):
@@ -681,7 +681,7 @@ 
         repo.vfs.rename('unshelverebasestate', 'rebasestate')
         try:
             rebase.rebase(ui, repo, **{
-                'continue' : True
+                r'continue' : True
             })
         except Exception:
             repo.vfs.rename('rebasestate', 'unshelverebasestate')
@@ -744,10 +744,10 @@ 
     ui.status(_('rebasing shelved changes\n'))
     try:
         rebase.rebase(ui, repo, **{
-            'rev': [shelvectx.rev()],
-            'dest': str(tmpwctx.rev()),
-            'keep': True,
-            'tool': opts.get('tool', ''),
+            r'rev': [shelvectx.rev()],
+            r'dest': str(tmpwctx.rev()),
+            r'keep': True,
+            r'tool': opts.get('tool', ''),
         })
     except error.InterventionRequired:
         tr.close()