Mercurial > hg
comparison hgext/rebase.py @ 38518:cf24f678adda
rebase: check whether the rebasestate exists or not a bit early
Converted the else part into `if True` because that part will soon be under a
except part.
Differential Revision: https://phab.mercurial-scm.org/D3876
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sun, 01 Jul 2018 01:00:39 +0530 |
parents | 4df9cef86740 |
children | 731debab233f |
comparison
equal
deleted
inserted
replaced
38517:4df9cef86740 | 38518:cf24f678adda |
---|---|
225 f.write("%s:%s:%s\n" % (oldrev, newrev, destnode)) | 225 f.write("%s:%s:%s\n" % (oldrev, newrev, destnode)) |
226 repo.ui.debug('rebase status stored\n') | 226 repo.ui.debug('rebase status stored\n') |
227 | 227 |
228 def restorestatus(self): | 228 def restorestatus(self): |
229 """Restore a previously stored status""" | 229 """Restore a previously stored status""" |
230 if not self.stateobj.exists(): | |
231 cmdutil.wrongtooltocontinue(self.repo, _('rebase')) | |
232 | |
230 data = self._read() | 233 data = self._read() |
231 self.repo.ui.debug('rebase status resumed\n') | 234 self.repo.ui.debug('rebase status resumed\n') |
232 | 235 |
233 self.originalwd = data['originalwd'] | 236 self.originalwd = data['originalwd'] |
234 self.destmap = data['destmap'] | 237 self.destmap = data['destmap'] |
248 'external': nullrev, 'keep': None, 'originalwd': None} | 251 'external': nullrev, 'keep': None, 'originalwd': None} |
249 legacydest = None | 252 legacydest = None |
250 state = {} | 253 state = {} |
251 destmap = {} | 254 destmap = {} |
252 | 255 |
253 if not self.stateobj.exists(): | 256 if True: |
254 cmdutil.wrongtooltocontinue(repo, _('rebase')) | |
255 else: | |
256 f = repo.vfs("rebasestate") | 257 f = repo.vfs("rebasestate") |
257 for i, l in enumerate(f.read().splitlines()): | 258 for i, l in enumerate(f.read().splitlines()): |
258 if i == 0: | 259 if i == 0: |
259 data['originalwd'] = repo[l].rev() | 260 data['originalwd'] = repo[l].rev() |
260 elif i == 1: | 261 elif i == 1: |