Mercurial > hg-stable
changeset 35952:78b985c75731
py3: add r'' to convert keys to keyword arguments to str
# skip-blame as we are just adding r''
Differential Revision: https://phab.mercurial-scm.org/D2038
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sun, 04 Feb 2018 20:46:26 +0530 |
| parents | 704095e27c5c |
| children | 558e01a23f40 |
| files | hgext/shelve.py |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/shelve.py Sun Feb 04 15:41:37 2018 +0530 +++ b/hgext/shelve.py Sun Feb 04 20:46:26 2018 +0530 @@ -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()