| hg-reviewers |
Converted the else part into if True because that part will soon be under a
except part.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (7 lines) |
| else: | else: | ||||
| newrev = "%d" % v | newrev = "%d" % v | ||||
| destnode = repo[destmap[d]].hex() | destnode = repo[destmap[d]].hex() | ||||
| f.write("%s:%s:%s\n" % (oldrev, newrev, destnode)) | f.write("%s:%s:%s\n" % (oldrev, newrev, destnode)) | ||||
| repo.ui.debug('rebase status stored\n') | repo.ui.debug('rebase status stored\n') | ||||
| def restorestatus(self): | def restorestatus(self): | ||||
| """Restore a previously stored status""" | """Restore a previously stored status""" | ||||
| if not self.stateobj.exists(): | |||||
| cmdutil.wrongtooltocontinue(self.repo, _('rebase')) | |||||
| data = self._read() | data = self._read() | ||||
| self.repo.ui.debug('rebase status resumed\n') | self.repo.ui.debug('rebase status resumed\n') | ||||
| self.originalwd = data['originalwd'] | self.originalwd = data['originalwd'] | ||||
| self.destmap = data['destmap'] | self.destmap = data['destmap'] | ||||
| self.state = data['state'] | self.state = data['state'] | ||||
| self.skipped = data['skipped'] | self.skipped = data['skipped'] | ||||
| self.collapsef = data['collapse'] | self.collapsef = data['collapse'] | ||||
| self.keepf = data['keep'] | self.keepf = data['keep'] | ||||
| self.keepbranchesf = data['keepbranches'] | self.keepbranchesf = data['keepbranches'] | ||||
| self.external = data['external'] | self.external = data['external'] | ||||
| self.activebookmark = data['activebookmark'] | self.activebookmark = data['activebookmark'] | ||||
| def _read(self): | def _read(self): | ||||
| self.prepared = True | self.prepared = True | ||||
| repo = self.repo | repo = self.repo | ||||
| assert repo.filtername is None | assert repo.filtername is None | ||||
| data = {'keepbranches': None, 'collapse': None, 'activebookmark': None, | data = {'keepbranches': None, 'collapse': None, 'activebookmark': None, | ||||
| 'external': nullrev, 'keep': None, 'originalwd': None} | 'external': nullrev, 'keep': None, 'originalwd': None} | ||||
| legacydest = None | legacydest = None | ||||
| state = {} | state = {} | ||||
| destmap = {} | destmap = {} | ||||
| if not self.stateobj.exists(): | if True: | ||||
| cmdutil.wrongtooltocontinue(repo, _('rebase')) | |||||
| else: | |||||
| f = repo.vfs("rebasestate") | f = repo.vfs("rebasestate") | ||||
| for i, l in enumerate(f.read().splitlines()): | for i, l in enumerate(f.read().splitlines()): | ||||
| if i == 0: | if i == 0: | ||||
| data['originalwd'] = repo[l].rev() | data['originalwd'] = repo[l].rev() | ||||
| elif i == 1: | elif i == 1: | ||||
| # this line should be empty in newer version. but legacy | # this line should be empty in newer version. but legacy | ||||
| # clients may still use it | # clients may still use it | ||||
| if l: | if l: | ||||