comparison hgext/rebase.py @ 38517:4df9cef86740

rebase: use staeobj to check whether interrupted rebase exists

This cleans up the code a bit.

Differential Revision: https://phab.mercurial-scm.org/D3875

38516:7c853edcf4ed

                'external': nullrev, 'keep': None, 'originalwd': None}
        legacydest = None
        state = {}
        destmap = {}

        try:
            f = repo.vfs("rebasestate")
            for i, l in enumerate(f.read().splitlines()):
                if i == 0:
                    data['originalwd'] = repo[l].rev()
                elif i == 1:

                    if newrev == revtodostr:
                        state[oldrev] = revtodo
                        # Legacy compat special case
                    else:
                        state[oldrev] = repo[newrev].rev()

        except IOError as err:
            if err.errno != errno.ENOENT:
                raise
            cmdutil.wrongtooltocontinue(repo, _('rebase'))

        if data['keepbranches'] is None:
            raise error.Abort(_('.hg/rebasestate is incomplete'))

        data['destmap'] = destmap

38517:4df9cef86740

                'external': nullrev, 'keep': None, 'originalwd': None}
        legacydest = None
        state = {}
        destmap = {}

        if not self.stateobj.exists():
            cmdutil.wrongtooltocontinue(repo, _('rebase'))
        else:
            f = repo.vfs("rebasestate")
            for i, l in enumerate(f.read().splitlines()):
                if i == 0:
                    data['originalwd'] = repo[l].rev()
                elif i == 1:

                    if newrev == revtodostr:
                        state[oldrev] = revtodo
                        # Legacy compat special case
                    else:
                        state[oldrev] = repo[newrev].rev()

        if data['keepbranches'] is None:
            raise error.Abort(_('.hg/rebasestate is incomplete'))

        data['destmap'] = destmap