D2520: py3: replace str() with it's bytes equivalent in hgext/shelve.py
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Thu Mar 1 14:15:49 EST 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG7af7443877da: py3: replace str() with it's bytes equivalent in hgext/shelve.py (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2520?vs=6266&id=6275
REVISION DETAIL
https://phab.mercurial-scm.org/D2520
AFFECTED FILES
hgext/shelve.py
CHANGE DETAILS
diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -192,16 +192,16 @@
d['nodestoremove'] = [nodemod.bin(h)
for h in d['nodestoremove'].split(' ')]
except (ValueError, TypeError, KeyError) as err:
- raise error.CorruptedState(str(err))
+ raise error.CorruptedState(pycompat.bytestr(err))
@classmethod
def _getversion(cls, repo):
"""Read version information from shelvestate file"""
fp = repo.vfs(cls._filename)
try:
version = int(fp.readline().strip())
except ValueError as err:
- raise error.CorruptedState(str(err))
+ raise error.CorruptedState(pycompat.bytestr(err))
finally:
fp.close()
return version
@@ -251,7 +251,7 @@
if d.get('activebook', '') != cls._noactivebook:
obj.activebookmark = d.get('activebook', '')
except (error.RepoLookupError, KeyError) as err:
- raise error.CorruptedState(str(err))
+ raise error.CorruptedState(pycompat.bytestr(err))
return obj
@@ -745,7 +745,7 @@
try:
rebase.rebase(ui, repo, **{
r'rev': [shelvectx.rev()],
- r'dest': str(tmpwctx.rev()),
+ r'dest': "%d" % tmpwctx.rev(),
r'keep': True,
r'tool': opts.get('tool', ''),
})
@@ -881,7 +881,7 @@
raise
cmdutil.wrongtooltocontinue(repo, _('unshelve'))
except error.CorruptedState as err:
- ui.debug(str(err) + '\n')
+ ui.debug(pycompat.bytestr(err) + '\n')
if continuef:
msg = _('corrupted shelved state file')
hint = _('please run hg unshelve --abort to abort unshelve '
To: pulkit, #hg-reviewers, durin42
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list