[PATCH evolve-ext-V5] evolve: extract logic to new method _evolvemerge

[Bryan O'Sullivan]

On Tue, Jan 26, 2016 at 3:42 PM, Shusen LIU <liushusen at fb.com> wrote:

> +    try:
> +       r = merge.graft(repo, orig, pctx, ['local', 'graft'], True)
> +    except TypeError:
> +       # not using recent enough mercurial
> +       if len(orig.parents()) == 2:
> +           raise error.Abort(
> +               _("no support for evolving merge changesets yet"),
> +               hint=_("Redo the merge and use `hg prune <old> --succ "
> +                      "<new>` to obsolete the old one"))
> +
> +       r = merge.graft(repo, orig, pctx, ['local', 'graft'])
> +    return r
>

Just as a small matter of code hygiene, I would prefer to see two return
statements instead of assignments followed by a return. That makes more
sense now that you've extracted this out into its own function.

Also, I am not sure what "support a continued keywork" in your description
means.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20160126/c52a7d01/attachment.html>