| durin42 |
| hg-reviewers |
Internally we are dealing with bytes everywhere, so anything returning a unicode
results in an error or some change in behaviour.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| try: | try: | ||||
| d['originalwctx'] = nodemod.bin(d['originalwctx']) | d['originalwctx'] = nodemod.bin(d['originalwctx']) | ||||
| d['pendingctx'] = nodemod.bin(d['pendingctx']) | d['pendingctx'] = nodemod.bin(d['pendingctx']) | ||||
| d['parents'] = [nodemod.bin(h) | d['parents'] = [nodemod.bin(h) | ||||
| for h in d['parents'].split(' ')] | for h in d['parents'].split(' ')] | ||||
| d['nodestoremove'] = [nodemod.bin(h) | d['nodestoremove'] = [nodemod.bin(h) | ||||
| for h in d['nodestoremove'].split(' ')] | for h in d['nodestoremove'].split(' ')] | ||||
| except (ValueError, TypeError, KeyError) as err: | except (ValueError, TypeError, KeyError) as err: | ||||
| raise error.CorruptedState(str(err)) | raise error.CorruptedState(pycompat.bytestr(err)) | ||||
| @classmethod | @classmethod | ||||
| def _getversion(cls, repo): | def _getversion(cls, repo): | ||||
| """Read version information from shelvestate file""" | """Read version information from shelvestate file""" | ||||
| fp = repo.vfs(cls._filename) | fp = repo.vfs(cls._filename) | ||||
| try: | try: | ||||
| version = int(fp.readline().strip()) | version = int(fp.readline().strip()) | ||||
| except ValueError as err: | except ValueError as err: | ||||
| raise error.CorruptedState(str(err)) | raise error.CorruptedState(pycompat.bytestr(err)) | ||||
| finally: | finally: | ||||
| fp.close() | fp.close() | ||||
| return version | return version | ||||
| @classmethod | @classmethod | ||||
| def _readold(cls, repo): | def _readold(cls, repo): | ||||
| """Read the old position-based version of a shelvestate file""" | """Read the old position-based version of a shelvestate file""" | ||||
| # Order is important, because old shelvestate file uses it | # Order is important, because old shelvestate file uses it | ||||
| obj.parents = d['parents'] | obj.parents = d['parents'] | ||||
| obj.nodestoremove = d['nodestoremove'] | obj.nodestoremove = d['nodestoremove'] | ||||
| obj.branchtorestore = d.get('branchtorestore', '') | obj.branchtorestore = d.get('branchtorestore', '') | ||||
| obj.keep = d.get('keep') == cls._keep | obj.keep = d.get('keep') == cls._keep | ||||
| obj.activebookmark = '' | obj.activebookmark = '' | ||||
| if d.get('activebook', '') != cls._noactivebook: | if d.get('activebook', '') != cls._noactivebook: | ||||
| obj.activebookmark = d.get('activebook', '') | obj.activebookmark = d.get('activebook', '') | ||||
| except (error.RepoLookupError, KeyError) as err: | except (error.RepoLookupError, KeyError) as err: | ||||
| raise error.CorruptedState(str(err)) | raise error.CorruptedState(pycompat.bytestr(err)) | ||||
| return obj | return obj | ||||
| @classmethod | @classmethod | ||||
| def save(cls, repo, name, originalwctx, pendingctx, nodestoremove, | def save(cls, repo, name, originalwctx, pendingctx, nodestoremove, | ||||
| branchtorestore, keep=False, activebook=''): | branchtorestore, keep=False, activebook=''): | ||||
| info = { | info = { | ||||
| "name": name, | "name": name, | ||||
| # we'll be merging with, rebase it to be on top. | # we'll be merging with, rebase it to be on top. | ||||
| if tmpwctx.node() == shelvectx.parents()[0].node(): | if tmpwctx.node() == shelvectx.parents()[0].node(): | ||||
| return shelvectx | return shelvectx | ||||
| ui.status(_('rebasing shelved changes\n')) | ui.status(_('rebasing shelved changes\n')) | ||||
| try: | try: | ||||
| rebase.rebase(ui, repo, **{ | rebase.rebase(ui, repo, **{ | ||||
| r'rev': [shelvectx.rev()], | r'rev': [shelvectx.rev()], | ||||
| r'dest': str(tmpwctx.rev()), | r'dest': "%d" % tmpwctx.rev(), | ||||
| r'keep': True, | r'keep': True, | ||||
| r'tool': opts.get('tool', ''), | r'tool': opts.get('tool', ''), | ||||
| }) | }) | ||||
| except error.InterventionRequired: | except error.InterventionRequired: | ||||
| tr.close() | tr.close() | ||||
| nodestoremove = [repo.changelog.node(rev) | nodestoremove = [repo.changelog.node(rev) | ||||
| for rev in xrange(oldtiprev, len(repo))] | for rev in xrange(oldtiprev, len(repo))] | ||||
| state = shelvedstate.load(repo) | state = shelvedstate.load(repo) | ||||
| if opts.get('keep') is None: | if opts.get('keep') is None: | ||||
| opts['keep'] = state.keep | opts['keep'] = state.keep | ||||
| except IOError as err: | except IOError as err: | ||||
| if err.errno != errno.ENOENT: | if err.errno != errno.ENOENT: | ||||
| raise | raise | ||||
| cmdutil.wrongtooltocontinue(repo, _('unshelve')) | cmdutil.wrongtooltocontinue(repo, _('unshelve')) | ||||
| except error.CorruptedState as err: | except error.CorruptedState as err: | ||||
| ui.debug(str(err) + '\n') | ui.debug(pycompat.bytestr(err) + '\n') | ||||
| if continuef: | if continuef: | ||||
| msg = _('corrupted shelved state file') | msg = _('corrupted shelved state file') | ||||
| hint = _('please run hg unshelve --abort to abort unshelve ' | hint = _('please run hg unshelve --abort to abort unshelve ' | ||||
| 'operation') | 'operation') | ||||
| raise error.Abort(msg, hint=hint) | raise error.Abort(msg, hint=hint) | ||||
| elif abortf: | elif abortf: | ||||
| msg = _('could not read shelved state file, your working copy ' | msg = _('could not read shelved state file, your working copy ' | ||||
| 'may be in an unexpected state\nplease update to some ' | 'may be in an unexpected state\nplease update to some ' | ||||