| ryanmce |
| hg-reviewers |
The move action (in a future patch) will require the set of base nodes that
histedit is editing from. This is the parent of the first revision in the
stack, plus any revisions specified by base actions.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/histedit.py (28 lines) |
| """ | """ | ||||
| rulehash = rule.strip().split(' ', 1)[0] | rulehash = rule.strip().split(' ', 1)[0] | ||||
| try: | try: | ||||
| rev = node.bin(rulehash) | rev = node.bin(rulehash) | ||||
| except TypeError: | except TypeError: | ||||
| raise error.ParseError("invalid changeset %s" % rulehash) | raise error.ParseError("invalid changeset %s" % rulehash) | ||||
| return cls(state, rev) | return cls(state, rev) | ||||
| def verify(self, prev, expected, seen): | def verify(self, prev, expected, seen, basenodes): | ||||
| """ Verifies semantic correctness of the rule""" | """ Verifies semantic correctness of the rule""" | ||||
| repo = self.repo | repo = self.repo | ||||
| ha = node.hex(self.node) | ha = node.hex(self.node) | ||||
| try: | try: | ||||
| self.node = repo[ha].node() | self.node = repo[ha].node() | ||||
| except error.RepoError: | except error.RepoError: | ||||
| raise error.ParseError(_('unknown changeset %s listed') | raise error.ParseError(_('unknown changeset %s listed') | ||||
| % ha[:12]) | % ha[:12]) | ||||
| if self.node is not None: | if self.node is not None: | ||||
| self._verifynodeconstraints(prev, expected, seen) | self._verifynodeconstraints(prev, expected, seen, basenodes) | ||||
| def _verifynodeconstraints(self, prev, expected, seen): | def _verifynodeconstraints(self, prev, expected, seen, basenodes): | ||||
| # by default command need a node in the edited list | # by default command need a node in the edited list | ||||
| if self.node not in expected: | if self.node not in expected: | ||||
| raise error.ParseError(_('%s "%s" changeset was not a candidate') | raise error.ParseError(_('%s "%s" changeset was not a candidate') | ||||
| % (self.verb, node.short(self.node)), | % (self.verb, node.short(self.node)), | ||||
| hint=_('only use listed changesets')) | hint=_('only use listed changesets')) | ||||
| # and only one command per node | # and only one command per node | ||||
| if self.node in seen: | if self.node in seen: | ||||
| raise error.ParseError(_('duplicated command for changeset %s') % | raise error.ParseError(_('duplicated command for changeset %s') % | ||||
| hint=_('hg histedit --continue to resume')) | hint=_('hg histedit --continue to resume')) | ||||
| def commiteditor(self): | def commiteditor(self): | ||||
| return cmdutil.getcommiteditor(edit=True, editform='histedit.edit') | return cmdutil.getcommiteditor(edit=True, editform='histedit.edit') | ||||
| @action(['fold', 'f'], | @action(['fold', 'f'], | ||||
| _('use commit, but combine it with the one above')) | _('use commit, but combine it with the one above')) | ||||
| class fold(histeditaction): | class fold(histeditaction): | ||||
| def verify(self, prev, expected, seen): | def verify(self, prev, expected, seen, basenodes): | ||||
| """ Verifies semantic correctness of the fold rule""" | """ Verifies semantic correctness of the fold rule""" | ||||
| super(fold, self).verify(prev, expected, seen) | super(fold, self).verify(prev, expected, seen, basenodes) | ||||
| repo = self.repo | repo = self.repo | ||||
| if not prev: | if not prev: | ||||
| c = repo[self.node].parents()[0] | c = repo[self.node].parents()[0] | ||||
| elif not prev.verb in ('pick', 'base'): | elif not prev.verb in ('pick', 'base'): | ||||
| return | return | ||||
| else: | else: | ||||
| c = repo[prev.node] | c = repo[prev.node] | ||||
| if not c.mutable(): | if not c.mutable(): | ||||
| def continuedirty(self): | def continuedirty(self): | ||||
| abortdirty() | abortdirty() | ||||
| def continueclean(self): | def continueclean(self): | ||||
| basectx = self.repo['.'] | basectx = self.repo['.'] | ||||
| return basectx, [] | return basectx, [] | ||||
| def _verifynodeconstraints(self, prev, expected, seen): | def _verifynodeconstraints(self, prev, expected, seen, basenodes): | ||||
| # base can only be use with a node not in the edited set | # base can only be use with a node not in the edited set | ||||
| if self.node in expected: | if self.node in expected: | ||||
| msg = _('%s "%s" changeset was an edited list candidate') | msg = _('%s "%s" changeset was an edited list candidate') | ||||
| raise error.ParseError( | raise error.ParseError( | ||||
| msg % (self.verb, node.short(self.node)), | msg % (self.verb, node.short(self.node)), | ||||
| hint=_('base must only use unlisted changesets')) | hint=_('base must only use unlisted changesets')) | ||||
| @action(['_multifold'], | @action(['_multifold'], | ||||
| node.short(state.parentctxnode), | node.short(state.parentctxnode), | ||||
| node.short(state.topmost)) | node.short(state.topmost)) | ||||
| rules = ruleeditor(repo, ui, state.actions, comment) | rules = ruleeditor(repo, ui, state.actions, comment) | ||||
| else: | else: | ||||
| rules = _readfile(ui, rules) | rules = _readfile(ui, rules) | ||||
| actions = parserules(rules, state) | actions = parserules(rules, state) | ||||
| ctxs = [repo[act.node] \ | ctxs = [repo[act.node] \ | ||||
| for act in state.actions if act.node] | for act in state.actions if act.node] | ||||
| warnverifyactions(ui, repo, actions, state, ctxs) | warnverifyactions(ui, repo, actions, state, ctxs, state.parentctxnode) | ||||
| state.actions = actions | state.actions = actions | ||||
| state.write() | state.write() | ||||
| def _newhistedit(ui, repo, state, revs, freeargs, opts): | def _newhistedit(ui, repo, state, revs, freeargs, opts): | ||||
| outg = opts.get('outgoing') | outg = opts.get('outgoing') | ||||
| rules = opts.get('commands', '') | rules = opts.get('commands', '') | ||||
| force = opts.get('force') | force = opts.get('force') | ||||
| ctxs = [repo[r] for r in revs] | ctxs = [repo[r] for r in revs] | ||||
| if not rules: | if not rules: | ||||
| comment = geteditcomment(ui, node.short(root), node.short(topmost)) | comment = geteditcomment(ui, node.short(root), node.short(topmost)) | ||||
| actions = [pick(state, r) for r in revs] | actions = [pick(state, r) for r in revs] | ||||
| rules = ruleeditor(repo, ui, actions, comment) | rules = ruleeditor(repo, ui, actions, comment) | ||||
| else: | else: | ||||
| rules = _readfile(ui, rules) | rules = _readfile(ui, rules) | ||||
| actions = parserules(rules, state) | actions = parserules(rules, state) | ||||
| warnverifyactions(ui, repo, actions, state, ctxs) | |||||
| parentctxnode = repo[root].parents()[0].node() | parentctxnode = repo[root].parents()[0].node() | ||||
| warnverifyactions(ui, repo, actions, state, ctxs, parentctxnode) | |||||
| state.parentctxnode = parentctxnode | state.parentctxnode = parentctxnode | ||||
| state.actions = actions | state.actions = actions | ||||
| state.topmost = topmost | state.topmost = topmost | ||||
| state.replacements = [] | state.replacements = [] | ||||
| # Create a backup so we can always abort completely. | # Create a backup so we can always abort completely. | ||||
| backupfile = None | backupfile = None | ||||
| if verb not in actiontable: | if verb not in actiontable: | ||||
| raise error.ParseError(_('unknown action "%s"') % verb) | raise error.ParseError(_('unknown action "%s"') % verb) | ||||
| action = actiontable[verb].fromrule(state, rest) | action = actiontable[verb].fromrule(state, rest) | ||||
| actions.append(action) | actions.append(action) | ||||
| return actions | return actions | ||||
| def warnverifyactions(ui, repo, actions, state, ctxs): | def warnverifyactions(ui, repo, actions, state, ctxs, basenode): | ||||
| try: | try: | ||||
| verifyactions(actions, state, ctxs) | verifyactions(actions, state, ctxs, basenode) | ||||
| except error.ParseError: | except error.ParseError: | ||||
| if repo.vfs.exists('histedit-last-edit.txt'): | if repo.vfs.exists('histedit-last-edit.txt'): | ||||
| ui.warn(_('warning: histedit rules saved ' | ui.warn(_('warning: histedit rules saved ' | ||||
| 'to: .hg/histedit-last-edit.txt\n')) | 'to: .hg/histedit-last-edit.txt\n')) | ||||
| raise | raise | ||||
| def verifyactions(actions, state, ctxs): | def verifyactions(actions, state, ctxs, basenode): | ||||
| """Verify that there exists exactly one action per given changeset and | """Verify that there exists exactly one action per given changeset and | ||||
| other constraints. | other constraints. | ||||
| Will abort if there are to many or too few rules, a malformed rule, | Will abort if there are to many or too few rules, a malformed rule, | ||||
| or a rule on a changeset outside of the user-given range. | or a rule on a changeset outside of the user-given range. | ||||
| """ | """ | ||||
| expected = set(c.node() for c in ctxs) | expected = set(c.node() for c in ctxs) | ||||
| seen = set() | seen = set() | ||||
| prev = None | prev = None | ||||
| if actions and actions[0].verb in ['roll', 'fold']: | if actions and actions[0].verb in ['roll', 'fold']: | ||||
| raise error.ParseError(_('first changeset cannot use verb "%s"') % | raise error.ParseError(_('first changeset cannot use verb "%s"') % | ||||
| actions[0].verb) | actions[0].verb) | ||||
| basenodes = set([state.repo[node.hex(action.node)].node() | |||||
| for action in actions if isinstance(action, base)]) | |||||
| basenodes.add(basenode) | |||||
| for action in actions: | for action in actions: | ||||
| action.verify(prev, expected, seen) | action.verify(prev, expected, seen, basenodes) | ||||
| prev = action | prev = action | ||||
| if action.node is not None: | if action.node is not None: | ||||
| seen.add(action.node) | seen.add(action.node) | ||||
| missing = sorted(expected - seen) # sort to stabilize output | missing = sorted(expected - seen) # sort to stabilize output | ||||
| if state.repo.ui.configbool('histedit', 'dropmissing'): | if state.repo.ui.configbool('histedit', 'dropmissing'): | ||||
| if len(actions) == 0: | if len(actions) == 0: | ||||
| raise error.ParseError(_('no rules provided'), | raise error.ParseError(_('no rules provided'), | ||||