| hg-reviewers |
This cleans up the code a bit.
| 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 (9 lines) |
| 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 = {} | ||||
| try: | if not self.stateobj.exists(): | ||||
| 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: | ||||
| destrev = legacydest | destrev = legacydest | ||||
| destmap[oldrev] = destrev | destmap[oldrev] = destrev | ||||
| if newrev == revtodostr: | if newrev == revtodostr: | ||||
| state[oldrev] = revtodo | state[oldrev] = revtodo | ||||
| # Legacy compat special case | # Legacy compat special case | ||||
| else: | else: | ||||
| state[oldrev] = repo[newrev].rev() | state[oldrev] = repo[newrev].rev() | ||||
| except IOError as err: | |||||
| if err.errno != errno.ENOENT: | |||||
| raise | |||||
| cmdutil.wrongtooltocontinue(repo, _('rebase')) | |||||
| if data['keepbranches'] is None: | if data['keepbranches'] is None: | ||||
| raise error.Abort(_('.hg/rebasestate is incomplete')) | raise error.Abort(_('.hg/rebasestate is incomplete')) | ||||
| data['destmap'] = destmap | data['destmap'] = destmap | ||||
| data['state'] = state | data['state'] = state | ||||
| skipped = set() | skipped = set() | ||||
| # recompute the set of skipped revs | # recompute the set of skipped revs | ||||
| if not data['collapse']: | if not data['collapse']: | ||||