# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1530386545 -19800 # Node ID 4df9cef867403b319cfcaf4f3858dd7be7323b2e # Parent 7c853edcf4edc072ee08d72a3cceb783d0052b92 rebase: use staeobj to check whether interrupted rebase exists This cleans up the code a bit. Differential Revision: https://phab.mercurial-scm.org/D3875 diff -r 7c853edcf4ed -r 4df9cef86740 hgext/rebase.py --- a/hgext/rebase.py Sun Jul 01 00:46:59 2018 +0530 +++ b/hgext/rebase.py Sun Jul 01 00:52:25 2018 +0530 @@ -250,7 +250,9 @@ state = {} destmap = {} - try: + 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: @@ -290,11 +292,6 @@ 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'))