[PATCH 1 of 8 cleanup] histedit: drop the 'nodetoverify' method

[Augie Fackler]

> On Aug 26, 2016, at 15:35, Pierre-Yves David <pierre-yves.david at ens-lyon.org> wrote:
> 
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
> # Date 1472236293 -7200
> #      Fri Aug 26 20:31:33 2016 +0200
> # Node ID 971ddb8990c6617925d3403dd4865ca77be3db59
> # Parent  4435d4c951ec2185d92cbe0041852767dda584c8
> # EXP-Topic histedit.constraint
> histedit: drop the 'nodetoverify' method

I believe this hook is in place so that exec can work. Mateusz, Durham?

> 
> That method is just returning self.node and is never overridden. We just use
> the attribute directly instead and get rid of the method.
> 
> This is the beginning of series to simplify and unify verification of constrains
> for actions.
> 
> diff --git a/hgext/histedit.py b/hgext/histedit.py
> --- a/hgext/histedit.py
> +++ b/hgext/histedit.py
> @@ -439,14 +439,6 @@ class histeditaction(object):
>         """
>         return set([_constraints.noduplicates, _constraints.noother])
> 
> -    def nodetoverify(self):
> -        """Returns a node associated with the action that will be used for
> -        verification purposes.
> -
> -        If the action doesn't correspond to node it should return None
> -        """
> -        return self.node
> -
>     def run(self):
>         """Runs the action. The default behavior is simply apply the action's
>         rulectx onto the current parentctx."""
> @@ -1199,8 +1191,8 @@ def _edithisteditplan(ui, repo, state, r
>     else:
>         rules = _readfile(rules)
>     actions = parserules(rules, state)
> -    ctxs = [repo[act.nodetoverify()] \
> -            for act in state.actions if act.nodetoverify()]
> +    ctxs = [repo[act.node] \
> +            for act in state.actions if act.node]
>     warnverifyactions(ui, repo, actions, state, ctxs)
>     state.actions = actions
>     state.write()
> @@ -1397,7 +1389,7 @@ def verifyactions(actions, state, ctxs):
>                 raise error.ParseError(_('unknown constraint "%s"') %
>                         constraint)
> 
> -        nodetoverify = action.nodetoverify()
> +        nodetoverify = action.node
>         if nodetoverify is not None:
>             ha = node.hex(nodetoverify)
>             if _constraints.noother in constraints and ha not in expected:
> @@ -1597,8 +1589,8 @@ def stripwrapper(orig, ui, repo, nodelis
>     if os.path.exists(os.path.join(repo.path, 'histedit-state')):
>         state = histeditstate(repo)
>         state.read()
> -        histedit_nodes = set([action.nodetoverify() for action
> -                             in state.actions if action.nodetoverify()])
> +        histedit_nodes = set([action.node for action
> +                             in state.actions if action.node])
>         strip_nodes = set([repo[n].node() for n in nodelist])
>         common_nodes = histedit_nodes & strip_nodes
>         if common_nodes:
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel